From bb58ae8632cc8de382f993372a763c26bf6e9585 Mon Sep 17 00:00:00 2001 From: Modmuss50 Date: Fri, 17 Apr 2015 20:00:30 +0100 Subject: [PATCH] This was to complicated, going to make it simpler --- src/main/java/techreborn/Core.java | 4 -- .../api/multiblock/BaseMultiBlock.java | 31 ----------- .../api/multiblock/IMultiBlock.java | 40 -------------- .../api/multiblock/IMultiBlockController.java | 7 --- .../api/multiblock/IMultiblockComponent.java | 9 ---- .../api/multiblock/MultiBlockController.java | 26 ---------- .../api/multiblock/package-info.java | 3 -- .../techreborn/blocks/BlockBlastFurnace.java | 3 +- .../techreborn/event/MultiblockEvent.java | 52 ------------------- .../multiblocks/MultiBlastfurnace.java | 32 ------------ .../techreborn/tiles/TileBlastFurnace.java | 8 +-- .../techreborn/tiles/TileMachineCasing.java | 8 +-- 12 files changed, 4 insertions(+), 219 deletions(-) delete mode 100644 src/main/java/techreborn/api/multiblock/BaseMultiBlock.java delete mode 100644 src/main/java/techreborn/api/multiblock/IMultiBlock.java delete mode 100644 src/main/java/techreborn/api/multiblock/IMultiBlockController.java delete mode 100644 src/main/java/techreborn/api/multiblock/IMultiblockComponent.java delete mode 100644 src/main/java/techreborn/api/multiblock/MultiBlockController.java delete mode 100644 src/main/java/techreborn/api/multiblock/package-info.java delete mode 100644 src/main/java/techreborn/event/MultiblockEvent.java delete mode 100644 src/main/java/techreborn/multiblocks/MultiBlastfurnace.java diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index aee642f74..00b61f2d9 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -6,13 +6,11 @@ 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 net.minecraftforge.common.MinecraftForge; import techreborn.achievement.TRAchievements; import techreborn.client.GuiHandler; import techreborn.compat.CompatManager; import techreborn.compat.recipes.RecipeManager; import techreborn.config.ConfigTechReborn; -import techreborn.event.MultiblockEvent; import techreborn.init.ModBlocks; import techreborn.init.ModItems; import techreborn.init.ModRecipes; @@ -57,8 +55,6 @@ public class Core { NetworkRegistry.INSTANCE.registerGuiHandler(INSTANCE, new GuiHandler()); //packets PacketHandler.setChannels(NetworkRegistry.INSTANCE.newChannel(ModInfo.MOD_ID + "_packets", new PacketHandler())); - //Events - MinecraftForge.EVENT_BUS.register(new MultiblockEvent()); //Achievements TRAchievements.init(); LogHelper.info("Initialization Compleate"); diff --git a/src/main/java/techreborn/api/multiblock/BaseMultiBlock.java b/src/main/java/techreborn/api/multiblock/BaseMultiBlock.java deleted file mode 100644 index f7ed6a277..000000000 --- a/src/main/java/techreborn/api/multiblock/BaseMultiBlock.java +++ /dev/null @@ -1,31 +0,0 @@ -package techreborn.api.multiblock; - -import net.minecraft.tileentity.TileEntity; - -public abstract class BaseMultiBlock implements IMultiBlock { - - boolean isComplete = false; - - TileEntity parent; - - public BaseMultiBlock() { - } - - public void setParent(TileEntity parent) { - this.parent = parent; - } - - @Override - public boolean isComplete() { - return isComplete; - } - - @Override - public TileEntity getController() { - return parent; - } - - public void setIsComplete(boolean isComplete) { - this.isComplete = isComplete; - } -} diff --git a/src/main/java/techreborn/api/multiblock/IMultiBlock.java b/src/main/java/techreborn/api/multiblock/IMultiBlock.java deleted file mode 100644 index 287e370cd..000000000 --- a/src/main/java/techreborn/api/multiblock/IMultiBlock.java +++ /dev/null @@ -1,40 +0,0 @@ -package techreborn.api.multiblock; - -import net.minecraft.tileentity.TileEntity; - -import java.util.List; - -public interface IMultiBlock { - - /** - * This is the name of the multiblock - */ - String getName(); - - /** - * This check to see if the multiblock is complete - */ - boolean checkIfComplete(); - - /** - * This check to see if the multiblock is complete - */ - boolean isComplete(); - - /** - * This is a list of all of the tiles that make up the multiblock - */ - List getTiles(); - - /** - * This is the controller for the whole multiblock structure. - * - * This tile will store the nbt and do the logic for the whole system. Send block actions to this block. - */ - TileEntity getController(); - - /** - * Call this from the controller to allow to tile to update is completeness. - */ - void recompute(); -} diff --git a/src/main/java/techreborn/api/multiblock/IMultiBlockController.java b/src/main/java/techreborn/api/multiblock/IMultiBlockController.java deleted file mode 100644 index 9f635b7e5..000000000 --- a/src/main/java/techreborn/api/multiblock/IMultiBlockController.java +++ /dev/null @@ -1,7 +0,0 @@ -package techreborn.api.multiblock; - -public interface IMultiBlockController { - - IMultiBlock getMultiBlock(); - -} diff --git a/src/main/java/techreborn/api/multiblock/IMultiblockComponent.java b/src/main/java/techreborn/api/multiblock/IMultiblockComponent.java deleted file mode 100644 index 61471d99e..000000000 --- a/src/main/java/techreborn/api/multiblock/IMultiblockComponent.java +++ /dev/null @@ -1,9 +0,0 @@ -package techreborn.api.multiblock; - -public interface IMultiblockComponent { - - /** - * This gets the instance of the multiblock , allow for different meta data for different structures, - */ - Class getMultiblockType(); -} diff --git a/src/main/java/techreborn/api/multiblock/MultiBlockController.java b/src/main/java/techreborn/api/multiblock/MultiBlockController.java deleted file mode 100644 index ff5fee91a..000000000 --- a/src/main/java/techreborn/api/multiblock/MultiBlockController.java +++ /dev/null @@ -1,26 +0,0 @@ -package techreborn.api.multiblock; - -import net.minecraft.tileentity.TileEntity; - -public class MultiBlockController extends TileEntity implements IMultiBlockController{ - - BaseMultiBlock multiBlock; - - public MultiBlockController(BaseMultiBlock multiBlock) { - this.multiBlock = multiBlock; - } - - @Override - public IMultiBlock getMultiBlock() { - return multiBlock; - } - - public void setMultiBlock(TileEntity tileEntity, BaseMultiBlock multiBlock){ - this.multiBlock = multiBlock; - - } - - public void setParent(TileEntity tileEntity){ - multiBlock.setParent(tileEntity); - } -} diff --git a/src/main/java/techreborn/api/multiblock/package-info.java b/src/main/java/techreborn/api/multiblock/package-info.java deleted file mode 100644 index dc2219a56..000000000 --- a/src/main/java/techreborn/api/multiblock/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion = "@MODVERSION@", owner = "techreborn", provides = "techrebornAPI") package techreborn.api.multiblock; - -import cpw.mods.fml.common.API; diff --git a/src/main/java/techreborn/blocks/BlockBlastFurnace.java b/src/main/java/techreborn/blocks/BlockBlastFurnace.java index f4a49d5b4..c9972dcbe 100644 --- a/src/main/java/techreborn/blocks/BlockBlastFurnace.java +++ b/src/main/java/techreborn/blocks/BlockBlastFurnace.java @@ -12,7 +12,6 @@ import net.minecraft.world.World; import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; -import techreborn.multiblocks.MultiBlastfurnace; import techreborn.tiles.TileBlastFurnace; public class BlockBlastFurnace extends BlockContainer{ @@ -32,7 +31,7 @@ public class BlockBlastFurnace extends BlockContainer{ @Override public TileEntity createNewTileEntity(World world, int p_149915_2_) { - return new TileBlastFurnace(new MultiBlastfurnace()); + return new TileBlastFurnace(); } @Override diff --git a/src/main/java/techreborn/event/MultiblockEvent.java b/src/main/java/techreborn/event/MultiblockEvent.java deleted file mode 100644 index b08e0b281..000000000 --- a/src/main/java/techreborn/event/MultiblockEvent.java +++ /dev/null @@ -1,52 +0,0 @@ -package techreborn.event; - -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import net.minecraft.tileentity.TileEntity; -import techreborn.api.multiblock.IMultiBlockController; -import techreborn.api.multiblock.IMultiblockComponent; - -public class MultiblockEvent { - - @SubscribeEvent(priority = EventPriority.LOWEST) - public void blockBreakEvent(net.minecraftforge.event.world.BlockEvent.BreakEvent event) { - if (event.world.getTileEntity(event.x, event.y, event.z) instanceof IMultiblockComponent) { - IMultiblockComponent component = (IMultiblockComponent) event.world.getTileEntity(event.x, event.y, event.z); - for (int x = -3; x < 3; x++) { - for (int y = -3; y < 3; y++) { - for (int z = -3; z < 3; z++) { - //TODO have a quicker way of doing this, Arraylist with all controllers? - TileEntity tile = event.world.getTileEntity(x + event.x, y + event.y, z + event.z); - if (tile != null && tile instanceof IMultiBlockController) { - IMultiBlockController controller = (IMultiBlockController) tile; - controller.getMultiBlock().recompute(); - System.out.println(controller.getMultiBlock().isComplete()); - } - } - } - } - } - } - - - @SubscribeEvent(priority = EventPriority.LOWEST) - public void blockPlaceEvent(net.minecraftforge.event.world.BlockEvent.PlaceEvent event) { - if (event.world.getTileEntity(event.x, event.y, event.z) instanceof IMultiblockComponent) { - IMultiblockComponent component = (IMultiblockComponent) event.world.getTileEntity(event.x, event.y, event.z); - for (int x = -3; x < 3; x++) { - for (int y = -3; y < 3; y++) { - for (int z = -3; z < 3; z++) { - //TODO have a quicker way of doing this - TileEntity tile = event.world.getTileEntity(x + event.x, y + event.y, z + event.z); - if (tile != null && tile instanceof IMultiBlockController) { - IMultiBlockController controller = (IMultiBlockController) tile; - controller.getMultiBlock().recompute(); - System.out.println(controller.getMultiBlock().isComplete()); - } - } - } - } - } - } -} - diff --git a/src/main/java/techreborn/multiblocks/MultiBlastfurnace.java b/src/main/java/techreborn/multiblocks/MultiBlastfurnace.java deleted file mode 100644 index 91e152060..000000000 --- a/src/main/java/techreborn/multiblocks/MultiBlastfurnace.java +++ /dev/null @@ -1,32 +0,0 @@ -package techreborn.multiblocks; - -import net.minecraft.tileentity.TileEntity; -import techreborn.api.multiblock.BaseMultiBlock; -import techreborn.init.ModBlocks; - -import java.util.List; - -public class MultiBlastfurnace extends BaseMultiBlock { - - - @Override - public String getName() { - return "BlastFurnaceMultiBlock"; - } - - @Override - public boolean checkIfComplete() { - return getController().getWorldObj().getBlock(getController().xCoord, getController().yCoord + 1, getController().zCoord) == ModBlocks.MachineCasing; - } - - - @Override - public List getTiles() { - return null; - } - - @Override - public void recompute() { - setIsComplete(checkIfComplete()); - } -} diff --git a/src/main/java/techreborn/tiles/TileBlastFurnace.java b/src/main/java/techreborn/tiles/TileBlastFurnace.java index ed20621ad..99f2b1b94 100644 --- a/src/main/java/techreborn/tiles/TileBlastFurnace.java +++ b/src/main/java/techreborn/tiles/TileBlastFurnace.java @@ -4,20 +4,16 @@ import ic2.api.energy.prefab.BasicSink; import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import techreborn.api.multiblock.BaseMultiBlock; -import techreborn.api.multiblock.MultiBlockController; import techreborn.init.ModBlocks; import techreborn.util.Inventory; -public class TileBlastFurnace extends MultiBlockController implements IWrenchable { +public class TileBlastFurnace extends TileMachineBase implements IWrenchable { public int tickTime; public BasicSink energy; public Inventory inventory = new Inventory(3, "TileBlastFurnace", 64); - public TileBlastFurnace(BaseMultiBlock multiBlock) { - super(multiBlock); - setParent(this); + public TileBlastFurnace() { } @Override diff --git a/src/main/java/techreborn/tiles/TileMachineCasing.java b/src/main/java/techreborn/tiles/TileMachineCasing.java index 2138be8c1..41e3b8686 100644 --- a/src/main/java/techreborn/tiles/TileMachineCasing.java +++ b/src/main/java/techreborn/tiles/TileMachineCasing.java @@ -1,10 +1,8 @@ package techreborn.tiles; import net.minecraft.tileentity.TileEntity; -import techreborn.api.multiblock.IMultiblockComponent; -import techreborn.multiblocks.MultiBlastfurnace; -public class TileMachineCasing extends TileEntity implements IMultiblockComponent { +public class TileMachineCasing extends TileEntity { @Override public boolean canUpdate() { @@ -12,8 +10,4 @@ public class TileMachineCasing extends TileEntity implements IMultiblockComponen return false; } - @Override - public Class getMultiblockType() { - return MultiBlastfurnace.class; - } }