Patched class to enable support for IBoilerPlateMod

This commit is contained in:
Emily Ediger 2022-04-24 13:26:20 -05:00
parent 4e820f6660
commit de035c4647
6 changed files with 66 additions and 14 deletions

View File

@ -1,6 +1,6 @@
minecraft_version=1.7.10 minecraft_version=1.7.10
forge_version=10.13.4.1566-1.7.10 forge_version=10.13.4.1566-1.7.10
tfc_version=0.79.27 tfc_version=0.79.27
mod_version=1.19 mod_version=1.21
mod_id=TerraFirmaPunkTweaks mod_id=TerraFirmaPunkTweaks
group_name=com.JAWolfe.TerraFirmaPunkTweaks group_name=com.JAWolfe.TerraFirmaPunkTweaks

View File

@ -7,6 +7,7 @@ import com.JAWolfe.terrafirmapunktweaks.minetweaker.TFCTweaker;
import com.JAWolfe.terrafirmapunktweaks.proxy.CommonProxy; import com.JAWolfe.terrafirmapunktweaks.proxy.CommonProxy;
import com.JAWolfe.terrafirmapunktweaks.reference.References; import com.JAWolfe.terrafirmapunktweaks.reference.References;
import boilerplate.common.IBoilerplateMod;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.SidedProxy; 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.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.NetworkRegistry;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
@Mod(modid = References.ModID, name = References.ModName, version = References.ModVersion, dependencies = References.ModDependencies) @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) @Mod.Instance(References.ModID)
public static TerraFirmaPunkTweaks instance; public static TerraFirmaPunkTweaks instance;
@ -30,11 +32,11 @@ public class TerraFirmaPunkTweaks
public void preInit(FMLPreInitializationEvent event) public void preInit(FMLPreInitializationEvent event)
{ {
ConfigHandler.init(event.getSuggestedConfigurationFile()); ConfigHandler.init(event.getSuggestedConfigurationFile());
FMLCommonHandler.instance().bus().register(new ConfigHandler()); FMLCommonHandler.instance().bus().register(new ConfigHandler());
proxy.registerFluids(); proxy.registerFluids();
TFPItems.initialise(); TFPItems.initialise();
TFPBlocks.initialise(); TFPBlocks.initialise();
@ -42,7 +44,7 @@ public class TerraFirmaPunkTweaks
} }
@EventHandler @EventHandler
public void initialize(FMLInitializationEvent event) public void init(FMLInitializationEvent event)
{ {
RecipeTweaks.RecipeFixes(); RecipeTweaks.RecipeFixes();
@ -67,4 +69,52 @@ public class TerraFirmaPunkTweaks
RecipeTweaks.SC2RecipeTweaks(); 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;
}
} }

View File

@ -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.watertank") + ": " + tag.getInteger("water") + " / " + ((TEBoiler)tileEntity).myTank.getCapacity());
currenttip.add(StatCollector.translateToLocal("gui.tfptweaks.steamtank") + ": " + tag.getInteger("steam") + " / " + ((TEBoiler)tileEntity).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.watertank") + ": " + ((TEFlashBoiler)tileEntity).getPrimaryTileEntity().getTank().getFluidAmount() + " / " + ((TEFlashBoiler)tileEntity).getPrimaryTileEntity().getTank().getCapacity());
currenttip.add(StatCollector.translateToLocal("gui.tfptweaks.steamtank") + ": "+ tag.getInteger("steam") + " / " + ((TEFlashBoiler)tileEntity).getMasterTileEntity().getCapacity()); currenttip.add(StatCollector.translateToLocal("gui.tfptweaks.steamtank") + ": "+ tag.getInteger("steam") + " / " + ((TEFlashBoiler)tileEntity).getPrimaryTileEntity().getCapacity());
} }
} }

View File

@ -5,6 +5,8 @@ public class References
public static final String ModID = "TerraFirmaPunkTweaks"; public static final String ModID = "TerraFirmaPunkTweaks";
public static final String ModName = "TerraFirmaPunk Tweaks"; public static final String ModName = "TerraFirmaPunk Tweaks";
public static final String PREFIX = "terrafirmapunkplus:";
public static final String MODID_TFC = "terrafirmacraft"; public static final String MODID_TFC = "terrafirmacraft";
public static final String MODNAME_TFC = "TerraFirmaCraft"; public static final String MODNAME_TFC = "TerraFirmaCraft";

View File

@ -204,7 +204,7 @@ public class TEFlashBoiler extends TileEntityFlashBoiler implements IFluidHandle
} }
@Override @Override
public TEFlashBoiler getMasterTileEntity() { public TEFlashBoiler getPrimaryTileEntity() {
int[][] cluster = getClusterCoords(getValidClusterFromMetadata()); int[][] cluster = getClusterCoords(getValidClusterFromMetadata());
int x = cluster[0][0], y = cluster[0][1], z = cluster[0][2]; int x = cluster[0][0], y = cluster[0][1], z = cluster[0][2];
TEFlashBoiler boiler = null; TEFlashBoiler boiler = null;

View File

@ -8,7 +8,7 @@
"mcversion": "${minecraft_version}", "mcversion": "${minecraft_version}",
"url": "", "url": "",
"updateUrl": "", "updateUrl": "",
"authorList": ["JAWolfe, OneWolfe"], "authorList": ["JAWolfe, OneWolfe", "Dje4321"],
"credits": "", "credits": "",
"logoFile": "", "logoFile": "",
"screenshots": [], "screenshots": [],