mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
Modularize TConstruct using Pulsar
This commit is contained in:
1 parent
edfe9ae7d4
commit
3de90bded2
24 files changed
+511
-3048
No files matched your search
@@ -3,6 +3,9 @@ package tconstruct.tools;
|
||||
import java.util.EnumSet;
|
||||
|
||||
import mantle.items.abstracts.CraftingItem;
|
||||
import mantle.pulsar.pulse.IPulse;
|
||||
import mantle.pulsar.pulse.Pulse;
|
||||
import mantle.pulsar.pulse.PulseProxy;
|
||||
import mantle.utils.RecipeRemover;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
@@ -11,6 +14,7 @@ import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
@@ -103,21 +107,24 @@ import tconstruct.util.config.PHConstruct;
|
||||
import tconstruct.world.TinkerWorld;
|
||||
import tconstruct.world.blocks.SoilBlock;
|
||||
import tconstruct.world.itemblocks.CraftedSoilItemBlock;
|
||||
import tconstruct.world.items.GoldenHead;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.Mod;
|
||||
import cpw.mods.fml.common.Mod.EventHandler;
|
||||
import cpw.mods.fml.common.Mod.Instance;
|
||||
import cpw.mods.fml.common.SidedProxy;
|
||||
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 cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
|
||||
|
||||
@Mod(modid = "TinkerTools", name = "TinkerTools", version = "${tinkertoolversion}")
|
||||
public class TinkerTools
|
||||
@ObjectHolder(TConstruct.modID)
|
||||
@Pulse(id = TConstruct.modID)
|
||||
public class TinkerTools implements IPulse //TODO: Remove IPulse implementation, keep annotation
|
||||
{
|
||||
/* Proxies for sides, used for graphics processing */
|
||||
@SidedProxy(clientSide = "tconstruct.tools.ToolProxyClient", serverSide = "tconstruct.tools.ToolProxyCommon")
|
||||
@PulseProxy(client = "tconstruct.tools.ToolProxyClient", server = "tconstruct.tools.ToolProxyCommon")
|
||||
public static ToolProxyCommon proxy;
|
||||
|
||||
@Instance("TinkerTools")
|
||||
@@ -356,6 +363,7 @@ public class TinkerTools
|
||||
// compat
|
||||
TConstructRegistry.addItemToDirectory(toolPartStrings[i], toolParts[i]);
|
||||
}
|
||||
goldHead = new GoldenHead(4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead");
|
||||
GameRegistry.registerItem(TinkerTools.goldHead, "goldHead");
|
||||
|
||||
TinkerTools.creativeModifier = new CreativeModifier().setUnlocalizedName("tconstruct.modifier.creative");
|
||||
|
||||
@@ -23,6 +23,7 @@ import tconstruct.client.gui.StencilTableGui;
|
||||
import tconstruct.client.gui.ToolForgeGui;
|
||||
import tconstruct.client.gui.ToolStationGui;
|
||||
import tconstruct.client.tabs.TabRegistry;
|
||||
import tconstruct.common.TProxyCommon;
|
||||
import tconstruct.mechworks.MechworksProxyCommon;
|
||||
import tconstruct.mechworks.inventory.ContainerLandmine;
|
||||
import tconstruct.mechworks.logic.TileEntityLandmine;
|
||||
@@ -49,6 +50,21 @@ public class ToolProxyClient extends ToolProxyCommon
|
||||
public ToolProxyClient()
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
registerGuiHandler();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerGuiHandler()
|
||||
{
|
||||
super.registerGuiHandler();
|
||||
TProxyCommon.registerClientGuiHandler(toolStationID, this);
|
||||
TProxyCommon.registerClientGuiHandler(partBuilderID, this);
|
||||
TProxyCommon.registerClientGuiHandler(patternChestID, this);
|
||||
TProxyCommon.registerClientGuiHandler(stencilTableID, this);
|
||||
TProxyCommon.registerClientGuiHandler(frypanGuiID, this);
|
||||
TProxyCommon.registerClientGuiHandler(toolForgeID, this);
|
||||
TProxyCommon.registerClientGuiHandler(furnaceID, this);
|
||||
TProxyCommon.registerClientGuiHandler(craftingStationID, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
package tconstruct.tools;
|
||||
|
||||
import tconstruct.common.TProxyCommon;
|
||||
import mantle.blocks.abstracts.InventoryLogic;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import cpw.mods.fml.common.network.IGuiHandler;
|
||||
|
||||
public class ToolProxyCommon implements IGuiHandler
|
||||
@@ -16,14 +18,24 @@ public class ToolProxyCommon implements IGuiHandler
|
||||
public static final int toolForgeID = 5;
|
||||
public static final int furnaceID = 8;
|
||||
public static final int craftingStationID = 11;
|
||||
public void preInit()
|
||||
|
||||
public ToolProxyCommon()
|
||||
{
|
||||
|
||||
registerGuiHandler();
|
||||
}
|
||||
public void postInit()
|
||||
|
||||
protected void registerGuiHandler()
|
||||
{
|
||||
|
||||
TProxyCommon.registerServerGuiHandler(toolStationID, this);
|
||||
TProxyCommon.registerServerGuiHandler(partBuilderID, this);
|
||||
TProxyCommon.registerServerGuiHandler(patternChestID, this);
|
||||
TProxyCommon.registerServerGuiHandler(stencilTableID, this);
|
||||
TProxyCommon.registerServerGuiHandler(frypanGuiID, this);
|
||||
TProxyCommon.registerServerGuiHandler(toolForgeID, this);
|
||||
TProxyCommon.registerServerGuiHandler(furnaceID, this);
|
||||
TProxyCommon.registerServerGuiHandler(craftingStationID, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getServerGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z)
|
||||
{
|
||||
|
||||
@@ -18,10 +18,10 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.smeltery.TinkerSmeltery;
|
||||
import tconstruct.tools.ToolProxyCommon;
|
||||
import tconstruct.tools.logic.ToolForgeLogic;
|
||||
import tconstruct.tools.model.TableRender;
|
||||
import tconstruct.world.TinkerWorld;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -82,7 +82,7 @@ public class ToolForgeBlock extends InventoryBlock
|
||||
case 3:
|
||||
return Blocks.emerald_block.getIcon(side, 0);
|
||||
default:
|
||||
return TinkerSmeltery.metalBlock.getIcon(side, meta - 4);
|
||||
return TinkerWorld.metalBlock.getIcon(side, meta - 4);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user