From 2120899b202f9d3ed373d351338bbb2f2f79e381 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Mon, 23 Dec 2013 20:45:37 +0800 Subject: [PATCH] Removed quantum entangler --- build.xml | 2 +- src/resonantinduction/ClientProxy.java | 6 +- src/resonantinduction/ResonantInduction.java | 31 +++---- .../battery/ItemBlockBattery.java | 26 ++++++ .../{render => battery}/RenderBattery.java | 2 +- .../entangler/ItemQuantumEntangler.java | 80 ------------------- .../BlockEMContractor.java | 3 +- .../ItemBlockContractor.java | 2 +- .../ItemCoordLink.java | 2 +- .../{entangler => levitator}/ItemLinker.java | 2 +- .../PathfinderEMContractor.java | 2 +- .../RenderLevitator.java} | 5 +- .../ThreadEMPathfinding.java | 2 +- .../TileEntityEMContractor.java | 2 +- .../multimeter/ItemMultimeter.java | 2 +- .../render/BlockRenderingHandler.java | 7 +- src/resonantinduction/tesla/BlockTesla.java | 2 +- src/resonantinduction/wire/ItemWire.java | 1 - .../wire/{render => }/RenderFlatWire.java | 2 +- .../wire/part/PartFlatWire.java | 2 +- 20 files changed, 58 insertions(+), 125 deletions(-) create mode 100644 src/resonantinduction/battery/ItemBlockBattery.java rename src/resonantinduction/{render => battery}/RenderBattery.java (99%) delete mode 100644 src/resonantinduction/entangler/ItemQuantumEntangler.java rename src/resonantinduction/{contractor => levitator}/BlockEMContractor.java (97%) rename src/resonantinduction/{contractor => levitator}/ItemBlockContractor.java (97%) rename src/resonantinduction/{entangler => levitator}/ItemCoordLink.java (98%) rename src/resonantinduction/{entangler => levitator}/ItemLinker.java (95%) rename src/resonantinduction/{contractor => levitator}/PathfinderEMContractor.java (98%) rename src/resonantinduction/{render/RenderEMContractor.java => levitator/RenderLevitator.java} (92%) rename src/resonantinduction/{contractor => levitator}/ThreadEMPathfinding.java (94%) rename src/resonantinduction/{contractor => levitator}/TileEntityEMContractor.java (99%) rename src/resonantinduction/wire/{render => }/RenderFlatWire.java (99%) diff --git a/build.xml b/build.xml index 92259370..52099edb 100644 --- a/build.xml +++ b/build.xml @@ -29,7 +29,7 @@ - + diff --git a/src/resonantinduction/ClientProxy.java b/src/resonantinduction/ClientProxy.java index 28510b90..661d0dd4 100644 --- a/src/resonantinduction/ClientProxy.java +++ b/src/resonantinduction/ClientProxy.java @@ -6,12 +6,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; -import resonantinduction.contractor.TileEntityEMContractor; import resonantinduction.fx.FXElectricBolt; import resonantinduction.gui.GuiMultimeter; +import resonantinduction.levitator.RenderLevitator; +import resonantinduction.levitator.TileEntityEMContractor; import resonantinduction.multimeter.PartMultimeter; import resonantinduction.render.BlockRenderingHandler; -import resonantinduction.render.RenderEMContractor; import resonantinduction.render.RenderItemMultimeter; import resonantinduction.render.RenderTesla; import resonantinduction.tesla.TileEntityTesla; @@ -39,7 +39,7 @@ public class ClientProxy extends CommonProxy RenderingRegistry.registerBlockHandler(BlockRenderingHandler.INSTANCE); MinecraftForgeClient.registerItemRenderer(ResonantInduction.itemMultimeter.itemID, new RenderItemMultimeter()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTesla.class, new RenderTesla()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityEMContractor.class, new RenderEMContractor()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityEMContractor.class, new RenderLevitator()); } @Override diff --git a/src/resonantinduction/ResonantInduction.java b/src/resonantinduction/ResonantInduction.java index 19a35790..bb29ec37 100644 --- a/src/resonantinduction/ResonantInduction.java +++ b/src/resonantinduction/ResonantInduction.java @@ -19,13 +19,14 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import org.modstats.ModstatInfo; import org.modstats.Modstats; -import resonantinduction.contractor.BlockEMContractor; -import resonantinduction.contractor.ItemBlockContractor; -import resonantinduction.contractor.TileEntityEMContractor; -import resonantinduction.entangler.ItemLinker; -import resonantinduction.entangler.ItemQuantumEntangler; +import resonantinduction.battery.BlockBattery; +import resonantinduction.battery.TileEntityBattery; import resonantinduction.furnace.BlockAdvancedFurnace; import resonantinduction.furnace.TileAdvancedFurnace; +import resonantinduction.levitator.BlockEMContractor; +import resonantinduction.levitator.ItemBlockContractor; +import resonantinduction.levitator.ItemLinker; +import resonantinduction.levitator.TileEntityEMContractor; import resonantinduction.multimeter.ItemMultimeter; import resonantinduction.tesla.BlockTesla; import resonantinduction.tesla.TileEntityTesla; @@ -131,7 +132,6 @@ public class ResonantInduction } // Items - public static Item itemQuantumEntangler; public static Item itemLinker; /** * Forge Multipart @@ -174,7 +174,6 @@ public class ResonantInduction TileEntityEMContractor.PUSH_DELAY = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Contractor Item Push Delay", TileEntityEMContractor.PUSH_DELAY).getInt(TileEntityEMContractor.PUSH_DELAY); // Items - itemQuantumEntangler = new ItemQuantumEntangler(getNextItemID()); itemLinker = new ItemLinker(getNextItemID()); itemPartWire = new ItemWire(getNextItemID()); itemMultimeter = new ItemMultimeter(getNextItemID()); @@ -182,7 +181,7 @@ public class ResonantInduction // Blocks blockTesla = new BlockTesla(getNextBlockID()); blockEMContractor = new BlockEMContractor(getNextBlockID()); - // blockBattery = new BlockBattery(getNextBlockID()); + blockBattery = new BlockBattery(getNextBlockID()); if (REPLACE_FURNACE) { @@ -193,19 +192,17 @@ public class ResonantInduction CONFIGURATION.save(); - GameRegistry.registerItem(itemQuantumEntangler, itemQuantumEntangler.getUnlocalizedName()); GameRegistry.registerItem(itemLinker, itemLinker.getUnlocalizedName()); GameRegistry.registerItem(itemMultimeter, itemMultimeter.getUnlocalizedName()); GameRegistry.registerBlock(blockTesla, blockTesla.getUnlocalizedName()); GameRegistry.registerBlock(blockEMContractor, ItemBlockContractor.class, blockEMContractor.getUnlocalizedName()); - // GameRegistry.registerBlock(blockBattery, blockBattery.getUnlocalizedName()); + GameRegistry.registerBlock(blockBattery, blockBattery.getUnlocalizedName()); // Tiles GameRegistry.registerTileEntity(TileEntityTesla.class, blockTesla.getUnlocalizedName()); GameRegistry.registerTileEntity(TileEntityEMContractor.class, blockEMContractor.getUnlocalizedName()); - // GameRegistry.registerTileEntity(TileEntityBattery.class, - // blockBattery.getUnlocalizedName()); + GameRegistry.registerTileEntity(TileEntityBattery.class, blockBattery.getUnlocalizedName()); ResonantInduction.proxy.registerRenderers(); @@ -254,16 +251,9 @@ public class ResonantInduction */ final ItemStack defaultWire = EnumWireMaterial.IRON.getWire(); - /** Capacitor **/ - // GameRegistry.addRecipe(new ShapedOreRecipe(UniversalRecipe.BATTERY.get(), "RRR", "RIR", - // "RRR", 'R', Item.redstone, 'I', UniversalRecipe.PRIMARY_METAL.get())); - /** Linker **/ GameRegistry.addRecipe(new ShapedOreRecipe(itemLinker, " E ", "GCG", " E ", 'E', Item.eyeOfEnder, 'C', UniversalRecipe.BATTERY.get(), 'G', UniversalRecipe.SECONDARY_METAL.get())); - /** Quantum Entangler **/ - GameRegistry.addRecipe(new ShapedOreRecipe(itemQuantumEntangler, "EEE", "ILI", "EEE", 'E', Item.eyeOfEnder, 'L', itemLinker, 'I', UniversalRecipe.PRIMARY_METAL.get())); - /** Tesla - by Jyzarc */ GameRegistry.addRecipe(new ShapedOreRecipe(blockTesla, "WEW", " C ", " I ", 'W', defaultWire, 'E', Item.eyeOfEnder, 'C', UniversalRecipe.BATTERY.get(), 'I', UniversalRecipe.PRIMARY_PLATE.get())); @@ -271,8 +261,7 @@ public class ResonantInduction GameRegistry.addRecipe(new ShapedOreRecipe(itemMultimeter, "WWW", "ICI", 'W', defaultWire, 'C', UniversalRecipe.BATTERY.get(), 'I', UniversalRecipe.PRIMARY_METAL.get())); /** Battery */ - // GameRegistry.addRecipe(new ShapedOreRecipe(blockBattery, "III", "IRI", "III", 'R', - // Block.blockRedstone, 'I', UniversalRecipe.PRIMARY_METAL.get())); + GameRegistry.addRecipe(new ShapedOreRecipe(blockBattery, "III", "IRI", "III", 'R', Block.blockRedstone, 'I', UniversalRecipe.PRIMARY_METAL.get())); /** EM Contractor */ GameRegistry.addRecipe(new ShapedOreRecipe(blockEMContractor, " I ", "GCG", "WWW", 'W', UniversalRecipe.PRIMARY_METAL.get(), 'C', UniversalRecipe.BATTERY.get(), 'G', UniversalRecipe.SECONDARY_METAL.get(), 'I', UniversalRecipe.PRIMARY_METAL.get())); diff --git a/src/resonantinduction/battery/ItemBlockBattery.java b/src/resonantinduction/battery/ItemBlockBattery.java new file mode 100644 index 00000000..68f9bb3c --- /dev/null +++ b/src/resonantinduction/battery/ItemBlockBattery.java @@ -0,0 +1,26 @@ +package resonantinduction.battery; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import resonantinduction.levitator.TileEntityEMContractor; + +public class ItemBlockBattery extends ItemBlock +{ + public ItemBlockBattery(int id) + { + super(id); + } + + @Override + public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) + { + boolean place = super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata); + + return place; + } +} diff --git a/src/resonantinduction/render/RenderBattery.java b/src/resonantinduction/battery/RenderBattery.java similarity index 99% rename from src/resonantinduction/render/RenderBattery.java rename to src/resonantinduction/battery/RenderBattery.java index 7d6654bc..0bdb4f15 100644 --- a/src/resonantinduction/render/RenderBattery.java +++ b/src/resonantinduction/battery/RenderBattery.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.render; +package resonantinduction.battery; import java.util.Random; diff --git a/src/resonantinduction/entangler/ItemQuantumEntangler.java b/src/resonantinduction/entangler/ItemQuantumEntangler.java deleted file mode 100644 index e5c493eb..00000000 --- a/src/resonantinduction/entangler/ItemQuantumEntangler.java +++ /dev/null @@ -1,80 +0,0 @@ -package resonantinduction.entangler; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import universalelectricity.api.vector.Vector3; - -/** - * - * @author AidanBrady - * - */ -public class ItemQuantumEntangler extends ItemCoordLink -{ - private static boolean didBindThisTick = false; - - public ItemQuantumEntangler(int id) - { - super("quantumEntangler", id); - this.setMaxStackSize(1); - // TODO Handheld model, render animation, energy usage (should be easy?) - } - - @Override - public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int x, int y, int z, int side, float posX, float posY, float posZ) - { - if (!world.isRemote) - { - if (world.isAirBlock(x, y + 1, z) && world.isAirBlock(x, y + 2, z)) - { - int dimID = world.provider.dimensionId; - - entityplayer.addChatMessage("Bound Entangler to block [" + x + ", " + y + ", " + z + "], dimension '" + dimID + "'"); - setLink(itemstack, new Vector3(x, y, z), dimID); - didBindThisTick = true; - - return true; - } - - entityplayer.addChatMessage("Error: invalid block for binding!"); - } - - return false; - } - - @Override - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - if (!world.isRemote && !didBindThisTick) - { - if (!hasLink(itemstack)) - { - entityplayer.addChatMessage("Error: no block bound to Entangler!"); - return itemstack; - } - - // TELEPORT // - - Vector3 vec = getLink(itemstack); - int dimID = getLinkDim(itemstack); - - // travel to dimension if different dimID - if (world.provider.dimensionId != dimID) - { - ((EntityPlayerMP) entityplayer).travelToDimension(dimID); - } - - // actually teleport to new coords - ((EntityPlayerMP) entityplayer).playerNetServerHandler.setPlayerLocation(vec.x + 0.5, vec.y + 1, vec.z + 0.5, entityplayer.rotationYaw, entityplayer.rotationPitch); - - world.playSoundAtEntity(entityplayer, "mob.endermen.portal", 1.0F, 1.0F); - } - - didBindThisTick = false; - - return itemstack; - } - -} diff --git a/src/resonantinduction/contractor/BlockEMContractor.java b/src/resonantinduction/levitator/BlockEMContractor.java similarity index 97% rename from src/resonantinduction/contractor/BlockEMContractor.java rename to src/resonantinduction/levitator/BlockEMContractor.java index e0254fce..aba247c2 100644 --- a/src/resonantinduction/contractor/BlockEMContractor.java +++ b/src/resonantinduction/levitator/BlockEMContractor.java @@ -1,4 +1,4 @@ -package resonantinduction.contractor; +package resonantinduction.levitator; import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.player.EntityPlayer; @@ -9,7 +9,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import resonantinduction.ResonantInduction; import resonantinduction.base.BlockBase; -import resonantinduction.entangler.ItemCoordLink; import resonantinduction.render.BlockRenderingHandler; import universalelectricity.api.vector.Vector3; import cpw.mods.fml.relauncher.Side; diff --git a/src/resonantinduction/contractor/ItemBlockContractor.java b/src/resonantinduction/levitator/ItemBlockContractor.java similarity index 97% rename from src/resonantinduction/contractor/ItemBlockContractor.java rename to src/resonantinduction/levitator/ItemBlockContractor.java index 039aed77..75fec648 100644 --- a/src/resonantinduction/contractor/ItemBlockContractor.java +++ b/src/resonantinduction/levitator/ItemBlockContractor.java @@ -1,4 +1,4 @@ -package resonantinduction.contractor; +package resonantinduction.levitator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/resonantinduction/entangler/ItemCoordLink.java b/src/resonantinduction/levitator/ItemCoordLink.java similarity index 98% rename from src/resonantinduction/entangler/ItemCoordLink.java rename to src/resonantinduction/levitator/ItemCoordLink.java index df8daad7..60a9288d 100644 --- a/src/resonantinduction/entangler/ItemCoordLink.java +++ b/src/resonantinduction/levitator/ItemCoordLink.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.entangler; +package resonantinduction.levitator; import java.util.List; diff --git a/src/resonantinduction/entangler/ItemLinker.java b/src/resonantinduction/levitator/ItemLinker.java similarity index 95% rename from src/resonantinduction/entangler/ItemLinker.java rename to src/resonantinduction/levitator/ItemLinker.java index f2ca487b..b8851464 100644 --- a/src/resonantinduction/entangler/ItemLinker.java +++ b/src/resonantinduction/levitator/ItemLinker.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.entangler; +package resonantinduction.levitator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/resonantinduction/contractor/PathfinderEMContractor.java b/src/resonantinduction/levitator/PathfinderEMContractor.java similarity index 98% rename from src/resonantinduction/contractor/PathfinderEMContractor.java rename to src/resonantinduction/levitator/PathfinderEMContractor.java index eb952681..a1a04123 100644 --- a/src/resonantinduction/contractor/PathfinderEMContractor.java +++ b/src/resonantinduction/levitator/PathfinderEMContractor.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.contractor; +package resonantinduction.levitator; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/resonantinduction/render/RenderEMContractor.java b/src/resonantinduction/levitator/RenderLevitator.java similarity index 92% rename from src/resonantinduction/render/RenderEMContractor.java rename to src/resonantinduction/levitator/RenderLevitator.java index e95526bc..f5bcfd21 100644 --- a/src/resonantinduction/render/RenderEMContractor.java +++ b/src/resonantinduction/levitator/RenderLevitator.java @@ -1,4 +1,4 @@ -package resonantinduction.render; +package resonantinduction.levitator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -7,10 +7,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import resonantinduction.ResonantInduction; -import resonantinduction.contractor.TileEntityEMContractor; import resonantinduction.model.ModelEMContractor; -public class RenderEMContractor extends TileEntitySpecialRenderer +public class RenderLevitator extends TileEntitySpecialRenderer { public static final ModelEMContractor MODEL = new ModelEMContractor(false); public static final ModelEMContractor MODEL_SPIN = new ModelEMContractor(true); diff --git a/src/resonantinduction/contractor/ThreadEMPathfinding.java b/src/resonantinduction/levitator/ThreadEMPathfinding.java similarity index 94% rename from src/resonantinduction/contractor/ThreadEMPathfinding.java rename to src/resonantinduction/levitator/ThreadEMPathfinding.java index 858deab6..22a7c2b8 100644 --- a/src/resonantinduction/contractor/ThreadEMPathfinding.java +++ b/src/resonantinduction/levitator/ThreadEMPathfinding.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.contractor; +package resonantinduction.levitator; import universalelectricity.api.vector.Vector3; diff --git a/src/resonantinduction/contractor/TileEntityEMContractor.java b/src/resonantinduction/levitator/TileEntityEMContractor.java similarity index 99% rename from src/resonantinduction/contractor/TileEntityEMContractor.java rename to src/resonantinduction/levitator/TileEntityEMContractor.java index 8b06ad72..74eb2490 100644 --- a/src/resonantinduction/contractor/TileEntityEMContractor.java +++ b/src/resonantinduction/levitator/TileEntityEMContractor.java @@ -1,4 +1,4 @@ -package resonantinduction.contractor; +package resonantinduction.levitator; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/resonantinduction/multimeter/ItemMultimeter.java b/src/resonantinduction/multimeter/ItemMultimeter.java index 07d33a66..bf48069d 100644 --- a/src/resonantinduction/multimeter/ItemMultimeter.java +++ b/src/resonantinduction/multimeter/ItemMultimeter.java @@ -34,7 +34,7 @@ public class ItemMultimeter extends JItemMultiPart @Override public TMultiPart newPart(ItemStack itemStack, EntityPlayer player, World world, BlockCoord pos, int side, Vector3 hit) { - BlockCoord onPos = pos.copy().offset(side ^ 1); + pos.offset(side ^ 1, -1); PartMultimeter part = (PartMultimeter) MultiPartRegistry.createPart("resonant_induction_multimeter", false); if (part != null) diff --git a/src/resonantinduction/render/BlockRenderingHandler.java b/src/resonantinduction/render/BlockRenderingHandler.java index 896f7888..2d14bf0b 100644 --- a/src/resonantinduction/render/BlockRenderingHandler.java +++ b/src/resonantinduction/render/BlockRenderingHandler.java @@ -9,7 +9,8 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import resonantinduction.contractor.BlockEMContractor; +import resonantinduction.levitator.BlockEMContractor; +import resonantinduction.levitator.RenderLevitator; import resonantinduction.tesla.BlockTesla; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; @@ -44,8 +45,8 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glPushMatrix(); GL11.glTranslated(0.5, 1.5, 0.5); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderEMContractor.TEXTURE); - RenderEMContractor.MODEL.render(0.0625f); + FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderLevitator.TEXTURE); + RenderLevitator.MODEL.render(0.0625f); GL11.glPopMatrix(); } /*else if (block instanceof BlockBattery) diff --git a/src/resonantinduction/tesla/BlockTesla.java b/src/resonantinduction/tesla/BlockTesla.java index 94a26422..dec31bca 100644 --- a/src/resonantinduction/tesla/BlockTesla.java +++ b/src/resonantinduction/tesla/BlockTesla.java @@ -11,7 +11,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import resonantinduction.ResonantInduction; import resonantinduction.base.BlockBase; -import resonantinduction.entangler.ItemCoordLink; +import resonantinduction.levitator.ItemCoordLink; import resonantinduction.render.BlockRenderingHandler; import universalelectricity.api.vector.Vector3; import cpw.mods.fml.relauncher.Side; diff --git a/src/resonantinduction/wire/ItemWire.java b/src/resonantinduction/wire/ItemWire.java index e16afc15..b89f6625 100644 --- a/src/resonantinduction/wire/ItemWire.java +++ b/src/resonantinduction/wire/ItemWire.java @@ -14,7 +14,6 @@ import resonantinduction.ResonantInduction; import resonantinduction.TabRI; import resonantinduction.Utility; import resonantinduction.wire.part.PartFlatWire; -import resonantinduction.wire.render.RenderFlatWire; import universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay.Unit; import codechicken.lib.vec.BlockCoord; diff --git a/src/resonantinduction/wire/render/RenderFlatWire.java b/src/resonantinduction/wire/RenderFlatWire.java similarity index 99% rename from src/resonantinduction/wire/render/RenderFlatWire.java rename to src/resonantinduction/wire/RenderFlatWire.java index f51834a7..25e4d5dc 100644 --- a/src/resonantinduction/wire/render/RenderFlatWire.java +++ b/src/resonantinduction/wire/RenderFlatWire.java @@ -1,4 +1,4 @@ -package resonantinduction.wire.render; +package resonantinduction.wire; import java.util.Arrays; import java.util.LinkedList; diff --git a/src/resonantinduction/wire/part/PartFlatWire.java b/src/resonantinduction/wire/part/PartFlatWire.java index 37c0df56..33f58ce0 100644 --- a/src/resonantinduction/wire/part/PartFlatWire.java +++ b/src/resonantinduction/wire/part/PartFlatWire.java @@ -16,7 +16,7 @@ import org.lwjgl.opengl.GL11; import resonantinduction.ResonantInduction; import resonantinduction.Utility; import resonantinduction.wire.EnumWireMaterial; -import resonantinduction.wire.render.RenderFlatWire; +import resonantinduction.wire.RenderFlatWire; import codechicken.lib.colour.Colour; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput;