mirror of
https://github.com/TicTicBoooom-Mods/MasterfulMachinery.git
synced 2026-03-18 21:40:34 +01:00
Upgrade Mekanism to 10.1
Mekanism 10.1 changed the constructor for chemical stack rendering, so a change on MM's end was needed
This commit is contained in:
@@ -177,7 +177,7 @@ dependencies {
|
|||||||
// The userdev artifact is a special name and will get all sorts of transformations applied to it.
|
// The userdev artifact is a special name and will get all sorts of transformations applied to it.
|
||||||
compileOnly 'org.projectlombok:lombok:1.18.18'
|
compileOnly 'org.projectlombok:lombok:1.18.18'
|
||||||
annotationProcessor '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'
|
compileOnly 'com.google.code.gson:gson:2.8.7'
|
||||||
implementation 'org.spongepowered:mixin:0.8-SNAPSHOT'
|
implementation 'org.spongepowered:mixin:0.8-SNAPSHOT'
|
||||||
|
|||||||
@@ -2,6 +2,6 @@
|
|||||||
# This is required to provide enough memory for the Minecraft decompilation process.
|
# This is required to provide enough memory for the Minecraft decompilation process.
|
||||||
org.gradle.jvmargs=-Xmx3G
|
org.gradle.jvmargs=-Xmx3G
|
||||||
org.gradle.daemon=false
|
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
|
mc_version=1.16.5
|
||||||
jei_version=7.+
|
jei_version=7.+
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ public class MekGasPortState extends PortState {
|
|||||||
|
|
||||||
this.gas = gas;
|
this.gas = gas;
|
||||||
this.amount = amount;
|
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
|
@Override
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ public class MekInfusePortState extends PortState {
|
|||||||
public MekInfusePortState(String gas, long amount) {
|
public MekInfusePortState(String gas, long amount) {
|
||||||
this.infuse = gas;
|
this.infuse = gas;
|
||||||
this.amount = amount;
|
this.amount = amount;
|
||||||
renderer = new ChemicalStackRenderer<>(amount, false, 16, 16, null);
|
renderer = new ChemicalStackRenderer<>(amount, 16, 16);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ public class MekSlurryPortState extends PortState {
|
|||||||
public MekSlurryPortState(String gas, long amount) {
|
public MekSlurryPortState(String gas, long amount) {
|
||||||
this.slurry = gas;
|
this.slurry = gas;
|
||||||
this.amount = amount;
|
this.amount = amount;
|
||||||
renderer = new ChemicalStackRenderer<>(amount, false, 16, 16, null);
|
renderer = new ChemicalStackRenderer<>(amount, 16, 16);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user