From de035c4647e821a4c4a37aa4308356da9d54dd34 Mon Sep 17 00:00:00 2001 From: Emily Ediger Date: Sun, 24 Apr 2022 13:26:20 -0500 Subject: [PATCH] Patched class to enable support for IBoilerPlateMod --- build.prop | 4 +- .../TerraFirmaPunkTweaks.java | 64 +++++++++++++++++-- .../terrafirmapunktweaks/WAILAInfo.java | 6 +- .../reference/References.java | 2 + .../tiles/TEFlashBoiler.java | 2 +- src/main/resources/mcmod.info | 2 +- 6 files changed, 66 insertions(+), 14 deletions(-) diff --git a/build.prop b/build.prop index dfc334e..e323ed6 100644 --- a/build.prop +++ b/build.prop @@ -1,6 +1,6 @@ minecraft_version=1.7.10 forge_version=10.13.4.1566-1.7.10 tfc_version=0.79.27 -mod_version=1.19 +mod_version=1.21 mod_id=TerraFirmaPunkTweaks -group_name=com.JAWolfe.TerraFirmaPunkTweaks \ No newline at end of file +group_name=com.JAWolfe.TerraFirmaPunkTweaks diff --git a/src/main/java/com/JAWolfe/terrafirmapunktweaks/TerraFirmaPunkTweaks.java b/src/main/java/com/JAWolfe/terrafirmapunktweaks/TerraFirmaPunkTweaks.java index 37b5888..c44c2c5 100644 --- a/src/main/java/com/JAWolfe/terrafirmapunktweaks/TerraFirmaPunkTweaks.java +++ b/src/main/java/com/JAWolfe/terrafirmapunktweaks/TerraFirmaPunkTweaks.java @@ -7,6 +7,7 @@ import com.JAWolfe.terrafirmapunktweaks.minetweaker.TFCTweaker; import com.JAWolfe.terrafirmapunktweaks.proxy.CommonProxy; import com.JAWolfe.terrafirmapunktweaks.reference.References; +import boilerplate.common.IBoilerplateMod; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; @@ -15,10 +16,11 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; +import net.minecraft.creativetab.CreativeTabs; import net.minecraftforge.common.MinecraftForge; @Mod(modid = References.ModID, name = References.ModName, version = References.ModVersion, dependencies = References.ModDependencies) -public class TerraFirmaPunkTweaks +public class TerraFirmaPunkTweaks implements IBoilerplateMod { @Mod.Instance(References.ModID) public static TerraFirmaPunkTweaks instance; @@ -30,11 +32,11 @@ public class TerraFirmaPunkTweaks public void preInit(FMLPreInitializationEvent event) { ConfigHandler.init(event.getSuggestedConfigurationFile()); - FMLCommonHandler.instance().bus().register(new ConfigHandler()); - - proxy.registerFluids(); - - TFPItems.initialise(); + FMLCommonHandler.instance().bus().register(new ConfigHandler()); + + proxy.registerFluids(); + + TFPItems.initialise(); TFPBlocks.initialise(); @@ -42,7 +44,7 @@ public class TerraFirmaPunkTweaks } @EventHandler - public void initialize(FMLInitializationEvent event) + public void init(FMLInitializationEvent event) { RecipeTweaks.RecipeFixes(); @@ -67,4 +69,52 @@ public class TerraFirmaPunkTweaks RecipeTweaks.SC2RecipeTweaks(); } + + @Override + public Object getInstance() + { + return instance; + } + + @Override + public CreativeTabs getCreativeTab() + { + return null; + } + + @Override + public String getID() + { + return References.ModID; + } + + @Override + public String getName() + { + return References.ModName; + } + + @Override + public String getVersion() + { + return References.ModVersion; + } + + @Override + public String getPrefix() + { + return References.PREFIX; + } + + @Override + public String getClientProxyPath() + { + return References.CLIENT_PROXY_CLASS; + } + + @Override + public String getCommonProxyPath() + { + return References.SERVER_PROXY_CLASS; + } } diff --git a/src/main/java/com/JAWolfe/terrafirmapunktweaks/WAILAInfo.java b/src/main/java/com/JAWolfe/terrafirmapunktweaks/WAILAInfo.java index d481b07..46b24be 100644 --- a/src/main/java/com/JAWolfe/terrafirmapunktweaks/WAILAInfo.java +++ b/src/main/java/com/JAWolfe/terrafirmapunktweaks/WAILAInfo.java @@ -57,10 +57,10 @@ public class WAILAInfo implements IWailaDataProvider currenttip.add(StatCollector.translateToLocal("gui.tfptweaks.watertank") + ": " + tag.getInteger("water") + " / " + ((TEBoiler)tileEntity).myTank.getCapacity()); currenttip.add(StatCollector.translateToLocal("gui.tfptweaks.steamtank") + ": " + tag.getInteger("steam") + " / " + ((TEBoiler)tileEntity).getCapacity()); } - else if (tileEntity != null && tileEntity instanceof TEFlashBoiler && ((TEFlashBoiler)tileEntity).hasMaster()) + else if (tileEntity != null && tileEntity instanceof TEFlashBoiler && ((TEFlashBoiler)tileEntity).hasPrimary()) { - currenttip.add(StatCollector.translateToLocal("gui.tfptweaks.watertank") + ": " + ((TEFlashBoiler)tileEntity).getMasterTileEntity().getTank().getFluidAmount() + " / " + ((TEFlashBoiler)tileEntity).getMasterTileEntity().getTank().getCapacity()); - currenttip.add(StatCollector.translateToLocal("gui.tfptweaks.steamtank") + ": "+ tag.getInteger("steam") + " / " + ((TEFlashBoiler)tileEntity).getMasterTileEntity().getCapacity()); + currenttip.add(StatCollector.translateToLocal("gui.tfptweaks.watertank") + ": " + ((TEFlashBoiler)tileEntity).getPrimaryTileEntity().getTank().getFluidAmount() + " / " + ((TEFlashBoiler)tileEntity).getPrimaryTileEntity().getTank().getCapacity()); + currenttip.add(StatCollector.translateToLocal("gui.tfptweaks.steamtank") + ": "+ tag.getInteger("steam") + " / " + ((TEFlashBoiler)tileEntity).getPrimaryTileEntity().getCapacity()); } } diff --git a/src/main/java/com/JAWolfe/terrafirmapunktweaks/reference/References.java b/src/main/java/com/JAWolfe/terrafirmapunktweaks/reference/References.java index feba6b0..8a98aa5 100644 --- a/src/main/java/com/JAWolfe/terrafirmapunktweaks/reference/References.java +++ b/src/main/java/com/JAWolfe/terrafirmapunktweaks/reference/References.java @@ -5,6 +5,8 @@ public class References public static final String ModID = "TerraFirmaPunkTweaks"; public static final String ModName = "TerraFirmaPunk Tweaks"; + public static final String PREFIX = "terrafirmapunkplus:"; + public static final String MODID_TFC = "terrafirmacraft"; public static final String MODNAME_TFC = "TerraFirmaCraft"; diff --git a/src/main/java/com/JAWolfe/terrafirmapunktweaks/tiles/TEFlashBoiler.java b/src/main/java/com/JAWolfe/terrafirmapunktweaks/tiles/TEFlashBoiler.java index 2e9e7c2..3c4a79c 100644 --- a/src/main/java/com/JAWolfe/terrafirmapunktweaks/tiles/TEFlashBoiler.java +++ b/src/main/java/com/JAWolfe/terrafirmapunktweaks/tiles/TEFlashBoiler.java @@ -204,7 +204,7 @@ public class TEFlashBoiler extends TileEntityFlashBoiler implements IFluidHandle } @Override - public TEFlashBoiler getMasterTileEntity() { + public TEFlashBoiler getPrimaryTileEntity() { int[][] cluster = getClusterCoords(getValidClusterFromMetadata()); int x = cluster[0][0], y = cluster[0][1], z = cluster[0][2]; TEFlashBoiler boiler = null; diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index ba10eaf..6dc8192 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -8,7 +8,7 @@ "mcversion": "${minecraft_version}", "url": "", "updateUrl": "", - "authorList": ["JAWolfe, OneWolfe"], + "authorList": ["JAWolfe, OneWolfe", "Dje4321"], "credits": "", "logoFile": "", "screenshots": [],