From dfabc9e1d834867e051ed2bae63da226f63b45a2 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Fri, 10 Jan 2014 03:00:46 -0500 Subject: [PATCH] Little bit of work --- .../api/events/MachineMiningEvent.java | 7 +- .../resonantinduction/archaic/Archaic.java | 2 - .../blocks/BlockColorGlass.java | 2 +- .../blocks/BlockColorGlowGlass.java | 2 +- .../blocks/BlockColorSand.java | 2 +- .../{old => archaic}/blocks/BlockColored.java | 2 +- .../blocks}/BlockTurntable.java | 10 +- .../blocks/ItemBlockColored.java | 4 +- .../core/debug/BlockDebug.java | 31 +- .../core/debug/TileEntityInfLoad.java | 2 +- .../core/debug/TileEntityInfSupply.java | 2 +- .../core/prefab/block/BlockBase.java | 32 +- .../core/prefab/block/BlockImprintable.java | 4 +- .../core/prefab/block/BlockMachine.java | 37 ++ .../prefab/tile}/TileEntityEnergyMachine.java | 4 +- .../prefab/tile}/TileEntityInv.java | 4 +- .../prefab/tile}/TileEntityMachine.java | 2 +- .../prefab/tile}/TileGenerator.java | 3 +- .../blocks => core/resource}/BlockGasOre.java | 2 +- .../blocks => core/resource}/BlockOre.java | 2 +- .../resource}/GasOreGenerator.java | 2 +- .../core/resource/ItemBlockOre.java | 2 +- .../core/resource/ItemDust.java | 6 - .../core/resource/ResourceGenerator.java | 3 - .../core}/tilenetwork/INetworkContainer.java | 2 +- .../core}/tilenetwork/INetworkEnergyPart.java | 2 +- .../core}/tilenetwork/INetworkPart.java | 2 +- .../core}/tilenetwork/ITileConnector.java | 2 +- .../core}/tilenetwork/ITileNetwork.java | 2 +- .../tilenetwork/prefab/NetworkPathFinder.java | 4 +- .../prefab/NetworkResourceSupply.java | 4 +- .../prefab/NetworkSharedPower.java | 6 +- .../prefab/NetworkTileEntities.java | 6 +- .../prefab/NetworkUpdateHandler.java | 4 +- .../electrical/CommonProxy.java | 6 +- .../armbot/BlockArmbot.java | 33 +- .../armbot/Program.java | 2 +- .../armbot/TaskBase.java | 2 +- .../armbot/TaskBaseArmbot.java | 2 +- .../armbot/TaskBaseLogic.java | 2 +- .../armbot/TaskBaseProcess.java | 2 +- .../armbot/TileEntityArmbot.java | 12 +- .../armbot/command/TaskBreak.java | 6 +- .../armbot/command/TaskDrop.java | 6 +- .../armbot/command/TaskEnd.java | 4 +- .../armbot/command/TaskFire.java | 6 +- .../armbot/command/TaskGOTO.java | 4 +- .../armbot/command/TaskGive.java | 6 +- .../armbot/command/TaskGrabEntity.java | 4 +- .../armbot/command/TaskGrabItem.java | 4 +- .../armbot/command/TaskGrabPrefab.java | 4 +- .../armbot/command/TaskHarvest.java | 2 +- .../armbot/command/TaskIF.java | 4 +- .../armbot/command/TaskIdle.java | 4 +- .../armbot/command/TaskPlace.java | 6 +- .../armbot/command/TaskReturn.java | 4 +- .../armbot/command/TaskRotateBy.java | 6 +- .../armbot/command/TaskRotateTo.java | 6 +- .../armbot/command/TaskStart.java | 4 +- .../armbot/command/TaskTake.java | 6 +- .../armbot/command/TaskUse.java | 6 +- .../generator/solar/BlockSolarPanel.java | 25 +- .../generator/solar/TileEntitySolarBox.java | 4 +- .../generator/solar/TileEntitySolarPanel.java | 4 +- .../multimeter/ItemReadoutTools.java | 4 +- .../wire/framed/RenderPartWire.java | 3 +- .../mechanical/Mechanical.java | 2 - .../belt/BlockConveyorBelt.java | 34 +- .../belt/TileEntityConveyorBelt.java | 2 +- .../grinder/BlockGrinderWheel.java | 2 +- .../grinder/TileGrinderWheel.java | 2 +- .../grinder/TilePurifier.java | 4 +- .../old/api/IProcessable.java | 2 +- .../old/api/fluid/IDrain.java | 2 +- .../old/api/fluid/INetworkFluidPart.java | 2 +- .../old/client/gui/GuiEncoderBase.java | 3 +- .../old/client/gui/GuiTaskList.java | 6 +- .../old/client/render/BlockRenderHelper.java | 8 - .../old/client/render/RenderArmbot.java | 2 +- .../old/client/render/RenderConveyorBelt.java | 4 +- .../old/client/render/RenderMiningLaser.java | 36 -- .../old/client/render/RenderSteamGen.java | 2 +- .../old/lib/ClientRegistryProxy.java | 2 +- .../old/lib/CoreRegistry.java | 5 +- .../prefab/invgui/GuiMachineContainer.java | 2 +- .../old/lib/prefab/invgui/InvChest.java | 4 +- .../old/lib/terminal/CommandRegistry.java | 2 +- .../old/lib/terminal/CommandUser.java | 2 +- .../old/lib/terminal/TileEntityTerminal.java | 6 +- .../mechanics/ResonantInductionMechanics.java | 12 +- .../furnace/TileAdvancedFurnace.java | 9 +- .../generator/steam/BlockSmallSteamGen.java | 197 ------- .../generator/steam/TileEntitySteamFan.java | 10 - .../generator/steam/TileEntitySteamGen.java | 130 ----- .../steam/TileEntitySteamPiston.java | 70 --- .../mining/BlockApertureExcavator.java | 40 +- .../machine/mining/BlockFracker.java | 40 +- .../machine/mining/BlockFrackingPipe.java | 39 +- .../machine/mining/BlockLaserDrill.java | 62 --- .../machine/mining/BlockMiningLaser.java | 86 --- .../machine/mining/TileApertureExcavator.java | 4 +- .../mechanics/machine/mining/TileFracker.java | 2 +- .../machine/mining/TileLaserDrill.java | 171 ------ .../machine/mining/TileMiningLaser.java | 168 ------ .../mechanics/processor/BlockProcessor.java | 13 +- .../processor/ContainerProcessor.java | 2 +- .../processor/TileEntityProcessor.java | 2 +- .../old/mechanics/purifier/BlockPurifier.java | 2 +- .../old/transport/NetworkAssembly.java | 6 +- .../transport/ResonantInductionTransport.java | 65 ++- .../old/transport/TileEntityAssembly.java | 8 +- .../crafting/BlockCraftingTable.java | 2 +- .../crafting/TileEntityCraftingTable.java | 2 +- .../old/transport/crate/BlockCrate.java | 2 +- .../old/transport/crate/InventoryCrate.java | 2 +- .../old/transport/crate/TileEntityCrate.java | 2 +- .../old/transport/encoder/BlockEncoder.java | 3 +- .../transport/encoder/ContainerEncoder.java | 2 +- .../transport/encoder/TileEntityEncoder.java | 6 +- .../old/transport/fluid/BlockKitchenSink.java | 2 +- .../transport/fluid/BlockReleaseValve.java | 2 +- .../old/transport/fluid/BlockSteamPiston.java | 2 +- .../old/transport/fluid/BlockTank.java | 2 +- .../transport/fluid/FluidCraftingHandler.java | 2 +- .../fluid/TileEntityReleaseValve.java | 2 +- .../old/transport/fluid/TileEntityTank.java | 4 +- .../fluid/network/NetworkFluidContainers.java | 4 +- .../fluid/network/NetworkFluidTiles.java | 8 +- .../transport/fluid/network/NetworkPipes.java | 4 +- .../old/transport/fluid/pipes/BlockPipe.java | 2 +- .../transport/fluid/pipes/TileEntityPipe.java | 4 +- .../fluid/prefab/TileEntityFluidDevice.java | 4 +- .../prefab/TileEntityFluidNetworkTile.java | 4 +- .../fluid/prefab/TileEntityFluidStorage.java | 2 +- .../fluid/pump/BlockConstructionPump.java | 4 +- .../old/transport/fluid/pump/BlockDrain.java | 2 +- .../fluid/pump/BlockPumpMachine.java | 2 +- .../pump/TileEntityConstructionPump.java | 2 +- .../fluid/pump/TileEntityStarterPump.java | 4 +- .../transport/hopper/BlockAdvancedHopper.java | 2 +- .../transport/imprinter/BlockImprinter.java | 5 +- .../imprinter/ContainerImprinter.java | 8 +- .../transport/levitator/BlockLevitator.java | 9 +- .../transport/logistic/ContainerScanner.java | 52 -- .../old/transport/logistic/TileScanner.java | 85 --- .../transport/vechicle/EntityAdvanced.java | 142 ----- .../old/transport/vechicle/EntityTestCar.java | 32 -- .../old/transport/vechicle/EntityVehicle.java | 514 ------------------ .../transport/vechicle/ItemVehicleSpawn.java | 123 ----- 149 files changed, 507 insertions(+), 2218 deletions(-) rename src/main/java/resonantinduction/{old => archaic}/blocks/BlockColorGlass.java (96%) rename src/main/java/resonantinduction/{old => archaic}/blocks/BlockColorGlowGlass.java (80%) rename src/main/java/resonantinduction/{old => archaic}/blocks/BlockColorSand.java (98%) rename src/main/java/resonantinduction/{old => archaic}/blocks/BlockColored.java (98%) rename src/main/java/resonantinduction/{old/transport => archaic/blocks}/BlockTurntable.java (97%) rename src/main/java/resonantinduction/{old => archaic}/blocks/ItemBlockColored.java (94%) create mode 100644 src/main/java/resonantinduction/core/prefab/block/BlockMachine.java rename src/main/java/resonantinduction/{old/lib/prefab => core/prefab/tile}/TileEntityEnergyMachine.java (99%) rename src/main/java/resonantinduction/{old/lib/prefab => core/prefab/tile}/TileEntityInv.java (98%) rename src/main/java/resonantinduction/{old/lib/prefab => core/prefab/tile}/TileEntityMachine.java (99%) rename src/main/java/resonantinduction/{old/mechanics/generator => core/prefab/tile}/TileGenerator.java (94%) rename src/main/java/resonantinduction/{old/blocks => core/resource}/BlockGasOre.java (99%) rename src/main/java/resonantinduction/{old/blocks => core/resource}/BlockOre.java (99%) rename src/main/java/resonantinduction/{old/blocks => core/resource}/GasOreGenerator.java (99%) rename src/main/java/{resonatninduction => resonantinduction/core}/tilenetwork/INetworkContainer.java (94%) rename src/main/java/{resonatninduction => resonantinduction/core}/tilenetwork/INetworkEnergyPart.java (93%) rename src/main/java/{resonatninduction => resonantinduction/core}/tilenetwork/INetworkPart.java (91%) rename src/main/java/{resonatninduction => resonantinduction/core}/tilenetwork/ITileConnector.java (96%) rename src/main/java/{resonatninduction => resonantinduction/core}/tilenetwork/ITileNetwork.java (97%) rename src/main/java/{resonatninduction => resonantinduction/core}/tilenetwork/prefab/NetworkPathFinder.java (93%) rename src/main/java/{resonatninduction => resonantinduction/core}/tilenetwork/prefab/NetworkResourceSupply.java (86%) rename src/main/java/{resonatninduction => resonantinduction/core}/tilenetwork/prefab/NetworkSharedPower.java (95%) rename src/main/java/{resonatninduction => resonantinduction/core}/tilenetwork/prefab/NetworkTileEntities.java (97%) rename src/main/java/{resonatninduction => resonantinduction/core}/tilenetwork/prefab/NetworkUpdateHandler.java (96%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/BlockArmbot.java (80%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/Program.java (99%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/TaskBase.java (98%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/TaskBaseArmbot.java (94%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/TaskBaseLogic.java (83%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/TaskBaseProcess.java (97%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/TileEntityArmbot.java (97%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskBreak.java (92%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskDrop.java (72%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskEnd.java (63%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskFire.java (97%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskGOTO.java (94%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskGive.java (95%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskGrabEntity.java (96%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskGrabItem.java (95%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskGrabPrefab.java (92%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskHarvest.java (84%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskIF.java (94%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskIdle.java (94%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskPlace.java (95%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskReturn.java (60%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskRotateBy.java (93%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskRotateTo.java (93%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskStart.java (76%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskTake.java (94%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/armbot/command/TaskUse.java (94%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/generator/solar/BlockSolarPanel.java (79%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/generator/solar/TileEntitySolarBox.java (72%) rename src/main/java/resonantinduction/{old/mechanics => electrical}/generator/solar/TileEntitySolarPanel.java (91%) rename src/main/java/resonantinduction/{old/transport => mechanical}/belt/BlockConveyorBelt.java (94%) rename src/main/java/resonantinduction/{old/transport => mechanical}/belt/TileEntityConveyorBelt.java (99%) rename src/main/java/resonantinduction/{old/mechanics/machine => mechanical}/grinder/BlockGrinderWheel.java (98%) rename src/main/java/resonantinduction/{old/mechanics/machine => mechanical}/grinder/TileGrinderWheel.java (98%) rename src/main/java/resonantinduction/{old/mechanics/machine => mechanical}/grinder/TilePurifier.java (97%) delete mode 100644 src/main/java/resonantinduction/old/client/render/RenderMiningLaser.java delete mode 100644 src/main/java/resonantinduction/old/mechanics/generator/steam/BlockSmallSteamGen.java delete mode 100644 src/main/java/resonantinduction/old/mechanics/generator/steam/TileEntitySteamFan.java delete mode 100644 src/main/java/resonantinduction/old/mechanics/generator/steam/TileEntitySteamGen.java delete mode 100644 src/main/java/resonantinduction/old/mechanics/generator/steam/TileEntitySteamPiston.java delete mode 100644 src/main/java/resonantinduction/old/mechanics/machine/mining/BlockLaserDrill.java delete mode 100644 src/main/java/resonantinduction/old/mechanics/machine/mining/BlockMiningLaser.java delete mode 100644 src/main/java/resonantinduction/old/mechanics/machine/mining/TileLaserDrill.java delete mode 100644 src/main/java/resonantinduction/old/mechanics/machine/mining/TileMiningLaser.java delete mode 100644 src/main/java/resonantinduction/old/transport/logistic/ContainerScanner.java delete mode 100644 src/main/java/resonantinduction/old/transport/logistic/TileScanner.java delete mode 100644 src/main/java/resonantinduction/old/transport/vechicle/EntityAdvanced.java delete mode 100644 src/main/java/resonantinduction/old/transport/vechicle/EntityTestCar.java delete mode 100644 src/main/java/resonantinduction/old/transport/vechicle/EntityVehicle.java delete mode 100644 src/main/java/resonantinduction/old/transport/vechicle/ItemVehicleSpawn.java diff --git a/src/main/java/resonantinduction/api/events/MachineMiningEvent.java b/src/main/java/resonantinduction/api/events/MachineMiningEvent.java index 3d9a84767..6c78a9cd8 100644 --- a/src/main/java/resonantinduction/api/events/MachineMiningEvent.java +++ b/src/main/java/resonantinduction/api/events/MachineMiningEvent.java @@ -67,7 +67,7 @@ public class MachineMiningEvent extends MachineEvent List items = block.getBlockDropped(world, target.intX(), target.intY(), target.intZ(), target.getBlockMetadata(world), 1); if (items != null) { - MiningDrop event = new MiningDrop(world,spot, target, items); + MiningDrop event = new MiningDrop(world, spot, target, items); MinecraftForge.EVENT_BUS.post(event); items = event.items; return items; @@ -75,4 +75,9 @@ public class MachineMiningEvent extends MachineEvent } return null; } + + public static List getItemsMined(TileEntity entity, Vector3 target) + { + return getItemsMined(entity.worldObj, new Vector3(entity), target); + } } \ No newline at end of file diff --git a/src/main/java/resonantinduction/archaic/Archaic.java b/src/main/java/resonantinduction/archaic/Archaic.java index 56948c3e2..bb1613091 100644 --- a/src/main/java/resonantinduction/archaic/Archaic.java +++ b/src/main/java/resonantinduction/archaic/Archaic.java @@ -1,7 +1,5 @@ package resonantinduction.archaic; -import java.util.logging.Logger; - import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.Settings; diff --git a/src/main/java/resonantinduction/old/blocks/BlockColorGlass.java b/src/main/java/resonantinduction/archaic/blocks/BlockColorGlass.java similarity index 96% rename from src/main/java/resonantinduction/old/blocks/BlockColorGlass.java rename to src/main/java/resonantinduction/archaic/blocks/BlockColorGlass.java index b0f745b4f..395e8e42f 100644 --- a/src/main/java/resonantinduction/old/blocks/BlockColorGlass.java +++ b/src/main/java/resonantinduction/archaic/blocks/BlockColorGlass.java @@ -1,4 +1,4 @@ -package resonantinduction.old.blocks; +package resonantinduction.archaic.blocks; import java.util.Random; diff --git a/src/main/java/resonantinduction/old/blocks/BlockColorGlowGlass.java b/src/main/java/resonantinduction/archaic/blocks/BlockColorGlowGlass.java similarity index 80% rename from src/main/java/resonantinduction/old/blocks/BlockColorGlowGlass.java rename to src/main/java/resonantinduction/archaic/blocks/BlockColorGlowGlass.java index e879c981b..806310b6f 100644 --- a/src/main/java/resonantinduction/old/blocks/BlockColorGlowGlass.java +++ b/src/main/java/resonantinduction/archaic/blocks/BlockColorGlowGlass.java @@ -1,4 +1,4 @@ -package resonantinduction.old.blocks; +package resonantinduction.archaic.blocks; public class BlockColorGlowGlass extends BlockColorGlass { diff --git a/src/main/java/resonantinduction/old/blocks/BlockColorSand.java b/src/main/java/resonantinduction/archaic/blocks/BlockColorSand.java similarity index 98% rename from src/main/java/resonantinduction/old/blocks/BlockColorSand.java rename to src/main/java/resonantinduction/archaic/blocks/BlockColorSand.java index 367600dfd..b1d567fd7 100644 --- a/src/main/java/resonantinduction/old/blocks/BlockColorSand.java +++ b/src/main/java/resonantinduction/archaic/blocks/BlockColorSand.java @@ -1,4 +1,4 @@ -package resonantinduction.old.blocks; +package resonantinduction.archaic.blocks; import java.util.Random; diff --git a/src/main/java/resonantinduction/old/blocks/BlockColored.java b/src/main/java/resonantinduction/archaic/blocks/BlockColored.java similarity index 98% rename from src/main/java/resonantinduction/old/blocks/BlockColored.java rename to src/main/java/resonantinduction/archaic/blocks/BlockColored.java index 05b2faf04..639cf1fff 100644 --- a/src/main/java/resonantinduction/old/blocks/BlockColored.java +++ b/src/main/java/resonantinduction/archaic/blocks/BlockColored.java @@ -1,4 +1,4 @@ -package resonantinduction.old.blocks; +package resonantinduction.archaic.blocks; import java.util.List; diff --git a/src/main/java/resonantinduction/old/transport/BlockTurntable.java b/src/main/java/resonantinduction/archaic/blocks/BlockTurntable.java similarity index 97% rename from src/main/java/resonantinduction/old/transport/BlockTurntable.java rename to src/main/java/resonantinduction/archaic/blocks/BlockTurntable.java index b86c0c0af..e72bd39f2 100644 --- a/src/main/java/resonantinduction/old/transport/BlockTurntable.java +++ b/src/main/java/resonantinduction/archaic/blocks/BlockTurntable.java @@ -1,9 +1,7 @@ -package resonantinduction.old.transport; +package resonantinduction.archaic.blocks; import java.util.Random; -import resonantinduction.old.lib.interfaces.IRotatable; -import resonantinduction.old.lib.interfaces.IRotatableBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -15,11 +13,15 @@ import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import resonantinduction.core.prefab.block.BlockMachine; +import resonantinduction.old.lib.interfaces.IRotatable; +import resonantinduction.old.lib.interfaces.IRotatableBlock; +import resonantinduction.old.transport.ResonantInductionTransport; import universalelectricity.api.vector.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BlockTurntable extends BlockAssembly +public class BlockTurntable extends BlockMachine { private Icon top; diff --git a/src/main/java/resonantinduction/old/blocks/ItemBlockColored.java b/src/main/java/resonantinduction/archaic/blocks/ItemBlockColored.java similarity index 94% rename from src/main/java/resonantinduction/old/blocks/ItemBlockColored.java rename to src/main/java/resonantinduction/archaic/blocks/ItemBlockColored.java index d131a129d..9ea796106 100644 --- a/src/main/java/resonantinduction/old/blocks/ItemBlockColored.java +++ b/src/main/java/resonantinduction/archaic/blocks/ItemBlockColored.java @@ -1,9 +1,9 @@ -package resonantinduction.old.blocks; +package resonantinduction.archaic.blocks; -import resonantinduction.old.lib.helpers.ColorCode; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import resonantinduction.old.lib.helpers.ColorCode; public class ItemBlockColored extends ItemBlock { diff --git a/src/main/java/resonantinduction/core/debug/BlockDebug.java b/src/main/java/resonantinduction/core/debug/BlockDebug.java index 3b3c24c05..862172bec 100644 --- a/src/main/java/resonantinduction/core/debug/BlockDebug.java +++ b/src/main/java/resonantinduction/core/debug/BlockDebug.java @@ -3,8 +3,8 @@ package resonantinduction.core.debug; import java.util.List; import java.util.Set; -import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,21 +13,22 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import resonantinduction.core.ResonantInductionTabs; +import resonantinduction.core.prefab.block.BlockMachine; +import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo; import resonantinduction.old.transport.ResonantInductionTransport; -import calclavia.lib.prefab.block.BlockMachine; import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BlockDebug extends BlockMachine +public class BlockDebug extends BlockMachine implements IExtraBlockInfo { public static float DebugWattOut, DebugWattDemand; public BlockDebug() { - super(ResonantInductionTransport.CONFIGURATION, "DebugBlock", Material.clay); + super("DebugBlock"); this.setCreativeTab(ResonantInductionTabs.CORE); } @@ -117,7 +118,6 @@ public class BlockDebug extends BlockMachine @Override public void loadExtraConfigs(Configuration config) { - super.loadExtraConfigs(config); for (DebugBlocks block : DebugBlocks.values()) { block.enabled = config.get("Blocks", "Enable" + block.name + "Block", true).getBoolean(true); @@ -184,4 +184,25 @@ public class BlockDebug extends BlockMachine } + @Override + public boolean hasExtraConfigs() + { + // TODO Auto-generated method stub + return false; + } + + @Override + public void loadOreNames() + { + // TODO Auto-generated method stub + + } + + @Override + public void getClientTileEntityRenderers(List, TileEntitySpecialRenderer>> list) + { + // TODO Auto-generated method stub + + } + } diff --git a/src/main/java/resonantinduction/core/debug/TileEntityInfLoad.java b/src/main/java/resonantinduction/core/debug/TileEntityInfLoad.java index a3347c550..0c8e7a6c3 100644 --- a/src/main/java/resonantinduction/core/debug/TileEntityInfLoad.java +++ b/src/main/java/resonantinduction/core/debug/TileEntityInfLoad.java @@ -1,7 +1,7 @@ package resonantinduction.core.debug; -import resonantinduction.old.lib.prefab.TileEntityEnergyMachine; import net.minecraftforge.common.ForgeDirection; +import resonantinduction.core.prefab.tile.TileEntityEnergyMachine; public class TileEntityInfLoad extends TileEntityEnergyMachine { diff --git a/src/main/java/resonantinduction/core/debug/TileEntityInfSupply.java b/src/main/java/resonantinduction/core/debug/TileEntityInfSupply.java index 35de4ab3e..a7aa26833 100644 --- a/src/main/java/resonantinduction/core/debug/TileEntityInfSupply.java +++ b/src/main/java/resonantinduction/core/debug/TileEntityInfSupply.java @@ -2,8 +2,8 @@ package resonantinduction.core.debug; import java.util.EnumSet; -import resonantinduction.old.lib.prefab.TileEntityEnergyMachine; import net.minecraftforge.common.ForgeDirection; +import resonantinduction.core.prefab.tile.TileEntityEnergyMachine; public class TileEntityInfSupply extends TileEntityEnergyMachine { diff --git a/src/main/java/resonantinduction/core/prefab/block/BlockBase.java b/src/main/java/resonantinduction/core/prefab/block/BlockBase.java index f51a4595c..a5fbdb9db 100644 --- a/src/main/java/resonantinduction/core/prefab/block/BlockBase.java +++ b/src/main/java/resonantinduction/core/prefab/block/BlockBase.java @@ -3,6 +3,7 @@ */ package resonantinduction.core.prefab.block; +import net.minecraft.block.material.Material; import net.minecraftforge.common.Configuration; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInductionTabs; @@ -10,18 +11,25 @@ import resonantinduction.core.Settings; import universalelectricity.api.UniversalElectricity; import calclavia.lib.prefab.block.BlockAdvanced; -/** - * @author Calclavia - * - */ +/** @author Calclavia */ public class BlockBase extends BlockAdvanced { - public BlockBase(String name, int id) - { - super(Settings.CONFIGURATION.get(Configuration.CATEGORY_BLOCK, name, id).getInt(id), UniversalElectricity.machine); - this.setCreativeTab(ResonantInductionTabs.CORE); - this.setUnlocalizedName(Reference.PREFIX + name); - this.setTextureName(Reference.PREFIX + name); - this.setHardness(1f); - } + public BlockBase(String name) + { + this(name, UniversalElectricity.machine); + } + + public BlockBase(String name, Material material) + { + this(Settings.getNextBlockID(), name, material); + } + + public BlockBase(int id, String name, Material material) + { + super(Settings.CONFIGURATION.get(Configuration.CATEGORY_BLOCK, name, id).getInt(id), material); + this.setCreativeTab(ResonantInductionTabs.CORE); + this.setUnlocalizedName(Reference.PREFIX + name); + this.setTextureName(Reference.PREFIX + name); + this.setHardness(1f); + } } diff --git a/src/main/java/resonantinduction/core/prefab/block/BlockImprintable.java b/src/main/java/resonantinduction/core/prefab/block/BlockImprintable.java index 52fbe7d18..d5c3d9496 100644 --- a/src/main/java/resonantinduction/core/prefab/block/BlockImprintable.java +++ b/src/main/java/resonantinduction/core/prefab/block/BlockImprintable.java @@ -8,11 +8,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import resonantinduction.core.Settings; import resonantinduction.core.prefab.tile.TileEntityFilterable; import resonantinduction.old.api.IFilterable; import resonantinduction.old.transport.imprinter.ItemImprinter; -import calclavia.lib.prefab.block.BlockMachine; /** Extend this block class if a filter is allowed to be placed inside of this block. * @@ -22,7 +20,7 @@ public abstract class BlockImprintable extends BlockMachine public BlockImprintable(String blockName, Material material) { - super(Settings.getNextBlockID(),Settings.CONFIGURATION, blockName, material); + super(blockName, material); } /** Allows filters to be placed inside of this block. */ diff --git a/src/main/java/resonantinduction/core/prefab/block/BlockMachine.java b/src/main/java/resonantinduction/core/prefab/block/BlockMachine.java new file mode 100644 index 000000000..7be7e9c11 --- /dev/null +++ b/src/main/java/resonantinduction/core/prefab/block/BlockMachine.java @@ -0,0 +1,37 @@ +package resonantinduction.core.prefab.block; + +import net.minecraft.block.material.Material; +import net.minecraftforge.common.Configuration; +import resonantinduction.core.Reference; +import resonantinduction.core.ResonantInductionTabs; +import resonantinduction.core.Settings; +import universalelectricity.api.UniversalElectricity; +import calclavia.lib.prefab.block.BlockTile; +/** + * Basic prefab for machine + * @author DarkGuardsman + * + */ +public class BlockMachine extends BlockTile +{ + + public BlockMachine(String name) + { + this(name, UniversalElectricity.machine); + } + + public BlockMachine(String name, Material material) + { + this(Settings.getNextBlockID(), name, material); + } + + public BlockMachine(int id, String name, Material material) + { + super(Settings.CONFIGURATION.get(Configuration.CATEGORY_BLOCK, name, id).getInt(id), material); + this.setCreativeTab(ResonantInductionTabs.CORE); + this.setUnlocalizedName(Reference.PREFIX + name); + this.setTextureName(Reference.PREFIX + name); + this.setHardness(1f); + } + +} diff --git a/src/main/java/resonantinduction/old/lib/prefab/TileEntityEnergyMachine.java b/src/main/java/resonantinduction/core/prefab/tile/TileEntityEnergyMachine.java similarity index 99% rename from src/main/java/resonantinduction/old/lib/prefab/TileEntityEnergyMachine.java rename to src/main/java/resonantinduction/core/prefab/tile/TileEntityEnergyMachine.java index afbaebd07..445df6192 100644 --- a/src/main/java/resonantinduction/old/lib/prefab/TileEntityEnergyMachine.java +++ b/src/main/java/resonantinduction/core/prefab/tile/TileEntityEnergyMachine.java @@ -1,8 +1,7 @@ -package resonantinduction.old.lib.prefab; +package resonantinduction.core.prefab.tile; import java.util.EnumSet; -import resonantinduction.old.lib.interfaces.IPowerLess; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; @@ -12,6 +11,7 @@ import net.minecraft.nbt.NBTTagLong; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; +import resonantinduction.old.lib.interfaces.IPowerLess; import universalelectricity.api.CompatibilityModule; import universalelectricity.api.electricity.IVoltageInput; import universalelectricity.api.electricity.IVoltageOutput; diff --git a/src/main/java/resonantinduction/old/lib/prefab/TileEntityInv.java b/src/main/java/resonantinduction/core/prefab/tile/TileEntityInv.java similarity index 98% rename from src/main/java/resonantinduction/old/lib/prefab/TileEntityInv.java rename to src/main/java/resonantinduction/core/prefab/tile/TileEntityInv.java index bf01d0329..318eda2bf 100644 --- a/src/main/java/resonantinduction/old/lib/prefab/TileEntityInv.java +++ b/src/main/java/resonantinduction/core/prefab/tile/TileEntityInv.java @@ -1,4 +1,4 @@ -package resonantinduction.old.lib.prefab; +package resonantinduction.core.prefab.tile; import java.util.ArrayList; import java.util.List; @@ -10,10 +10,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.ForgeDirection; +import resonantinduction.core.tilenetwork.prefab.NetworkTileEntities; import resonantinduction.old.lib.interfaces.IExternalInv; import resonantinduction.old.lib.interfaces.IInvBox; import resonantinduction.old.lib.prefab.invgui.InvChest; -import resonatninduction.tilenetwork.prefab.NetworkTileEntities; import universalelectricity.api.vector.Vector3; import calclavia.lib.access.AccessGroup; import calclavia.lib.access.AccessUser; diff --git a/src/main/java/resonantinduction/old/lib/prefab/TileEntityMachine.java b/src/main/java/resonantinduction/core/prefab/tile/TileEntityMachine.java similarity index 99% rename from src/main/java/resonantinduction/old/lib/prefab/TileEntityMachine.java rename to src/main/java/resonantinduction/core/prefab/tile/TileEntityMachine.java index d33836939..2e5ba3ab1 100644 --- a/src/main/java/resonantinduction/old/lib/prefab/TileEntityMachine.java +++ b/src/main/java/resonantinduction/core/prefab/tile/TileEntityMachine.java @@ -1,4 +1,4 @@ -package resonantinduction.old.lib.prefab; +package resonantinduction.core.prefab.tile; import java.io.IOException; diff --git a/src/main/java/resonantinduction/old/mechanics/generator/TileGenerator.java b/src/main/java/resonantinduction/core/prefab/tile/TileGenerator.java similarity index 94% rename from src/main/java/resonantinduction/old/mechanics/generator/TileGenerator.java rename to src/main/java/resonantinduction/core/prefab/tile/TileGenerator.java index 66a339d21..634b2f0ba 100644 --- a/src/main/java/resonantinduction/old/mechanics/generator/TileGenerator.java +++ b/src/main/java/resonantinduction/core/prefab/tile/TileGenerator.java @@ -1,6 +1,5 @@ -package resonantinduction.old.mechanics.generator; +package resonantinduction.core.prefab.tile; -import resonantinduction.old.lib.prefab.TileEntityEnergyMachine; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.CompatibilityModule; diff --git a/src/main/java/resonantinduction/old/blocks/BlockGasOre.java b/src/main/java/resonantinduction/core/resource/BlockGasOre.java similarity index 99% rename from src/main/java/resonantinduction/old/blocks/BlockGasOre.java rename to src/main/java/resonantinduction/core/resource/BlockGasOre.java index ec8869005..a23555561 100644 --- a/src/main/java/resonantinduction/old/blocks/BlockGasOre.java +++ b/src/main/java/resonantinduction/core/resource/BlockGasOre.java @@ -1,4 +1,4 @@ -package resonantinduction.old.blocks; +package resonantinduction.core.resource; import java.awt.Color; import java.util.List; diff --git a/src/main/java/resonantinduction/old/blocks/BlockOre.java b/src/main/java/resonantinduction/core/resource/BlockOre.java similarity index 99% rename from src/main/java/resonantinduction/old/blocks/BlockOre.java rename to src/main/java/resonantinduction/core/resource/BlockOre.java index 3e876ef0f..5aa146ad4 100644 --- a/src/main/java/resonantinduction/old/blocks/BlockOre.java +++ b/src/main/java/resonantinduction/core/resource/BlockOre.java @@ -1,4 +1,4 @@ -package resonantinduction.old.blocks; +package resonantinduction.core.resource; import java.util.List; import java.util.Set; diff --git a/src/main/java/resonantinduction/old/blocks/GasOreGenerator.java b/src/main/java/resonantinduction/core/resource/GasOreGenerator.java similarity index 99% rename from src/main/java/resonantinduction/old/blocks/GasOreGenerator.java rename to src/main/java/resonantinduction/core/resource/GasOreGenerator.java index fd140ba30..d353b30ab 100644 --- a/src/main/java/resonantinduction/old/blocks/GasOreGenerator.java +++ b/src/main/java/resonantinduction/core/resource/GasOreGenerator.java @@ -1,4 +1,4 @@ -package resonantinduction.old.blocks; +package resonantinduction.core.resource; import java.util.Random; diff --git a/src/main/java/resonantinduction/core/resource/ItemBlockOre.java b/src/main/java/resonantinduction/core/resource/ItemBlockOre.java index 40aad8b03..72b4b13d0 100644 --- a/src/main/java/resonantinduction/core/resource/ItemBlockOre.java +++ b/src/main/java/resonantinduction/core/resource/ItemBlockOre.java @@ -3,7 +3,7 @@ package resonantinduction.core.resource; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import resonantinduction.core.Reference; -import resonantinduction.old.blocks.BlockOre.OreData; +import resonantinduction.core.resource.BlockOre.OreData; public class ItemBlockOre extends ItemBlock { diff --git a/src/main/java/resonantinduction/core/resource/ItemDust.java b/src/main/java/resonantinduction/core/resource/ItemDust.java index 4e6d7dcdd..ac1c25189 100644 --- a/src/main/java/resonantinduction/core/resource/ItemDust.java +++ b/src/main/java/resonantinduction/core/resource/ItemDust.java @@ -7,15 +7,9 @@ import java.util.Set; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent; -import resonantinduction.api.recipe.OreDetectionBlackList; import resonantinduction.core.Reference; -import resonantinduction.core.ResonantInduction; import resonantinduction.core.prefab.item.ItemBase; -import resonantinduction.core.resource.ResourceGenerator; import calclavia.lib.utility.LanguageUtility; import calclavia.lib.utility.NBTUtility; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/resonantinduction/core/resource/ResourceGenerator.java b/src/main/java/resonantinduction/core/resource/ResourceGenerator.java index 8eb19c1bf..cd2eaff19 100644 --- a/src/main/java/resonantinduction/core/resource/ResourceGenerator.java +++ b/src/main/java/resonantinduction/core/resource/ResourceGenerator.java @@ -1,7 +1,5 @@ package resonantinduction.core.resource; -import java.awt.Color; -import java.lang.reflect.Method; import java.util.HashMap; import java.util.HashSet; import java.util.Set; @@ -22,7 +20,6 @@ import resonantinduction.core.ResonantInduction; import codechicken.lib.colour.Colour; import codechicken.lib.colour.ColourRGBA; import codechicken.lib.render.TextureUtils; -import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonatninduction/tilenetwork/INetworkContainer.java b/src/main/java/resonantinduction/core/tilenetwork/INetworkContainer.java similarity index 94% rename from src/main/java/resonatninduction/tilenetwork/INetworkContainer.java rename to src/main/java/resonantinduction/core/tilenetwork/INetworkContainer.java index 9975f87e5..2935edbb5 100644 --- a/src/main/java/resonatninduction/tilenetwork/INetworkContainer.java +++ b/src/main/java/resonantinduction/core/tilenetwork/INetworkContainer.java @@ -1,4 +1,4 @@ -package resonatninduction.tilenetwork; +package resonantinduction.core.tilenetwork; /** * Used on tiles that can contain more than one tile network. Currently WIP so don't use unless you diff --git a/src/main/java/resonatninduction/tilenetwork/INetworkEnergyPart.java b/src/main/java/resonantinduction/core/tilenetwork/INetworkEnergyPart.java similarity index 93% rename from src/main/java/resonatninduction/tilenetwork/INetworkEnergyPart.java rename to src/main/java/resonantinduction/core/tilenetwork/INetworkEnergyPart.java index 8c9711810..e5c439822 100644 --- a/src/main/java/resonatninduction/tilenetwork/INetworkEnergyPart.java +++ b/src/main/java/resonantinduction/core/tilenetwork/INetworkEnergyPart.java @@ -1,4 +1,4 @@ -package resonatninduction.tilenetwork; +package resonantinduction.core.tilenetwork; import universalelectricity.api.energy.IEnergyContainer; diff --git a/src/main/java/resonatninduction/tilenetwork/INetworkPart.java b/src/main/java/resonantinduction/core/tilenetwork/INetworkPart.java similarity index 91% rename from src/main/java/resonatninduction/tilenetwork/INetworkPart.java rename to src/main/java/resonantinduction/core/tilenetwork/INetworkPart.java index ba57cdc84..99a9aedb5 100644 --- a/src/main/java/resonatninduction/tilenetwork/INetworkPart.java +++ b/src/main/java/resonantinduction/core/tilenetwork/INetworkPart.java @@ -1,4 +1,4 @@ -package resonatninduction.tilenetwork; +package resonantinduction.core.tilenetwork; import java.util.List; diff --git a/src/main/java/resonatninduction/tilenetwork/ITileConnector.java b/src/main/java/resonantinduction/core/tilenetwork/ITileConnector.java similarity index 96% rename from src/main/java/resonatninduction/tilenetwork/ITileConnector.java rename to src/main/java/resonantinduction/core/tilenetwork/ITileConnector.java index fcff3e45a..6e62ca5d2 100644 --- a/src/main/java/resonatninduction/tilenetwork/ITileConnector.java +++ b/src/main/java/resonantinduction/core/tilenetwork/ITileConnector.java @@ -1,4 +1,4 @@ -package resonatninduction.tilenetwork; +package resonantinduction.core.tilenetwork; import net.minecraftforge.common.ForgeDirection; diff --git a/src/main/java/resonatninduction/tilenetwork/ITileNetwork.java b/src/main/java/resonantinduction/core/tilenetwork/ITileNetwork.java similarity index 97% rename from src/main/java/resonatninduction/tilenetwork/ITileNetwork.java rename to src/main/java/resonantinduction/core/tilenetwork/ITileNetwork.java index bc0fdcead..6b1283f20 100644 --- a/src/main/java/resonatninduction/tilenetwork/ITileNetwork.java +++ b/src/main/java/resonantinduction/core/tilenetwork/ITileNetwork.java @@ -1,4 +1,4 @@ -package resonatninduction.tilenetwork; +package resonantinduction.core.tilenetwork; import java.util.Set; diff --git a/src/main/java/resonatninduction/tilenetwork/prefab/NetworkPathFinder.java b/src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkPathFinder.java similarity index 93% rename from src/main/java/resonatninduction/tilenetwork/prefab/NetworkPathFinder.java rename to src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkPathFinder.java index 6a90229cd..eb3bc7d9a 100644 --- a/src/main/java/resonatninduction/tilenetwork/prefab/NetworkPathFinder.java +++ b/src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkPathFinder.java @@ -1,11 +1,11 @@ -package resonatninduction.tilenetwork.prefab; +package resonantinduction.core.tilenetwork.prefab; import java.util.HashSet; import java.util.Set; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import resonatninduction.tilenetwork.INetworkPart; +import resonantinduction.core.tilenetwork.INetworkPart; import universalelectricity.api.vector.Vector3; import calclavia.lib.path.IPathCallBack; import calclavia.lib.path.Pathfinder; diff --git a/src/main/java/resonatninduction/tilenetwork/prefab/NetworkResourceSupply.java b/src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkResourceSupply.java similarity index 86% rename from src/main/java/resonatninduction/tilenetwork/prefab/NetworkResourceSupply.java rename to src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkResourceSupply.java index 084bfab3e..5ac6a8014 100644 --- a/src/main/java/resonatninduction/tilenetwork/prefab/NetworkResourceSupply.java +++ b/src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkResourceSupply.java @@ -1,11 +1,11 @@ -package resonatninduction.tilenetwork.prefab; +package resonantinduction.core.tilenetwork.prefab; import java.util.HashMap; import java.util.List; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import resonatninduction.tilenetwork.INetworkPart; +import resonantinduction.core.tilenetwork.INetworkPart; /** * Network that supplies resources to tiles that demand a set resource diff --git a/src/main/java/resonatninduction/tilenetwork/prefab/NetworkSharedPower.java b/src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkSharedPower.java similarity index 95% rename from src/main/java/resonatninduction/tilenetwork/prefab/NetworkSharedPower.java rename to src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkSharedPower.java index 22b9e35c7..a150bedd1 100644 --- a/src/main/java/resonatninduction/tilenetwork/prefab/NetworkSharedPower.java +++ b/src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkSharedPower.java @@ -1,9 +1,9 @@ -package resonatninduction.tilenetwork.prefab; +package resonantinduction.core.tilenetwork.prefab; import net.minecraft.tileentity.TileEntity; +import resonantinduction.core.tilenetwork.INetworkEnergyPart; +import resonantinduction.core.tilenetwork.INetworkPart; import resonantinduction.old.lib.interfaces.IPowerLess; -import resonatninduction.tilenetwork.INetworkEnergyPart; -import resonatninduction.tilenetwork.INetworkPart; /** * Used for tile networks that only need to share power or act like a group battery that doesn't diff --git a/src/main/java/resonatninduction/tilenetwork/prefab/NetworkTileEntities.java b/src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkTileEntities.java similarity index 97% rename from src/main/java/resonatninduction/tilenetwork/prefab/NetworkTileEntities.java rename to src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkTileEntities.java index d9edddc46..f475eb3ff 100644 --- a/src/main/java/resonatninduction/tilenetwork/prefab/NetworkTileEntities.java +++ b/src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkTileEntities.java @@ -1,4 +1,4 @@ -package resonatninduction.tilenetwork.prefab; +package resonantinduction.core.tilenetwork.prefab; import java.util.HashSet; import java.util.Iterator; @@ -7,8 +7,8 @@ import java.util.Set; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import resonatninduction.tilenetwork.INetworkPart; -import resonatninduction.tilenetwork.ITileNetwork; +import resonantinduction.core.tilenetwork.INetworkPart; +import resonantinduction.core.tilenetwork.ITileNetwork; import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorHelper; import calclavia.lib.path.Pathfinder; diff --git a/src/main/java/resonatninduction/tilenetwork/prefab/NetworkUpdateHandler.java b/src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkUpdateHandler.java similarity index 96% rename from src/main/java/resonatninduction/tilenetwork/prefab/NetworkUpdateHandler.java rename to src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkUpdateHandler.java index 01e01ad0e..d77718f3d 100644 --- a/src/main/java/resonatninduction/tilenetwork/prefab/NetworkUpdateHandler.java +++ b/src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkUpdateHandler.java @@ -1,4 +1,4 @@ -package resonatninduction.tilenetwork.prefab; +package resonantinduction.core.tilenetwork.prefab; import java.util.EnumSet; import java.util.HashMap; @@ -6,7 +6,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import resonatninduction.tilenetwork.ITileNetwork; +import resonantinduction.core.tilenetwork.ITileNetwork; import cpw.mods.fml.common.ITickHandler; import cpw.mods.fml.common.TickType; diff --git a/src/main/java/resonantinduction/electrical/CommonProxy.java b/src/main/java/resonantinduction/electrical/CommonProxy.java index 7e901f424..79a247ef0 100644 --- a/src/main/java/resonantinduction/electrical/CommonProxy.java +++ b/src/main/java/resonantinduction/electrical/CommonProxy.java @@ -3,13 +3,13 @@ package resonantinduction.electrical; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import codechicken.lib.colour.ColourRGBA; -import codechicken.multipart.TMultiPart; -import codechicken.multipart.TileMultipart; import resonantinduction.core.prefab.ProxyBase; import resonantinduction.electrical.multimeter.ContainerMultimeter; import resonantinduction.electrical.multimeter.PartMultimeter; import universalelectricity.api.vector.Vector3; +import codechicken.lib.colour.ColourRGBA; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; public class CommonProxy extends ProxyBase { diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/BlockArmbot.java b/src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java similarity index 80% rename from src/main/java/resonantinduction/old/mechanics/armbot/BlockArmbot.java rename to src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java index 13abda6ad..07895c000 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/BlockArmbot.java +++ b/src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.armbot; +package resonantinduction.electrical.armbot; import java.util.List; import java.util.Random; @@ -10,23 +10,23 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import resonantinduction.core.Settings; +import net.minecraftforge.common.Configuration; +import resonantinduction.core.prefab.block.BlockMachine; import resonantinduction.old.client.render.BlockRenderingHandler; import resonantinduction.old.client.render.RenderArmbot; -import universalelectricity.api.UniversalElectricity; +import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo; import calclavia.lib.multiblock.link.IMultiBlock; -import calclavia.lib.prefab.block.BlockMachine; import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BlockArmbot extends BlockMachine +public class BlockArmbot extends BlockMachine implements IExtraBlockInfo { public BlockArmbot() { - super(Settings.CONFIGURATION,"armbot", UniversalElectricity.machine); + super("armbot"); } @Override @@ -116,4 +116,25 @@ public class BlockArmbot extends BlockMachine { return false; } + + @Override + public boolean hasExtraConfigs() + { + // TODO Auto-generated method stub + return false; + } + + @Override + public void loadExtraConfigs(Configuration config) + { + // TODO Auto-generated method stub + + } + + @Override + public void loadOreNames() + { + // TODO Auto-generated method stub + + } } diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/Program.java b/src/main/java/resonantinduction/electrical/armbot/Program.java similarity index 99% rename from src/main/java/resonantinduction/old/mechanics/armbot/Program.java rename to src/main/java/resonantinduction/electrical/armbot/Program.java index c5bb88c96..6fa26ba7f 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/Program.java +++ b/src/main/java/resonantinduction/electrical/armbot/Program.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.armbot; +package resonantinduction.electrical.armbot; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/TaskBase.java b/src/main/java/resonantinduction/electrical/armbot/TaskBase.java similarity index 98% rename from src/main/java/resonantinduction/old/mechanics/armbot/TaskBase.java rename to src/main/java/resonantinduction/electrical/armbot/TaskBase.java index 6046079d8..395b794e1 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/TaskBase.java +++ b/src/main/java/resonantinduction/electrical/armbot/TaskBase.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.armbot; +package resonantinduction.electrical.armbot; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/TaskBaseArmbot.java b/src/main/java/resonantinduction/electrical/armbot/TaskBaseArmbot.java similarity index 94% rename from src/main/java/resonantinduction/old/mechanics/armbot/TaskBaseArmbot.java rename to src/main/java/resonantinduction/electrical/armbot/TaskBaseArmbot.java index af1d31509..2c5950946 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/TaskBaseArmbot.java +++ b/src/main/java/resonantinduction/electrical/armbot/TaskBaseArmbot.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.armbot; +package resonantinduction.electrical.armbot; import resonantinduction.old.api.IArmbot; import resonantinduction.old.api.coding.IProgrammableMachine; diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/TaskBaseLogic.java b/src/main/java/resonantinduction/electrical/armbot/TaskBaseLogic.java similarity index 83% rename from src/main/java/resonantinduction/old/mechanics/armbot/TaskBaseLogic.java rename to src/main/java/resonantinduction/electrical/armbot/TaskBaseLogic.java index 114c41b11..a4a903d53 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/TaskBaseLogic.java +++ b/src/main/java/resonantinduction/electrical/armbot/TaskBaseLogic.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.armbot; +package resonantinduction.electrical.armbot; import resonantinduction.old.api.coding.ILogicTask; diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/TaskBaseProcess.java b/src/main/java/resonantinduction/electrical/armbot/TaskBaseProcess.java similarity index 97% rename from src/main/java/resonantinduction/old/mechanics/armbot/TaskBaseProcess.java rename to src/main/java/resonantinduction/electrical/armbot/TaskBaseProcess.java index 57d1acb43..de2bfadb0 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/TaskBaseProcess.java +++ b/src/main/java/resonantinduction/electrical/armbot/TaskBaseProcess.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.armbot; +package resonantinduction.electrical.armbot; import net.minecraft.item.ItemStack; import resonantinduction.old.api.coding.IProcessTask; diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/TileEntityArmbot.java b/src/main/java/resonantinduction/electrical/armbot/TileEntityArmbot.java similarity index 97% rename from src/main/java/resonantinduction/old/mechanics/armbot/TileEntityArmbot.java rename to src/main/java/resonantinduction/electrical/armbot/TileEntityArmbot.java index 790492c8b..103e0550b 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/TileEntityArmbot.java +++ b/src/main/java/resonantinduction/electrical/armbot/TileEntityArmbot.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.armbot; +package resonantinduction.electrical.armbot; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; @@ -10,15 +10,15 @@ import net.minecraft.network.packet.Packet; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.ResonantInduction; +import resonantinduction.electrical.armbot.command.TaskDrop; +import resonantinduction.electrical.armbot.command.TaskGOTO; +import resonantinduction.electrical.armbot.command.TaskGrabItem; +import resonantinduction.electrical.armbot.command.TaskReturn; +import resonantinduction.electrical.armbot.command.TaskRotateTo; import resonantinduction.old.api.IArmbot; import resonantinduction.old.api.coding.IProgram; import resonantinduction.old.api.coding.ProgramHelper; import resonantinduction.old.core.recipe.RecipeLoader; -import resonantinduction.old.mechanics.armbot.command.TaskDrop; -import resonantinduction.old.mechanics.armbot.command.TaskGOTO; -import resonantinduction.old.mechanics.armbot.command.TaskGrabItem; -import resonantinduction.old.mechanics.armbot.command.TaskReturn; -import resonantinduction.old.mechanics.armbot.command.TaskRotateTo; import resonantinduction.old.transport.ResonantInductionTransport; import resonantinduction.old.transport.TileEntityAssembly; import resonantinduction.old.transport.encoder.ItemDisk; diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskBreak.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskBreak.java similarity index 92% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskBreak.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskBreak.java index 81c891897..9b8efbe8f 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskBreak.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskBreak.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; import java.util.ArrayList; @@ -7,10 +7,10 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import resonantinduction.electrical.armbot.TaskBaseArmbot; +import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.old.api.IArmbot; import resonantinduction.old.api.coding.ITask; -import resonantinduction.old.mechanics.armbot.TaskBaseArmbot; -import resonantinduction.old.mechanics.armbot.TaskBaseProcess; import universalelectricity.api.vector.Vector3; import calclavia.lib.utility.HelperMethods; diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskDrop.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskDrop.java similarity index 72% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskDrop.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskDrop.java index 0d616a8e8..cbaec6379 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskDrop.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskDrop.java @@ -1,8 +1,8 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; +import resonantinduction.electrical.armbot.TaskBaseArmbot; +import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.old.api.IArmbot; -import resonantinduction.old.mechanics.armbot.TaskBaseArmbot; -import resonantinduction.old.mechanics.armbot.TaskBaseProcess; import universalelectricity.api.vector.Vector2; public class TaskDrop extends TaskBaseArmbot diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskEnd.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskEnd.java similarity index 63% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskEnd.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskEnd.java index bd4fc5d81..15e3c1cb6 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskEnd.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskEnd.java @@ -1,6 +1,6 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; -import resonantinduction.old.mechanics.armbot.TaskBase; +import resonantinduction.electrical.armbot.TaskBase; /** @author DarkGuardsman */ public class TaskEnd extends TaskBase diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskFire.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskFire.java similarity index 97% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskFire.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskFire.java index 18c9629e1..2ee4d4747 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskFire.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskFire.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; import java.util.Random; @@ -9,10 +9,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import resonantinduction.electrical.armbot.TaskBaseArmbot; +import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.old.api.IArmbot; import resonantinduction.old.api.coding.args.ArgumentFloatData; -import resonantinduction.old.mechanics.armbot.TaskBaseArmbot; -import resonantinduction.old.mechanics.armbot.TaskBaseProcess; import universalelectricity.api.vector.Vector3; import com.builtbroken.common.Pair; diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGOTO.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskGOTO.java similarity index 94% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGOTO.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskGOTO.java index 414acd143..f63aec0d5 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGOTO.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskGOTO.java @@ -1,12 +1,12 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; import java.util.ArrayList; import java.util.List; import net.minecraft.nbt.NBTTagCompound; +import resonantinduction.electrical.armbot.TaskBase; import resonantinduction.old.api.coding.IRedirectTask; import resonantinduction.old.api.coding.ITask; -import resonantinduction.old.mechanics.armbot.TaskBase; import universalelectricity.api.vector.Vector2; /** @author DarkGuardsman */ diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGive.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskGive.java similarity index 95% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGive.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskGive.java index a7a0947b9..1eac21862 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGive.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskGive.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; import java.util.ArrayList; import java.util.List; @@ -8,11 +8,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; +import resonantinduction.electrical.armbot.TaskBaseArmbot; +import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.old.api.IArmbot; import resonantinduction.old.api.coding.IProgrammableMachine; import resonantinduction.old.api.coding.args.ArgumentIntData; -import resonantinduction.old.mechanics.armbot.TaskBaseArmbot; -import resonantinduction.old.mechanics.armbot.TaskBaseProcess; import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; import calclavia.lib.utility.InvInteractionHelper; diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGrabEntity.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskGrabEntity.java similarity index 96% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGrabEntity.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskGrabEntity.java index 039e14e53..c3435a472 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGrabEntity.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskGrabEntity.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; import java.util.List; @@ -8,10 +8,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.old.api.EntityDictionary; import resonantinduction.old.api.IArmbot; import resonantinduction.old.api.coding.args.ArgumentData; -import resonantinduction.old.mechanics.armbot.TaskBaseProcess; public class TaskGrabEntity extends TaskGrabPrefab { diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGrabItem.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskGrabItem.java similarity index 95% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGrabItem.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskGrabItem.java index 92ea45a90..c1d5c82a3 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGrabItem.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskGrabItem.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; import java.util.List; @@ -6,9 +6,9 @@ import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.old.api.IArmbot; import resonantinduction.old.api.coding.args.ArgumentIntData; -import resonantinduction.old.mechanics.armbot.TaskBaseProcess; import com.builtbroken.common.science.units.UnitHelper; diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGrabPrefab.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskGrabPrefab.java similarity index 92% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGrabPrefab.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskGrabPrefab.java index 0acdf96f1..c8af2efdf 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskGrabPrefab.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskGrabPrefab.java @@ -1,10 +1,10 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; +import resonantinduction.electrical.armbot.TaskBaseArmbot; import resonantinduction.old.api.IArmbot; import resonantinduction.old.api.IBelt; -import resonantinduction.old.mechanics.armbot.TaskBaseArmbot; import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskHarvest.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskHarvest.java similarity index 84% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskHarvest.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskHarvest.java index f0a9f0bff..60d022e84 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskHarvest.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskHarvest.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; /** * Used by arms to break a specific block in a position. diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskIF.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskIF.java similarity index 94% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskIF.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskIF.java index 106d58a17..562dfe8fb 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskIF.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskIF.java @@ -1,12 +1,12 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; import java.util.ArrayList; import java.util.List; +import resonantinduction.electrical.armbot.TaskBaseLogic; import resonantinduction.old.api.coding.IProgrammableMachine; import resonantinduction.old.api.coding.ITask; import resonantinduction.old.api.coding.args.ArgumentData; -import resonantinduction.old.mechanics.armbot.TaskBaseLogic; import universalelectricity.api.vector.Vector2; /** @author DarkGuardsman */ diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskIdle.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskIdle.java similarity index 94% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskIdle.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskIdle.java index 27587e19b..850bef1eb 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskIdle.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskIdle.java @@ -1,11 +1,11 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; import java.util.List; import net.minecraft.nbt.NBTTagCompound; +import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.old.api.coding.IProgrammableMachine; import resonantinduction.old.api.coding.args.ArgumentData; -import resonantinduction.old.mechanics.armbot.TaskBaseProcess; import com.builtbroken.common.science.units.UnitHelper; diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskPlace.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskPlace.java similarity index 95% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskPlace.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskPlace.java index 458b33b9c..6e311e879 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskPlace.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskPlace.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; @@ -6,9 +6,9 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.IPlantable; +import resonantinduction.electrical.armbot.TaskBaseArmbot; +import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.old.api.IArmbot; -import resonantinduction.old.mechanics.armbot.TaskBaseArmbot; -import resonantinduction.old.mechanics.armbot.TaskBaseProcess; import universalelectricity.api.vector.Vector3; /** diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskReturn.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskReturn.java similarity index 60% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskReturn.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskReturn.java index 6a7cda6bd..28dd25b81 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskReturn.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskReturn.java @@ -1,6 +1,6 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; -import resonantinduction.old.mechanics.armbot.TaskBaseProcess; +import resonantinduction.electrical.armbot.TaskBaseProcess; public class TaskReturn extends TaskRotateTo { diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskRotateBy.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskRotateBy.java similarity index 93% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskRotateBy.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskRotateBy.java index ab4816a3d..84df889a2 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskRotateBy.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskRotateBy.java @@ -1,12 +1,12 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; import java.util.List; import net.minecraft.nbt.NBTTagCompound; +import resonantinduction.electrical.armbot.TaskBaseArmbot; +import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.old.api.IArmbot; import resonantinduction.old.api.coding.args.ArgumentIntData; -import resonantinduction.old.mechanics.armbot.TaskBaseArmbot; -import resonantinduction.old.mechanics.armbot.TaskBaseProcess; import universalelectricity.api.vector.Vector2; import com.builtbroken.common.science.units.UnitHelper; diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskRotateTo.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskRotateTo.java similarity index 93% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskRotateTo.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskRotateTo.java index 71d7a12ff..15000e9d9 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskRotateTo.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskRotateTo.java @@ -1,12 +1,12 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; import java.util.List; import net.minecraft.nbt.NBTTagCompound; +import resonantinduction.electrical.armbot.TaskBaseArmbot; +import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.old.api.IArmbot; import resonantinduction.old.api.coding.args.ArgumentIntData; -import resonantinduction.old.mechanics.armbot.TaskBaseArmbot; -import resonantinduction.old.mechanics.armbot.TaskBaseProcess; import universalelectricity.api.vector.Vector2; import com.builtbroken.common.science.units.UnitHelper; diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskStart.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskStart.java similarity index 76% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskStart.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskStart.java index bd995ebe4..ca4b851e9 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskStart.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskStart.java @@ -1,6 +1,6 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; -import resonantinduction.old.mechanics.armbot.TaskBase; +import resonantinduction.electrical.armbot.TaskBase; /** * Fake task as the player can not create, edit, or do anything with this task. Its only used to diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskTake.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskTake.java similarity index 94% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskTake.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskTake.java index 63605cf97..10fe15955 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskTake.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskTake.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; import java.util.ArrayList; import java.util.List; @@ -8,10 +8,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; +import resonantinduction.electrical.armbot.TaskBaseArmbot; +import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.old.api.IArmbot; import resonantinduction.old.api.coding.args.ArgumentIntData; -import resonantinduction.old.mechanics.armbot.TaskBaseArmbot; -import resonantinduction.old.mechanics.armbot.TaskBaseProcess; import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; import calclavia.lib.utility.InvInteractionHelper; diff --git a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskUse.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskUse.java similarity index 94% rename from src/main/java/resonantinduction/old/mechanics/armbot/command/TaskUse.java rename to src/main/java/resonantinduction/electrical/armbot/command/TaskUse.java index ee570bebb..fc33c03de 100644 --- a/src/main/java/resonantinduction/old/mechanics/armbot/command/TaskUse.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskUse.java @@ -1,16 +1,16 @@ -package resonantinduction.old.mechanics.armbot.command; +package resonantinduction.electrical.armbot.command; import java.util.List; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import resonantinduction.electrical.armbot.TaskBaseArmbot; +import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.old.api.IArmbot; import resonantinduction.old.api.IArmbotUseable; import resonantinduction.old.api.coding.IProcessTask; import resonantinduction.old.api.coding.args.ArgumentIntData; -import resonantinduction.old.mechanics.armbot.TaskBaseArmbot; -import resonantinduction.old.mechanics.armbot.TaskBaseProcess; import com.builtbroken.common.science.units.UnitHelper; diff --git a/src/main/java/resonantinduction/old/mechanics/generator/solar/BlockSolarPanel.java b/src/main/java/resonantinduction/electrical/generator/solar/BlockSolarPanel.java similarity index 79% rename from src/main/java/resonantinduction/old/mechanics/generator/solar/BlockSolarPanel.java rename to src/main/java/resonantinduction/electrical/generator/solar/BlockSolarPanel.java index 171db4dbf..13a4be352 100644 --- a/src/main/java/resonantinduction/old/mechanics/generator/solar/BlockSolarPanel.java +++ b/src/main/java/resonantinduction/electrical/generator/solar/BlockSolarPanel.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.generator.solar; +package resonantinduction.electrical.generator.solar; import java.util.List; import java.util.Set; @@ -9,19 +9,17 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import net.minecraftforge.oredict.OreDictionary; -import resonantinduction.core.ResonantInductionTabs; +import resonantinduction.core.prefab.block.BlockMachine; import resonantinduction.old.client.render.BlockRenderingHandler; import resonantinduction.old.client.render.RenderBlockSolarPanel; -import resonantinduction.old.transport.ResonantInductionTransport; -import universalelectricity.api.UniversalElectricity; -import calclavia.lib.prefab.block.BlockMachine; +import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo; import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BlockSolarPanel extends BlockMachine +public class BlockSolarPanel extends BlockMachine implements IExtraBlockInfo { public static int tickRate = 10; public static long wattDay = 120; @@ -30,9 +28,8 @@ public class BlockSolarPanel extends BlockMachine public BlockSolarPanel() { - super(ResonantInductionTransport.CONFIGURATION, "BlockSolarPanel", UniversalElectricity.machine); + super("BlockSolarPanel"); this.setBlockBounds(0, 0, 0, 1f, .6f, 1f); - this.setCreativeTab(ResonantInductionTabs.tabIndustrial()); } @Override @@ -69,16 +66,13 @@ public class BlockSolarPanel extends BlockMachine @SideOnly(Side.CLIENT) public void getClientTileEntityRenderers(List, TileEntitySpecialRenderer>> list) { - if (!this.zeroRendering) - { list.add(new Pair, TileEntitySpecialRenderer>(TileEntitySolarPanel.class, new RenderBlockSolarPanel())); - } + } @Override public void loadExtraConfigs(Configuration config) { - super.loadExtraConfigs(config); tickRate = config.get("settings", "PanelUpdateRate", tickRate).getInt(); wattDay = config.get("settings", "WattDayLight", 120).getInt(); wattNight = config.get("settings", "WattMoonLight", 1).getInt(); @@ -90,4 +84,11 @@ public class BlockSolarPanel extends BlockMachine { OreDictionary.registerOre("SolarPanel", new ItemStack(this, 1, 0)); } + + @Override + public boolean hasExtraConfigs() + { + // TODO Auto-generated method stub + return false; + } } diff --git a/src/main/java/resonantinduction/old/mechanics/generator/solar/TileEntitySolarBox.java b/src/main/java/resonantinduction/electrical/generator/solar/TileEntitySolarBox.java similarity index 72% rename from src/main/java/resonantinduction/old/mechanics/generator/solar/TileEntitySolarBox.java rename to src/main/java/resonantinduction/electrical/generator/solar/TileEntitySolarBox.java index 7f3fb5afa..4ecda1d27 100644 --- a/src/main/java/resonantinduction/old/mechanics/generator/solar/TileEntitySolarBox.java +++ b/src/main/java/resonantinduction/electrical/generator/solar/TileEntitySolarBox.java @@ -1,6 +1,6 @@ -package resonantinduction.old.mechanics.generator.solar; +package resonantinduction.electrical.generator.solar; -import resonantinduction.old.mechanics.generator.TileGenerator; +import resonantinduction.core.prefab.tile.TileGenerator; /** TileEntity that acts as the connection node for the solar panel */ public class TileEntitySolarBox extends TileGenerator diff --git a/src/main/java/resonantinduction/old/mechanics/generator/solar/TileEntitySolarPanel.java b/src/main/java/resonantinduction/electrical/generator/solar/TileEntitySolarPanel.java similarity index 91% rename from src/main/java/resonantinduction/old/mechanics/generator/solar/TileEntitySolarPanel.java rename to src/main/java/resonantinduction/electrical/generator/solar/TileEntitySolarPanel.java index 71fd830c2..e5883090a 100644 --- a/src/main/java/resonantinduction/old/mechanics/generator/solar/TileEntitySolarPanel.java +++ b/src/main/java/resonantinduction/electrical/generator/solar/TileEntitySolarPanel.java @@ -1,9 +1,9 @@ -package resonantinduction.old.mechanics.generator.solar; +package resonantinduction.electrical.generator.solar; import java.util.EnumSet; import net.minecraftforge.common.ForgeDirection; -import resonantinduction.old.mechanics.generator.TileGenerator; +import resonantinduction.core.prefab.tile.TileGenerator; public class TileEntitySolarPanel extends TileGenerator { diff --git a/src/main/java/resonantinduction/electrical/multimeter/ItemReadoutTools.java b/src/main/java/resonantinduction/electrical/multimeter/ItemReadoutTools.java index f487d712d..1a563a055 100644 --- a/src/main/java/resonantinduction/electrical/multimeter/ItemReadoutTools.java +++ b/src/main/java/resonantinduction/electrical/multimeter/ItemReadoutTools.java @@ -16,10 +16,10 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import resonantinduction.core.Reference; import resonantinduction.core.Settings; +import resonantinduction.core.prefab.tile.TileEntityEnergyMachine; +import resonantinduction.core.prefab.tile.TileGenerator; import resonantinduction.old.lib.interfaces.IReadOut; import resonantinduction.old.lib.interfaces.IReadOut.EnumTools; -import resonantinduction.old.lib.prefab.TileEntityEnergyMachine; -import resonantinduction.old.mechanics.generator.TileGenerator; import universalelectricity.api.electricity.IVoltageInput; import universalelectricity.api.electricity.IVoltageOutput; import universalelectricity.api.energy.IConductor; diff --git a/src/main/java/resonantinduction/electrical/wire/framed/RenderPartWire.java b/src/main/java/resonantinduction/electrical/wire/framed/RenderPartWire.java index 417ae0f5f..3344b2864 100644 --- a/src/main/java/resonantinduction/electrical/wire/framed/RenderPartWire.java +++ b/src/main/java/resonantinduction/electrical/wire/framed/RenderPartWire.java @@ -11,10 +11,9 @@ import net.minecraftforge.common.ForgeDirection; import org.lwjgl.BufferUtils; import org.lwjgl.opengl.GL11; -import calclavia.lib.render.EnumColor; import resonantinduction.core.Reference; -import resonantinduction.core.ResonantInduction; import resonantinduction.core.render.InvertX; +import calclavia.lib.render.EnumColor; import codechicken.lib.colour.Colour; import codechicken.lib.colour.ColourRGBA; import codechicken.lib.lighting.LightModel; diff --git a/src/main/java/resonantinduction/mechanical/Mechanical.java b/src/main/java/resonantinduction/mechanical/Mechanical.java index 26db0cce8..1f26422fd 100644 --- a/src/main/java/resonantinduction/mechanical/Mechanical.java +++ b/src/main/java/resonantinduction/mechanical/Mechanical.java @@ -1,7 +1,5 @@ package resonantinduction.mechanical; -import java.util.logging.Logger; - import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.Settings; diff --git a/src/main/java/resonantinduction/old/transport/belt/BlockConveyorBelt.java b/src/main/java/resonantinduction/mechanical/belt/BlockConveyorBelt.java similarity index 94% rename from src/main/java/resonantinduction/old/transport/belt/BlockConveyorBelt.java rename to src/main/java/resonantinduction/mechanical/belt/BlockConveyorBelt.java index 9b149bca7..5d1409453 100644 --- a/src/main/java/resonantinduction/old/transport/belt/BlockConveyorBelt.java +++ b/src/main/java/resonantinduction/mechanical/belt/BlockConveyorBelt.java @@ -1,4 +1,4 @@ -package resonantinduction.old.transport.belt; +package resonantinduction.mechanical.belt; import java.util.List; import java.util.Set; @@ -15,13 +15,13 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.Configuration; import net.minecraftforge.common.ForgeDirection; -import resonantinduction.core.Settings; +import resonantinduction.core.prefab.block.BlockMachine; +import resonantinduction.mechanical.belt.TileEntityConveyorBelt.SlantType; import resonantinduction.old.client.render.BlockRenderingHandler; import resonantinduction.old.client.render.RenderConveyorBelt; -import resonantinduction.old.transport.belt.TileEntityConveyorBelt.SlantType; -import universalelectricity.api.UniversalElectricity; -import calclavia.lib.prefab.block.BlockMachine; +import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo; import com.builtbroken.common.Pair; @@ -31,11 +31,11 @@ import cpw.mods.fml.relauncher.SideOnly; /** The block for the actual conveyor belt! * * @author Calclavia, DarkGuardsman */ -public class BlockConveyorBelt extends BlockMachine +public class BlockConveyorBelt extends BlockMachine implements IExtraBlockInfo { public BlockConveyorBelt() { - super(Settings.CONFIGURATION, "conveyorBelt", UniversalElectricity.machine); + super("conveyorBelt"); this.setBlockBounds(0, 0, 0, 1, 0.3f, 1); } @@ -375,4 +375,24 @@ public class BlockConveyorBelt extends BlockMachine { return 0; } + + @Override + public boolean hasExtraConfigs() + { + return false; + } + + @Override + public void loadExtraConfigs(Configuration config) + { + // TODO Auto-generated method stub + + } + + @Override + public void loadOreNames() + { + // TODO Auto-generated method stub + + } } diff --git a/src/main/java/resonantinduction/old/transport/belt/TileEntityConveyorBelt.java b/src/main/java/resonantinduction/mechanical/belt/TileEntityConveyorBelt.java similarity index 99% rename from src/main/java/resonantinduction/old/transport/belt/TileEntityConveyorBelt.java rename to src/main/java/resonantinduction/mechanical/belt/TileEntityConveyorBelt.java index 7b1227173..c46efc5f3 100644 --- a/src/main/java/resonantinduction/old/transport/belt/TileEntityConveyorBelt.java +++ b/src/main/java/resonantinduction/mechanical/belt/TileEntityConveyorBelt.java @@ -1,4 +1,4 @@ -package resonantinduction.old.transport.belt; +package resonantinduction.mechanical.belt; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/resonantinduction/old/mechanics/machine/grinder/BlockGrinderWheel.java b/src/main/java/resonantinduction/mechanical/grinder/BlockGrinderWheel.java similarity index 98% rename from src/main/java/resonantinduction/old/mechanics/machine/grinder/BlockGrinderWheel.java rename to src/main/java/resonantinduction/mechanical/grinder/BlockGrinderWheel.java index 9cddc2113..1fcccaccb 100644 --- a/src/main/java/resonantinduction/old/mechanics/machine/grinder/BlockGrinderWheel.java +++ b/src/main/java/resonantinduction/mechanical/grinder/BlockGrinderWheel.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.machine.grinder; +package resonantinduction.mechanical.grinder; import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.Entity; diff --git a/src/main/java/resonantinduction/old/mechanics/machine/grinder/TileGrinderWheel.java b/src/main/java/resonantinduction/mechanical/grinder/TileGrinderWheel.java similarity index 98% rename from src/main/java/resonantinduction/old/mechanics/machine/grinder/TileGrinderWheel.java rename to src/main/java/resonantinduction/mechanical/grinder/TileGrinderWheel.java index 7689dddad..567ebd7db 100644 --- a/src/main/java/resonantinduction/old/mechanics/machine/grinder/TileGrinderWheel.java +++ b/src/main/java/resonantinduction/mechanical/grinder/TileGrinderWheel.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.machine.grinder; +package resonantinduction.mechanical.grinder; import java.util.HashMap; diff --git a/src/main/java/resonantinduction/old/mechanics/machine/grinder/TilePurifier.java b/src/main/java/resonantinduction/mechanical/grinder/TilePurifier.java similarity index 97% rename from src/main/java/resonantinduction/old/mechanics/machine/grinder/TilePurifier.java rename to src/main/java/resonantinduction/mechanical/grinder/TilePurifier.java index bc6321466..066e0b316 100644 --- a/src/main/java/resonantinduction/old/mechanics/machine/grinder/TilePurifier.java +++ b/src/main/java/resonantinduction/mechanical/grinder/TilePurifier.java @@ -1,4 +1,4 @@ -package resonantinduction.old.mechanics.machine.grinder; +package resonantinduction.mechanical.grinder; import java.util.HashMap; import java.util.List; @@ -8,7 +8,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import resonantinduction.core.Reference; -import resonantinduction.old.mechanics.item.ItemDust; +import resonantinduction.core.resource.ItemDust; import universalelectricity.api.energy.EnergyStorageHandler; import universalelectricity.api.vector.Vector3; import calclavia.lib.prefab.tile.TileElectrical; diff --git a/src/main/java/resonantinduction/old/api/IProcessable.java b/src/main/java/resonantinduction/old/api/IProcessable.java index 6d78ec00d..1814a5c63 100644 --- a/src/main/java/resonantinduction/old/api/IProcessable.java +++ b/src/main/java/resonantinduction/old/api/IProcessable.java @@ -1,7 +1,7 @@ package resonantinduction.old.api; -import resonantinduction.old.lib.recipes.ProcessorType; import net.minecraft.item.ItemStack; +import resonantinduction.old.lib.recipes.ProcessorType; /** * Simple interface that allows an item to control how its salvaged, processed, or refined by a diff --git a/src/main/java/resonantinduction/old/api/fluid/IDrain.java b/src/main/java/resonantinduction/old/api/fluid/IDrain.java index 82b4f1f4b..33fe24377 100644 --- a/src/main/java/resonantinduction/old/api/fluid/IDrain.java +++ b/src/main/java/resonantinduction/old/api/fluid/IDrain.java @@ -2,9 +2,9 @@ package resonantinduction.old.api.fluid; import java.util.Set; -import resonantinduction.old.lib.interfaces.IRotatable; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; +import resonantinduction.old.lib.interfaces.IRotatable; import universalelectricity.api.vector.Vector3; /** diff --git a/src/main/java/resonantinduction/old/api/fluid/INetworkFluidPart.java b/src/main/java/resonantinduction/old/api/fluid/INetworkFluidPart.java index 70d5397e6..4f4ed1c74 100644 --- a/src/main/java/resonantinduction/old/api/fluid/INetworkFluidPart.java +++ b/src/main/java/resonantinduction/old/api/fluid/INetworkFluidPart.java @@ -4,7 +4,7 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import resonatninduction.tilenetwork.INetworkPart; +import resonantinduction.core.tilenetwork.INetworkPart; /** * Interface used by part that are members of a fluid tile network. Parts in the network will act as diff --git a/src/main/java/resonantinduction/old/client/gui/GuiEncoderBase.java b/src/main/java/resonantinduction/old/client/gui/GuiEncoderBase.java index 3403aa132..5deae47c0 100644 --- a/src/main/java/resonantinduction/old/client/gui/GuiEncoderBase.java +++ b/src/main/java/resonantinduction/old/client/gui/GuiEncoderBase.java @@ -2,7 +2,8 @@ package resonantinduction.old.client.gui; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import resonantinduction.old.lib.prefab.TileEntityMachine; +import resonantinduction.core.prefab.tile.TileEntityMachine; +import resonantinduction.mechanical.MechCommonProxy; import resonantinduction.old.lib.prefab.invgui.ContainerFake; import resonantinduction.old.lib.prefab.invgui.GuiMachineContainer; import resonantinduction.old.transport.ResonantInductionTransport; diff --git a/src/main/java/resonantinduction/old/client/gui/GuiTaskList.java b/src/main/java/resonantinduction/old/client/gui/GuiTaskList.java index a4391f014..adfc430a3 100644 --- a/src/main/java/resonantinduction/old/client/gui/GuiTaskList.java +++ b/src/main/java/resonantinduction/old/client/gui/GuiTaskList.java @@ -6,13 +6,13 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; +import resonantinduction.electrical.armbot.command.TaskEnd; +import resonantinduction.electrical.armbot.command.TaskIdle; +import resonantinduction.electrical.armbot.command.TaskStart; import resonantinduction.old.api.coding.IProgram; import resonantinduction.old.api.coding.IRedirectTask; import resonantinduction.old.api.coding.ITask; import resonantinduction.old.lib.interfaces.IScroll; -import resonantinduction.old.mechanics.armbot.command.TaskEnd; -import resonantinduction.old.mechanics.armbot.command.TaskIdle; -import resonantinduction.old.mechanics.armbot.command.TaskStart; import resonantinduction.old.transport.encoder.TileEntityEncoder; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.FMLCommonHandler; diff --git a/src/main/java/resonantinduction/old/client/render/BlockRenderHelper.java b/src/main/java/resonantinduction/old/client/render/BlockRenderHelper.java index 60c57626b..6626ed185 100644 --- a/src/main/java/resonantinduction/old/client/render/BlockRenderHelper.java +++ b/src/main/java/resonantinduction/old/client/render/BlockRenderHelper.java @@ -74,14 +74,6 @@ public class BlockRenderHelper implements ISimpleBlockRenderingHandler GL11.glScalef(1.0F, -1F, -1F); RenderFrackingPipe.model.renderAll(); } - else if (RecipeLoader.laserSentry != null && block.blockID == RecipeLoader.laserSentry.blockID) - { - FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderMiningLaser.TEXTURE); - GL11.glTranslatef(0, 1.7F, 0); - GL11.glScalef(1.0F, -1F, -1F); - GL11.glRotatef(180, 0, 1, 0); - RenderMiningLaser.model.renderAll(); - } GL11.glPopMatrix(); } diff --git a/src/main/java/resonantinduction/old/client/render/RenderArmbot.java b/src/main/java/resonantinduction/old/client/render/RenderArmbot.java index 839ff20a9..8b9bee7e6 100644 --- a/src/main/java/resonantinduction/old/client/render/RenderArmbot.java +++ b/src/main/java/resonantinduction/old/client/render/RenderArmbot.java @@ -15,8 +15,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import resonantinduction.core.Reference; +import resonantinduction.electrical.armbot.TileEntityArmbot; import resonantinduction.old.client.model.ModelArmbot; -import resonantinduction.old.mechanics.armbot.TileEntityArmbot; import universalelectricity.api.vector.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/old/client/render/RenderConveyorBelt.java b/src/main/java/resonantinduction/old/client/render/RenderConveyorBelt.java index 4ffcc8a32..b1b7472ff 100644 --- a/src/main/java/resonantinduction/old/client/render/RenderConveyorBelt.java +++ b/src/main/java/resonantinduction/old/client/render/RenderConveyorBelt.java @@ -7,10 +7,10 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import resonantinduction.core.Reference; +import resonantinduction.mechanical.belt.TileEntityConveyorBelt; +import resonantinduction.mechanical.belt.TileEntityConveyorBelt.SlantType; import resonantinduction.old.client.model.ModelAngledBelt; import resonantinduction.old.client.model.ModelConveyorBelt; -import resonantinduction.old.transport.belt.TileEntityConveyorBelt; -import resonantinduction.old.transport.belt.TileEntityConveyorBelt.SlantType; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/old/client/render/RenderMiningLaser.java b/src/main/java/resonantinduction/old/client/render/RenderMiningLaser.java deleted file mode 100644 index 8817029d6..000000000 --- a/src/main/java/resonantinduction/old/client/render/RenderMiningLaser.java +++ /dev/null @@ -1,36 +0,0 @@ -package resonantinduction.old.client.render; - -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - -import resonantinduction.core.Reference; -import resonantinduction.old.client.model.ModelLaserTile; -import resonantinduction.old.mechanics.machine.mining.TileMiningLaser; - -/** @author Darkguardsman */ -public class RenderMiningLaser extends TileEntitySpecialRenderer -{ - - public static final ModelLaserTile model = new ModelLaserTile(); - public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_DIRECTORY + "LaserTile.png"); - - @Override - public void renderTileEntityAt(TileEntity tileEntity, double d, double d1, double d2, float f) - { - bindTexture(TEXTURE); - - GL11.glPushMatrix(); - GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); - GL11.glScalef(1.0F, -1F, -1F); - if (tileEntity instanceof TileMiningLaser) - { - float yaw = ((TileMiningLaser) tileEntity).getYaw() - 90; - GL11.glRotatef(yaw, 0, 1, 0); - } - model.renderAll(); - GL11.glPopMatrix(); // end - } -} diff --git a/src/main/java/resonantinduction/old/client/render/RenderSteamGen.java b/src/main/java/resonantinduction/old/client/render/RenderSteamGen.java index 66e174333..92577f50b 100644 --- a/src/main/java/resonantinduction/old/client/render/RenderSteamGen.java +++ b/src/main/java/resonantinduction/old/client/render/RenderSteamGen.java @@ -8,10 +8,10 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import resonantinduction.core.Reference; +import resonantinduction.core.prefab.tile.TileEntityMachine; import resonantinduction.old.client.model.ModelMachine; import resonantinduction.old.client.model.ModelSteamGen; import resonantinduction.old.client.model.ModelSteamTurbine; -import resonantinduction.old.lib.prefab.TileEntityMachine; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/old/lib/ClientRegistryProxy.java b/src/main/java/resonantinduction/old/lib/ClientRegistryProxy.java index c52530d22..b15c8be8a 100644 --- a/src/main/java/resonantinduction/old/lib/ClientRegistryProxy.java +++ b/src/main/java/resonantinduction/old/lib/ClientRegistryProxy.java @@ -3,11 +3,11 @@ package resonantinduction.old.lib; import java.util.ArrayList; import java.util.List; -import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo; import net.minecraft.block.Block; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemBlock; import net.minecraft.tileentity.TileEntity; +import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo; import com.builtbroken.common.Pair; diff --git a/src/main/java/resonantinduction/old/lib/CoreRegistry.java b/src/main/java/resonantinduction/old/lib/CoreRegistry.java index 22d705c12..66123a262 100644 --- a/src/main/java/resonantinduction/old/lib/CoreRegistry.java +++ b/src/main/java/resonantinduction/old/lib/CoreRegistry.java @@ -6,8 +6,6 @@ import java.util.HashSet; import java.util.Map.Entry; import java.util.Set; -import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo; -import resonantinduction.old.lib.IExtraInfo.IExtraItemInfo; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; @@ -15,12 +13,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.Configuration; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; +import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo; +import resonantinduction.old.lib.IExtraInfo.IExtraItemInfo; import com.builtbroken.common.Pair; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.registry.GameRegistry; /** diff --git a/src/main/java/resonantinduction/old/lib/prefab/invgui/GuiMachineContainer.java b/src/main/java/resonantinduction/old/lib/prefab/invgui/GuiMachineContainer.java index d93c7c623..8ea1351ee 100644 --- a/src/main/java/resonantinduction/old/lib/prefab/invgui/GuiMachineContainer.java +++ b/src/main/java/resonantinduction/old/lib/prefab/invgui/GuiMachineContainer.java @@ -13,7 +13,7 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import resonantinduction.core.Reference; -import resonantinduction.old.lib.prefab.TileEntityMachine; +import resonantinduction.core.prefab.tile.TileEntityMachine; import resonantinduction.old.lib.prefab.invgui.GuiButtonImage.ButtonIcon; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/resonantinduction/old/lib/prefab/invgui/InvChest.java b/src/main/java/resonantinduction/old/lib/prefab/invgui/InvChest.java index 4e68d0a5a..715e8b810 100644 --- a/src/main/java/resonantinduction/old/lib/prefab/invgui/InvChest.java +++ b/src/main/java/resonantinduction/old/lib/prefab/invgui/InvChest.java @@ -1,7 +1,5 @@ package resonantinduction.old.lib.prefab.invgui; -import resonantinduction.old.lib.interfaces.IExternalInv; -import resonantinduction.old.lib.interfaces.IInvBox; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -9,6 +7,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; +import resonantinduction.old.lib.interfaces.IExternalInv; +import resonantinduction.old.lib.interfaces.IInvBox; public class InvChest implements IInvBox { diff --git a/src/main/java/resonantinduction/old/lib/terminal/CommandRegistry.java b/src/main/java/resonantinduction/old/lib/terminal/CommandRegistry.java index b7c4bc3dd..0c0019a7f 100644 --- a/src/main/java/resonantinduction/old/lib/terminal/CommandRegistry.java +++ b/src/main/java/resonantinduction/old/lib/terminal/CommandRegistry.java @@ -3,9 +3,9 @@ package resonantinduction.old.lib.terminal; import java.util.ArrayList; import java.util.List; +import net.minecraft.entity.player.EntityPlayer; import resonantinduction.old.lib.interfaces.ITerminal; import resonantinduction.old.lib.interfaces.ITerminalCommand; -import net.minecraft.entity.player.EntityPlayer; import calclavia.lib.access.GroupRegistry; public class CommandRegistry diff --git a/src/main/java/resonantinduction/old/lib/terminal/CommandUser.java b/src/main/java/resonantinduction/old/lib/terminal/CommandUser.java index ae637df28..dc573ee9e 100644 --- a/src/main/java/resonantinduction/old/lib/terminal/CommandUser.java +++ b/src/main/java/resonantinduction/old/lib/terminal/CommandUser.java @@ -3,9 +3,9 @@ package resonantinduction.old.lib.terminal; import java.util.HashSet; import java.util.Set; +import net.minecraft.entity.player.EntityPlayer; import resonantinduction.old.lib.interfaces.ITerminal; import resonantinduction.old.lib.interfaces.ITerminalCommand; -import net.minecraft.entity.player.EntityPlayer; import calclavia.lib.access.ISpecialAccess; public class CommandUser implements ITerminalCommand diff --git a/src/main/java/resonantinduction/old/lib/terminal/TileEntityTerminal.java b/src/main/java/resonantinduction/old/lib/terminal/TileEntityTerminal.java index 714fc03a9..f43bf60f7 100644 --- a/src/main/java/resonantinduction/old/lib/terminal/TileEntityTerminal.java +++ b/src/main/java/resonantinduction/old/lib/terminal/TileEntityTerminal.java @@ -3,13 +3,13 @@ package resonantinduction.old.lib.terminal; import java.util.ArrayList; import java.util.List; -import resonantinduction.old.lib.interfaces.IScroll; -import resonantinduction.old.lib.interfaces.ITerminal; -import resonantinduction.old.lib.prefab.TileEntityEnergyMachine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.util.AxisAlignedBB; +import resonantinduction.core.prefab.tile.TileEntityEnergyMachine; +import resonantinduction.old.lib.interfaces.IScroll; +import resonantinduction.old.lib.interfaces.ITerminal; import calclavia.lib.network.PacketHandler; import com.google.common.io.ByteArrayDataInput; diff --git a/src/main/java/resonantinduction/old/mechanics/ResonantInductionMechanics.java b/src/main/java/resonantinduction/old/mechanics/ResonantInductionMechanics.java index d3785059f..97a67e7e1 100644 --- a/src/main/java/resonantinduction/old/mechanics/ResonantInductionMechanics.java +++ b/src/main/java/resonantinduction/old/mechanics/ResonantInductionMechanics.java @@ -5,12 +5,10 @@ import java.util.HashMap; import java.util.Map; import net.minecraft.block.Block; -import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.Icon; import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -25,14 +23,12 @@ import resonantinduction.core.resource.BlockFluidMixture; import resonantinduction.core.resource.ResourceGenerator; import resonantinduction.core.resource.TileFluidMixture; import resonantinduction.electrical.MultipartElectrical; +import resonantinduction.mechanical.grinder.BlockGrinderWheel; +import resonantinduction.mechanical.grinder.TileGrinderWheel; +import resonantinduction.mechanical.grinder.TilePurifier; import resonantinduction.old.mechanics.furnace.BlockAdvancedFurnace; import resonantinduction.old.mechanics.furnace.TileAdvancedFurnace; -import resonantinduction.old.mechanics.item.ItemDust; -import resonantinduction.old.mechanics.machine.grinder.BlockGrinderWheel; -import resonantinduction.old.mechanics.machine.grinder.TileGrinderWheel; -import resonantinduction.old.mechanics.machine.grinder.TilePurifier; import resonantinduction.old.mechanics.purifier.BlockPurifier; -import calclavia.lib.network.PacketHandler; import calclavia.lib.network.PacketTile; import calclavia.lib.utility.LanguageUtility; import codechicken.lib.colour.ColourRGBA; @@ -42,11 +38,9 @@ import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.ModMetadata; import cpw.mods.fml.common.ObfuscationReflectionHelper; -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.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/resonantinduction/old/mechanics/furnace/TileAdvancedFurnace.java b/src/main/java/resonantinduction/old/mechanics/furnace/TileAdvancedFurnace.java index 455179d40..20bd7e517 100644 --- a/src/main/java/resonantinduction/old/mechanics/furnace/TileAdvancedFurnace.java +++ b/src/main/java/resonantinduction/old/mechanics/furnace/TileAdvancedFurnace.java @@ -10,6 +10,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.ResonantInduction; +import resonantinduction.core.Settings; import universalelectricity.api.CompatibilityModule; import universalelectricity.api.UniversalClass; import universalelectricity.api.energy.EnergyStorageHandler; @@ -32,7 +33,7 @@ public class TileAdvancedFurnace extends TileEntityFurnace implements IEnergyInt { private static final float WATTAGE = 5; - private EnergyStorageHandler energy = new EnergyStorageHandler(ResonantInduction.FURNACE_WATTAGE * 5); + private EnergyStorageHandler energy = new EnergyStorageHandler(Settings.FURNACE_WATTAGE * 5); @Override public void updateEntity() @@ -53,7 +54,7 @@ public class TileAdvancedFurnace extends TileEntityFurnace implements IEnergyInt if (this.furnaceBurnTime > 0) { - this.energy.receiveEnergy(ResonantInduction.FURNACE_WATTAGE / 20, true); + this.energy.receiveEnergy(Settings.FURNACE_WATTAGE / 20, true); this.furnaceBurnTime--; } @@ -70,7 +71,7 @@ public class TileAdvancedFurnace extends TileEntityFurnace implements IEnergyInt */ if (this.canSmelt()) { - if (this.energy.checkExtract(ResonantInduction.FURNACE_WATTAGE / 20)) + if (this.energy.checkExtract(Settings.FURNACE_WATTAGE / 20)) { this.furnaceCookTime++; @@ -80,7 +81,7 @@ public class TileAdvancedFurnace extends TileEntityFurnace implements IEnergyInt this.smeltItem(); } - this.energy.extractEnergy(ResonantInduction.FURNACE_WATTAGE / 20, true); + this.energy.extractEnergy(Settings.FURNACE_WATTAGE / 20, true); } } else diff --git a/src/main/java/resonantinduction/old/mechanics/generator/steam/BlockSmallSteamGen.java b/src/main/java/resonantinduction/old/mechanics/generator/steam/BlockSmallSteamGen.java deleted file mode 100644 index b3fe56ec9..000000000 --- a/src/main/java/resonantinduction/old/mechanics/generator/steam/BlockSmallSteamGen.java +++ /dev/null @@ -1,197 +0,0 @@ -package resonantinduction.old.mechanics.generator.steam; - -import java.util.List; -import java.util.Random; -import java.util.Set; - -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; -import net.minecraftforge.common.Configuration; -import resonantinduction.core.ResonantInductionTabs; -import resonantinduction.old.client.render.BlockRenderingHandler; -import resonantinduction.old.client.render.RenderSteamGen; -import resonantinduction.old.transport.ResonantInductionTransport; -import universalelectricity.api.UniversalElectricity; -import calclavia.lib.prefab.block.BlockMachine; - -import com.builtbroken.common.Pair; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -/** - * Starter power setup using steam generated by burning items or fuels. This setup takes two blocks. - * A) the generator B) the collector The generator creates the steam and burns the fuel. The - * collector uses the steam to generate a small amount of constant power. This setup is not very - * powerful but is easy to create and doesn't take much to keep running - * - * @author DarkGuardsman - */ -public class BlockSmallSteamGen extends BlockMachine -{ - - public BlockSmallSteamGen() - { - super(ResonantInductionTransport.CONFIGURATION, "StarterSteamGen", UniversalElectricity.machine); - this.setStepSound(soundMetalFootstep); - this.setCreativeTab(ResonantInductionTabs.tabIndustrial()); - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entityLiving, ItemStack itemStack) - { - super.onBlockPlacedBy(world, x, y, z, entityLiving, itemStack); - int metadata = world.getBlockMetadata(x, y, z); - int angle = net.minecraft.util.MathHelper.floor_double((entityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - world.setBlockMetadataWithNotify(x, y, z, ((metadata / 4) * 4) + angle, 3); - } - - @Override - public void randomDisplayTick(World par1World, int x, int y, int z, Random rand) - { - TileEntity tile = par1World.getBlockTileEntity(x, y, z); - - if (tile instanceof TileEntitySteamGen) - { - TileEntitySteamGen tileEntity = (TileEntitySteamGen) tile; - if (tileEntity.isFunctioning()) - { - int face = par1World.getBlockMetadata(x, y, z) % 4; - float xx = x + 0.5F; - float yy = y + 0.0F + rand.nextFloat() * 6.0F / 16.0F; - float zz = z + 0.5F; - float posTooner = 0.52F; - float randPosChange = rand.nextFloat() * 0.6F - 0.3F; - - if (face == 3) - { - par1World.spawnParticle("smoke", xx - posTooner, yy, zz + randPosChange, 0.0D, 0.0D, 0.0D); - par1World.spawnParticle("flame", xx - posTooner, yy, zz + randPosChange, 0.0D, 0.0D, 0.0D); - } - else if (face == 2) - { - par1World.spawnParticle("smoke", xx + posTooner, yy, zz + randPosChange, 0.0D, 0.0D, 0.0D); - par1World.spawnParticle("flame", xx + posTooner, yy, zz + randPosChange, 0.0D, 0.0D, 0.0D); - } - else if (face == 1) - { - par1World.spawnParticle("smoke", xx + randPosChange, yy, zz - posTooner, 0.0D, 0.0D, 0.0D); - par1World.spawnParticle("flame", xx + randPosChange, yy, zz - posTooner, 0.0D, 0.0D, 0.0D); - } - else if (face == 0) - { - par1World.spawnParticle("smoke", xx + randPosChange, yy, zz + posTooner, 0.0D, 0.0D, 0.0D); - par1World.spawnParticle("flame", xx + randPosChange, yy, zz + posTooner, 0.0D, 0.0D, 0.0D); - } - } - } - } - - @Override - public boolean onUseWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) - { - if (world.getBlockMetadata(x, y, z) % 4 < 3) - { - world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z) + 1, 3); - return true; - } - else - { - world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z) - 3, 3); - return true; - } - } - - @Override - public void getTileEntities(int blockID, Set>> list) - { - list.add(new Pair>("DCTileSteamFan", TileEntitySteamFan.class)); - list.add(new Pair>("DCTileSteamPiston", TileEntitySteamPiston.class)); - list.add(new Pair>("DCTileSteamGen", TileEntitySteamGen.class)); - } - - @Override - @SideOnly(Side.CLIENT) - public void getClientTileEntityRenderers(List, TileEntitySpecialRenderer>> list) - { - list.add(new Pair(TileEntitySteamPiston.class, new RenderSteamGen())); - list.add(new Pair(TileEntitySteamFan.class, new RenderSteamGen())); - list.add(new Pair(TileEntitySteamGen.class, new RenderSteamGen())); - } - - @Override - public void loadExtraConfigs(Configuration config) - { - super.loadExtraConfigs(config); - } - - /** Called when the block is right clicked by the player */ - @Override - public boolean onMachineActivated(World par1World, int x, int y, int z, EntityPlayer par5EntityPlayer, int side, float hitX, float hitY, float hitZ) - { - return true; - } - - @Override - public boolean isOpaqueCube() - { - return false; - } - - @Override - public boolean renderAsNormalBlock() - { - return false; - } - - @Override - public int getRenderType() - { - return BlockRenderingHandler.BLOCK_RENDER_ID; - } - - @Override - public TileEntity createTileEntity(World world, int metadata) - { - switch (metadata / 4) - { - case 0: - return new TileEntitySteamFan(); - case 1: - return new TileEntitySteamPiston(); - case 2: - return new TileEntitySteamGen(); - case 3: - return new TileEntitySteamGen(); - - } - return super.createTileEntity(world, metadata); - - } - - @Override - public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) - { - par3List.add(new ItemStack(par1, 1, 0)); - par3List.add(new ItemStack(par1, 1, 8)); - par3List.add(new ItemStack(par1, 1, 12)); - } - - @Override - public int damageDropped(int metadata) - { - return metadata / 4; - } - - @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) - { - return new ItemStack(this, 1, (world.getBlockMetadata(x, y, z) / 4) * 4); - } -} \ No newline at end of file diff --git a/src/main/java/resonantinduction/old/mechanics/generator/steam/TileEntitySteamFan.java b/src/main/java/resonantinduction/old/mechanics/generator/steam/TileEntitySteamFan.java deleted file mode 100644 index 3174a5df8..000000000 --- a/src/main/java/resonantinduction/old/mechanics/generator/steam/TileEntitySteamFan.java +++ /dev/null @@ -1,10 +0,0 @@ -package resonantinduction.old.mechanics.generator.steam; - -public class TileEntitySteamFan extends TileEntitySteamPiston -{ - @Override - protected void updateAnimation() - { - - } -} diff --git a/src/main/java/resonantinduction/old/mechanics/generator/steam/TileEntitySteamGen.java b/src/main/java/resonantinduction/old/mechanics/generator/steam/TileEntitySteamGen.java deleted file mode 100644 index ab01ba709..000000000 --- a/src/main/java/resonantinduction/old/mechanics/generator/steam/TileEntitySteamGen.java +++ /dev/null @@ -1,130 +0,0 @@ -package resonantinduction.old.mechanics.generator.steam; - -import resonantinduction.old.lib.prefab.TileEntityMachine; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; - -/** - * Simple steam gen designed to burn items to create steam to power a steam device directly above - * it. Doesn't actually make steam fluid but rather simple functions. The machines above it will - * need to call to this machines and do a check for steam. If this machines is creating steam then - * the machine above it should function - * - * @author DarkGuardsman - */ -public class TileEntitySteamGen extends TileEntityMachine implements IFluidHandler -{ - /** - * The number of ticks that a fresh copy of the currently-burning item would keep the furnace - * burning for - */ - public int itemCookTime = 0; - - protected final int HEAT_TIME = 100; - protected int heatTicks = 0; - - protected boolean steamMachineConnected = false, isHeated = false, creatingSteam = false; - - protected FluidTank tank = new FluidTank(2 * FluidContainerRegistry.BUCKET_VOLUME); - - @Override - public void updateEntity() - { - super.updateEntity(); - this.creatingSteam = false; - if (itemCookTime < 10) - { - this.consumeFuel(); - if (itemCookTime <= 0) - { - if (heatTicks > 0) - heatTicks--; - } - } - else if (this.heatTicks < HEAT_TIME) - { - heatTicks++; - } - if (this.isFunctioning()) - { - if (this.tank != null && this.tank.getFluid() != null && this.tank.getFluidAmount() > 1 && this.tank.getFluid().isFluidEqual(new FluidStack(FluidRegistry.WATER, 1000))) - { - this.tank.drain(1, true); - this.creatingSteam = true; - } - else - { - // TODO start heating up machine and blow it up if left without water for too long - this.tank.fill(new FluidStack(FluidRegistry.WATER, 1000), true); - } - } - } - - /** Called when the generator is running low on energy and needs to burn more fuel to keep going */ - public void consumeFuel() - { - // TODO consume an item to keep us running - itemCookTime += 20; - } - - /** Is the machines running and making steam */ - public boolean isCreatingSteam() - { - return creatingSteam; - } - - @Override - public boolean canFunction() - { - TileEntity ent = this.worldObj.getBlockTileEntity(xCoord, yCoord + 1, zCoord); - return super.canFunction() && ent instanceof TileEntitySteamPiston && this.itemCookTime > 0 && this.isHeated; - } - - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) - { - if (resource != null && resource.getFluid().equals(FluidRegistry.WATER)) - { - this.tank.fill(resource, doFill); - } - return 0; - } - - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) - { - return null; - } - - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) - { - return null; - } - - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) - { - return fluid != null && fluid.equals(FluidRegistry.WATER); - } - - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) - { - return false; - } - - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) - { - return new FluidTankInfo[] { this.tank.getInfo() }; - } - -} \ No newline at end of file diff --git a/src/main/java/resonantinduction/old/mechanics/generator/steam/TileEntitySteamPiston.java b/src/main/java/resonantinduction/old/mechanics/generator/steam/TileEntitySteamPiston.java deleted file mode 100644 index 22e3f78d8..000000000 --- a/src/main/java/resonantinduction/old/mechanics/generator/steam/TileEntitySteamPiston.java +++ /dev/null @@ -1,70 +0,0 @@ -package resonantinduction.old.mechanics.generator.steam; - -import java.util.EnumSet; - -import resonantinduction.old.lib.prefab.TileEntityEnergyMachine; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; - -public class TileEntitySteamPiston extends TileEntityEnergyMachine -{ - protected float wattPerSteam = 32.0f; - protected float maxWattOutput = 500f; - protected float maxSteamInput = 50f; - protected float wattsOut = 0; - protected int heatUpTime = 100; - protected int heatTicks = 0; - - public TileEntitySteamPiston() - { - super(0, 0); - } - - @Override - public void updateEntity() - { - super.updateEntity(); - - if (this.isFunctioning()) - { - if (heatTicks < heatUpTime) - { - heatTicks++; - } - this.wattsOut = this.maxWattOutput * (heatTicks / heatUpTime); - } - else - { - if (heatTicks > 0) - { - heatTicks--; - } - } - - } - - @Override - public boolean canFunction() - { - TileEntity ent = this.worldObj.getBlockTileEntity(xCoord, yCoord - 1, zCoord); - return super.canFunction() && ent instanceof TileEntitySteamGen && ((TileEntitySteamGen) ent).isCreatingSteam(); - } - - protected void updateAnimation() - { - - } - - @Override - public EnumSet getInputDirections() - { - return EnumSet.noneOf(ForgeDirection.class); - } - - @Override - public EnumSet getOutputDirections() - { - return EnumSet.allOf(ForgeDirection.class); - } - -} diff --git a/src/main/java/resonantinduction/old/mechanics/machine/mining/BlockApertureExcavator.java b/src/main/java/resonantinduction/old/mechanics/machine/mining/BlockApertureExcavator.java index adab19769..29488e660 100644 --- a/src/main/java/resonantinduction/old/mechanics/machine/mining/BlockApertureExcavator.java +++ b/src/main/java/resonantinduction/old/mechanics/machine/mining/BlockApertureExcavator.java @@ -1,22 +1,24 @@ package resonantinduction.old.mechanics.machine.mining; +import java.util.List; import java.util.Set; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import resonantinduction.core.Settings; -import universalelectricity.api.UniversalElectricity; -import calclavia.lib.prefab.block.BlockMachine; +import net.minecraftforge.common.Configuration; +import resonantinduction.core.prefab.block.BlockMachine; +import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo; import com.builtbroken.common.Pair; /** @author Archadia */ -public class BlockApertureExcavator extends BlockMachine +public class BlockApertureExcavator extends BlockMachine implements IExtraBlockInfo { public BlockApertureExcavator() { - super(Settings.CONFIGURATION, "Machine_ApertureExcavator", UniversalElectricity.machine); + super("Machine_ApertureExcavator"); } @Override @@ -30,4 +32,32 @@ public class BlockApertureExcavator extends BlockMachine { list.add(new Pair>("TileApertureExcavator", TileApertureExcavator.class)); } + + @Override + public boolean hasExtraConfigs() + { + // TODO Auto-generated method stub + return false; + } + + @Override + public void loadExtraConfigs(Configuration config) + { + // TODO Auto-generated method stub + + } + + @Override + public void loadOreNames() + { + // TODO Auto-generated method stub + + } + + @Override + public void getClientTileEntityRenderers(List, TileEntitySpecialRenderer>> list) + { + // TODO Auto-generated method stub + + } } diff --git a/src/main/java/resonantinduction/old/mechanics/machine/mining/BlockFracker.java b/src/main/java/resonantinduction/old/mechanics/machine/mining/BlockFracker.java index 5d13b184b..3bfd3d3e3 100644 --- a/src/main/java/resonantinduction/old/mechanics/machine/mining/BlockFracker.java +++ b/src/main/java/resonantinduction/old/mechanics/machine/mining/BlockFracker.java @@ -1,23 +1,25 @@ package resonantinduction.old.mechanics.machine.mining; +import java.util.List; import java.util.Set; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import resonantinduction.core.Settings; -import universalelectricity.api.UniversalElectricity; -import calclavia.lib.prefab.block.BlockMachine; +import net.minecraftforge.common.Configuration; +import resonantinduction.core.prefab.block.BlockMachine; +import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo; import com.builtbroken.common.Pair; /** @author Archadia */ -public class BlockFracker extends BlockMachine +public class BlockFracker extends BlockMachine implements IExtraBlockInfo { public BlockFracker() { - super(Settings.CONFIGURATION, "Machine_Fracker", UniversalElectricity.machine); + super("Machine_Fracker"); } @Override @@ -41,4 +43,32 @@ public class BlockFracker extends BlockMachine { list.add(new Pair>("TileFracker", TileFracker.class)); } + + @Override + public boolean hasExtraConfigs() + { + // TODO Auto-generated method stub + return false; + } + + @Override + public void loadExtraConfigs(Configuration config) + { + // TODO Auto-generated method stub + + } + + @Override + public void loadOreNames() + { + // TODO Auto-generated method stub + + } + + @Override + public void getClientTileEntityRenderers(List, TileEntitySpecialRenderer>> list) + { + // TODO Auto-generated method stub + + } } diff --git a/src/main/java/resonantinduction/old/mechanics/machine/mining/BlockFrackingPipe.java b/src/main/java/resonantinduction/old/mechanics/machine/mining/BlockFrackingPipe.java index daf53efad..85f5d920f 100644 --- a/src/main/java/resonantinduction/old/mechanics/machine/mining/BlockFrackingPipe.java +++ b/src/main/java/resonantinduction/old/mechanics/machine/mining/BlockFrackingPipe.java @@ -1,24 +1,25 @@ package resonantinduction.old.mechanics.machine.mining; import java.util.List; +import java.util.Set; -import net.minecraft.block.material.Material; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import resonantinduction.core.Settings; +import net.minecraftforge.common.Configuration; +import resonantinduction.core.prefab.block.BlockMachine; import resonantinduction.old.client.render.BlockRenderHelper; -import calclavia.lib.prefab.block.BlockMachine; +import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo; import com.builtbroken.common.Pair; /** @author Archadia */ -public class BlockFrackingPipe extends BlockMachine +public class BlockFrackingPipe extends BlockMachine implements IExtraBlockInfo { public BlockFrackingPipe() { - super(Settings.CONFIGURATION, "Fracking_Pipe", Material.wood); + super("Fracking_Pipe"); } @Override @@ -50,4 +51,32 @@ public class BlockFrackingPipe extends BlockMachine { return new TileFrackingPipe(); } + + @Override + public boolean hasExtraConfigs() + { + // TODO Auto-generated method stub + return false; + } + + @Override + public void loadExtraConfigs(Configuration config) + { + // TODO Auto-generated method stub + + } + + @Override + public void loadOreNames() + { + // TODO Auto-generated method stub + + } + + @Override + public void getTileEntities(int blockID, Set>> list) + { + // TODO Auto-generated method stub + + } } diff --git a/src/main/java/resonantinduction/old/mechanics/machine/mining/BlockLaserDrill.java b/src/main/java/resonantinduction/old/mechanics/machine/mining/BlockLaserDrill.java deleted file mode 100644 index d45a5ab16..000000000 --- a/src/main/java/resonantinduction/old/mechanics/machine/mining/BlockLaserDrill.java +++ /dev/null @@ -1,62 +0,0 @@ -package resonantinduction.old.mechanics.machine.mining; - -import java.util.Set; - -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import resonantinduction.core.Settings; -import calclavia.lib.prefab.block.BlockMachine; - -import com.builtbroken.common.Pair; - -/** @author Archadia */ -public class BlockLaserDrill extends BlockMachine -{ - - public BlockLaserDrill() - { - super(Settings.CONFIGURATION, "Machine_LaserDrill", Material.iron); - } - - @Override - public TileEntity createTileEntity(World world, int metadata) - { - return new TileLaserDrill(); - } - - @Override - public void getTileEntities(int blockID, Set>> list) - { - list.add(new Pair>("TileLaserDrill", TileLaserDrill.class)); - } - - @Override - public boolean onUseWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) - { - if (!world.isRemote) - { - TileEntity ent = world.getBlockTileEntity(x, y, z); - if (ent instanceof TileMiningLaser) - { - ((TileMiningLaser) ent).rotateYaw(-10); - } - } - return false; - } - - @Override - public boolean onSneakUseWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) - { - if (!world.isRemote) - { - TileEntity ent = world.getBlockTileEntity(x, y, z); - if (ent instanceof TileMiningLaser) - { - ((TileMiningLaser) ent).rotateYaw(10); - } - } - return false; - } -} diff --git a/src/main/java/resonantinduction/old/mechanics/machine/mining/BlockMiningLaser.java b/src/main/java/resonantinduction/old/mechanics/machine/mining/BlockMiningLaser.java deleted file mode 100644 index 7f4283c50..000000000 --- a/src/main/java/resonantinduction/old/mechanics/machine/mining/BlockMiningLaser.java +++ /dev/null @@ -1,86 +0,0 @@ -package resonantinduction.old.mechanics.machine.mining; - -import java.util.Set; - -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import resonantinduction.core.Settings; -import resonantinduction.old.client.render.BlockRenderHelper; -import calclavia.lib.prefab.block.BlockMachine; - -import com.builtbroken.common.Pair; - -/** - * Mining laser Prototype mainly used for crafting but can be used in the same way as Excavator. - * Creates four lasers from the side it is pointing in to mine away blocks - * - * @author DarkGuardsman - */ -public class BlockMiningLaser extends BlockMachine -{ - public BlockMiningLaser() - { - super(Settings.CONFIGURATION, "LaserMiner", Material.iron); - } - - @Override - public TileEntity createTileEntity(World world, int metadata) - { - return new TileMiningLaser(); - } - - @Override - public void getTileEntities(int blockID, Set>> list) - { - list.add(new Pair>("TileMiningLaser", TileMiningLaser.class)); - } - - @Override - public boolean onUseWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) - { - if (!world.isRemote) - { - TileEntity ent = world.getBlockTileEntity(x, y, z); - if (ent instanceof TileMiningLaser) - { - ((TileMiningLaser) ent).rotateYaw(-10); - } - } - return false; - } - - @Override - public boolean onSneakUseWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) - { - if (!world.isRemote) - { - TileEntity ent = world.getBlockTileEntity(x, y, z); - if (ent instanceof TileMiningLaser) - { - ((TileMiningLaser) ent).rotateYaw(10); - } - } - return false; - } - - @Override - public int getRenderType() - { - return BlockRenderHelper.instance.getRenderId(); - } - - @Override - public boolean isOpaqueCube() - { - return false; - } - - @Override - public boolean renderAsNormalBlock() - { - return false; - } - -} diff --git a/src/main/java/resonantinduction/old/mechanics/machine/mining/TileApertureExcavator.java b/src/main/java/resonantinduction/old/mechanics/machine/mining/TileApertureExcavator.java index 1e56d2998..b52ffbf72 100644 --- a/src/main/java/resonantinduction/old/mechanics/machine/mining/TileApertureExcavator.java +++ b/src/main/java/resonantinduction/old/mechanics/machine/mining/TileApertureExcavator.java @@ -7,7 +7,7 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeDirection; import resonantinduction.api.events.MachineMiningEvent; -import resonantinduction.old.lib.prefab.TileEntityEnergyMachine; +import resonantinduction.core.prefab.tile.TileEntityEnergyMachine; import universalelectricity.api.vector.Vector3; import calclavia.lib.utility.InvInteractionHelper; @@ -66,7 +66,7 @@ public class TileApertureExcavator extends TileEntityEnergyMachine Block block = Block.blocksList[target.getBlockID(this.worldObj)]; if (MachineMiningEvent.doMachineMiningCheck(this.worldObj, target, this)) { - List items = MachineMiningEvent.getItemsMined(this.worldObj, target, this); + List items = MachineMiningEvent.getItemsMined(this, target); if (items != null) { for (ItemStack stack : items) diff --git a/src/main/java/resonantinduction/old/mechanics/machine/mining/TileFracker.java b/src/main/java/resonantinduction/old/mechanics/machine/mining/TileFracker.java index fdde3e4c8..595b53810 100644 --- a/src/main/java/resonantinduction/old/mechanics/machine/mining/TileFracker.java +++ b/src/main/java/resonantinduction/old/mechanics/machine/mining/TileFracker.java @@ -8,8 +8,8 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.IFluidHandler; +import resonantinduction.core.prefab.tile.TileEntityEnergyMachine; import resonantinduction.old.core.recipe.RecipeLoader; -import resonantinduction.old.lib.prefab.TileEntityEnergyMachine; import resonantinduction.old.transport.fluid.EnumGas; import resonantinduction.old.transport.fluid.GasTank; import universalelectricity.api.vector.Vector3; diff --git a/src/main/java/resonantinduction/old/mechanics/machine/mining/TileLaserDrill.java b/src/main/java/resonantinduction/old/mechanics/machine/mining/TileLaserDrill.java deleted file mode 100644 index ddd679b83..000000000 --- a/src/main/java/resonantinduction/old/mechanics/machine/mining/TileLaserDrill.java +++ /dev/null @@ -1,171 +0,0 @@ -package resonantinduction.old.mechanics.machine.mining; - -import java.awt.Color; - -import net.minecraft.network.packet.Packet; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumMovingObjectType; -import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.common.MinecraftForge; -import resonantinduction.api.events.LaserEvent; -import resonantinduction.old.lib.CoreRegistry; -import resonantinduction.old.lib.prefab.TileEntityEnergyMachine; -import universalelectricity.api.vector.Vector3; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.utility.RayTraceHelper; - -import com.google.common.io.ByteArrayDataInput; - -import cpw.mods.fml.common.network.Player; - -/** @author Archadia */ -public class TileLaserDrill extends TileEntityEnergyMachine -{ - - private Vector3 target; - private Vector3 hit; - private int hitTicks = 0; - private float yaw = 0; - private float pitch = 90; - private float range = 20; - - public TileLaserDrill() - { - super(0, 4); - } - - @Override - public boolean canFunction() - { - return super.canFunction(); - } - - @Override - public void updateEntity() - { - super.updateEntity(); - if (this.ticks % 3 == 0 && this.isFunctioning()) - { - if (this.consumePower(3, false)) - { - this.fireLaser(); - this.consumePower(2500, true); - } - } - } - - public void rotateYaw(float by) - { - this.yaw += by; - if (!this.worldObj.isRemote) - { - PacketHandler.instance().sendPacketToClients(this.getDescriptionPacket(), this.worldObj, new Vector3(this), 64); - } - } - - public float getYaw() - { - return this.yaw; - } - - public void rotatePitch(float by) - { - this.pitch += by; - if (!this.worldObj.isRemote) - { - PacketHandler.instance().sendPacketToClients(this.getDescriptionPacket(), this.worldObj, new Vector3(this), 64); - } - } - - @Override - public boolean simplePacket(String id, ByteArrayDataInput dis, Player player) - { - try - { - if (!super.simplePacket(id, dis, player) && this.worldObj.isRemote) - { - if (id.equalsIgnoreCase("Desc")) - { - this.functioning = dis.readBoolean(); - this.yaw = dis.readFloat(); - this.pitch = dis.readFloat(); - return true; - } - } - } - catch (Exception e) - { - e.printStackTrace(); - } - return false; - } - - @Override - public Packet getDescriptionPacket() - { - return PacketHandler.instance().getTilePacket(this.getChannel(), "Desc", this, this.functioning, this.yaw, this.pitch); - } - - public void fireLaser() - { - - Vector3 start = RayTraceHelper.getPosFromRotation(new Vector3(this).translate(new Vector3(0.5, 0.7, 0.5)), .7f, yaw, pitch); - Vector3 hitSpot = RayTraceHelper.getPosFromRotation(start, range, yaw, pitch); - MovingObjectPosition hitPos = RayTraceHelper.ray_trace_do(this.worldObj, start.toVec3(), hitSpot.toVec3(), range, false); - - if (hitPos != null) - { - LaserEvent event = new LaserEvent.LaserFireEvent(this, hitPos); - MinecraftForge.EVENT_BUS.post(event); - - if (!worldObj.isRemote && !event.isCanceled() && this.worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord)) - { - if (hitPos.typeOfHit == EnumMovingObjectType.ENTITY && hitPos.entityHit != null) - { - System.out.println("Entity hit by laser"); - DamageSource damageSource = DamageSource.onFire; - hitPos.entityHit.attackEntityFrom(damageSource, 7); - hitPos.entityHit.setFire(8); - } - else if (hitPos.typeOfHit == EnumMovingObjectType.TILE) - { - if (this.hit != null && this.hit.equals(new Vector3(hitPos)) && !this.hit.equals(new Vector3(this))) - { - this.hitTicks++; - - if (hitTicks >= 6) - { - LaserEvent.onBlockMinedByLaser(this.worldObj, this, this.hit); - this.hit = null; - this.hitTicks = 0; - } - } - else - { - this.hitTicks = 1; - this.hit = new Vector3(hitPos); - LaserEvent.onLaserHitBlock(this.worldObj, this, this.hit, ForgeDirection.UP); - } - - } - - } - hitSpot = new Vector3(hitPos.hitVec); - } - CoreRegistry.proxy().renderBeam(this.worldObj, start, hitSpot, Color.ORANGE, 3); - } - - public Vector3 getTarget() - { - return this.target; - } - - public void setTarget(Vector3 vec) - { - if (!this.worldObj.isRemote) - { - this.sendPowerUpdate(); - } - } -} diff --git a/src/main/java/resonantinduction/old/mechanics/machine/mining/TileMiningLaser.java b/src/main/java/resonantinduction/old/mechanics/machine/mining/TileMiningLaser.java deleted file mode 100644 index 323ee2e1b..000000000 --- a/src/main/java/resonantinduction/old/mechanics/machine/mining/TileMiningLaser.java +++ /dev/null @@ -1,168 +0,0 @@ -package resonantinduction.old.mechanics.machine.mining; - -import java.awt.Color; - -import net.minecraft.network.packet.Packet; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumMovingObjectType; -import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.common.MinecraftForge; -import resonantinduction.api.events.LaserEvent; -import resonantinduction.old.lib.CoreRegistry; -import resonantinduction.old.lib.prefab.TileEntityEnergyMachine; -import universalelectricity.api.vector.Vector3; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.utility.RayTraceHelper; - -import com.google.common.io.ByteArrayDataInput; - -import cpw.mods.fml.common.network.Player; - -/** @author DarkGuardsman */ -public class TileMiningLaser extends TileEntityEnergyMachine -{ - private Vector3 target; - private Vector3 hit; - private int hitTicks = 0; - private float yaw = 0; - private float pitch = 0; - private float range = 20; - private float powerDrain = .1f; - - @Override - public boolean canFunction() - { - return super.canFunction(); - } - - @Override - public void updateEntity() - { - super.updateEntity(); - if (this.ticks % 3 == 0 && this.isFunctioning()) - { - this.fireLaser(); - } - } - - public void rotateYaw(float by) - { - this.yaw += by; - if (!this.worldObj.isRemote) - { - PacketHandler.instance().sendPacketToClients(this.getDescriptionPacket(), this.worldObj, new Vector3(this), 64); - } - } - - public float getYaw() - { - return this.yaw; - } - - public void rotatePitch(float by) - { - this.pitch += by; - if (!this.worldObj.isRemote) - { - PacketHandler.instance().sendPacketToClients(this.getDescriptionPacket(), this.worldObj, new Vector3(this), 64); - } - } - - @Override - public boolean simplePacket(String id, ByteArrayDataInput dis, Player player) - { - try - { - if (!super.simplePacket(id, dis, player) && this.worldObj.isRemote) - { - if (id.equalsIgnoreCase("Desc")) - { - this.functioning = dis.readBoolean(); - this.yaw = dis.readFloat(); - this.pitch = dis.readFloat(); - return true; - } - } - } - catch (Exception e) - { - e.printStackTrace(); - } - return false; - } - - @Override - public Packet getDescriptionPacket() - { - return PacketHandler.instance().getTilePacket(this.getChannel(), "Desc", this, this.functioning, this.yaw, this.pitch); - } - - public void fireLaser() - { - - final Vector3 start = RayTraceHelper.getPosFromRotation(new Vector3(this.xCoord + 0.5, this.yCoord + 0.7, this.zCoord + 0.5), .7f, yaw, pitch); - Vector3 hitSpot = RayTraceHelper.getPosFromRotation(new Vector3(this.xCoord + 0.5, this.yCoord + 0.7, this.zCoord + 0.5), range, yaw, pitch); - MovingObjectPosition hitPos = RayTraceHelper.ray_trace_do(this.worldObj, start.toVec3(), hitSpot.toVec3(), range, false); - - if (hitPos != null) - { - LaserEvent event = new LaserEvent.LaserFireEvent(this, hitPos); - MinecraftForge.EVENT_BUS.post(event); - - if (!worldObj.isRemote && !event.isCanceled()) - { - if (hitPos.typeOfHit == EnumMovingObjectType.ENTITY && hitPos.entityHit != null) - { - if (this.worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord)) - { - DamageSource damageSource = DamageSource.onFire; - hitPos.entityHit.attackEntityFrom(damageSource, 7); - hitPos.entityHit.setFire(8); - } - } - else if (hitPos.typeOfHit == EnumMovingObjectType.TILE) - { - if (this.worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord)) - { - if (this.hit != null && this.hit.equals(new Vector3(hitPos)) && !this.hit.equals(new Vector3(this))) - { - this.hitTicks++; - - if (hitTicks >= 6) - { - LaserEvent.onBlockMinedByLaser(this.worldObj, this, this.hit); - this.hit = null; - this.hitTicks = 0; - } - } - else - { - this.hitTicks = 1; - this.hit = new Vector3(hitPos); - LaserEvent.onLaserHitBlock(this.worldObj, this, this.hit, ForgeDirection.UP); - } - } - - } - - } - hitSpot = new Vector3(hitPos.hitVec); - - } - CoreRegistry.proxy().renderBeam(this.worldObj, start, hitSpot, this.worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord) ? Color.ORANGE : Color.blue, 3); - } - - public Vector3 getTarget() - { - return this.target; - } - - public void setTarget(Vector3 vec) - { - if (!this.worldObj.isRemote) - { - this.sendPowerUpdate(); - } - } -} diff --git a/src/main/java/resonantinduction/old/mechanics/processor/BlockProcessor.java b/src/main/java/resonantinduction/old/mechanics/processor/BlockProcessor.java index 09914daba..4bc43a3fc 100644 --- a/src/main/java/resonantinduction/old/mechanics/processor/BlockProcessor.java +++ b/src/main/java/resonantinduction/old/mechanics/processor/BlockProcessor.java @@ -13,14 +13,13 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import net.minecraftforge.oredict.OreDictionary; -import resonantinduction.core.ResonantInductionTabs; -import resonantinduction.core.Settings; +import resonantinduction.core.prefab.block.BlockMachine; +import resonantinduction.mechanical.MechCommonProxy; import resonantinduction.old.client.render.BlockRenderingHandler; import resonantinduction.old.client.render.RenderProcessor; +import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo; import resonantinduction.old.lib.recipes.ProcessorType; import resonantinduction.old.transport.ResonantInductionTransport; -import universalelectricity.api.UniversalElectricity; -import calclavia.lib.prefab.block.BlockMachine; import com.builtbroken.common.Pair; @@ -28,13 +27,12 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BlockProcessor extends BlockMachine +public class BlockProcessor extends BlockMachine implements IExtraBlockInfo { public BlockProcessor() { - super(Settings.CONFIGURATION, "OreProcessor", UniversalElectricity.machine); - this.setCreativeTab(ResonantInductionTabs.tabIndustrial()); + super("OreProcessor"); } @Override @@ -98,7 +96,6 @@ public class BlockProcessor extends BlockMachine @Override public void loadExtraConfigs(Configuration config) { - super.loadExtraConfigs(config); for (ProcessorData data : ProcessorData.values()) { data.enabled = config.get(data.unlocalizedName, "Enabled", true).getBoolean(true); diff --git a/src/main/java/resonantinduction/old/mechanics/processor/ContainerProcessor.java b/src/main/java/resonantinduction/old/mechanics/processor/ContainerProcessor.java index cea8d3877..9a0c5762d 100644 --- a/src/main/java/resonantinduction/old/mechanics/processor/ContainerProcessor.java +++ b/src/main/java/resonantinduction/old/mechanics/processor/ContainerProcessor.java @@ -1,6 +1,5 @@ package resonantinduction.old.mechanics.processor; -import resonantinduction.old.lib.recipes.MachineRecipeHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -8,6 +7,7 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotFurnace; import net.minecraft.item.ItemStack; +import resonantinduction.old.lib.recipes.MachineRecipeHandler; import universalelectricity.api.item.IEnergyItem; public class ContainerProcessor extends Container diff --git a/src/main/java/resonantinduction/old/mechanics/processor/TileEntityProcessor.java b/src/main/java/resonantinduction/old/mechanics/processor/TileEntityProcessor.java index b4a7612c2..a59f87170 100644 --- a/src/main/java/resonantinduction/old/mechanics/processor/TileEntityProcessor.java +++ b/src/main/java/resonantinduction/old/mechanics/processor/TileEntityProcessor.java @@ -4,8 +4,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraftforge.common.ForgeDirection; +import resonantinduction.core.prefab.tile.TileEntityEnergyMachine; import resonantinduction.old.lib.interfaces.IInvBox; -import resonantinduction.old.lib.prefab.TileEntityEnergyMachine; import resonantinduction.old.lib.prefab.invgui.InvChest; import resonantinduction.old.lib.recipes.MachineRecipeHandler; import resonantinduction.old.lib.recipes.ProcessorType; diff --git a/src/main/java/resonantinduction/old/mechanics/purifier/BlockPurifier.java b/src/main/java/resonantinduction/old/mechanics/purifier/BlockPurifier.java index 9c7bdb4ba..6edf32cd7 100644 --- a/src/main/java/resonantinduction/old/mechanics/purifier/BlockPurifier.java +++ b/src/main/java/resonantinduction/old/mechanics/purifier/BlockPurifier.java @@ -5,7 +5,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.prefab.block.BlockRotatableBase; -import resonantinduction.old.mechanics.machine.grinder.TilePurifier; +import resonantinduction.mechanical.grinder.TilePurifier; import universalelectricity.api.vector.VectorWorld; /** diff --git a/src/main/java/resonantinduction/old/transport/NetworkAssembly.java b/src/main/java/resonantinduction/old/transport/NetworkAssembly.java index 72b3d0fa8..d12323c4d 100644 --- a/src/main/java/resonantinduction/old/transport/NetworkAssembly.java +++ b/src/main/java/resonantinduction/old/transport/NetworkAssembly.java @@ -1,8 +1,8 @@ package resonantinduction.old.transport; -import resonatninduction.tilenetwork.INetworkPart; -import resonatninduction.tilenetwork.prefab.NetworkSharedPower; -import resonatninduction.tilenetwork.prefab.NetworkUpdateHandler; +import resonantinduction.core.tilenetwork.INetworkPart; +import resonantinduction.core.tilenetwork.prefab.NetworkSharedPower; +import resonantinduction.core.tilenetwork.prefab.NetworkUpdateHandler; public class NetworkAssembly extends NetworkSharedPower { diff --git a/src/main/java/resonantinduction/old/transport/ResonantInductionTransport.java b/src/main/java/resonantinduction/old/transport/ResonantInductionTransport.java index 84d43f61e..d5aa3e8bb 100644 --- a/src/main/java/resonantinduction/old/transport/ResonantInductionTransport.java +++ b/src/main/java/resonantinduction/old/transport/ResonantInductionTransport.java @@ -15,23 +15,46 @@ import net.minecraftforge.oredict.OreDictionary; import org.modstats.Modstats; +import resonantinduction.archaic.blocks.BlockColorGlass; +import resonantinduction.archaic.blocks.BlockColorGlowGlass; +import resonantinduction.archaic.blocks.BlockColorSand; +import resonantinduction.archaic.blocks.BlockTurntable; +import resonantinduction.archaic.blocks.ItemBlockColored; import resonantinduction.core.ResonantInductionTabs; import resonantinduction.core.Settings; import resonantinduction.core.debug.BlockDebug; import resonantinduction.core.network.PacketIDTile; +import resonantinduction.core.resource.BlockGasOre; +import resonantinduction.core.resource.BlockOre; +import resonantinduction.core.resource.BlockOre.OreData; +import resonantinduction.core.resource.GasOreGenerator; import resonantinduction.core.resource.ItemBlockOre; import resonantinduction.core.resource.ItemParts; import resonantinduction.core.resource.ItemParts.Parts; +import resonantinduction.core.tilenetwork.prefab.NetworkUpdateHandler; +import resonantinduction.electrical.armbot.BlockArmbot; +import resonantinduction.electrical.armbot.command.TaskBreak; +import resonantinduction.electrical.armbot.command.TaskDrop; +import resonantinduction.electrical.armbot.command.TaskEnd; +import resonantinduction.electrical.armbot.command.TaskFire; +import resonantinduction.electrical.armbot.command.TaskGOTO; +import resonantinduction.electrical.armbot.command.TaskGive; +import resonantinduction.electrical.armbot.command.TaskGrabEntity; +import resonantinduction.electrical.armbot.command.TaskGrabItem; +import resonantinduction.electrical.armbot.command.TaskHarvest; +import resonantinduction.electrical.armbot.command.TaskIF; +import resonantinduction.electrical.armbot.command.TaskIdle; +import resonantinduction.electrical.armbot.command.TaskPlace; +import resonantinduction.electrical.armbot.command.TaskReturn; +import resonantinduction.electrical.armbot.command.TaskRotateBy; +import resonantinduction.electrical.armbot.command.TaskRotateTo; +import resonantinduction.electrical.armbot.command.TaskStart; +import resonantinduction.electrical.armbot.command.TaskTake; +import resonantinduction.electrical.armbot.command.TaskUse; +import resonantinduction.electrical.generator.solar.BlockSolarPanel; import resonantinduction.electrical.multimeter.ItemReadoutTools; +import resonantinduction.mechanical.belt.BlockConveyorBelt; import resonantinduction.old.api.coding.TaskRegistry; -import resonantinduction.old.blocks.BlockColorGlass; -import resonantinduction.old.blocks.BlockColorGlowGlass; -import resonantinduction.old.blocks.BlockColorSand; -import resonantinduction.old.blocks.BlockGasOre; -import resonantinduction.old.blocks.BlockOre; -import resonantinduction.old.blocks.GasOreGenerator; -import resonantinduction.old.blocks.ItemBlockColored; -import resonantinduction.old.blocks.BlockOre.OreData; import resonantinduction.old.core.ItemOreDirv; import resonantinduction.old.core.misc.BehaviorDispenseEgg; import resonantinduction.old.core.misc.EntityFarmEgg; @@ -44,29 +67,8 @@ import resonantinduction.old.lib.CoreRegistry; import resonantinduction.old.lib.EnumMaterial; import resonantinduction.old.lib.EnumOrePart; import resonantinduction.old.lib.LaserEntityDamageSource; -import resonantinduction.old.mechanics.armbot.BlockArmbot; -import resonantinduction.old.mechanics.armbot.command.TaskBreak; -import resonantinduction.old.mechanics.armbot.command.TaskDrop; -import resonantinduction.old.mechanics.armbot.command.TaskEnd; -import resonantinduction.old.mechanics.armbot.command.TaskFire; -import resonantinduction.old.mechanics.armbot.command.TaskGOTO; -import resonantinduction.old.mechanics.armbot.command.TaskGive; -import resonantinduction.old.mechanics.armbot.command.TaskGrabEntity; -import resonantinduction.old.mechanics.armbot.command.TaskGrabItem; -import resonantinduction.old.mechanics.armbot.command.TaskHarvest; -import resonantinduction.old.mechanics.armbot.command.TaskIF; -import resonantinduction.old.mechanics.armbot.command.TaskIdle; -import resonantinduction.old.mechanics.armbot.command.TaskPlace; -import resonantinduction.old.mechanics.armbot.command.TaskReturn; -import resonantinduction.old.mechanics.armbot.command.TaskRotateBy; -import resonantinduction.old.mechanics.armbot.command.TaskRotateTo; -import resonantinduction.old.mechanics.armbot.command.TaskStart; -import resonantinduction.old.mechanics.armbot.command.TaskTake; -import resonantinduction.old.mechanics.armbot.command.TaskUse; -import resonantinduction.old.mechanics.generator.solar.BlockSolarPanel; import resonantinduction.old.mechanics.generator.steam.BlockSmallSteamGen; import resonantinduction.old.mechanics.processor.BlockProcessor; -import resonantinduction.old.transport.belt.BlockConveyorBelt; import resonantinduction.old.transport.crate.BlockCrate; import resonantinduction.old.transport.crate.ItemBlockCrate; import resonantinduction.old.transport.encoder.BlockEncoder; @@ -93,8 +95,6 @@ import resonantinduction.old.transport.logistic.BlockManipulator; import resonantinduction.old.transport.logistic.BlockRejector; import resonantinduction.old.transport.vechicle.EntityTestCar; import resonantinduction.old.transport.vechicle.ItemVehicleSpawn; -import resonatninduction.tilenetwork.prefab.NetworkUpdateHandler; -import calclavia.lib.network.PacketHandler; import calclavia.lib.ore.OreGenReplaceStone; import calclavia.lib.ore.OreGenerator; import calclavia.lib.prefab.item.ItemBlockHolder; @@ -102,16 +102,13 @@ import calclavia.lib.utility.FluidHelper; import calclavia.lib.utility.PlayerKeyHandler; import calclavia.lib.utility.SaveManager; 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.Mod.Metadata; import cpw.mods.fml.common.ModMetadata; -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.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/resonantinduction/old/transport/TileEntityAssembly.java b/src/main/java/resonantinduction/old/transport/TileEntityAssembly.java index 57000aa15..7d92cb0fd 100644 --- a/src/main/java/resonantinduction/old/transport/TileEntityAssembly.java +++ b/src/main/java/resonantinduction/old/transport/TileEntityAssembly.java @@ -7,10 +7,10 @@ import java.util.Random; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; -import resonantinduction.old.lib.prefab.TileEntityEnergyMachine; -import resonatninduction.tilenetwork.INetworkEnergyPart; -import resonatninduction.tilenetwork.ITileNetwork; -import resonatninduction.tilenetwork.prefab.NetworkSharedPower; +import resonantinduction.core.prefab.tile.TileEntityEnergyMachine; +import resonantinduction.core.tilenetwork.INetworkEnergyPart; +import resonantinduction.core.tilenetwork.ITileNetwork; +import resonantinduction.core.tilenetwork.prefab.NetworkSharedPower; import universalelectricity.api.vector.Vector3; /** diff --git a/src/main/java/resonantinduction/old/transport/crafting/BlockCraftingTable.java b/src/main/java/resonantinduction/old/transport/crafting/BlockCraftingTable.java index 3ce2d7a67..0978c541d 100644 --- a/src/main/java/resonantinduction/old/transport/crafting/BlockCraftingTable.java +++ b/src/main/java/resonantinduction/old/transport/crafting/BlockCraftingTable.java @@ -1,12 +1,12 @@ package resonantinduction.old.transport.crafting; -import calclavia.lib.prefab.block.BlockMachine; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; +import resonantinduction.core.prefab.block.BlockMachine; import resonantinduction.old.transport.ResonantInductionTransport; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/old/transport/crafting/TileEntityCraftingTable.java b/src/main/java/resonantinduction/old/transport/crafting/TileEntityCraftingTable.java index 42389541a..b155c48b9 100644 --- a/src/main/java/resonantinduction/old/transport/crafting/TileEntityCraftingTable.java +++ b/src/main/java/resonantinduction/old/transport/crafting/TileEntityCraftingTable.java @@ -1,6 +1,6 @@ package resonantinduction.old.transport.crafting; -import resonantinduction.old.lib.prefab.TileEntityInv; +import resonantinduction.core.prefab.tile.TileEntityInv; public class TileEntityCraftingTable extends TileEntityInv { diff --git a/src/main/java/resonantinduction/old/transport/crate/BlockCrate.java b/src/main/java/resonantinduction/old/transport/crate/BlockCrate.java index 15024328f..cf6f70538 100644 --- a/src/main/java/resonantinduction/old/transport/crate/BlockCrate.java +++ b/src/main/java/resonantinduction/old/transport/crate/BlockCrate.java @@ -17,9 +17,9 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import resonantinduction.core.Reference; import resonantinduction.core.Settings; +import resonantinduction.core.prefab.block.BlockMachine; import resonantinduction.old.client.render.RenderCrate; import universalelectricity.api.UniversalElectricity; -import calclavia.lib.prefab.block.BlockMachine; import com.builtbroken.common.Pair; diff --git a/src/main/java/resonantinduction/old/transport/crate/InventoryCrate.java b/src/main/java/resonantinduction/old/transport/crate/InventoryCrate.java index 188b964f0..0a1bf29b3 100644 --- a/src/main/java/resonantinduction/old/transport/crate/InventoryCrate.java +++ b/src/main/java/resonantinduction/old/transport/crate/InventoryCrate.java @@ -1,9 +1,9 @@ package resonantinduction.old.transport.crate; -import resonantinduction.old.lib.prefab.invgui.InvChest; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import resonantinduction.old.lib.prefab.invgui.InvChest; public class InventoryCrate extends InvChest { diff --git a/src/main/java/resonantinduction/old/transport/crate/TileEntityCrate.java b/src/main/java/resonantinduction/old/transport/crate/TileEntityCrate.java index 5fb86783a..1b1f3f100 100644 --- a/src/main/java/resonantinduction/old/transport/crate/TileEntityCrate.java +++ b/src/main/java/resonantinduction/old/transport/crate/TileEntityCrate.java @@ -5,8 +5,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.network.ISimplePacketReceiver; +import resonantinduction.core.prefab.tile.TileEntityInv; import resonantinduction.old.lib.interfaces.IExtendedStorage; -import resonantinduction.old.lib.prefab.TileEntityInv; import resonantinduction.old.transport.ResonantInductionTransport; import calclavia.lib.network.PacketHandler; diff --git a/src/main/java/resonantinduction/old/transport/encoder/BlockEncoder.java b/src/main/java/resonantinduction/old/transport/encoder/BlockEncoder.java index 742a2a6d6..861c47085 100644 --- a/src/main/java/resonantinduction/old/transport/encoder/BlockEncoder.java +++ b/src/main/java/resonantinduction/old/transport/encoder/BlockEncoder.java @@ -11,8 +11,9 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import resonantinduction.core.Reference; import resonantinduction.core.Settings; +import resonantinduction.core.prefab.block.BlockMachine; +import resonantinduction.mechanical.MechCommonProxy; import resonantinduction.old.transport.ResonantInductionTransport; -import calclavia.lib.prefab.block.BlockMachine; import com.builtbroken.common.Pair; diff --git a/src/main/java/resonantinduction/old/transport/encoder/ContainerEncoder.java b/src/main/java/resonantinduction/old/transport/encoder/ContainerEncoder.java index 30bbb1657..c0e1e2fef 100644 --- a/src/main/java/resonantinduction/old/transport/encoder/ContainerEncoder.java +++ b/src/main/java/resonantinduction/old/transport/encoder/ContainerEncoder.java @@ -1,11 +1,11 @@ package resonantinduction.old.transport.encoder; -import resonantinduction.old.lib.prefab.invgui.SlotSpecific; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import resonantinduction.old.lib.prefab.invgui.SlotSpecific; public class ContainerEncoder extends Container { diff --git a/src/main/java/resonantinduction/old/transport/encoder/TileEntityEncoder.java b/src/main/java/resonantinduction/old/transport/encoder/TileEntityEncoder.java index 96de2f456..a4f8161b7 100644 --- a/src/main/java/resonantinduction/old/transport/encoder/TileEntityEncoder.java +++ b/src/main/java/resonantinduction/old/transport/encoder/TileEntityEncoder.java @@ -7,12 +7,12 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; +import resonantinduction.core.prefab.tile.TileEntityMachine; +import resonantinduction.electrical.armbot.Program; +import resonantinduction.electrical.armbot.command.TaskRotateTo; import resonantinduction.old.api.coding.IProgram; import resonantinduction.old.api.coding.ITask; import resonantinduction.old.api.coding.TaskRegistry; -import resonantinduction.old.lib.prefab.TileEntityMachine; -import resonantinduction.old.mechanics.armbot.Program; -import resonantinduction.old.mechanics.armbot.command.TaskRotateTo; import resonantinduction.old.transport.ResonantInductionTransport; import universalelectricity.api.vector.Vector2; import calclavia.lib.network.PacketHandler; diff --git a/src/main/java/resonantinduction/old/transport/fluid/BlockKitchenSink.java b/src/main/java/resonantinduction/old/transport/fluid/BlockKitchenSink.java index ff8cd19fc..9a671ee25 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/BlockKitchenSink.java +++ b/src/main/java/resonantinduction/old/transport/fluid/BlockKitchenSink.java @@ -11,8 +11,8 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import resonantinduction.core.Settings; +import resonantinduction.core.prefab.block.BlockMachine; import resonantinduction.old.client.render.BlockRenderHelper; -import calclavia.lib.prefab.block.BlockMachine; import calclavia.lib.utility.FluidHelper; import com.builtbroken.common.Pair; diff --git a/src/main/java/resonantinduction/old/transport/fluid/BlockReleaseValve.java b/src/main/java/resonantinduction/old/transport/fluid/BlockReleaseValve.java index 3a600b289..cc05ebe2c 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/BlockReleaseValve.java +++ b/src/main/java/resonantinduction/old/transport/fluid/BlockReleaseValve.java @@ -10,8 +10,8 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import resonantinduction.core.Settings; +import resonantinduction.core.prefab.block.BlockMachine; import resonantinduction.old.core.recipe.RecipeLoader; -import calclavia.lib.prefab.block.BlockMachine; import com.builtbroken.common.Pair; diff --git a/src/main/java/resonantinduction/old/transport/fluid/BlockSteamPiston.java b/src/main/java/resonantinduction/old/transport/fluid/BlockSteamPiston.java index 2b754528a..40fe86513 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/BlockSteamPiston.java +++ b/src/main/java/resonantinduction/old/transport/fluid/BlockSteamPiston.java @@ -9,8 +9,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import resonantinduction.core.Settings; +import resonantinduction.core.prefab.block.BlockMachine; import resonantinduction.old.mechanics.generator.steam.TileEntitySteamPiston; -import calclavia.lib.prefab.block.BlockMachine; import com.builtbroken.common.Pair; diff --git a/src/main/java/resonantinduction/old/transport/fluid/BlockTank.java b/src/main/java/resonantinduction/old/transport/fluid/BlockTank.java index 732a9cc08..efc70f7bd 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/BlockTank.java +++ b/src/main/java/resonantinduction/old/transport/fluid/BlockTank.java @@ -13,12 +13,12 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import resonantinduction.core.Settings; +import resonantinduction.core.prefab.block.BlockMachine; import resonantinduction.old.client.render.BlockRenderHelper; import resonantinduction.old.transport.fluid.pipes.FluidPartsMaterial; import resonantinduction.old.transport.fluid.pipes.ItemBlockPipe; import resonantinduction.old.transport.fluid.pipes.TileEntityPipe; import universalelectricity.api.vector.Vector3; -import calclavia.lib.prefab.block.BlockMachine; import calclavia.lib.utility.FluidHelper; import calclavia.lib.utility.HelperMethods; diff --git a/src/main/java/resonantinduction/old/transport/fluid/FluidCraftingHandler.java b/src/main/java/resonantinduction/old/transport/fluid/FluidCraftingHandler.java index 19d2adaa8..369fcd1eb 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/FluidCraftingHandler.java +++ b/src/main/java/resonantinduction/old/transport/fluid/FluidCraftingHandler.java @@ -10,8 +10,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import resonantinduction.old.transport.fluid.network.IFluidRecipeCrafter; import resonantinduction.old.transport.fluid.network.FluidRecipeInfo.SimpleFluidRecipe; +import resonantinduction.old.transport.fluid.network.IFluidRecipeCrafter; import calclavia.lib.utility.FluidHelper; import com.builtbroken.common.Pair; diff --git a/src/main/java/resonantinduction/old/transport/fluid/TileEntityReleaseValve.java b/src/main/java/resonantinduction/old/transport/fluid/TileEntityReleaseValve.java index ffc12f4f2..12339d5dc 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/TileEntityReleaseValve.java +++ b/src/main/java/resonantinduction/old/transport/fluid/TileEntityReleaseValve.java @@ -6,11 +6,11 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; +import resonantinduction.core.tilenetwork.ITileConnector; import resonantinduction.old.api.fluid.INetworkPipe; import resonantinduction.old.lib.interfaces.IReadOut; import resonantinduction.old.transport.fluid.network.NetworkPipes; import resonantinduction.old.transport.fluid.prefab.TileEntityFluidDevice; -import resonatninduction.tilenetwork.ITileConnector; import calclavia.lib.utility.HelperMethods; public class TileEntityReleaseValve extends TileEntityFluidDevice implements ITileConnector, IReadOut diff --git a/src/main/java/resonantinduction/old/transport/fluid/TileEntityTank.java b/src/main/java/resonantinduction/old/transport/fluid/TileEntityTank.java index 6bae43c66..4454bd3d3 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/TileEntityTank.java +++ b/src/main/java/resonantinduction/old/transport/fluid/TileEntityTank.java @@ -2,11 +2,11 @@ package resonantinduction.old.transport.fluid; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; +import resonantinduction.core.tilenetwork.INetworkPart; +import resonantinduction.core.tilenetwork.ITileNetwork; import resonantinduction.old.api.fluid.INetworkFluidPart; import resonantinduction.old.transport.fluid.network.NetworkFluidContainers; import resonantinduction.old.transport.fluid.prefab.TileEntityFluidNetworkTile; -import resonatninduction.tilenetwork.INetworkPart; -import resonatninduction.tilenetwork.ITileNetwork; public class TileEntityTank extends TileEntityFluidNetworkTile { diff --git a/src/main/java/resonantinduction/old/transport/fluid/network/NetworkFluidContainers.java b/src/main/java/resonantinduction/old/transport/fluid/network/NetworkFluidContainers.java index 8fdadfde7..5e122fd2f 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/network/NetworkFluidContainers.java +++ b/src/main/java/resonantinduction/old/transport/fluid/network/NetworkFluidContainers.java @@ -6,9 +6,9 @@ import java.util.List; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; +import resonantinduction.core.tilenetwork.INetworkPart; +import resonantinduction.core.tilenetwork.prefab.NetworkUpdateHandler; import resonantinduction.old.api.fluid.INetworkFluidPart; -import resonatninduction.tilenetwork.INetworkPart; -import resonatninduction.tilenetwork.prefab.NetworkUpdateHandler; import calclavia.lib.utility.FluidHelper; /** diff --git a/src/main/java/resonantinduction/old/transport/fluid/network/NetworkFluidTiles.java b/src/main/java/resonantinduction/old/transport/fluid/network/NetworkFluidTiles.java index cf3855a3d..d8818ce6b 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/network/NetworkFluidTiles.java +++ b/src/main/java/resonantinduction/old/transport/fluid/network/NetworkFluidTiles.java @@ -12,12 +12,12 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import resonantinduction.core.tilenetwork.INetworkPart; +import resonantinduction.core.tilenetwork.ITileNetwork; +import resonantinduction.core.tilenetwork.prefab.NetworkTileEntities; +import resonantinduction.core.tilenetwork.prefab.NetworkUpdateHandler; import resonantinduction.old.api.fluid.INetworkFluidPart; import resonantinduction.old.transport.fluid.FluidCraftingHandler; -import resonatninduction.tilenetwork.INetworkPart; -import resonatninduction.tilenetwork.ITileNetwork; -import resonatninduction.tilenetwork.prefab.NetworkTileEntities; -import resonatninduction.tilenetwork.prefab.NetworkUpdateHandler; import calclavia.lib.utility.FluidHelper; public class NetworkFluidTiles extends NetworkTileEntities diff --git a/src/main/java/resonantinduction/old/transport/fluid/network/NetworkPipes.java b/src/main/java/resonantinduction/old/transport/fluid/network/NetworkPipes.java index dc99675c9..6a7a55715 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/network/NetworkPipes.java +++ b/src/main/java/resonantinduction/old/transport/fluid/network/NetworkPipes.java @@ -7,9 +7,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; +import resonantinduction.core.tilenetwork.INetworkPart; +import resonantinduction.core.tilenetwork.prefab.NetworkUpdateHandler; import resonantinduction.old.api.fluid.INetworkPipe; -import resonatninduction.tilenetwork.INetworkPart; -import resonatninduction.tilenetwork.prefab.NetworkUpdateHandler; import calclavia.lib.utility.FluidHelper; /** diff --git a/src/main/java/resonantinduction/old/transport/fluid/pipes/BlockPipe.java b/src/main/java/resonantinduction/old/transport/fluid/pipes/BlockPipe.java index ee37e857a..ebe5a96b4 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/pipes/BlockPipe.java +++ b/src/main/java/resonantinduction/old/transport/fluid/pipes/BlockPipe.java @@ -17,10 +17,10 @@ import net.minecraftforge.common.Configuration; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidTankInfo; import resonantinduction.core.Settings; +import resonantinduction.core.prefab.block.BlockMachine; import resonantinduction.old.lib.helpers.ColorCode; import resonantinduction.old.lib.helpers.ColorCode.IColorCoded; import universalelectricity.api.vector.Vector3; -import calclavia.lib.prefab.block.BlockMachine; import calclavia.lib.utility.FluidHelper; import com.builtbroken.common.Pair; diff --git a/src/main/java/resonantinduction/old/transport/fluid/pipes/TileEntityPipe.java b/src/main/java/resonantinduction/old/transport/fluid/pipes/TileEntityPipe.java index 8ac13b0d4..d4d95fd6a 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/pipes/TileEntityPipe.java +++ b/src/main/java/resonantinduction/old/transport/fluid/pipes/TileEntityPipe.java @@ -5,13 +5,13 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; +import resonantinduction.core.tilenetwork.ITileConnector; +import resonantinduction.core.tilenetwork.ITileNetwork; import resonantinduction.old.api.fluid.INetworkPipe; import resonantinduction.old.lib.helpers.ColorCode; import resonantinduction.old.lib.helpers.ColorCode.IColorCoded; import resonantinduction.old.transport.fluid.network.NetworkPipes; import resonantinduction.old.transport.fluid.prefab.TileEntityFluidNetworkTile; -import resonatninduction.tilenetwork.ITileConnector; -import resonatninduction.tilenetwork.ITileNetwork; import universalelectricity.api.vector.Vector3; import calclavia.lib.utility.FluidHelper; diff --git a/src/main/java/resonantinduction/old/transport/fluid/prefab/TileEntityFluidDevice.java b/src/main/java/resonantinduction/old/transport/fluid/prefab/TileEntityFluidDevice.java index 653541408..9a7b19c46 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/prefab/TileEntityFluidDevice.java +++ b/src/main/java/resonantinduction/old/transport/fluid/prefab/TileEntityFluidDevice.java @@ -4,9 +4,9 @@ import java.util.Random; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.ForgeDirection; +import resonantinduction.core.tilenetwork.ITileConnector; +import resonantinduction.core.tilenetwork.prefab.NetworkTileEntities; import resonantinduction.old.lib.interfaces.IReadOut; -import resonatninduction.tilenetwork.ITileConnector; -import resonatninduction.tilenetwork.prefab.NetworkTileEntities; import calclavia.lib.prefab.tile.TileAdvanced; public abstract class TileEntityFluidDevice extends TileAdvanced implements IReadOut, ITileConnector diff --git a/src/main/java/resonantinduction/old/transport/fluid/prefab/TileEntityFluidNetworkTile.java b/src/main/java/resonantinduction/old/transport/fluid/prefab/TileEntityFluidNetworkTile.java index 20fae5449..d8a9672cb 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/prefab/TileEntityFluidNetworkTile.java +++ b/src/main/java/resonantinduction/old/transport/fluid/prefab/TileEntityFluidNetworkTile.java @@ -21,13 +21,13 @@ import net.minecraftforge.fluids.FluidTankInfo; import org.bouncycastle.util.Arrays; import resonantinduction.core.network.ISimplePacketReceiver; +import resonantinduction.core.tilenetwork.INetworkPart; +import resonantinduction.core.tilenetwork.ITileNetwork; import resonantinduction.old.api.fluid.FluidMasterList; import resonantinduction.old.api.fluid.INetworkFluidPart; import resonantinduction.old.transport.ResonantInductionTransport; import resonantinduction.old.transport.fluid.network.NetworkFluidTiles; import resonantinduction.old.transport.fluid.pipes.FluidPartsMaterial; -import resonatninduction.tilenetwork.INetworkPart; -import resonatninduction.tilenetwork.ITileNetwork; import universalelectricity.api.vector.Vector3; import calclavia.lib.network.PacketHandler; diff --git a/src/main/java/resonantinduction/old/transport/fluid/prefab/TileEntityFluidStorage.java b/src/main/java/resonantinduction/old/transport/fluid/prefab/TileEntityFluidStorage.java index 54234a65c..8df3725a0 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/prefab/TileEntityFluidStorage.java +++ b/src/main/java/resonantinduction/old/transport/fluid/prefab/TileEntityFluidStorage.java @@ -1,6 +1,5 @@ package resonantinduction.old.transport.fluid.prefab; -import resonantinduction.old.lib.helpers.ColorCode.IColorCoded; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.ForgeDirection; @@ -11,6 +10,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import resonantinduction.old.lib.helpers.ColorCode.IColorCoded; import calclavia.lib.utility.FluidHelper; public abstract class TileEntityFluidStorage extends TileEntityFluidDevice implements IFluidHandler, IColorCoded diff --git a/src/main/java/resonantinduction/old/transport/fluid/pump/BlockConstructionPump.java b/src/main/java/resonantinduction/old/transport/fluid/pump/BlockConstructionPump.java index 74851051c..9c229644c 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/pump/BlockConstructionPump.java +++ b/src/main/java/resonantinduction/old/transport/fluid/pump/BlockConstructionPump.java @@ -15,10 +15,10 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import resonantinduction.core.Reference; import resonantinduction.core.Settings; +import resonantinduction.core.prefab.block.BlockMachine; +import resonantinduction.core.tilenetwork.prefab.NetworkTileEntities; import resonantinduction.old.client.render.BlockRenderHelper; import resonantinduction.old.core.recipe.RecipeLoader; -import resonatninduction.tilenetwork.prefab.NetworkTileEntities; -import calclavia.lib.prefab.block.BlockMachine; import com.builtbroken.common.Pair; diff --git a/src/main/java/resonantinduction/old/transport/fluid/pump/BlockDrain.java b/src/main/java/resonantinduction/old/transport/fluid/pump/BlockDrain.java index d593db080..3547cda61 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/pump/BlockDrain.java +++ b/src/main/java/resonantinduction/old/transport/fluid/pump/BlockDrain.java @@ -16,7 +16,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.Reference; import resonantinduction.core.Settings; -import calclavia.lib.prefab.block.BlockMachine; +import resonantinduction.core.prefab.block.BlockMachine; import com.builtbroken.common.Pair; diff --git a/src/main/java/resonantinduction/old/transport/fluid/pump/BlockPumpMachine.java b/src/main/java/resonantinduction/old/transport/fluid/pump/BlockPumpMachine.java index dfeeaab51..4d88a93a9 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/pump/BlockPumpMachine.java +++ b/src/main/java/resonantinduction/old/transport/fluid/pump/BlockPumpMachine.java @@ -11,9 +11,9 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.Settings; +import resonantinduction.core.prefab.block.BlockMachine; import resonantinduction.old.client.render.BlockRenderHelper; import resonantinduction.old.core.recipe.RecipeLoader; -import calclavia.lib.prefab.block.BlockMachine; import com.builtbroken.common.Pair; diff --git a/src/main/java/resonantinduction/old/transport/fluid/pump/TileEntityConstructionPump.java b/src/main/java/resonantinduction/old/transport/fluid/pump/TileEntityConstructionPump.java index 292fb899d..6576cd578 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/pump/TileEntityConstructionPump.java +++ b/src/main/java/resonantinduction/old/transport/fluid/pump/TileEntityConstructionPump.java @@ -15,10 +15,10 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import resonantinduction.core.tilenetwork.ITileConnector; import resonantinduction.old.api.fluid.IDrain; import resonantinduction.old.api.fluid.INetworkPipe; import resonantinduction.old.transport.fluid.network.NetworkFluidTiles; -import resonatninduction.tilenetwork.ITileConnector; import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorHelper; diff --git a/src/main/java/resonantinduction/old/transport/fluid/pump/TileEntityStarterPump.java b/src/main/java/resonantinduction/old/transport/fluid/pump/TileEntityStarterPump.java index 84591326f..900b1410e 100644 --- a/src/main/java/resonantinduction/old/transport/fluid/pump/TileEntityStarterPump.java +++ b/src/main/java/resonantinduction/old/transport/fluid/pump/TileEntityStarterPump.java @@ -10,10 +10,10 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; +import resonantinduction.core.prefab.tile.TileEntityEnergyMachine; +import resonantinduction.core.tilenetwork.ITileConnector; import resonantinduction.old.api.fluid.IDrain; import resonantinduction.old.lib.interfaces.IReadOut; -import resonantinduction.old.lib.prefab.TileEntityEnergyMachine; -import resonatninduction.tilenetwork.ITileConnector; import universalelectricity.api.vector.Vector3; import calclavia.lib.utility.FluidHelper; diff --git a/src/main/java/resonantinduction/old/transport/hopper/BlockAdvancedHopper.java b/src/main/java/resonantinduction/old/transport/hopper/BlockAdvancedHopper.java index ab797bc11..96f5d4bd0 100644 --- a/src/main/java/resonantinduction/old/transport/hopper/BlockAdvancedHopper.java +++ b/src/main/java/resonantinduction/old/transport/hopper/BlockAdvancedHopper.java @@ -15,8 +15,8 @@ import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import resonantinduction.core.Settings; +import resonantinduction.core.prefab.block.BlockMachine; import resonantinduction.old.client.render.RenderAdvancedHopper; -import calclavia.lib.prefab.block.BlockMachine; import com.builtbroken.common.Pair; diff --git a/src/main/java/resonantinduction/old/transport/imprinter/BlockImprinter.java b/src/main/java/resonantinduction/old/transport/imprinter/BlockImprinter.java index 167631cac..f920d8720 100644 --- a/src/main/java/resonantinduction/old/transport/imprinter/BlockImprinter.java +++ b/src/main/java/resonantinduction/old/transport/imprinter/BlockImprinter.java @@ -14,10 +14,9 @@ import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import resonantinduction.core.Reference; -import resonantinduction.core.Settings; +import resonantinduction.core.prefab.block.BlockMachine; import resonantinduction.old.mechanics.CommonProxy; import resonantinduction.old.transport.ResonantInductionTransport; -import calclavia.lib.prefab.block.BlockMachine; import com.builtbroken.common.Pair; @@ -32,7 +31,7 @@ public class BlockImprinter extends BlockMachine public BlockImprinter() { - super(Settings.CONFIGURATION, "imprinter", Material.wood); + super("imprinter", Material.wood); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/resonantinduction/old/transport/imprinter/ContainerImprinter.java b/src/main/java/resonantinduction/old/transport/imprinter/ContainerImprinter.java index fb62e8f87..2c3017b9f 100644 --- a/src/main/java/resonantinduction/old/transport/imprinter/ContainerImprinter.java +++ b/src/main/java/resonantinduction/old/transport/imprinter/ContainerImprinter.java @@ -1,14 +1,14 @@ package resonantinduction.old.transport.imprinter; -import resonantinduction.old.lib.prefab.invgui.ISlotWatcher; -import resonantinduction.old.lib.prefab.invgui.SlotCraftingResult; -import resonantinduction.old.lib.prefab.invgui.SlotSpecific; -import resonantinduction.old.lib.prefab.invgui.WatchedSlot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import resonantinduction.old.lib.prefab.invgui.ISlotWatcher; +import resonantinduction.old.lib.prefab.invgui.SlotCraftingResult; +import resonantinduction.old.lib.prefab.invgui.SlotSpecific; +import resonantinduction.old.lib.prefab.invgui.WatchedSlot; public class ContainerImprinter extends Container implements ISlotWatcher { diff --git a/src/main/java/resonantinduction/old/transport/levitator/BlockLevitator.java b/src/main/java/resonantinduction/old/transport/levitator/BlockLevitator.java index 05c894eba..9b40c19f7 100644 --- a/src/main/java/resonantinduction/old/transport/levitator/BlockLevitator.java +++ b/src/main/java/resonantinduction/old/transport/levitator/BlockLevitator.java @@ -1,6 +1,5 @@ package resonantinduction.old.transport.levitator; -import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; @@ -8,16 +7,16 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.Reference; -import resonantinduction.core.prefab.block.BlockBase; +import resonantinduction.core.prefab.block.BlockMachine; import resonantinduction.old.core.render.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BlockLevitator extends BlockBase implements ITileEntityProvider +public class BlockLevitator extends BlockMachine { - public BlockLevitator(int id) + public BlockLevitator() { - super("levitator", id); + super("levitator"); this.setTextureName(Reference.PREFIX + "machine"); } diff --git a/src/main/java/resonantinduction/old/transport/logistic/ContainerScanner.java b/src/main/java/resonantinduction/old/transport/logistic/ContainerScanner.java deleted file mode 100644 index 5a4dd1d26..000000000 --- a/src/main/java/resonantinduction/old/transport/logistic/ContainerScanner.java +++ /dev/null @@ -1,52 +0,0 @@ -package resonantinduction.old.transport.logistic; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -/** @author Archadia */ -public class ContainerScanner extends Container -{ - - private TileScanner tileEnt; - - public ContainerScanner(InventoryPlayer par1InventoryPlayer, TileScanner tile) - { - bindPlayerInventory(par1InventoryPlayer); - - this.tileEnt = tile; - } - - public void bindPlayerInventory(InventoryPlayer inv) - { - int i; - - for (i = 0; i < 3; ++i) - { - for (int j = 0; j < 9; ++j) - { - this.addSlotToContainer(new Slot(inv, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); - } - } - - for (i = 0; i < 9; ++i) - { - this.addSlotToContainer(new Slot(inv, i, 8 + i * 18, 142)); - } - } - - @Override - public boolean canInteractWith(EntityPlayer par1EntityPlayer) - { - return true; - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) - { - return null; - } - -} diff --git a/src/main/java/resonantinduction/old/transport/logistic/TileScanner.java b/src/main/java/resonantinduction/old/transport/logistic/TileScanner.java deleted file mode 100644 index a934eac07..000000000 --- a/src/main/java/resonantinduction/old/transport/logistic/TileScanner.java +++ /dev/null @@ -1,85 +0,0 @@ -package resonantinduction.old.transport.logistic; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map.Entry; - -import net.minecraftforge.common.ForgeDirection; -import resonantinduction.old.core.BlockMapUtil; -import resonantinduction.old.lib.prefab.TileEntityEnergyMachine; -import universalelectricity.api.vector.Vector3; - -import com.builtbroken.common.Pair; - -/** @author Archadia, DarkCow */ -public class TileScanner extends TileEntityEnergyMachine -{ - - private ArrayList validTarget = new ArrayList(); - private Vector3 coord; - private Vector3 coordDown; - private Vector3 scanSize = new Vector3(15, 1, 15); - private Vector3 scanLocation; - - public boolean enabled = true; - - public TileScanner() - { - super(500); // 500W - - } - - @Override - public void updateEntity() - { - super.updateEntity(); - if (coord == null || this.xCoord != coord.intX() || this.yCoord != coord.intY() || this.zCoord != coord.intZ()) - { - coord = new Vector3(this); - coordDown = coord.clone().translate(new Vector3(0, -1, 0)); - } - if (!worldObj.isRemote) - { - for (byte i = 0; i < 5 && this.canFunction(); i++) - { - scanArea(); - } - } - } - - @Override - public boolean canFunction() - { - return super.canFunction() && this.enabled; - } - - /** Scans the area for valid blocks */ - protected void scanArea() - { - if (scanLocation == null) - { - this.scanLocation = this.coordDown.clone(); - } - @SuppressWarnings("unchecked") - HashMap> blocks = BlockMapUtil.getBlocksInGrid(this.worldObj, this.coordDown, this.scanSize); - for (Entry> entry : blocks.entrySet()) - { - int blockID = entry.getValue().left(); - int meta = entry.getValue().right(); - } - // Update pos logic - this.scanLocation.translate(new Vector3(0, -1, 0)); - if (this.scanLocation.intY() == 0) - { - this.scanLocation = this.coordDown.clone(); - } - // Do logic here to sort out the returned blocks with what you want - } - - @Override - public boolean canConnect(ForgeDirection dir) - { - return true; - } - -} \ No newline at end of file diff --git a/src/main/java/resonantinduction/old/transport/vechicle/EntityAdvanced.java b/src/main/java/resonantinduction/old/transport/vechicle/EntityAdvanced.java deleted file mode 100644 index 5b7a4aafa..000000000 --- a/src/main/java/resonantinduction/old/transport/vechicle/EntityAdvanced.java +++ /dev/null @@ -1,142 +0,0 @@ -package resonantinduction.old.transport.vechicle; - -import net.minecraft.entity.Entity; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; - -/** - * Extended version of the entity, used in the case that an entity needs to be created that can't - * extend entity living base - * - * @author DarkGuardsman - */ -public abstract class EntityAdvanced extends Entity -{ - protected float maxDamage = 50; - protected long ticks = 1; - protected static final int DAMAGE_ID = 6, HIT_TICK_ID = 7, ROLL_DIRECTION_ID = 8, - ROLL_AMP_ID = 9, FORWARD_DIRECTION_ID = 10; - - public EntityAdvanced(World world) - { - super(world); - this.setHealth(this.getMaxHealth()); - } - - @Override - protected void entityInit() - { - this.dataWatcher.addObject(DAMAGE_ID, Float.valueOf(1.0F)); - this.dataWatcher.addObject(HIT_TICK_ID, Integer.valueOf(0)); - this.dataWatcher.addObject(ROLL_DIRECTION_ID, Integer.valueOf(0)); - this.dataWatcher.addObject(ROLL_AMP_ID, Integer.valueOf(0)); - this.dataWatcher.addObject(FORWARD_DIRECTION_ID, Integer.valueOf(0)); - } - - @Override - public void onUpdate() - { - super.onUpdate(); - if (this.ticks++ >= Long.MAX_VALUE - 10) - { - this.ticks = 1; - } - if (this.worldObj.isRemote) - { - this.updateAnimation(); - } - if (this.getTimeSinceHit() > 0) - { - this.setTimeSinceHit(this.getTimeSinceHit() - 1); - } - } - - /** - * Don't do any client side calls but rather update variables that control renders. For example - * rotation of the model - */ - public void updateAnimation() - { - - } - - @Override - protected void readEntityFromNBT(NBTTagCompound nbt) - { - this.setHealth(nbt.getFloat("Health")); - - } - - @Override - protected void writeEntityToNBT(NBTTagCompound nbt) - { - nbt.setFloat("Health", this.getHealth()); - - } - - public final float getHealth() - { - return this.dataWatcher.getWatchableObjectFloat(DAMAGE_ID); - } - - public void setHealth(float hp) - { - this.dataWatcher.updateObject(DAMAGE_ID, Float.valueOf(MathHelper.clamp_float(hp, 0.0F, this.getMaxHealth()))); - } - - /** Max damage this entity can take */ - public float getMaxHealth() - { - return this.maxDamage; - } - - /** Sets the time to count down from since the last time entity was hit. */ - public void setTimeSinceHit(int par1) - { - this.dataWatcher.updateObject(HIT_TICK_ID, Integer.valueOf(par1)); - } - - /** Gets the time since the last hit. */ - public int getTimeSinceHit() - { - return this.dataWatcher.getWatchableObjectInt(HIT_TICK_ID); - } - - /** Sets the rolling amplitude the cart rolls while being attacked. */ - public void setRollingAmplitude(int par1) - { - this.dataWatcher.updateObject(ROLL_AMP_ID, Integer.valueOf(par1)); - } - - /** Gets the rolling amplitude the cart rolls while being attacked. */ - public int getRollingAmplitude() - { - return this.dataWatcher.getWatchableObjectInt(ROLL_AMP_ID); - } - - /** Sets the rolling direction the cart rolls while being attacked. Can be 1 or -1. */ - public void setRollingDirection(int par1) - { - this.dataWatcher.updateObject(ROLL_DIRECTION_ID, Integer.valueOf(par1)); - } - - /** Gets the rolling direction the cart rolls while being attacked. Can be 1 or -1. */ - public int getRollingDirection() - { - return this.dataWatcher.getWatchableObjectInt(ROLL_DIRECTION_ID); - } - - /** Sets the forward direction of the entity. */ - public void setForwardDirection(int par1) - { - this.dataWatcher.updateObject(FORWARD_DIRECTION_ID, Integer.valueOf(par1)); - } - - /** Gets the forward direction of the entity. */ - public int getForwardDirection() - { - return this.dataWatcher.getWatchableObjectInt(FORWARD_DIRECTION_ID); - } - -} diff --git a/src/main/java/resonantinduction/old/transport/vechicle/EntityTestCar.java b/src/main/java/resonantinduction/old/transport/vechicle/EntityTestCar.java deleted file mode 100644 index f2a64e22f..000000000 --- a/src/main/java/resonantinduction/old/transport/vechicle/EntityTestCar.java +++ /dev/null @@ -1,32 +0,0 @@ -package resonantinduction.old.transport.vechicle; - -import net.minecraft.world.World; -import resonantinduction.old.core.recipe.RecipeLoader; - -public class EntityTestCar extends EntityVehicle -{ - - public EntityTestCar(World world) - { - super(world); - } - - public EntityTestCar(World world, float xx, float yy, float zz) - { - super(world, xx, yy, zz); - } - - @Override - public void updateClients() - { - // TODO Auto-generated method stub - - } - - @Override - public void dropAsItem() - { - this.dropItemWithOffset(RecipeLoader.itemVehicleTest.itemID, 1, 0.0F); - } - -} diff --git a/src/main/java/resonantinduction/old/transport/vechicle/EntityVehicle.java b/src/main/java/resonantinduction/old/transport/vechicle/EntityVehicle.java deleted file mode 100644 index f4c62d7d1..000000000 --- a/src/main/java/resonantinduction/old/transport/vechicle/EntityVehicle.java +++ /dev/null @@ -1,514 +0,0 @@ -package resonantinduction.old.transport.vechicle; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChatMessageComponent; -import net.minecraft.util.DamageSource; -import net.minecraft.world.World; -import resonantinduction.core.network.ISimplePacketReceiver; -import resonantinduction.old.lib.interfaces.IControlReceiver; - -import com.google.common.io.ByteArrayDataInput; - -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.network.Player; - -public abstract class EntityVehicle extends EntityAdvanced implements IControlReceiver, ISimplePacketReceiver -{ - // 1m/tick is 80km/h or 50mi/h - // 0.5/tick is 40km/h - public double speed = 0.0, maxSpeed = 0.5, turnRate = 3, acceration = .1; - - public double boatX, boatY, boatZ, boatYaw, boatPitch; - public int boatPosRotationIncrements; - - public EntityVehicle(World world) - { - super(world); - this.setSize(0.98F, 0.7F); - this.preventEntitySpawning = true; - this.ignoreFrustumCheck = true; - this.isImmuneToFire = true; - this.yOffset = 0.45f; - // PacketManagerKeyEvent.instance().register(this); - } - - public EntityVehicle(World world, double xx, double yy, double zz) - { - this(world); - this.setPosition(xx, yy + this.yOffset, zz); - } - - @Override - public boolean keyTyped(EntityPlayer player, int keycode) - { - // System.out.println("Key: " + keycode + " P: " + (player != null ? player.username : - // "null")); - if (player != null && this.riddenByEntity instanceof EntityPlayer && ((EntityPlayer) this.riddenByEntity).username.equalsIgnoreCase(player.username)) - { - boolean flag = false; - // TODO add auto forward and backwards keys like those in WoT - if (keycode == Minecraft.getMinecraft().gameSettings.keyBindForward.keyCode) - { - this.accelerate(true); - } - if (keycode == Minecraft.getMinecraft().gameSettings.keyBindBack.keyCode) - { - this.accelerate(false); - } - if (keycode == Minecraft.getMinecraft().gameSettings.keyBindLeft.keyCode) - { - this.turn(true); - } - if (keycode == Minecraft.getMinecraft().gameSettings.keyBindRight.keyCode) - { - this.turn(false); - } - // Power brakes - if (keycode == Minecraft.getMinecraft().gameSettings.keyBindJump.keyCode) - { - this.speed -= 2.f; - if (speed <= 0) - { - speed = 0; - } - } - return flag; - } - return false; - } - - @Override - public void updateRiderPosition() - { - if (this.riddenByEntity != null) - { - // Changes the player's position based on the boats rotation - double deltaX = Math.cos(this.rotationYaw * Math.PI / 180.0D + 114.8) * -0.23D; - double deltaZ = Math.sin(this.rotationYaw * Math.PI / 180.0D + 114.8) * -0.23D; - this.riddenByEntity.setPosition(this.posX + deltaX, this.posY + this.riddenByEntity.getYOffset(), this.posZ + deltaZ); - - if (this.riddenByEntity.rotationYaw > this.rotationYaw + 30) - { - this.riddenByEntity.rotationYaw = this.rotationYaw + 30; - } - if (this.riddenByEntity.rotationYaw < this.rotationYaw - 30) - { - this.riddenByEntity.rotationYaw = this.rotationYaw - 30; - } - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - if (this.riddenByEntity instanceof EntityPlayer) - { - - if (this.worldObj.isRemote) - { - ((EntityPlayer) this.riddenByEntity).sendChatToPlayer(ChatMessageComponent.createFromText("Client:RotationYaw: " + this.rotationYaw)); - } - else - { - ((EntityPlayer) this.riddenByEntity).sendChatToPlayer(ChatMessageComponent.createFromText("Server:RotationYaw: " + this.rotationYaw)); - } - } - if (this.worldObj.isRemote) - { - this.worldObj.spawnParticle("mobSpell", this.posX, this.posY, this.posZ, 0, 0, 0); - } - - if (this.worldObj.isRemote && (this.riddenByEntity == null || !(this.riddenByEntity instanceof EntityPlayer) || !FMLClientHandler.instance().getClient().thePlayer.equals(this.riddenByEntity))) - { - double x; - double y; - double z; - if (this.boatPosRotationIncrements > 0) - { - x = this.posX + (this.boatX - this.posX) / this.boatPosRotationIncrements; - y = this.posY + (this.boatY - this.posY) / this.boatPosRotationIncrements; - z = this.posZ + (this.boatZ - this.posZ) / this.boatPosRotationIncrements; - - this.rotationYaw = (float) (this.rotationYaw + net.minecraft.util.MathHelper.wrapAngleTo180_double(this.boatYaw - this.rotationYaw) / this.boatPosRotationIncrements); - this.rotationPitch = (float) (this.rotationPitch + (this.boatPitch - this.rotationPitch) / this.boatPosRotationIncrements); - --this.boatPosRotationIncrements; - this.setPosition(x, y, z); - this.setRotation(this.rotationYaw, this.rotationPitch); - } - else - { - x = this.posX + this.motionX; - y = this.posY + this.motionY; - z = this.posZ + this.motionZ; - this.setPosition(x, y, z); - - if (this.onGround) - { - this.motionX *= 0.5D; - this.motionY *= 0.5D; - this.motionZ *= 0.5D; - } - - this.motionX *= 0.9900000095367432D; - this.motionY *= 0.949999988079071D; - this.motionZ *= 0.9900000095367432D; - } - } - else - { - double currentVel; - - if (this.speed != 0.0D) - { - this.motionX = -Math.sin((this.rotationYaw * (float) Math.PI / 180.0F)) * this.speed; - this.motionZ = Math.cos((this.rotationYaw * (float) Math.PI / 180.0F)) * this.speed; - } - - currentVel = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); - - if (currentVel > this.maxSpeed) - { - double d = this.maxSpeed / currentVel; - this.motionX *= d; - this.motionZ *= d; - currentVel = this.maxSpeed; - } - this.applyFriction(); - if (this.onGround) - { - this.motionX *= 0.5D; - this.motionY *= 0.5D; - this.motionZ *= 0.5D; - } - - this.moveEntity(this.motionX, this.motionY, this.motionZ); - - if (this.isCollidedHorizontally && this.speed > .1) - { - this.motionY = .1; - } - else - { - this.motionX *= 0.9900000095367432D; - this.motionY *= 0.949999988079071D; - this.motionZ *= 0.9900000095367432D; - } - if (ticks % 5 == 0) - { - if (worldObj.isRemote) - // PacketManagerEntity.sendEntityUpdatePacket(this, this.worldObj.isRemote, - // "Desc", this.posX, this.posY, this.posZ, this.rotationYaw, - // this.rotationPitch, this.motionX, this.motionY, this.motionZ); - - if (!this.worldObj.isRemote) - { - this.updateClients(); - } - } - - } - - } - - /** Called to update all the clients with new information */ - public abstract void updateClients(); - - @Override - public boolean simplePacket(String id, ByteArrayDataInput data, Player player) - { - if (id.equalsIgnoreCase("Desc")) - { - this.setPositionRotationAndMotion(data.readDouble(), data.readDouble(), data.readDouble(), data.readFloat(), data.readFloat(), data.readDouble(), data.readDouble(), data.readDouble()); - - return true; - } - return false; - } - - public void setPositionRotationAndMotion(double x, double y, double z, float yaw, float pitch, double motX, double motY, double motZ) - { - if (this.worldObj.isRemote) - { - this.boatX = x; - this.boatY = y; - this.boatZ = z; - this.boatYaw = yaw; - this.boatPitch = pitch; - this.motionX = motX; - this.motionY = motY; - this.motionZ = motZ; - this.boatPosRotationIncrements = 5; - } - else - { - this.setPosition(x, y, z); - this.setRotation(yaw, pitch); - this.motionX = motX; - this.motionY = motY; - this.motionZ = motZ; - } - } - - public void checkCollisions() - { - if (!this.worldObj.isRemote) - { - List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.expand(0.20000000298023224D, 0.0D, 0.20000000298023224D)); - int l; - - if (list != null && !list.isEmpty()) - { - for (l = 0; l < list.size(); ++l) - { - Entity entity = (Entity) list.get(l); - - if (entity != this.riddenByEntity && entity.canBePushed()) - { - entity.applyEntityCollision(this); - } - } - } - - for (l = 0; l < 4; ++l) - { - int i1 = net.minecraft.util.MathHelper.floor_double(this.posX + ((l % 2) - 0.5D) * 0.8D); - int j1 = net.minecraft.util.MathHelper.floor_double(this.posZ + ((l / 2) - 0.5D) * 0.8D); - - for (int k1 = 0; k1 < 2; ++k1) - { - int l1 = net.minecraft.util.MathHelper.floor_double(this.posY) + k1; - int i2 = this.worldObj.getBlockId(i1, l1, j1); - - if (i2 == Block.snow.blockID) - { - this.worldObj.setBlockToAir(i1, l1, j1); - } - else if (i2 == Block.waterlily.blockID) - { - this.worldObj.destroyBlock(i1, l1, j1, true); - } - } - } - } - } - - /** - * Increases the speed by a determined amount per tick the player holds the forward key down - * - * @param forward - */ - public void accelerate(boolean forward) - { - if (forward) - { - this.speed += this.acceration; - if (this.speed > this.maxSpeed) - { - this.speed = this.maxSpeed; - } - - } - else - { - this.speed -= this.acceration; - if (this.speed < -this.maxSpeed) - { - this.speed = -this.maxSpeed; - } - - } - } - - public void turn(boolean left) - { - if (left) - { - this.rotationYaw -= this.turnRate; - } - else - { - this.rotationYaw += this.turnRate; - } - } - - /** - * By default this slows the vehicle down with a constant. However this can be used to apply - * advanced friction based on materials - */ - public void applyFriction() - { - this.motionY -= 0.03; - if (this.inWater) - { - this.speed *= 0.8; - } - if (this.isCollidedHorizontally) - { - this.speed *= 0.91; - } - else - { - this.speed *= 0.98; - } - - } - - @Override - public void setPositionAndRotation2(double d, double d1, double d2, float f, float f1, int i) - { - if (this.riddenByEntity != null) - { - if (this.riddenByEntity instanceof EntityPlayer && FMLClientHandler.instance().getClient().thePlayer.equals(this.riddenByEntity)) - { - } - else - { - this.boatPosRotationIncrements = i + 5; - this.boatX = d; - this.boatY = d1 + (this.riddenByEntity == null ? 1 : 0); - this.boatZ = d2; - this.boatYaw = f; - this.boatPitch = f1; - } - } - } - - @Override - public void performHurtAnimation() - { - this.setForwardDirection(-this.getForwardDirection()); - this.setTimeSinceHit(10); - this.setHealth(this.getHealth() * 11.0F); - } - - @Override - public boolean attackEntityFrom(DamageSource source, float damage) - { - // TODO take fire damage as heat then slowly damage the vehicle once it over heats - // TODO reflect some arrow, and bullet damage - // TODO reflect fall damage when we have only fell 6 blocks or bellow - // TODO reflect most meele damage that is not from weapons - // TODO take extra damage from explosion including damaging vehicle parts. As well knock - // player out of vehicle if it was right next to the vehicle - // TODO on damage over X amount lose cargo - // TODO ignore most spell damage as this is made of metal - // TODO ignore all potions except those that are acids - // TODO on radiation damage have the vehicle carry the radiation to damage players who use - // the vehicle - if (this.isEntityInvulnerable() || source == DamageSource.cactus) - { - return false; - } - else if (!this.worldObj.isRemote && !this.isDead) - { - this.setForwardDirection(-this.getForwardDirection()); - this.setTimeSinceHit(10); - this.setHealth(this.getHealth() + damage * 10.0F); - this.setBeenAttacked(); - boolean flag = source.getEntity() instanceof EntityPlayer && ((EntityPlayer) source.getEntity()).capabilities.isCreativeMode; - - if (flag || this.getHealth() > this.maxDamage) - { - if (this.riddenByEntity != null) - { - this.riddenByEntity.mountEntity(this); - } - - if (!flag) - { - // this.dropItemWithOffset(CoreRecipeLoader.itemVehicleTest.itemID, 1, 0.0F); - this.dropAsItem(); - } - - this.setDead(); - } - - return true; - } - else - { - return true; - } - } - - /** Called whe the vehicle is destory and should be dropped */ - public abstract void dropAsItem(); - - /** Checks if the vehicle can move, use this to check for fuel */ - public boolean canMove() - { - return true; - } - - @Override - protected boolean canTriggerWalking() - { - return true; - } - - @Override - public AxisAlignedBB getBoundingBox() - { - return this.boundingBox; - } - - @Override - public boolean canBePushed() - { - return false; - } - - @Override - public double getMountedYOffset() - { - return -.2; - } - - @Override - public boolean canBeCollidedWith() - { - return !this.isDead; - } - - @Override - protected void readEntityFromNBT(NBTTagCompound var1) - { - - } - - @Override - protected void writeEntityToNBT(NBTTagCompound var1) - { - } - - @Override - public boolean interactFirst(EntityPlayer var1) - { - if (this.worldObj.isRemote) - { - return true; - } - else - { - if (this.riddenByEntity != null) - { - var1.mountEntity(null); - return true; - } - else - { - var1.mountEntity(this); - return true; - } - } - } - -} diff --git a/src/main/java/resonantinduction/old/transport/vechicle/ItemVehicleSpawn.java b/src/main/java/resonantinduction/old/transport/vechicle/ItemVehicleSpawn.java deleted file mode 100644 index 12b894eca..000000000 --- a/src/main/java/resonantinduction/old/transport/vechicle/ItemVehicleSpawn.java +++ /dev/null @@ -1,123 +0,0 @@ -package resonantinduction.old.transport.vechicle; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.EnumMovingObjectType; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; -import resonantinduction.core.Settings; - -/** - * Basic item used to spawn a vehicle - * - * @author DarkGuardsman - */ -public class ItemVehicleSpawn extends Item -{ - public ItemVehicleSpawn() - { - super(Settings.CONFIGURATION.getItem("ItemCar",Settings.getNextItemID()).getInt()); - this.setUnlocalizedName("Vehicle"); - } - - @Override - public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) - { - float playerLook = 1.0F; - float playerPitch = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * playerLook; - float playerYaw = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * playerLook; - - // Find were the current player is looking at - double lookX = player.prevPosX + (player.posX - player.prevPosX) * playerLook; - double lookY = player.prevPosY + (player.posY - player.prevPosY) * playerLook + 1.62D - player.yOffset; - double lookZ = player.prevPosZ + (player.posZ - player.prevPosZ) * playerLook; - - Vec3 start = world.getWorldVec3Pool().getVecFromPool(lookX, lookY, lookZ); - - // Find the vector X blocks away from the player in the same direction as the player is - // looking - double searchRange = 5.0D; - float deltaX = net.minecraft.util.MathHelper.sin(-playerYaw * 0.017453292F - (float) Math.PI) * -net.minecraft.util.MathHelper.cos(-playerPitch * 0.017453292F); - float deltaY = net.minecraft.util.MathHelper.sin(-playerPitch * 0.017453292F); - float deltaZ = net.minecraft.util.MathHelper.cos(-playerYaw * 0.017453292F - (float) Math.PI) * -net.minecraft.util.MathHelper.cos(-playerPitch * 0.017453292F); - - Vec3 end = start.addVector(deltaX * searchRange, deltaY * searchRange, deltaZ * searchRange); - - // Check for collision between player look, and player look expanded - MovingObjectPosition hitObj = world.clip(start, end, true); - - if (hitObj == null) - { - return itemStack; - } - else - { - // Check for collisions using the entities collision box against the spawn location - Vec3 playerView = player.getLook(playerLook); - boolean entityInTheWay = false; - final List entities = world.getEntitiesWithinAABBExcludingEntity(player, player.boundingBox.addCoord(playerView.xCoord * searchRange, playerView.yCoord * searchRange, playerView.zCoord * searchRange).expand(1f, 1f, 1f)); - - for (int i = 0; i < entities.size(); ++i) - { - Entity checkEntity = (Entity) entities.get(i); - - if (checkEntity.canBeCollidedWith()) - { - float entityBoarderSize = checkEntity.getCollisionBorderSize(); - AxisAlignedBB boundBox = checkEntity.boundingBox.expand(entityBoarderSize, entityBoarderSize, entityBoarderSize); - - if (boundBox.isVecInside(start)) - { - entityInTheWay = true; - } - } - } - // IF an entity is in the way return - if (entityInTheWay) - { - return itemStack; - } - else - { - // Else start to calculate placement - if (hitObj.typeOfHit == EnumMovingObjectType.TILE) - { - int y = hitObj.blockY; - - // Move down if snow - if (world.getBlockId(hitObj.blockX, hitObj.blockY, hitObj.blockZ) == Block.snow.blockID) - { - --y; - } - - EntityTestCar spawnedEntity = new EntityTestCar(world, hitObj.blockX + 0.5F, y + 1.0F, hitObj.blockZ + 0.5F); - - // Last collision check using the entities collision box - if (!world.getCollidingBoundingBoxes(spawnedEntity, spawnedEntity.boundingBox.expand(-0.1D, -0.1D, -0.1D)).isEmpty()) - { - return itemStack; - } - - if (!world.isRemote) - { - world.spawnEntityInWorld(spawnedEntity); - } - - if (!player.capabilities.isCreativeMode) - { - --itemStack.stackSize; - } - } - - return itemStack; - } - } - } -}