1.19.2-0.2.7b

Zuxelus · Sep 4, 2023 · 8e16741 · 8e16741
1 parent 32e313b
commit 8e16741
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.spongepowered.mixin'
 //apply plugin: 'scala'
 
-version = '1.19.2-0.2.7a'
+version = '1.19.2-0.2.7b'
 group = 'com.zuxelus.energycontrol'
 archivesBaseName = 'EnergyControl-forge'
 
@@ -99,23 +99,23 @@ repositories {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.19.2-43.2.4'
+    minecraft 'net.minecraftforge:forge:1.19.2-43.2.23'
     implementation 'io.netty:netty-codec-http:4.1.77.Final'
     implementation 'org.scala-lang:scala-library:2.13.8'
-    compileOnly fg.deobf ("curse.maven:ae2-223794:4293558")
-    compileOnly fg.deobf ("curse.maven:cctweaked-282001:4395619")
-    compileOnly fg.deobf ("curse.maven:ic2c-242942:4348706")
-    compileOnly fg.deobf ("curse.maven:WTHIT-455982:4368864") //
-    compileOnly fg.deobf ("curse.maven:badpackets-615134:4073854") //
-    compileOnly fg.deobf ("curse.maven:jei-238222:4434397")
-    compileOnly fg.deobf ("curse.maven:extremereactors-250277:4417968")
-    compileOnly fg.deobf ("curse.maven:zerocore-247921:4485324")
+    compileOnly fg.deobf ("curse.maven:ae2-223794:4733119")
+    compileOnly fg.deobf ("curse.maven:cctweaked-282001:4630524")
+    compileOnly fg.deobf ("curse.maven:ic2c-242942:4563059")
+    compileOnly fg.deobf ("curse.maven:WTHIT-455982:4727694") //
+    compileOnly fg.deobf ("curse.maven:badpackets-615134:4735301") //
+    compileOnly fg.deobf ("curse.maven:jei-238222:4712866")
+    compileOnly fg.deobf ("curse.maven:extremereactors-250277:4715935")
+    compileOnly fg.deobf ("curse.maven:zerocore-247921:4702621")
     compileOnly fg.deobf ("curse.maven:advancedgenerators-223622:4104739")
     compileOnly fg.deobf ("curse.maven:bdlib-70496:4100704")
     compileOnly fg.deobf ("curse.maven:catsforce-320926:4028119")
-    compileOnly fg.deobf ("curse.maven:mekanism-268560:4385637")
-    compileOnly fg.deobf ("curse.maven:mekanismgenerators-268566:4385639")
-    compileOnly fg.deobf ("com.maciej916.indreb:indreb:1.19.2-0.14.3-exp-quantum-armor")
+    compileOnly fg.deobf ("curse.maven:mekanism-268560:4644795")
+    compileOnly fg.deobf ("curse.maven:mekanismgenerators-268566:4644798")
+    compileOnly fg.deobf ("com.maciej916.indreb:indreb:1.19.2-0.14.3-exp-final")
     //annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 }
 

diff --git a/src/main/java/com/zuxelus/energycontrol/crossmod/CrossBigReactors.java b/src/main/java/com/zuxelus/energycontrol/crossmod/CrossBigReactors.java
@@ -43,8 +43,8 @@ public CompoundTag getEnergyData(BlockEntity te) {
 
 			CompoundTag tag = new CompoundTag();
 			tag.putString(DataHelper.EUTYPE, "FE");
-			tag.putDouble(DataHelper.ENERGY, reactor.getEnergyStored(EnergySystem.REFERENCE, null));
-			tag.putDouble(DataHelper.CAPACITY, reactor.getCapacity(EnergySystem.REFERENCE, null));
+			tag.putDouble(DataHelper.ENERGY, reactor.getEnergyStored(reactor.getOutputEnergySystem()).doubleValue());
+			tag.putDouble(DataHelper.CAPACITY, reactor.getCapacity(reactor.getOutputEnergySystem()).doubleValue());
 			return tag;
 		}
 		if (te instanceof AbstractTurbineEntity) {
@@ -57,8 +57,8 @@ public CompoundTag getEnergyData(BlockEntity te) {
 
 			CompoundTag tag = new CompoundTag();
 			tag.putString(DataHelper.EUTYPE, "FE");
-			tag.putDouble(DataHelper.ENERGY, turbine.getEnergyStored(EnergySystem.REFERENCE, null));
-			tag.putDouble(DataHelper.CAPACITY, turbine.getCapacity(EnergySystem.REFERENCE, null));
+			tag.putDouble(DataHelper.ENERGY, turbine.getEnergyStored(turbine.getOutputEnergySystem()).doubleValue());
+			tag.putDouble(DataHelper.CAPACITY, turbine.getCapacity(turbine.getOutputEnergySystem()).doubleValue());
 			return tag;
 		}
 		return null;
@@ -134,7 +134,7 @@ public CompoundTag getCardData(BlockEntity te) {
 			tag.putBoolean("cooling", reactor.getOperationalMode().isPassive());
 			tag.putDouble("heat", reactor.getFuelHeat().getAsDouble());
 			tag.putDouble("coreHeat", reactor.getReactorHeat().getAsDouble());
-			tag.putString(DataHelper.ENERGY, String.format("%s / %s", PanelString.getFormatter().format(reactor.getEnergyStored(EnergySystem.REFERENCE, null)), PanelString.getFormatter().format(reactor.getCapacity(EnergySystem.REFERENCE, null))));
+			tag.putString(DataHelper.ENERGY, String.format("%s / %s", PanelString.getFormatter().format(reactor.getEnergyStored(reactor.getOutputEnergySystem()).doubleValue()), PanelString.getFormatter().format(reactor.getCapacity(reactor.getOutputEnergySystem()).doubleValue())));
 			tag.putDouble("output", reactor.getUiStats().getAmountGeneratedLastTick());
 			tag.putInt("rods", reactor.getFuelRodsCount());
 			tag.putString("fuel", String.format("%s / %s", reactor.getFuelAmount(), reactor.getCapacity()));
@@ -155,7 +155,7 @@ public CompoundTag getCardData(BlockEntity te) {
 			CompoundTag tag = new CompoundTag();
 			tag.putInt("type", 2);
 			tag.putBoolean("reactorPoweredB", turbine.isMachineActive());
-			tag.putString(DataHelper.ENERGY, String.format("%s / %s", PanelString.getFormatter().format(turbine.getEnergyStored(EnergySystem.REFERENCE, null)), PanelString.getFormatter().format(turbine.getCapacity(EnergySystem.REFERENCE, null))));
+			tag.putString(DataHelper.ENERGY, String.format("%s / %s", PanelString.getFormatter().format(turbine.getEnergyStored(turbine.getOutputEnergySystem()).doubleValue()), PanelString.getFormatter().format(turbine.getCapacity(turbine.getOutputEnergySystem()).doubleValue())));
 			tag.putDouble("output", turbine.getEnergyGeneratedLastTick());
 			tag.putDouble("speed", turbine.getRotorSpeed());
 			//tag.putDouble("speedMax", turbine.getMaxRotorSpeed());