From 17e9fcb881dd48edffc347a2eaa9866fbe059364 Mon Sep 17 00:00:00 2001 From: TechLord22 <37029404+techlord22@users.noreply.github.com> Date: Sun, 14 Apr 2024 13:21:47 -0400 Subject: [PATCH 1/3] fix waila provider category name --- .../hwyla/provider/BlockOreDataProvider.java | 8 +++++--- .../hwyla/provider/ControllableDataProvider.java | 3 +-- .../hwyla/provider/ConverterDataProvider.java | 2 +- .../hwyla/provider/DiodeDataProvider.java | 3 +-- .../provider/ElectricContainerDataProvider.java | 3 +-- .../hwyla/provider/LampDataProvider.java | 3 +-- .../hwyla/provider/MaintenanceDataProvider.java | 3 +-- .../provider/MultiRecipeMapDataProvider.java | 3 +-- .../hwyla/provider/MultiblockDataProvider.java | 3 +-- .../hwyla/provider/PrimitivePumpDataProvider.java | 3 +-- .../hwyla/provider/RecipeLogicDataProvider.java | 2 +- .../hwyla/provider/SteamBoilerDataProvider.java | 3 +-- .../hwyla/provider/TransformerDataProvider.java | 2 +- .../hwyla/provider/WorkableDataProvider.java | 3 +-- .../resources/assets/gregtech/lang/en_us.lang | 15 +++++++++++++++ 15 files changed, 33 insertions(+), 26 deletions(-) diff --git a/src/main/java/gregtech/integration/hwyla/provider/BlockOreDataProvider.java b/src/main/java/gregtech/integration/hwyla/provider/BlockOreDataProvider.java index b8d6512742b..a34e22d42c7 100644 --- a/src/main/java/gregtech/integration/hwyla/provider/BlockOreDataProvider.java +++ b/src/main/java/gregtech/integration/hwyla/provider/BlockOreDataProvider.java @@ -1,6 +1,5 @@ package gregtech.integration.hwyla.provider; -import gregtech.api.GTValues; import gregtech.api.unification.ore.StoneType; import gregtech.common.blocks.BlockOre; import gregtech.integration.hwyla.HWYLAModule; @@ -8,7 +7,10 @@ import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; -import mcp.mobius.waila.api.*; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.IWailaRegistrar; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -19,7 +21,7 @@ public class BlockOreDataProvider implements IWailaDataProvider { public void register(@NotNull IWailaRegistrar registrar) { registrar.registerBodyProvider(this, BlockOre.class); - registrar.addConfig(GTValues.MODID, "gregtech.block_ore"); + registrar.addConfig("GregTech", "gregtech.block_ore"); } @NotNull diff --git a/src/main/java/gregtech/integration/hwyla/provider/ControllableDataProvider.java b/src/main/java/gregtech/integration/hwyla/provider/ControllableDataProvider.java index 20791ab3e34..1142e32854e 100644 --- a/src/main/java/gregtech/integration/hwyla/provider/ControllableDataProvider.java +++ b/src/main/java/gregtech/integration/hwyla/provider/ControllableDataProvider.java @@ -1,6 +1,5 @@ package gregtech.integration.hwyla.provider; -import gregtech.api.GTValues; import gregtech.api.capability.GregtechTileCapabilities; import gregtech.api.capability.IControllable; @@ -26,7 +25,7 @@ public class ControllableDataProvider extends CapabilityDataProvider { public void register(@NotNull IWailaRegistrar registrar) { registrar.registerBodyProvider(this, TileEntity.class); registrar.registerNBTProvider(this, TileEntity.class); - registrar.addConfig(GTValues.MODID, "gregtech.workable"); + registrar.addConfig("GregTech", "gregtech.workable"); } @Override diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index d041e2f0126..78cbaeb9f2d 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -104,6 +104,21 @@ gregtech.top.ld_pipe_output=Output gregtech.top.ld_pipe_input_endpoint=Input Endpoint: gregtech.top.ld_pipe_output_endpoint=Output Endpoint: +option.gregtech.block_ore=Ore Blocks +option.gregtech.controllable=Controllable Machines +option.gregtech.converter=Energy Converters +option.gregtech.diode=Diodes +option.gregtech.energy=Energy Containers +option.gregtech.block_lamp=Lamp Blocks +option.gregtech.maintenance=Maintenance Problems +option.gregtech.multi_recipemap=Machine Modes +option.gregtech.multiblock=Multiblocks +option.gregtech.primitive_pump=Primitive Pump +option.gregtech.recipe_logic=Recipes +option.gregtech.steam_boiler=Steam Boilers +option.gregtech.transformer=Transformers +option.gregtech.workable=Workable Machines + gregtech.waila.energy_stored=Energy: %d EU / %d EU gregtech.waila.progress_idle=Idle gregtech.waila.progress_tick=Progress: %d t / %d t From 1b09402ed4ed063ec54a2339aeab0ae43efb1cfe Mon Sep 17 00:00:00 2001 From: TechLord22 <37029404+techlord22@users.noreply.github.com> Date: Sun, 14 Apr 2024 13:22:47 -0400 Subject: [PATCH 2/3] fix recipe logic provider showing EU consumption on primitive machines --- .../integration/hwyla/provider/RecipeLogicDataProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/gregtech/integration/hwyla/provider/RecipeLogicDataProvider.java b/src/main/java/gregtech/integration/hwyla/provider/RecipeLogicDataProvider.java index 63bff8b2998..8ab96b0d3c0 100644 --- a/src/main/java/gregtech/integration/hwyla/provider/RecipeLogicDataProvider.java +++ b/src/main/java/gregtech/integration/hwyla/provider/RecipeLogicDataProvider.java @@ -3,6 +3,7 @@ import gregtech.api.GTValues; import gregtech.api.capability.GregtechTileCapabilities; import gregtech.api.capability.impl.AbstractRecipeLogic; +import gregtech.api.capability.impl.PrimitiveRecipeLogic; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.SteamMetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; @@ -46,7 +47,7 @@ public void register(@NotNull IWailaRegistrar registrar) { protected NBTTagCompound getNBTData(AbstractRecipeLogic capability, NBTTagCompound tag) { NBTTagCompound subTag = new NBTTagCompound(); subTag.setBoolean("Working", capability.isWorking()); - if (capability.isWorking()) { + if (capability.isWorking() && !(capability instanceof PrimitiveRecipeLogic)) { subTag.setInteger("RecipeEUt", capability.getInfoProviderEUt()); } tag.setTag("gregtech.AbstractRecipeLogic", subTag); From 007de0ca45fb5767215467790389d2e1667a01ba Mon Sep 17 00:00:00 2001 From: TechLord22 <37029404+techlord22@users.noreply.github.com> Date: Sun, 14 Apr 2024 13:37:04 -0400 Subject: [PATCH 3/3] add GTValues.MOD_NAME --- src/main/java/gregtech/GregTechMod.java | 2 +- src/main/java/gregtech/api/GTValues.java | 5 +++++ src/main/java/gregtech/api/util/GTLog.java | 4 +++- src/main/java/gregtech/api/util/input/KeyBind.java | 5 +++-- .../integration/forestry/bees/GTBeeDefinition.java | 9 +++++++-- .../gregtech/integration/groovy/GroovyScriptModule.java | 2 +- .../integration/hwyla/provider/BlockOreDataProvider.java | 3 ++- .../hwyla/provider/ControllableDataProvider.java | 3 ++- .../hwyla/provider/ConverterDataProvider.java | 2 +- .../integration/hwyla/provider/DiodeDataProvider.java | 3 ++- .../hwyla/provider/ElectricContainerDataProvider.java | 3 ++- .../integration/hwyla/provider/LampDataProvider.java | 3 ++- .../hwyla/provider/MaintenanceDataProvider.java | 3 ++- .../hwyla/provider/MultiRecipeMapDataProvider.java | 3 ++- .../hwyla/provider/MultiblockDataProvider.java | 3 ++- .../hwyla/provider/PrimitivePumpDataProvider.java | 3 ++- .../hwyla/provider/RecipeLogicDataProvider.java | 2 +- .../hwyla/provider/SteamBoilerDataProvider.java | 3 ++- .../hwyla/provider/TransformerDataProvider.java | 2 +- .../integration/hwyla/provider/WorkableDataProvider.java | 3 ++- 20 files changed, 45 insertions(+), 21 deletions(-) diff --git a/src/main/java/gregtech/GregTechMod.java b/src/main/java/gregtech/GregTechMod.java index 883b581292c..b0afab8f2d6 100644 --- a/src/main/java/gregtech/GregTechMod.java +++ b/src/main/java/gregtech/GregTechMod.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; @Mod(modid = GTValues.MODID, - name = "GregTech", + name = GTValues.MOD_NAME, acceptedMinecraftVersions = "[1.12.2,1.13)", version = GTInternalTags.VERSION, dependencies = "required:forge@[14.23.5.2847,);" + "required-after:codechickenlib@[3.2.3,);" + diff --git a/src/main/java/gregtech/api/GTValues.java b/src/main/java/gregtech/api/GTValues.java index 05053d6fbb8..006f9444117 100644 --- a/src/main/java/gregtech/api/GTValues.java +++ b/src/main/java/gregtech/api/GTValues.java @@ -126,6 +126,11 @@ public class GTValues { */ public static final String MODID = "gregtech"; + /** + * GregTech Mod Name + */ + public static final String MOD_NAME = "GregTech"; + /** @deprecated Use {@link gregtech.api.util.Mods} instead */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.9") diff --git a/src/main/java/gregtech/api/util/GTLog.java b/src/main/java/gregtech/api/util/GTLog.java index 56a003fde5b..a7e980f1e52 100644 --- a/src/main/java/gregtech/api/util/GTLog.java +++ b/src/main/java/gregtech/api/util/GTLog.java @@ -1,5 +1,7 @@ package gregtech.api.util; +import gregtech.api.GTValues; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -9,7 +11,7 @@ */ public class GTLog { - public static Logger logger = LogManager.getLogger("GregTech"); + public static Logger logger = LogManager.getLogger(GTValues.MOD_NAME); private GTLog() {} } diff --git a/src/main/java/gregtech/api/util/input/KeyBind.java b/src/main/java/gregtech/api/util/input/KeyBind.java index 309a4d28c1c..74ec9442afb 100644 --- a/src/main/java/gregtech/api/util/input/KeyBind.java +++ b/src/main/java/gregtech/api/util/input/KeyBind.java @@ -1,5 +1,6 @@ package gregtech.api.util.input; +import gregtech.api.GTValues; import gregtech.api.GregTechAPI; import gregtech.api.util.GTLog; import gregtech.core.network.packets.PacketKeysPressed; @@ -99,14 +100,14 @@ public static boolean scrollingDown() { KeyBind(String langKey, int button) { if (FMLCommonHandler.instance().getSide().isClient()) { - this.keybinding = new KeyBinding(langKey, button, "GregTech"); + this.keybinding = new KeyBinding(langKey, button, GTValues.MOD_NAME); ClientRegistry.registerKeyBinding(this.keybinding); } } KeyBind(String langKey, IKeyConflictContext ctx, int button) { if (FMLCommonHandler.instance().getSide().isClient()) { - this.keybinding = new KeyBinding(langKey, ctx, button, "GregTech"); + this.keybinding = new KeyBinding(langKey, ctx, button, GTValues.MOD_NAME); ClientRegistry.registerKeyBinding(this.keybinding); } } diff --git a/src/main/java/gregtech/integration/forestry/bees/GTBeeDefinition.java b/src/main/java/gregtech/integration/forestry/bees/GTBeeDefinition.java index d4a967e4bfe..610c93e3d5f 100644 --- a/src/main/java/gregtech/integration/forestry/bees/GTBeeDefinition.java +++ b/src/main/java/gregtech/integration/forestry/bees/GTBeeDefinition.java @@ -18,7 +18,12 @@ import net.minecraftforge.fml.common.Optional; import appeng.core.Api; -import forestry.api.apiculture.*; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeMutationBuilder; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.IAllele; @@ -1206,7 +1211,7 @@ public enum GTBeeDefinition implements IBeeDefinition { String name = "for.bees.species." + lowercaseName; this.branch = branch; - this.species = new GTAlleleBeeSpecies(GTValues.MODID, uid, name, "GregTech", description, dominant, + this.species = new GTAlleleBeeSpecies(GTValues.MODID, uid, name, GTValues.MOD_NAME, description, dominant, branch.getBranch(), binomial, primary, secondary); this.generationCondition = generationCondition; } diff --git a/src/main/java/gregtech/integration/groovy/GroovyScriptModule.java b/src/main/java/gregtech/integration/groovy/GroovyScriptModule.java index e5082df1461..8ce7fefb0f0 100644 --- a/src/main/java/gregtech/integration/groovy/GroovyScriptModule.java +++ b/src/main/java/gregtech/integration/groovy/GroovyScriptModule.java @@ -223,7 +223,7 @@ public static void loadMetaItemBracketHandler() { @Override public @NotNull String getContainerName() { - return "GregTech"; + return GTValues.MOD_NAME; } @Optional.Method(modid = Mods.Names.GROOVY_SCRIPT) diff --git a/src/main/java/gregtech/integration/hwyla/provider/BlockOreDataProvider.java b/src/main/java/gregtech/integration/hwyla/provider/BlockOreDataProvider.java index a34e22d42c7..98654be839f 100644 --- a/src/main/java/gregtech/integration/hwyla/provider/BlockOreDataProvider.java +++ b/src/main/java/gregtech/integration/hwyla/provider/BlockOreDataProvider.java @@ -1,5 +1,6 @@ package gregtech.integration.hwyla.provider; +import gregtech.api.GTValues; import gregtech.api.unification.ore.StoneType; import gregtech.common.blocks.BlockOre; import gregtech.integration.hwyla.HWYLAModule; @@ -21,7 +22,7 @@ public class BlockOreDataProvider implements IWailaDataProvider { public void register(@NotNull IWailaRegistrar registrar) { registrar.registerBodyProvider(this, BlockOre.class); - registrar.addConfig("GregTech", "gregtech.block_ore"); + registrar.addConfig(GTValues.MOD_NAME, "gregtech.block_ore"); } @NotNull diff --git a/src/main/java/gregtech/integration/hwyla/provider/ControllableDataProvider.java b/src/main/java/gregtech/integration/hwyla/provider/ControllableDataProvider.java index 1142e32854e..84d8151c6bd 100644 --- a/src/main/java/gregtech/integration/hwyla/provider/ControllableDataProvider.java +++ b/src/main/java/gregtech/integration/hwyla/provider/ControllableDataProvider.java @@ -1,5 +1,6 @@ package gregtech.integration.hwyla.provider; +import gregtech.api.GTValues; import gregtech.api.capability.GregtechTileCapabilities; import gregtech.api.capability.IControllable; @@ -25,7 +26,7 @@ public class ControllableDataProvider extends CapabilityDataProvider { public void register(@NotNull IWailaRegistrar registrar) { registrar.registerBodyProvider(this, TileEntity.class); registrar.registerNBTProvider(this, TileEntity.class); - registrar.addConfig("GregTech", "gregtech.workable"); + registrar.addConfig(GTValues.MOD_NAME, "gregtech.workable"); } @Override