CEuの最新masterに追従

Author: tier940

dependencies.gradle

@@ -48,15 +48,15 @@ dependencies {
     implementation "curse.maven:infinitylib-251396:3317119"
     implementation "curse.maven:spice-of-life-carrot-edition-277616:2959847"
 
-    implementation "curse.maven:enderio-64578:3328811"
-    implementation "curse.maven:endercore-231868:2972849"
+    implementation "curse.maven:enderio-64578:4674244"
+    implementation "curse.maven:endercore-231868:4671384"
     implementation "info.loenwind.autoconfig:AutoConfig:${project.minecraft.version}-1.0.2"
     implementation "info.loenwind.autosave:AutoSave:${project.minecraft.version}-1.0.11"
 
     //compile "curse.maven:spiceoflife-220811:2571951"
 
-    //implementation files("libs/gregtech-1.12.2-2.6.2-beta-dev.jar")
-    implementation rfg.deobf("curse.maven:gregtech-ce-unofficial-557242:4641113")
+    implementation files("libs/gregtech-1.12.2-2.7.2-beta-dev-b8c7c30.jar")
+    //implementation rfg.deobf("curse.maven:gregtech-ce-unofficial-557242:4641113")
     implementation files("libs/AppleSkin-mc1.12-1.0.9.jar")
     implementation files("libs/groovyscript-0.4.0.jar")
     implementation files("libs/NuclearCraft-2o.6.0-1.12.2.jar")

libs/gregtech-1.12.2-2.7.2-beta-dev-b8c7c30.jar

@@ -73,24 +73,14 @@ protected ModularUI.Builder createGuiTemplate(EntityPlayer player) {
                 .setButtonTexture(GuiTextures.BUTTON_OVERCLOCK));
 
         if (exportItems.getSlots() + exportFluids.getTanks() <= 9) {
-            ImageWidget logo = new ImageWidget(152, 62 + yOffset, 17, 17,
+            ImageWidget logo = new ImageWidget(152, 63 + yOffset, 17, 17,
                     GTValues.XMAS.get() ? GTFOGuiTextures.GTFO_LOGO_XMAS : GTFOGuiTextures.GTFO_LOGO)
                     .setIgnoreColor(true);
 
             if (this.circuitInventory != null) {
-                SlotWidget circuitSlot = new GhostCircuitSlotWidget(circuitInventory, 0, 124, 62 + yOffset)
-                        .setBackgroundTexture(GuiTextures.SLOT, getCircuitSlotOverlay());
-                builder.widget(getCircuitSlotTooltip(circuitSlot)).widget(logo)
-                        .widget(new ClickButtonWidget(115, 62 + yOffset, 9, 9, "",
-                                click -> circuitInventory.addCircuitValue(click.isShiftClick ? 5 : 1))
-                                .setShouldClientCallback(true)
-                                .setButtonTexture(GuiTextures.BUTTON_INT_CIRCUIT_PLUS)
-                                .setDisplayFunction(() -> circuitInventory.hasCircuitValue() && circuitInventory.getCircuitValue() < IntCircuitIngredient.CIRCUIT_MAX))
-                        .widget(new ClickButtonWidget(115, 71 + yOffset, 9, 9, "",
-                                click -> circuitInventory.addCircuitValue(click.isShiftClick ? -5 : -1))
-                                .setShouldClientCallback(true)
-                                .setButtonTexture(GuiTextures.BUTTON_INT_CIRCUIT_MINUS)
-                                .setDisplayFunction(() -> circuitInventory.hasCircuitValue() && circuitInventory.getCircuitValue() > IntCircuitIngredient.CIRCUIT_MIN));
+                SlotWidget circuitSlot = new GhostCircuitSlotWidget(this.circuitInventory, 0, 124, 62 + yOffset)
+                        .setBackgroundTexture(GuiTextures.SLOT, this.getCircuitSlotOverlay());
+                builder.widget(circuitSlot.setConsumer(this::getCircuitSlotTooltip)).widget(logo);
             }
         }
         return builder;

run/mods/EnderCore-1.12.2-0.5.76-core.jar

@@ -3,12 +3,12 @@
 import gregtech.api.capability.IEnergyContainer;
 import gregtech.api.capability.impl.RecipeLogicEnergy;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.SimpleMachineMetaTileEntity;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
 import gregtech.api.recipes.Recipe;
 import gregtech.api.recipes.RecipeMap;
 import gregtech.client.renderer.ICubeRenderer;
 import gregtechfoodoption.client.GTFOClientHandler;
+import gregtechfoodoption.item.GTFOSimpleMachineMetaTileEntity;
 import gregtechfoodoption.recipe.GTFORecipeMaps;
 import gregtechfoodoption.recipe.properties.CauseDamageProperty;
 import gregtechfoodoption.recipe.properties.MobOnTopProperty;
@@ -25,7 +25,7 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-public class MetaTileEntityMobExtractor extends SimpleMachineMetaTileEntity {
+public class MetaTileEntityMobExtractor extends GTFOSimpleMachineMetaTileEntity {
     private EntityLivingBase attackableTarget;
 
     public MetaTileEntityMobExtractor(ResourceLocation metaTileEntityId, RecipeMap<?> recipeMap, ICubeRenderer renderer, int tier, boolean hasFrontFacing,