1.20 broken partial update

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'eclipse'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '5.1.+'
+    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
 }
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
@@ -12,10 +12,15 @@ version = "${mc_version}-${mod_version}"
 group = 'com.lothrazar.cyclic'
 archivesBaseName = 'Cyclic'
 
+base {
+    archivesName = mod_id
+}
+
 minecraft {
     mappings channel: 'official', version: "${mc_version}"
 
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+    copyIdeResources = true
 
     // Default run configurations.
     // These can be tweaked, removed, or duplicated as needed.
@@ -33,7 +38,7 @@ minecraft {
             property 'mixin.env.disableRefMap', 'true'
 
             mods {
-                cyclic {
+                "${mod_id}" {
                     source sourceSets.main
                 }
             }
@@ -70,7 +75,8 @@ dependencies {
 //	runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-common:${jei_version}")
 	runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")
 
-    implementation fg.deobf("top.theillusivec4.curios:curios-forge:${mc_version}-${curios_version}")
+   // runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:${version}")
+   // compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:${version}:api")
 
 	// optional compat: guidebook
 	//RIP patchouli i will miss you please stop being dead soon 
@@ -106,6 +112,26 @@ repositories {
   maven { url = "https://modmaven.dev"  }    
 //  maven { url 'https://www.cursemaven.com'  }
 }
+
+
+
+def resourceTargets = ['META-INF/mods.toml', 'pack.mcmeta']
+def replaceProperties = [
+        minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
+        forge_version: forge_version, forge_version_range: forge_version_range,
+        loader_version_range: loader_version_range,
+        mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
+        mod_authors: mod_authors, mod_description: mod_description
+]
+processResources {
+    inputs.properties replaceProperties
+    replaceProperties.put 'project', project
+
+    filesMatching(resourceTargets) {
+        expand replaceProperties
+    }
+}
+
 // Example for how to get properties into the manifest for reading by the runtime..
 jar {
     manifest {

gradle.properties

@@ -6,15 +6,28 @@ org.gradle.daemon=false
 # as needed run/server.properties : online-mode=false
 dist_folder=c:/temp
 
+mod_id=cyclic
+mod_name=cyclic
+id=cyclic
+mod_license=All Rights Reserved
+mod_authors=Lothrazar
+mod_description=stuff
+mod_group_id=com.lothrazar.cyclic
 curse_id=239286
 mod_version=1.10.0
 
-mc_version=1.19.4
-forge_version=45.1.0
-
+minecraft_version=1.20
+mc_version=1.20
+minecraft_version_range=[1.20,1.21)
+# The Forge version must agree with the Minecraft version to get a valid artifact
+forge_version=46.0.13
+# The Forge version range can use any version of Forge as bounds or match the loader version range
+forge_version_range=[46,)
+# The loader version range can only use the major version of Forge/FML as bounds
+loader_version_range=[46,)
 # optional dependencies
-jei_version=13.1.0.11
-curios_version=5.1.5.3
+jei_version=14.0.0.5
+curios_version=5.2.0-beta.1+1.20
 patchouli_version=78
 
 # for eclipse.ini if needed

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

src/main/java/com/lothrazar/cyclic/api/IHasTooltip.java

@@ -10,7 +10,7 @@ public interface IHasTooltip {
    * 
    * @return tooltips as a list
    */
-  public List<Component> getTooltip();
+  public List<Component> getTooltips();
 
   /**
    * Override the tooltip and set it to a new list containing this string

src/main/java/com/lothrazar/cyclic/block/anvil/ScreenAnvil.java

@@ -5,6 +5,8 @@
 import com.lothrazar.cyclic.gui.ScreenBase;
 import com.lothrazar.cyclic.registry.TextureRegistry;
 import com.mojang.blaze3d.vertex.PoseStack;
+
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 
@@ -15,7 +17,7 @@ public class ScreenAnvil extends ScreenBase<ContainerAnvil> {
 
   public ScreenAnvil(ContainerAnvil screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    this.energy = new EnergyBar(this, TileAnvilAuto.MAX);
+    this.energy = new EnergyBar(this.font, TileAnvilAuto.MAX);
   }
 
   @Override
@@ -31,7 +33,7 @@ public void init() {
   }
 
   @Override
-  public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+  public void render(GuiGraphics ms, int mouseX, int mouseY, float partialTicks) {
     this.renderBackground(ms);
     super.render(ms, mouseX, mouseY, partialTicks);
     this.renderTooltip(ms, mouseX, mouseY);
@@ -40,13 +42,13 @@ public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
   }
 
   @Override
-  protected void renderLabels(PoseStack ms, int mouseX, int mouseY) {
+  protected void renderLabels(GuiGraphics ms, int mouseX, int mouseY) {
     this.drawButtonTooltips(ms, mouseX, mouseY);
     this.drawName(ms, this.title.getString());
   }
 
   @Override
-  protected void renderBg(PoseStack ms, float partialTicks, int mouseX, int mouseY) {
+  protected void renderBg(GuiGraphics ms, float partialTicks, int mouseX, int mouseY) {
     this.drawBackground(ms, TextureRegistry.INVENTORY);
     this.drawSlot(ms, 54, 34);
     this.drawSlotLarge(ms, 104, 30);

src/main/java/com/lothrazar/cyclic/block/anvilmagma/ScreenAnvilMagma.java

@@ -5,6 +5,8 @@
 import com.lothrazar.cyclic.gui.ScreenBase;
 import com.lothrazar.cyclic.registry.TextureRegistry;
 import com.mojang.blaze3d.vertex.PoseStack;
+
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 
@@ -15,7 +17,7 @@ public class ScreenAnvilMagma extends ScreenBase<ContainerAnvilMagma> {
 
   public ScreenAnvilMagma(ContainerAnvilMagma screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    fluid = new FluidBar(this, 152, 8, TileAnvilMagma.CAPACITY);
+    fluid = new FluidBar(this.font, 152, 8, TileAnvilMagma.CAPACITY);
   }
 
   @Override
@@ -30,22 +32,22 @@ public void init() {
   }
 
   @Override
-  public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+  public void render(GuiGraphics ms, int mouseX, int mouseY, float partialTicks) {
     this.renderBackground(ms);
     super.render(ms, mouseX, mouseY, partialTicks);
     this.renderTooltip(ms, mouseX, mouseY);
     fluid.renderHoveredToolTip(ms, mouseX, mouseY, menu.tile.getFluid());
   }
 
   @Override
-  protected void renderLabels(PoseStack ms, int mouseX, int mouseY) {
+  protected void renderLabels(GuiGraphics ms, int mouseX, int mouseY) {
     this.drawButtonTooltips(ms, mouseX, mouseY);
     this.drawName(ms, this.title.getString());
     btnRedstone.onValueUpdate(menu.tile);
   }
 
   @Override
-  protected void renderBg(PoseStack ms, float partialTicks, int mouseX, int mouseY) {
+  protected void renderBg(GuiGraphics ms, float partialTicks, int mouseX, int mouseY) {
     this.drawBackground(ms, TextureRegistry.INVENTORY);
     this.drawSlot(ms, 54, 34);
     this.drawSlotLarge(ms, 104, 30);

src/main/java/com/lothrazar/cyclic/block/anvilvoid/ScreenAnvilVoid.java

@@ -6,6 +6,8 @@
 import com.lothrazar.cyclic.registry.TextureRegistry;
 import com.lothrazar.cyclic.util.ChatUtil;
 import com.mojang.blaze3d.vertex.PoseStack;
+
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 
@@ -16,7 +18,7 @@ public class ScreenAnvilVoid extends ScreenBase<ContainerAnvilVoid> {
 
   public ScreenAnvilVoid(ContainerAnvilVoid screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    fluid = new FluidBar(this, 152, 8, TileAnvilVoid.CAPACITY);
+    fluid = new FluidBar(this.font, 152, 8, TileAnvilVoid.CAPACITY);
     fluid.emtpyTooltip = "0 " + ChatUtil.lang("fluid.cyclic.xpjuice");
   }
 
@@ -32,7 +34,7 @@ public void init() {
   }
 
   @Override
-  public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+  public void render(GuiGraphics ms, int mouseX, int mouseY, float partialTicks) {
     this.renderBackground(ms);
     super.render(ms, mouseX, mouseY, partialTicks);
     this.renderTooltip(ms, mouseX, mouseY);
@@ -41,13 +43,13 @@ public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
   }
 
   @Override
-  protected void renderLabels(PoseStack ms, int mouseX, int mouseY) {
+  protected void renderLabels(GuiGraphics ms, int mouseX, int mouseY) {
     this.drawButtonTooltips(ms, mouseX, mouseY);
     this.drawName(ms, this.title.getString());
   }
 
   @Override
-  protected void renderBg(PoseStack ms, float partialTicks, int mouseX, int mouseY) {
+  protected void renderBg(GuiGraphics ms, float partialTicks, int mouseX, int mouseY) {
     this.drawBackground(ms, TextureRegistry.INVENTORY);
     this.drawSlot(ms, 54, 34);
     this.drawSlotLarge(ms, 104, 30);

src/main/java/com/lothrazar/cyclic/block/battery/BlockBattery.java

@@ -21,6 +21,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
+import net.minecraft.world.level.storage.loot.LootParams;
 import net.minecraftforge.common.capabilities.ForgeCapabilities;
 import net.minecraftforge.energy.IEnergyStorage;
 
@@ -45,7 +46,7 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
   }
 
   @Override
-  public List<ItemStack> getDrops(BlockState state, net.minecraft.world.level.storage.loot.LootContext.Builder builder) {
+  public List<ItemStack> getDrops(BlockState state, LootParams.Builder builder) {
     //because harvestBlock manually forces a drop  
     return new ArrayList<>();
   }

src/main/java/com/lothrazar/cyclic/block/battery/ScreenBattery.java

@@ -10,6 +10,8 @@
 import com.lothrazar.cyclic.registry.TextureRegistry;
 import com.lothrazar.cyclic.util.ChatUtil;
 import com.mojang.blaze3d.vertex.PoseStack;
+
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 
@@ -26,7 +28,7 @@ public class ScreenBattery extends ScreenBase<ContainerBattery> {
 
   public ScreenBattery(ContainerBattery screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    this.energy = new EnergyBar(this, TileBattery.MAX);
+    this.energy = new EnergyBar(this.font, TileBattery.MAX);
   }
 
   @Override
@@ -94,15 +96,15 @@ public void init() {
   }
 
   @Override
-  public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+  public void render(GuiGraphics ms, int mouseX, int mouseY, float partialTicks) {
     this.renderBackground(ms);
     super.render(ms, mouseX, mouseY, partialTicks);
     this.renderTooltip(ms, mouseX, mouseY);
     energy.renderHoveredToolTip(ms, mouseX, mouseY, menu.getEnergy());
   }
 
   @Override
-  protected void renderLabels(PoseStack ms, int mouseX, int mouseY) {
+  protected void renderLabels(GuiGraphics ms, int mouseX, int mouseY) {
     btnToggle.setTooltip(ChatUtil.lang("gui.cyclic.flowing" + menu.tile.getFlowing()));
     btnToggle.setTextureId(menu.tile.getFlowing() == 1 ? TextureEnum.POWER_MOVING : TextureEnum.POWER_STOP);
     btnU.setTextureId(getTextureId(Fields.U));
@@ -120,7 +122,7 @@ private TextureEnum getTextureId(Enum<Fields> field) {
   }
 
   @Override
-  protected void renderBg(PoseStack ms, float partialTicks, int mouseX, int mouseY) {
+  protected void renderBg(GuiGraphics ms, float partialTicks, int mouseX, int mouseY) {
     this.drawBackground(ms, TextureRegistry.INVENTORY);
     this.drawSlot(ms, 133, 53, TextureRegistry.SLOT_CHARGE);
     energy.draw(ms, menu.getEnergy());

src/main/java/com/lothrazar/cyclic/block/batteryclay/ClayBattery.java

@@ -17,6 +17,7 @@
 import net.minecraft.world.level.block.entity.BlockEntityTicker;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.storage.loot.LootParams;
 import net.minecraftforge.common.capabilities.ForgeCapabilities;
 import net.minecraftforge.energy.IEnergyStorage;
 
@@ -33,7 +34,7 @@ public void registerClient() {
   }
 
   @Override
-  public List<ItemStack> getDrops(BlockState state, net.minecraft.world.level.storage.loot.LootContext.Builder builder) {
+  public List<ItemStack> getDrops(BlockState state,LootParams.Builder builder) {
     //because harvestBlock manually forces a drop  
     return new ArrayList<>();
   }