From 55b9b924ccfa1d712df533568f96c887cc10aa62 Mon Sep 17 00:00:00 2001 From: rguy98 Date: Thu, 23 Dec 2021 06:41:10 -0500 Subject: [PATCH] Upgrade Mekanism to 10.1 Mekanism 10.1 changed the constructor for chemical stack rendering, so a change on MM's end was needed --- build.gradle | 2 +- gradle.properties | 4 ++-- .../com/ticticboooom/mods/mm/ports/state/MekGasPortState.java | 2 +- .../ticticboooom/mods/mm/ports/state/MekInfusePortState.java | 2 +- .../ticticboooom/mods/mm/ports/state/MekSlurryPortState.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index fb65450..d36c19f 100644 --- a/build.gradle +++ b/build.gradle @@ -177,7 +177,7 @@ dependencies { // The userdev artifact is a special name and will get all sorts of transformations applied to it. compileOnly 'org.projectlombok:lombok:1.18.18' annotationProcessor 'org.projectlombok:lombok:1.18.18' - minecraft 'net.minecraftforge:forge:1.16.5-36.1.23' + minecraft 'net.minecraftforge:forge:1.16.5-36.2.21' compileOnly 'com.google.code.gson:gson:2.8.7' implementation 'org.spongepowered:mixin:0.8-SNAPSHOT' diff --git a/gradle.properties b/gradle.properties index fa070cb..e76ffa6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,6 +2,6 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -mekanism_version=1.16.5-10.0.20.447 +mekanism_version=1.16.5-10.1.0.455 mc_version=1.16.5 -jei_version=7.+ \ No newline at end of file +jei_version=7.+ diff --git a/src/main/java/com/ticticboooom/mods/mm/ports/state/MekGasPortState.java b/src/main/java/com/ticticboooom/mods/mm/ports/state/MekGasPortState.java index 134b33b..0b73e4a 100644 --- a/src/main/java/com/ticticboooom/mods/mm/ports/state/MekGasPortState.java +++ b/src/main/java/com/ticticboooom/mods/mm/ports/state/MekGasPortState.java @@ -41,7 +41,7 @@ public class MekGasPortState extends PortState { this.gas = gas; this.amount = amount; - renderer = new ChemicalStackRenderer<>(amount, false, 16, 16, null); + renderer = new ChemicalStackRenderer<>(amount, 16, 16); // Fixed to meet Mekanism 10.1's revised code } @Override diff --git a/src/main/java/com/ticticboooom/mods/mm/ports/state/MekInfusePortState.java b/src/main/java/com/ticticboooom/mods/mm/ports/state/MekInfusePortState.java index a21d8df..24cc162 100644 --- a/src/main/java/com/ticticboooom/mods/mm/ports/state/MekInfusePortState.java +++ b/src/main/java/com/ticticboooom/mods/mm/ports/state/MekInfusePortState.java @@ -41,7 +41,7 @@ public class MekInfusePortState extends PortState { public MekInfusePortState(String gas, long amount) { this.infuse = gas; this.amount = amount; - renderer = new ChemicalStackRenderer<>(amount, false, 16, 16, null); + renderer = new ChemicalStackRenderer<>(amount, 16, 16); } @Override diff --git a/src/main/java/com/ticticboooom/mods/mm/ports/state/MekSlurryPortState.java b/src/main/java/com/ticticboooom/mods/mm/ports/state/MekSlurryPortState.java index b27901f..78b4082 100644 --- a/src/main/java/com/ticticboooom/mods/mm/ports/state/MekSlurryPortState.java +++ b/src/main/java/com/ticticboooom/mods/mm/ports/state/MekSlurryPortState.java @@ -41,7 +41,7 @@ public class MekSlurryPortState extends PortState { public MekSlurryPortState(String gas, long amount) { this.slurry = gas; this.amount = amount; - renderer = new ChemicalStackRenderer<>(amount, false, 16, 16, null); + renderer = new ChemicalStackRenderer<>(amount, 16, 16); } @Override