tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Reorganized and refactored half of everything

Browse source
This commit is contained in:
Calclavia 2014-01-08 21:24:25 +08:00
parent 03df09471b
commit 0f2a7fad45
179 changed files with 316 additions and 1184 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/resonantinduction/assemblyline/ALRecipeLoader.java
View file

@ -7,8 +7,8 @@ import resonantinduction.assemblyline.fluid.pipes.FluidPartsMaterial;
import resonantinduction.assemblyline.item.EnumTool;
import resonantinduction.assemblyline.item.ItemOreDirv;
import resonantinduction.assemblyline.item.ItemParts.Parts;
import resonantinduction.assemblyline.machine.BlockCrate;
import resonantinduction.assemblyline.machine.processor.BlockProcessor;
import resonantinduction.mechanics.processor.BlockProcessor;
import resonantinduction.transport.crate.BlockCrate;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

40
src/main/java/resonantinduction/assemblyline/AssemblyLine.java
View file

@ -71,28 +71,28 @@ import resonantinduction.assemblyline.item.ItemParts;
import resonantinduction.assemblyline.item.ItemReadoutTools;
import resonantinduction.assemblyline.item.ItemWrench;
import resonantinduction.assemblyline.item.ItemParts.Parts;
import resonantinduction.assemblyline.machine.BlockCrate;
import resonantinduction.assemblyline.machine.BlockDebug;
import resonantinduction.assemblyline.machine.BlockDetector;
import resonantinduction.assemblyline.machine.BlockEnergyStorage;
import resonantinduction.assemblyline.machine.BlockManipulator;
import resonantinduction.assemblyline.machine.BlockRejector;
import resonantinduction.assemblyline.machine.BlockReleaseValve;
import resonantinduction.assemblyline.machine.BlockSink;
import resonantinduction.assemblyline.machine.BlockTank;
import resonantinduction.assemblyline.machine.BlockTurntable;
import resonantinduction.assemblyline.machine.ItemBlockCrate;
import resonantinduction.assemblyline.machine.ItemBlockEnergyStorage;
import resonantinduction.assemblyline.machine.ItemFluidCan;
import resonantinduction.assemblyline.machine.TileEntityAssembly;
import resonantinduction.assemblyline.machine.belt.BlockConveyorBelt;
import resonantinduction.assemblyline.machine.encoder.BlockEncoder;
import resonantinduction.assemblyline.machine.encoder.ItemDisk;
import resonantinduction.assemblyline.machine.processor.BlockProcessor;
import resonantinduction.assemblyline.network.PacketIDTile;
import resonantinduction.assemblyline.redstone.BlockAdvancedHopper;
import resonantinduction.assemblyline.transmit.BlockWire;
import resonantinduction.assemblyline.transmit.ItemBlockWire;
import resonantinduction.core.debug.BlockDebug;
import resonantinduction.core.network.PacketIDTile;
import resonantinduction.energy.battery.BlockEnergyStorage;
import resonantinduction.energy.battery.ItemBlockEnergyStorage;
import resonantinduction.mechanics.processor.BlockProcessor;
import resonantinduction.transport.BlockTurntable;
import resonantinduction.transport.belt.BlockConveyorBelt;
import resonantinduction.transport.crate.BlockCrate;
import resonantinduction.transport.crate.ItemBlockCrate;
import resonantinduction.transport.encoder.BlockEncoder;
import resonantinduction.transport.encoder.ItemDisk;
import resonantinduction.transport.fluid.BlockKitchenSink;
import resonantinduction.transport.fluid.BlockReleaseValve;
import resonantinduction.transport.fluid.BlockTank;
import resonantinduction.transport.fluid.ItemFluidCan;
import resonantinduction.transport.hopper.BlockAdvancedHopper;
import resonantinduction.transport.logistic.BlockDetector;
import resonantinduction.transport.logistic.BlockManipulator;
import resonantinduction.transport.logistic.BlockRejector;
import calclavia.lib.network.PacketHandler;
import calclavia.lib.ore.OreGenReplaceStone;
import calclavia.lib.ore.OreGenerator;
@ -300,7 +300,7 @@ public class AssemblyLine
ALRecipeLoader.blockReleaseValve = CoreRegistry.createNewBlock("FMBlockReleaseValve", AssemblyLine.MOD_ID, BlockReleaseValve.class, ItemBlockHolder.class);
ALRecipeLoader.blockTank = CoreRegistry.createNewBlock("FMBlockTank", AssemblyLine.MOD_ID, BlockTank.class, ItemBlockPipe.class);
ALRecipeLoader.blockSink = CoreRegistry.createNewBlock("FMBlockSink", AssemblyLine.MOD_ID, BlockSink.class, ItemBlockHolder.class);
ALRecipeLoader.blockSink = CoreRegistry.createNewBlock("FMBlockSink", AssemblyLine.MOD_ID, BlockKitchenSink.class, ItemBlockHolder.class);
ALRecipeLoader.blockDrain = CoreRegistry.createNewBlock("FMBlockDrain", AssemblyLine.MOD_ID, BlockDrain.class, ItemBlockHolder.class);
ALRecipeLoader.blockConPump = CoreRegistry.createNewBlock("FMBlockConstructionPump", AssemblyLine.MOD_ID, BlockConstructionPump.class, ItemBlockHolder.class);
ALRecipeLoader.blockSteamGen = CoreRegistry.createNewBlock("DMBlockSteamMachine", AssemblyLine.MOD_ID, BlockSmallSteamGen.class, ItemBlockHolder.class);

12
src/main/java/resonantinduction/assemblyline/CommonProxy.java
View file

@ -10,12 +10,12 @@ import resonantinduction.assemblyline.generators.ContainerCoalGenerator;
import resonantinduction.assemblyline.generators.TileEntitySteamGen;
import resonantinduction.assemblyline.imprinter.ContainerImprinter;
import resonantinduction.assemblyline.imprinter.TileEntityImprinter;
import resonantinduction.assemblyline.machine.ContainerBatteryBox;
import resonantinduction.assemblyline.machine.TileEntityBatteryBox;
import resonantinduction.assemblyline.machine.encoder.ContainerEncoder;
import resonantinduction.assemblyline.machine.encoder.TileEntityEncoder;
import resonantinduction.assemblyline.machine.processor.ContainerProcessor;
import resonantinduction.assemblyline.machine.processor.TileEntityProcessor;
import resonantinduction.energy.battery.ContainerBatteryBox;
import resonantinduction.energy.battery.TileEntityBatteryBox;
import resonantinduction.mechanics.processor.ContainerProcessor;
import resonantinduction.mechanics.processor.TileEntityProcessor;
import resonantinduction.transport.encoder.ContainerEncoder;
import resonantinduction.transport.encoder.TileEntityEncoder;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;

2
src/main/java/resonantinduction/assemblyline/armbot/TileEntityArmbot.java
View file

@ -11,7 +11,7 @@ import resonantinduction.assemblyline.armbot.command.TaskGrabItem;
import resonantinduction.assemblyline.armbot.command.TaskReturn;
import resonantinduction.assemblyline.armbot.command.TaskRotateTo;
import resonantinduction.assemblyline.machine.TileEntityAssembly;
import resonantinduction.assemblyline.machine.encoder.ItemDisk;
import resonantinduction.transport.encoder.ItemDisk;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.item.EntityItem;

14
src/main/java/resonantinduction/assemblyline/client/ClientProxy.java
View file

@ -28,12 +28,12 @@ import resonantinduction.assemblyline.fluid.pipes.TileEntityPipe;
import resonantinduction.assemblyline.fluid.pump.TileEntityConstructionPump;
import resonantinduction.assemblyline.fluid.pump.TileEntityStarterPump;
import resonantinduction.assemblyline.imprinter.TileEntityImprinter;
import resonantinduction.assemblyline.machine.TileEntityBatteryBox;
import resonantinduction.assemblyline.machine.TileEntityReleaseValve;
import resonantinduction.assemblyline.machine.TileEntitySink;
import resonantinduction.assemblyline.machine.TileEntityTank;
import resonantinduction.assemblyline.machine.encoder.TileEntityEncoder;
import resonantinduction.assemblyline.machine.processor.TileEntityProcessor;
import resonantinduction.energy.battery.TileEntityBatteryBox;
import resonantinduction.mechanics.processor.TileEntityProcessor;
import resonantinduction.transport.encoder.TileEntityEncoder;
import resonantinduction.transport.fluid.TileEntityReleaseValve;
import resonantinduction.transport.fluid.TileEntityTank;
import resonantinduction.transport.fluid.TileKitchenSink;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.renderer.entity.RenderSnowball;
import net.minecraft.entity.player.EntityPlayer;
@ -70,7 +70,7 @@ public class ClientProxy extends CommonProxy
//ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRod.class, new RenderGearRod());
//ClientRegistry.bindTileEntitySpecialRenderer(TileEntityGenerator.class, new RenderGenerator());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityReleaseValve.class, new RenderReleaseValve());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySink.class, new RenderSink());
ClientRegistry.bindTileEntitySpecialRenderer(TileKitchenSink.class, new RenderSink());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityConstructionPump.class, new RenderConstructionPump());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTank.class, new RenderTank());

4
src/main/java/resonantinduction/assemblyline/client/gui/GuiBatteryBox.java
View file

@ -8,8 +8,8 @@ import net.minecraft.util.StatCollector;
import org.lwjgl.opengl.GL11;
import resonantinduction.assemblyline.AssemblyLine;
import resonantinduction.assemblyline.machine.ContainerBatteryBox;
import resonantinduction.assemblyline.machine.TileEntityBatteryBox;
import resonantinduction.energy.battery.ContainerBatteryBox;
import resonantinduction.energy.battery.TileEntityBatteryBox;
import universalelectricity.api.energy.UnitDisplay;
import universalelectricity.api.energy.UnitDisplay.Unit;
import cpw.mods.fml.relauncher.Side;

2
src/main/java/resonantinduction/assemblyline/client/gui/GuiEncoderCoder.java
View file

@ -6,7 +6,7 @@ import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
import resonantinduction.assemblyline.machine.encoder.TileEntityEncoder;
import resonantinduction.transport.encoder.TileEntityEncoder;
import com.builtbroken.minecraft.prefab.invgui.GuiButtonImage;
import com.builtbroken.minecraft.prefab.invgui.GuiButtonImage.ButtonIcon;

2
src/main/java/resonantinduction/assemblyline/client/gui/GuiEncoderHelp.java
View file

@ -1,7 +1,7 @@
package resonantinduction.assemblyline.client.gui;
import resonantinduction.assemblyline.AssemblyLine;
import resonantinduction.assemblyline.machine.encoder.TileEntityEncoder;
import resonantinduction.transport.encoder.TileEntityEncoder;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation;

4
src/main/java/resonantinduction/assemblyline/client/gui/GuiEncoderInventory.java
View file

@ -6,8 +6,8 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import resonantinduction.assemblyline.AssemblyLine;
import resonantinduction.assemblyline.machine.encoder.ContainerEncoder;
import resonantinduction.assemblyline.machine.encoder.TileEntityEncoder;
import resonantinduction.transport.encoder.ContainerEncoder;
import resonantinduction.transport.encoder.TileEntityEncoder;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

4
src/main/java/resonantinduction/assemblyline/client/gui/GuiProcessor.java
View file

@ -8,8 +8,8 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import resonantinduction.assemblyline.AssemblyLine;
import resonantinduction.assemblyline.machine.processor.ContainerProcessor;
import resonantinduction.assemblyline.machine.processor.TileEntityProcessor;
import resonantinduction.mechanics.processor.ContainerProcessor;
import resonantinduction.mechanics.processor.TileEntityProcessor;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/main/java/resonantinduction/assemblyline/client/gui/GuiTaskList.java
View file

@ -12,7 +12,7 @@ import resonantinduction.assemblyline.api.coding.ITask;
import resonantinduction.assemblyline.armbot.command.TaskEnd;
import resonantinduction.assemblyline.armbot.command.TaskIdle;
import resonantinduction.assemblyline.armbot.command.TaskStart;
import resonantinduction.assemblyline.machine.encoder.TileEntityEncoder;
import resonantinduction.transport.encoder.TileEntityEncoder;
import com.builtbroken.minecraft.interfaces.IScroll;

2
src/main/java/resonantinduction/assemblyline/client/render/BlockRenderingHandler.java
View file

@ -16,7 +16,7 @@ import resonantinduction.assemblyline.client.model.ModelMachine;
import resonantinduction.assemblyline.client.model.ModelManipulator;
import resonantinduction.assemblyline.client.model.ModelRejectorPiston;
import resonantinduction.assemblyline.client.model.ModelSolarPanel;
import resonantinduction.assemblyline.redstone.BlockAdvancedHopper;
import resonantinduction.transport.hopper.BlockAdvancedHopper;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;

2
src/main/java/resonantinduction/assemblyline/client/render/ItemRenderFluidCan.java
View file

@ -11,7 +11,7 @@ import org.lwjgl.opengl.GL11;
import resonantinduction.assemblyline.ALRecipeLoader;
import resonantinduction.assemblyline.AssemblyLine;
import resonantinduction.assemblyline.client.model.ModelSmallFluidCan;
import resonantinduction.assemblyline.machine.ItemFluidCan;
import resonantinduction.transport.fluid.ItemFluidCan;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/main/java/resonantinduction/assemblyline/client/render/ItemTankRenderer.java
View file

@ -12,7 +12,7 @@ import org.lwjgl.opengl.GL11;
import resonantinduction.assemblyline.ALRecipeLoader;
import resonantinduction.assemblyline.AssemblyLine;
import resonantinduction.assemblyline.client.model.ModelTankSide;
import resonantinduction.assemblyline.machine.BlockTank;
import resonantinduction.transport.fluid.BlockTank;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/main/java/resonantinduction/assemblyline/client/render/RenderAdvancedHopper.java
View file

@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11;
import resonantinduction.assemblyline.AssemblyLine;
import resonantinduction.assemblyline.client.model.ModelAdvancedHopper;
import resonantinduction.assemblyline.redstone.TileEntityAdvancedHopper;
import resonantinduction.transport.hopper.TileEntityAdvancedHopper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

4
src/main/java/resonantinduction/assemblyline/client/render/RenderConveyorBelt.java
View file

@ -9,8 +9,8 @@ import org.lwjgl.opengl.GL11;
import resonantinduction.assemblyline.AssemblyLine;
import resonantinduction.assemblyline.client.model.ModelAngledBelt;
import resonantinduction.assemblyline.client.model.ModelConveyorBelt;
import resonantinduction.assemblyline.machine.belt.TileEntityConveyorBelt;
import resonantinduction.assemblyline.machine.belt.TileEntityConveyorBelt.SlantType;
import resonantinduction.transport.belt.TileEntityConveyorBelt;
import resonantinduction.transport.belt.TileEntityConveyorBelt.SlantType;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/main/java/resonantinduction/assemblyline/client/render/RenderCrate.java
View file

@ -17,7 +17,7 @@ import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import resonantinduction.assemblyline.machine.TileEntityCrate;
import resonantinduction.transport.crate.TileEntityCrate;
import universalelectricity.api.vector.Vector3;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/main/java/resonantinduction/assemblyline/client/render/RenderManipulator.java
View file

@ -7,7 +7,7 @@ import org.lwjgl.opengl.GL11;
import resonantinduction.assemblyline.AssemblyLine;
import resonantinduction.assemblyline.client.model.ModelManipulator;
import resonantinduction.assemblyline.machine.TileEntityManipulator;
import resonantinduction.transport.logistic.TileEntityManipulator;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

6
src/main/java/resonantinduction/assemblyline/client/render/RenderMiningLaser.java
View file

@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11;
import resonantinduction.assemblyline.AssemblyLine;
import resonantinduction.assemblyline.client.model.ModelLaserTile;
import resonantinduction.assemblyline.machine.TileLaserSentry;
import resonantinduction.mechanics.mining.TileMiningLaser;
/** @author Darkguardsman */
public class RenderMiningLaser extends TileEntitySpecialRenderer
@ -25,9 +25,9 @@ public class RenderMiningLaser extends TileEntitySpecialRenderer
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 TileLaserSentry)
if (tileEntity instanceof TileMiningLaser)
{
float yaw = ((TileLaserSentry) tileEntity).getYaw() - 90;
float yaw = ((TileMiningLaser) tileEntity).getYaw() - 90;
GL11.glRotatef(yaw, 0, 1, 0);
}
model.renderAll();

2
src/main/java/resonantinduction/assemblyline/client/render/RenderProcessor.java
View file

@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11;
import resonantinduction.assemblyline.AssemblyLine;
import resonantinduction.assemblyline.client.model.ModelCrusher;
import resonantinduction.assemblyline.client.model.ModelGrinder;
import resonantinduction.assemblyline.machine.processor.TileEntityProcessor;
import resonantinduction.mechanics.processor.TileEntityProcessor;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/main/java/resonantinduction/assemblyline/client/render/RenderRejector.java
View file

@ -7,7 +7,7 @@ import org.lwjgl.opengl.GL11;
import resonantinduction.assemblyline.AssemblyLine;
import resonantinduction.assemblyline.client.model.ModelRejectorPiston;
import resonantinduction.assemblyline.machine.TileEntityRejector;
import resonantinduction.transport.logistic.TileEntityRejector;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/main/java/resonantinduction/assemblyline/client/render/RenderReleaseValve.java
View file

@ -9,7 +9,7 @@ import org.lwjgl.opengl.GL11;
import resonantinduction.assemblyline.AssemblyLine;
import resonantinduction.assemblyline.client.model.ModelLargePipe;
import resonantinduction.assemblyline.client.model.ModelReleaseValve;
import resonantinduction.assemblyline.machine.TileEntityReleaseValve;
import resonantinduction.transport.fluid.TileEntityReleaseValve;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/main/java/resonantinduction/assemblyline/client/render/RenderTank.java
View file

@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidStack;
import org.lwjgl.opengl.GL11;
import resonantinduction.assemblyline.client.model.ModelTankSide;
import resonantinduction.assemblyline.machine.TileEntityTank;
import resonantinduction.transport.fluid.TileEntityTank;
import com.builtbroken.minecraft.helpers.ColorCode;

2
src/main/java/resonantinduction/assemblyline/entities/prefab/EntityVehicle.java
View file

@ -2,7 +2,7 @@ package resonantinduction.assemblyline.entities.prefab;
import java.util.List;
import resonantinduction.assemblyline.network.ISimplePacketReceiver;
import resonantinduction.core.network.ISimplePacketReceiver;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;

2
src/main/java/resonantinduction/assemblyline/fluid/pipes/ItemBlockPipe.java
View file

@ -4,7 +4,7 @@ import java.util.List;
import resonantinduction.assemblyline.ALRecipeLoader;
import resonantinduction.assemblyline.fluid.prefab.TileEntityFluidNetworkTile;
import resonantinduction.assemblyline.machine.TileEntityTank;
import resonantinduction.transport.fluid.TileEntityTank;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;

2
src/main/java/resonantinduction/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java
View file

@ -25,7 +25,7 @@ import resonantinduction.assemblyline.api.fluid.FluidMasterList;
import resonantinduction.assemblyline.api.fluid.INetworkFluidPart;
import resonantinduction.assemblyline.fluid.network.NetworkFluidTiles;
import resonantinduction.assemblyline.fluid.pipes.FluidPartsMaterial;
import resonantinduction.assemblyline.network.ISimplePacketReceiver;
import resonantinduction.core.network.ISimplePacketReceiver;
import universalelectricity.api.vector.Vector3;
import calclavia.lib.network.PacketHandler;

2
src/main/java/resonantinduction/assemblyline/generators/TileEntitySolarBox.java
View file

@ -1,6 +1,6 @@
package resonantinduction.assemblyline.generators;
import resonantinduction.assemblyline.machine.TileEntityGenerator;
import resonantinduction.energy.generator.TileEntityGenerator;
/** TileEntity that acts as the connection node for the solar panel */
public class TileEntitySolarBox extends TileEntityGenerator

2
src/main/java/resonantinduction/assemblyline/generators/TileEntitySolarPanel.java
View file

@ -2,7 +2,7 @@ package resonantinduction.assemblyline.generators;
import java.util.EnumSet;
import resonantinduction.assemblyline.machine.TileEntityGenerator;
import resonantinduction.energy.generator.TileEntityGenerator;
import micdoodle8.mods.galacticraft.api.world.ISolarLevel;
import net.minecraftforge.common.ForgeDirection;

2
src/main/java/resonantinduction/assemblyline/item/ItemReadoutTools.java
View file

@ -3,7 +3,7 @@ package resonantinduction.assemblyline.item;
import java.util.List;
import resonantinduction.assemblyline.AssemblyLine;
import resonantinduction.assemblyline.machine.TileEntityGenerator;
import resonantinduction.energy.generator.TileEntityGenerator;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;

18
src/main/java/resonantinduction/assemblyline/machine/BlockTransformer.java
View file

@ -1,18 +0,0 @@
package resonantinduction.assemblyline.machine;
import resonantinduction.assemblyline.AssemblyLine;
import resonantinduction.assemblyline.IndustryTabs;
import net.minecraft.block.material.Material;
import net.minecraftforge.common.Configuration;
import universalelectricity.api.UniversalElectricity;
import com.builtbroken.minecraft.prefab.BlockMachine;
public class BlockTransformer extends BlockMachine
{
public BlockTransformer(Configuration config, String blockName, Material material)
{
super(AssemblyLine.CONFIGURATION, "Transformer", UniversalElectricity.machine);
this.setCreativeTab(IndustryTabs.tabIndustrial());
}
}

66
src/main/java/resonantinduction/assemblyline/machine/TileGasBurner.java
View file

@ -1,66 +0,0 @@
package resonantinduction.assemblyline.machine;
import resonantinduction.assemblyline.fluid.GasTank;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import com.builtbroken.minecraft.prefab.TileEntityMachine;
/** @author Archadia */
public class TileGasBurner extends TileEntityMachine implements IFluidHandler
{
GasTank tank = new GasTank(5000);
public TileGasBurner()
{
}
@Override
public int fill(ForgeDirection from, FluidStack resource, boolean doFill)
{
if (resource != null)
{
if (resource.getFluid().isGaseous())
{
return 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 true;
}
@Override
public boolean canDrain(ForgeDirection from, Fluid fluid)
{
return false;
}
@Override
public FluidTankInfo[] getTankInfo(ForgeDirection from)
{
return null;
}
}

147
src/main/java/resonantinduction/assemblyline/machine/TileGasCombustionEngine.java
View file

@ -1,147 +0,0 @@
package resonantinduction.assemblyline.machine;
import resonantinduction.assemblyline.fluid.EnumGas;
import resonantinduction.assemblyline.fluid.GasTank;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
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;
import com.builtbroken.minecraft.prefab.TileEntityAdvanced;
import com.builtbroken.minecraft.tilenetwork.ITileConnector.Connection;
/** Combustion engine that runs off of gas fluid such as methain, propain, and butane
*
* @author DarkGuardsman, Archadia */
public class TileGasCombustionEngine extends TileEntityAdvanced implements IFluidHandler
{
/** Tank which fuel is stored. */
protected GasTank fuelTank = new GasTank(1000);
/** Oil that that is used to keep the engine parts moving smoothly */
protected FluidTank oilTank = new FluidTank(1000);
/** Direction in which the engine is facing */
protected ForgeDirection face = ForgeDirection.UP;
float speed = 0.0f, spinUpSpeed = 20f, spinDownSpeed = 10f, maxSpeed = 1000f;
float force = 0.0f, appliedForce;
int animation = 0;
//TODO balance
int mbFuelPerTick = 10, tickPerOilDrain = 1000;
int damage = 0, maxDamage = 10;
@Override
public void updateEntity()
{
super.updateEntity();
if (damage >= maxDamage)
{
//TODO go boom
}
if (this.ticks % tickPerOilDrain == 0)
{
if (this.oilTank.drain(1, false) != null)
{
this.oilTank.drain(1, true);
}
else
{
damage += 1;
}
}
if (fuelTank.getFluid() != null && this.isValidFuel(fuelTank.getFluid()) && fuelTank.getFluidAmount() > mbFuelPerTick)
{
fuelTank.drain(mbFuelPerTick, true);
speed += spinUpSpeed;
}
else if (speed > 0)
{
this.speed -= spinDownSpeed;
if (speed < 0)
{
speed = 0;
}
}
}
public boolean isValidFuel(FluidStack stack)
{
return stack != null && stack.fluidID == FluidRegistry.getFluidID(EnumGas.METHANE.getGas().getName());
}
public boolean canTileConnect(Connection type, ForgeDirection dir)
{
if (type == Connection.FLUIDS && dir != face)
{
return true;
}
if (type == Connection.FORCE && (dir == face || dir == face.getOpposite()))
{
return true;
}
return false;
}
/* 8888888888888888888888888888888888888888888888888888888888888
* Force calculation stuff
* 888888888888888888888888888888888888888888888888888888888888 */
//TODO re-add
/* 8888888888888888888888888888888888888888888888888888888888888
*Fluid Tank Stuff
* 888888888888888888888888888888888888888888888888888888888888 */
@Override
public int fill(ForgeDirection from, FluidStack resource, boolean doFill)
{
if (from != face)
{
return fuelTank.fill(resource, doFill);
}
return 0;
}
@Override
public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain)
{
if (from != face && fuelTank.getFluid() != null && resource != null && fuelTank.getFluid().isFluidEqual(resource))
{
return fuelTank.drain(resource.amount, doDrain);
}
return null;
}
@Override
public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain)
{
if (from != face)
{
return fuelTank.drain(maxDrain, doDrain);
}
return null;
}
@Override
public boolean canFill(ForgeDirection from, Fluid fluid)
{
return from != face;
}
@Override
public boolean canDrain(ForgeDirection from, Fluid fluid)
{
return from != face;
}
@Override
public FluidTankInfo[] getTankInfo(ForgeDirection from)
{
if (from != face)
{
return new FluidTankInfo[] { fuelTank.getInfo() };
}
return null;
}
}

19
src/main/java/resonantinduction/assemblyline/redstone/BlockPistonPlus.java
View file

@ -1,19 +0,0 @@
package resonantinduction.assemblyline.redstone;
import resonantinduction.assemblyline.AssemblyLine;
import net.minecraft.block.material.Material;
import com.builtbroken.minecraft.prefab.BlockMachine;
/** This will be a piston that can extend from 1 - 20 depending on teir and user settings
*
* @author Guardsman */
public class BlockPistonPlus extends BlockMachine
{
public BlockPistonPlus()
{
super(AssemblyLine.CONFIGURATION, "DMPiston", Material.piston);
}
}

20
src/main/java/resonantinduction/assemblyline/redstone/TileEntityPistonPlus.java
View file

@ -1,20 +0,0 @@
package resonantinduction.assemblyline.redstone;
import universalelectricity.api.vector.Vector3;
import com.builtbroken.minecraft.interfaces.IMultiBlock;
import com.builtbroken.minecraft.prefab.TileEntityMachine;
public class TileEntityPistonPlus extends TileEntityMachine implements IMultiBlock
{
int extensionLimit = 1;
boolean isExtended = false;
@Override
public Vector3[] getMultiBlockVectors()
{
// TODO Auto-generated method stub
return null;
}
}

292
src/main/java/resonantinduction/assemblyline/transmit/BlockWire.java
View file

@ -1,292 +0,0 @@
package resonantinduction.assemblyline.transmit;
import java.util.List;
import java.util.Set;
import resonantinduction.assemblyline.ALRecipeLoader;
import resonantinduction.assemblyline.AssemblyLine;
import resonantinduction.assemblyline.IndustryTabs;
import resonantinduction.assemblyline.client.render.RenderBlockWire;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.Icon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.oredict.OreDictionary;
import universalelectricity.api.vector.Vector3;
import com.builtbroken.common.Pair;
import com.builtbroken.minecraft.prefab.BlockMachine;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockWire extends BlockMachine
{
public static float wireResistance = 0.001f;
public static long energyMax = 100000;
public boolean isWireCollision = true;
public Vector3 minVector = new Vector3(0.3, 0.3, 0.3);
public Vector3 maxVector = new Vector3(0.7, 0.7, 0.7);
@SideOnly(Side.CLIENT)
public Icon wireIcon;
public BlockWire()
{
super(AssemblyLine.CONFIGURATION, "DMWire", Material.cloth);
this.setStepSound(soundClothFootstep);
this.setResistance(0.2F);
this.setHardness(0.1f);
this.setBlockBounds(0.3f, 0.3f, 0.3f, 0.7f, 0.7f, 0.7f);
Block.setBurnProperties(this.blockID, 30, 60);
this.setCreativeTab(IndustryTabs.tabIndustrial());
}
@Override
public void registerIcons(IconRegister par1IconRegister)
{
this.wireIcon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + "CopperWire");
}
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int meta)
{
if (meta == 17)
{
return this.blockIcon;
}
return Block.blockRedstone.getIcon(side, 0);
}
@Override
public boolean isOpaqueCube()
{
return false;
}
@Override
public int getRenderType()
{
return this.zeroRendering ? 0 : -1;
}
@Override
public TileEntity createTileEntity(World world, int metadata)
{
if (metadata == 1)
{
return new TileEntityDetectorWire();
}
else if (metadata == 2)
{
return new TileEntitySwitchWire();
}
return this.createNewTileEntity(world);
}
@Override
public TileEntity createNewTileEntity(World world)
{
return new TileEntityWire();
}
@Override
public void onBlockAdded(World world, int x, int y, int z)
{
super.onBlockAdded(world, x, y, z);
TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
setBlockBoundsBasedOnState(world, x, y, z);
if (tileEntity instanceof TileEntityWire)
{
((TileEntityWire) tileEntity).refresh();
}
}
@Override
public void onNeighborBlockChange(World world, int x, int y, int z, int blockID)
{
TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
setBlockBoundsBasedOnState(world, x, y, z);
if (tileEntity instanceof TileEntityWire)
{
((TileEntityWire) tileEntity).refresh();
}
}
@Override
public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z)
{
this.setBlockBoundsBasedOnState(world, x, y, z);
return super.getCollisionBoundingBoxFromPool(world, x, y, z);
}
@Override
public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z)
{
this.setBlockBoundsBasedOnState(world, x, y, z);
return super.getSelectedBoundingBoxFromPool(world, x, y, z);
}
/** Returns the bounding box of the wired rectangular prism to render. */
@Override
public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z)
{
if (this.isWireCollision)
{
TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
if (tileEntity instanceof TileEntityWire)
{
TileEntity[] connectable = ((TileEntityWire) tileEntity).getConnections();
if (connectable != null)
{
float minX = (float) this.minVector.x;
float minY = (float) this.minVector.y;
float minZ = (float) this.minVector.z;
float maxX = (float) this.maxVector.x;
float maxY = (float) this.maxVector.y;
float maxZ = (float) this.maxVector.z;
if (connectable[0] != null)
{
minY = 0.0F;
}
if (connectable[1] != null)
{
maxY = 1.0F;
}
if (connectable[2] != null)
{
minZ = 0.0F;
}
if (connectable[3] != null)
{
maxZ = 1.0F;
}
if (connectable[4] != null)
{
minX = 0.0F;
}
if (connectable[5] != null)
{
maxX = 1.0F;
}
this.setBlockBounds(minX, minY, minZ, maxX, maxY, maxZ);
}
}
}
}
@Override
public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List list, Entity entity)
{
if (this.isWireCollision)
{
TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
if (tileEntity instanceof TileEntityWire)
{
TileEntity[] connectable = ((TileEntityWire) tileEntity).getConnections();
this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, (float) this.minVector.z, (float) this.maxVector.x, (float) this.maxVector.y, (float) this.maxVector.z);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity);
if (connectable[4] != null)
{
this.setBlockBounds(0, (float) this.minVector.y, (float) this.minVector.z, (float) this.maxVector.x, (float) this.maxVector.y, (float) this.maxVector.z);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity);
}
if (connectable[5] != null)
{
this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, (float) this.minVector.z, 1, (float) this.maxVector.y, (float) this.maxVector.z);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity);
}
if (connectable[0] != null)
{
this.setBlockBounds((float) this.minVector.x, 0, (float) this.minVector.z, (float) this.maxVector.x, (float) this.maxVector.y, (float) this.maxVector.z);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity);
}
if (connectable[1] != null)
{
this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, (float) this.minVector.z, (float) this.maxVector.x, 1, (float) this.maxVector.z);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity);
}
if (connectable[2] != null)
{
this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, 0, (float) this.maxVector.x, (float) this.maxVector.y, (float) this.maxVector.z);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity);
}
if (connectable[3] != null)
{
this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, (float) this.minVector.z, (float) this.maxVector.x, (float) this.maxVector.y, 1);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity);
}
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
}
}
else
{
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity);
}
}
@Override
public void getTileEntities(int blockID, Set<Pair<String, Class<? extends TileEntity>>> list)
{
list.add(new Pair<String, Class<? extends TileEntity>>("DMWireTile", TileEntityWire.class));
}
@Override
@SideOnly(Side.CLIENT)
public void getClientTileEntityRenderers(List<Pair<Class<? extends TileEntity>, TileEntitySpecialRenderer>> list)
{
if (!this.zeroRendering)
{
list.add(new Pair<Class<? extends TileEntity>, TileEntitySpecialRenderer>(TileEntityWire.class, new RenderBlockWire()));
}
}
@Override
public boolean hasExtraConfigs()
{
return true;
}
@Override
public void loadExtraConfigs(Configuration config)
{
super.loadExtraConfigs(config);
BlockWire.wireResistance = config.get("Settings", "miliOhms", 1, "Resistance of the wire in 1/1000 of an ohm").getInt() / 1000;
BlockWire.energyMax = config.get("Settings", "maxEnergy", energyMax, "Max energy the wire can move at any given time").getInt();
}
@Override
public void loadOreNames()
{
OreDictionary.registerOre(ALRecipeLoader.COPPER_WIRE, new ItemStack(this, 1, 0));
}
}

22
src/main/java/resonantinduction/assemblyline/transmit/ItemBlockWire.java
View file

@ -1,22 +0,0 @@
package resonantinduction.assemblyline.transmit;
import resonantinduction.assemblyline.ALRecipeLoader;
import net.minecraft.util.Icon;
import com.builtbroken.minecraft.prefab.ItemBlockHolder;
public class ItemBlockWire extends ItemBlockHolder
{
public ItemBlockWire(int id)
{
super(id);
}
@Override
public Icon getIconFromDamage(int par1)
{
return ALRecipeLoader.blockWire instanceof BlockWire ? ((BlockWire) ALRecipeLoader.blockWire).wireIcon : ALRecipeLoader.blockWire.getIcon(0, par1);
}
}

20
src/main/java/resonantinduction/assemblyline/transmit/TileEntityDetectorWire.java
View file

@ -1,20 +0,0 @@
package resonantinduction.assemblyline.transmit;
public class TileEntityDetectorWire extends TileEntityWire
{
@Override
public void updateEntity()
{
if (!this.worldObj.isRemote && this.getNetwork() != null && this.ticks % 5 == 0)
{
//TODO if produced watts > minimal set value by the detector gui activate redstone on all sides
}
}
@Override
public boolean canUpdate()
{
return true;
}
}

40
src/main/java/resonantinduction/assemblyline/transmit/TileEntitySwitchWire.java
View file

@ -1,40 +0,0 @@
package resonantinduction.assemblyline.transmit;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
public class TileEntitySwitchWire extends TileEntityWire
{
protected boolean activated = true;
@Override
public TileEntity[] getConnections()
{
if (activated)
{
return super.getConnections();
}
return null;
}
public void setActivate(boolean yes)
{
boolean p = this.activated;
this.activated = yes;
if (p != this.activated)
{
this.refresh();
}
}
public boolean getActivated()
{
return this.activated;
}
@Override
public boolean canConnect(ForgeDirection direction)
{
return this.getActivated();
}
}

226
src/main/java/resonantinduction/assemblyline/transmit/TileEntityWire.java
View file

@ -1,226 +0,0 @@
package resonantinduction.assemblyline.transmit;
import resonantinduction.assemblyline.AssemblyLine;
import resonantinduction.assemblyline.network.ISimplePacketReceiver;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.packet.Packet;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.api.CompatibilityModule;
import universalelectricity.api.UniversalClass;
import universalelectricity.api.energy.EnergyNetworkLoader;
import universalelectricity.api.energy.IConductor;
import universalelectricity.api.energy.IEnergyNetwork;
import universalelectricity.api.vector.Vector3;
import universalelectricity.api.vector.VectorHelper;
import calclavia.lib.network.PacketHandler;
import com.builtbroken.minecraft.helpers.ColorCode;
import com.builtbroken.minecraft.helpers.ColorCode.IColorCoded;
import com.builtbroken.minecraft.prefab.TileEntityAdvanced;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@UniversalClass
public class TileEntityWire extends TileEntityAdvanced implements IConductor, ISimplePacketReceiver, IColorCoded
{
protected int updateTick = 1;
protected ColorCode color = ColorCode.UNKOWN;
private IEnergyNetwork network;
public TileEntity[] connections = new TileEntity[6];
public byte currentAcceptorConnections = 0x00;
@Override
public void updateEntity()
{
super.updateEntity();
if (!worldObj.isRemote)
{
if (ticks % this.updateTick == 0)
{
this.updateTick = this.worldObj.rand.nextInt(5) * 40 + 20;
this.refresh();
}
}
}
@Override
public void invalidate()
{
super.invalidate();
this.getNetwork().split(this);
}
public void refresh()
{
if (!this.worldObj.isRemote)
{
byte possibleAcceptorConnections = 0x00;
this.connections = new TileEntity[6];
for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
{
TileEntity tileEntity = VectorHelper.getTileEntityFromSide(this.worldObj, new Vector3(this), side);
if (CompatibilityModule.canConnect(tileEntity, side.getOpposite()) && this.canConnect(side))
{
if (tileEntity instanceof IConductor)
{
this.getNetwork().merge(((IConductor) tileEntity).getNetwork());
}
this.connections[side.ordinal()] = tileEntity;
possibleAcceptorConnections |= 1 << side.ordinal();
}
}
if (this.currentAcceptorConnections != possibleAcceptorConnections)
{
this.currentAcceptorConnections = possibleAcceptorConnections;
PacketHandler.instance().sendPacketToClients(this.getDescriptionPacket(), this.worldObj, new Vector3(this), 64);
this.getNetwork().reconstruct();
}
}
}
public boolean hasConnectionSide(ForgeDirection side)
{
return connectionMapContainsSide(this.currentAcceptorConnections, side);
}
public static boolean connectionMapContainsSide(byte connections, ForgeDirection side)
{
byte tester = (byte) (1 << side.ordinal());
return ((connections & tester) > 0);
}
@Override
public boolean simplePacket(String id, ByteArrayDataInput data, Player player)
{
if (id.equalsIgnoreCase("Wire"))
{
this.currentAcceptorConnections = data.readByte();
this.setColor(ColorCode.get(data.readInt()));
return true;
}
return false;
}
@Override
public Packet getDescriptionPacket()
{
return PacketHandler.instance().getTilePacket(AssemblyLine.CHANNEL, "Wire", this, this.currentAcceptorConnections, this.getColor().ordinal());
}
@Override
public boolean canUpdate()
{
return true;
}
@Override
public TileEntity[] getConnections()
{
if (this.connections == null)
{
this.refresh();
}
return this.connections;
}
@Override
public IEnergyNetwork getNetwork()
{
if (!(this.network instanceof IEnergyNetwork))
{
this.network = EnergyNetworkLoader.getNewNetwork(this);
}
return this.network;
}
@Override
public void setNetwork(IEnergyNetwork network)
{
this.network = network;
}
@Override
public boolean canConnect(ForgeDirection direction)
{
return true;
}
@Override
public long onReceiveEnergy(ForgeDirection from, long receive, boolean doReceive)
{
if (this.canConnect(from) && this.getNetwork() != null)
{
return this.getNetwork().produce(this, from.getOpposite(), receive, doReceive);
}
return 0;
}
@Override
public long onExtractEnergy(ForgeDirection from, long extract, boolean doExtract)
{
return 0;
}
@Override
public ColorCode getColor()
{
return this.color;
}
@Override
public boolean setColor(Object obj)
{
if (ColorCode.get(obj) != null)
{
this.color = ColorCode.get(obj);
return true;
}
return false;
}
@Override
@SideOnly(Side.CLIENT)
public AxisAlignedBB getRenderBoundingBox()
{
return AxisAlignedBB.getAABBPool().getAABB(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1);
}
@Override
public float getResistance()
{
return 0.0000000168f;
}
@Override
public long getCurrentCapacity()
{
return 1000000;
}
/** NBT Data */
@Override
public void readFromNBT(NBTTagCompound nbt)
{
super.readFromNBT(nbt);
if (nbt.hasKey("saveBuffer"))
this.getNetwork().setBufferFor(this, nbt.getLong("saveBuffer"));
}
/** Writes a tile entity to NBT. */
@Override
public void writeToNBT(NBTTagCompound nbt)
{
super.writeToNBT(nbt);
if (this.getNetwork().getBufferOf(this) > 0)
nbt.setLong("saveBuffer", this.getNetwork().getBufferOf(this));
}
}

24
src/main/java/resonantinduction/core/ClientProxy.java
View file

@ -6,18 +6,18 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.MinecraftForge;
import resonantinduction.core.core.multimeter.PartMultimeter;
import resonantinduction.core.core.render.BlockRenderingHandler;
import resonantinduction.core.core.render.RenderRIItem;
import resonantinduction.core.energy.battery.RenderBattery;
import resonantinduction.core.energy.battery.TileBattery;
import resonantinduction.core.energy.fx.FXElectricBolt;
import resonantinduction.core.energy.gui.GuiMultimeter;
import resonantinduction.core.energy.tesla.RenderTesla;
import resonantinduction.core.energy.tesla.TileTesla;
import resonantinduction.core.mechanics.item.ItemDust;
import resonantinduction.core.transport.levitator.RenderLevitator;
import resonantinduction.core.transport.levitator.TileEMLevitator;
import resonantinduction.core.multimeter.PartMultimeter;
import resonantinduction.core.render.BlockRenderingHandler;
import resonantinduction.core.render.RenderRIItem;
import resonantinduction.energy.battery.RenderBattery;
import resonantinduction.energy.battery.TileBattery;
import resonantinduction.energy.fx.FXElectricBolt;
import resonantinduction.energy.gui.GuiMultimeter;
import resonantinduction.energy.tesla.RenderTesla;
import resonantinduction.energy.tesla.TileTesla;
import resonantinduction.mechanics.item.ItemDust;
import resonantinduction.transport.levitator.RenderLevitator;
import resonantinduction.transport.levitator.TileEMLevitator;
import universalelectricity.api.vector.Vector3;
import codechicken.multipart.TMultiPart;
import codechicken.multipart.TileMultipart;

4
src/main/java/resonantinduction/core/CommonProxy.java
View file

@ -6,8 +6,8 @@ package resonantinduction.core;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import resonantinduction.core.core.multimeter.ContainerMultimeter;
import resonantinduction.core.core.multimeter.PartMultimeter;
import resonantinduction.core.multimeter.ContainerMultimeter;
import resonantinduction.core.multimeter.PartMultimeter;
import universalelectricity.api.vector.Vector3;
import codechicken.lib.colour.ColourRGBA;
import codechicken.multipart.TMultiPart;

12
src/main/java/resonantinduction/core/MultipartRI.java
View file

@ -1,11 +1,11 @@
package resonantinduction.core;
import resonantinduction.core.core.multimeter.PartMultimeter;
import resonantinduction.core.energy.transformer.PartTransformer;
import resonantinduction.core.energy.wire.flat.PartFlatSwitchWire;
import resonantinduction.core.energy.wire.flat.PartFlatWire;
import resonantinduction.core.energy.wire.framed.PartFramedSwitchWire;
import resonantinduction.core.energy.wire.framed.PartFramedWire;
import resonantinduction.core.multimeter.PartMultimeter;
import resonantinduction.energy.transformer.PartTransformer;
import resonantinduction.energy.wire.flat.PartFlatSwitchWire;
import resonantinduction.energy.wire.flat.PartFlatWire;
import resonantinduction.energy.wire.framed.PartFramedSwitchWire;
import resonantinduction.energy.wire.framed.PartFramedWire;
import codechicken.multipart.MultiPartRegistry;
import codechicken.multipart.MultiPartRegistry.IPartFactory;
import codechicken.multipart.MultipartGenerator;

46
src/main/java/resonantinduction/core/ResonantInduction.java
View file

@ -26,29 +26,29 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
import org.modstats.ModstatInfo;
import org.modstats.Modstats;
import resonantinduction.core.core.multimeter.ItemMultimeter;
import resonantinduction.core.energy.LinkEvent;
import resonantinduction.core.energy.battery.BlockBattery;
import resonantinduction.core.energy.battery.ItemBlockBattery;
import resonantinduction.core.energy.battery.TileBattery;
import resonantinduction.core.energy.tesla.BlockTesla;
import resonantinduction.core.energy.tesla.TileTesla;
import resonantinduction.core.energy.transformer.ItemTransformer;
import resonantinduction.core.energy.wire.EnumWireMaterial;
import resonantinduction.core.energy.wire.ItemWire;
import resonantinduction.core.mechanics.BlockMachinePart;
import resonantinduction.core.mechanics.furnace.BlockAdvancedFurnace;
import resonantinduction.core.mechanics.furnace.TileAdvancedFurnace;
import resonantinduction.core.mechanics.grinder.BlockGrinderWheel;
import resonantinduction.core.mechanics.grinder.TileGrinderWheel;
import resonantinduction.core.mechanics.grinder.TilePurifier;
import resonantinduction.core.mechanics.item.ItemDust;
import resonantinduction.core.mechanics.liquid.BlockFluidMixture;
import resonantinduction.core.mechanics.liquid.TileFluidMixture;
import resonantinduction.core.mechanics.purifier.BlockPurifier;
import resonantinduction.core.transport.levitator.BlockLevitator;
import resonantinduction.core.transport.levitator.ItemBlockContractor;
import resonantinduction.core.transport.levitator.TileEMLevitator;
import resonantinduction.core.multimeter.ItemMultimeter;
import resonantinduction.energy.LinkEvent;
import resonantinduction.energy.battery.BlockBattery;
import resonantinduction.energy.battery.ItemBlockBattery;
import resonantinduction.energy.battery.TileBattery;
import resonantinduction.energy.tesla.BlockTesla;
import resonantinduction.energy.tesla.TileTesla;
import resonantinduction.energy.transformer.ItemTransformer;
import resonantinduction.energy.wire.EnumWireMaterial;
import resonantinduction.energy.wire.ItemWire;
import resonantinduction.mechanics.BlockMachinePart;
import resonantinduction.mechanics.furnace.BlockAdvancedFurnace;
import resonantinduction.mechanics.furnace.TileAdvancedFurnace;
import resonantinduction.mechanics.grinder.BlockGrinderWheel;
import resonantinduction.mechanics.grinder.TileGrinderWheel;
import resonantinduction.mechanics.grinder.TilePurifier;
import resonantinduction.mechanics.item.ItemDust;
import resonantinduction.mechanics.liquid.BlockFluidMixture;
import resonantinduction.mechanics.liquid.TileFluidMixture;
import resonantinduction.mechanics.purifier.BlockPurifier;
import resonantinduction.transport.levitator.BlockLevitator;
import resonantinduction.transport.levitator.ItemBlockContractor;
import resonantinduction.transport.levitator.TileEMLevitator;
import calclavia.lib.network.PacketHandler;
import calclavia.lib.network.PacketTile;
import calclavia.lib.recipe.UniversalRecipe;

2
src/main/java/resonantinduction/core/core/base/BlockBase.java → src/main/java/resonantinduction/core/base/BlockBase.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.core.core.base;
package resonantinduction.core.base;
import net.minecraft.block.material.Material;
import net.minecraftforge.common.Configuration;

2
src/main/java/resonantinduction/core/core/base/BlockIOBase.java → src/main/java/resonantinduction/core/base/BlockIOBase.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.core.core.base;
package resonantinduction.core.base;
import net.minecraft.block.material.Material;
import net.minecraftforge.common.Configuration;

2
src/main/java/resonantinduction/assemblyline/machine/BlockMapUtil.java → src/main/java/resonantinduction/core/base/BlockMapUtil.java
View file

@ -1,4 +1,4 @@
package resonantinduction.assemblyline.machine;
package resonantinduction.core.base;
import java.util.ArrayList;
import java.util.HashMap;

2
src/main/java/resonantinduction/core/core/base/BlockRotatableBase.java → src/main/java/resonantinduction/core/base/BlockRotatableBase.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.core.core.base;
package resonantinduction.core.base;
import calclavia.lib.prefab.block.BlockRotatable;
import net.minecraft.block.material.Material;

2
src/main/java/resonantinduction/core/core/base/InventoryUtil.java → src/main/java/resonantinduction/core/base/InventoryUtil.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.core.base;
package resonantinduction.core.base;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;

2
src/main/java/resonantinduction/core/core/base/ItemBase.java → src/main/java/resonantinduction/core/base/ItemBase.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.core.base;
package resonantinduction.core.base;
import net.minecraft.item.Item;
import net.minecraftforge.common.Configuration;

2
src/main/java/resonantinduction/core/core/base/ItemMultipartBase.java → src/main/java/resonantinduction/core/base/ItemMultipartBase.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.core.base;
package resonantinduction.core.base;
import net.minecraftforge.common.Configuration;
import resonantinduction.core.ResonantInduction;

2
src/main/java/resonantinduction/core/core/base/PartAdvanced.java → src/main/java/resonantinduction/core/base/PartAdvanced.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.core.base;
package resonantinduction.core.base;
import net.minecraft.world.World;
import codechicken.multipart.TMultiPart;

2
src/main/java/resonantinduction/assemblyline/machine/BlockDebug.java → src/main/java/resonantinduction/core/debug/BlockDebug.java
View file

@ -1,4 +1,4 @@
package resonantinduction.assemblyline.machine;
package resonantinduction.core.debug;
import java.util.List;
import java.util.Set;

2
src/main/java/resonantinduction/assemblyline/machine/TileEntityInfFluid.java → src/main/java/resonantinduction/core/debug/TileEntityInfFluid.java
View file

@ -1,4 +1,4 @@
package resonantinduction.assemblyline.machine;
package resonantinduction.core.debug;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;

2
src/main/java/resonantinduction/assemblyline/machine/TileEntityInfLoad.java → src/main/java/resonantinduction/core/debug/TileEntityInfLoad.java
View file

@ -1,4 +1,4 @@
package resonantinduction.assemblyline.machine;
package resonantinduction.core.debug;
import net.minecraftforge.common.ForgeDirection;

2
src/main/java/resonantinduction/assemblyline/machine/TileEntityInfSupply.java → src/main/java/resonantinduction/core/debug/TileEntityInfSupply.java
View file

@ -1,4 +1,4 @@
package resonantinduction.assemblyline.machine;
package resonantinduction.core.debug;
import java.util.EnumSet;

2
src/main/java/resonantinduction/assemblyline/machine/TileEntityVoid.java → src/main/java/resonantinduction/core/debug/TileEntityVoid.java
View file

@ -1,4 +1,4 @@
package resonantinduction.assemblyline.machine;
package resonantinduction.core.debug;
import java.util.HashMap;

2
src/main/java/resonantinduction/core/core/multimeter/ContainerMultimeter.java → src/main/java/resonantinduction/core/multimeter/ContainerMultimeter.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.core.core.multimeter;
package resonantinduction.core.multimeter;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;

6
src/main/java/resonantinduction/core/core/multimeter/ItemMultimeter.java → src/main/java/resonantinduction/core/multimeter/ItemMultimeter.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.core.multimeter;
package resonantinduction.core.multimeter;
import java.util.List;
@ -9,8 +9,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.core.core.base.ItemMultipartBase;
import resonantinduction.core.energy.wire.EnumWireMaterial;
import resonantinduction.core.base.ItemMultipartBase;
import resonantinduction.energy.wire.EnumWireMaterial;
import codechicken.lib.vec.BlockCoord;
import codechicken.lib.vec.Vector3;
import codechicken.multipart.MultiPartRegistry;

2
src/main/java/resonantinduction/core/core/multimeter/PartMultimeter.java → src/main/java/resonantinduction/core/multimeter/PartMultimeter.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.core.core.multimeter;
package resonantinduction.core.multimeter;
import java.util.ArrayList;
import java.util.Arrays;

4
src/main/java/resonantinduction/core/core/multimeter/RenderMultimeter.java → src/main/java/resonantinduction/core/multimeter/RenderMultimeter.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.core.multimeter;
package resonantinduction.core.multimeter;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
@ -8,7 +8,7 @@ import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.energy.model.ModelMultimeter;
import resonantinduction.energy.model.ModelMultimeter;
import universalelectricity.api.energy.UnitDisplay;
import universalelectricity.api.energy.UnitDisplay.Unit;
import cpw.mods.fml.client.FMLClientHandler;

2
src/main/java/resonantinduction/assemblyline/network/ISimplePacketReceiver.java → src/main/java/resonantinduction/core/network/ISimplePacketReceiver.java
View file

@ -1,4 +1,4 @@
package resonantinduction.assemblyline.network;
package resonantinduction.core.network;
import com.google.common.io.ByteArrayDataInput;

2
src/main/java/resonantinduction/assemblyline/network/PacketIDTile.java → src/main/java/resonantinduction/core/network/PacketIDTile.java
View file

@ -1,4 +1,4 @@
package resonantinduction.assemblyline.network;
package resonantinduction.core.network;
import java.util.ArrayList;
import java.util.List;

14
src/main/java/resonantinduction/core/core/render/BlockRenderingHandler.java → src/main/java/resonantinduction/core/render/BlockRenderingHandler.java
View file

@ -1,17 +1,17 @@
/**
*
*/
package resonantinduction.core.core.render;
package resonantinduction.core.render;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.world.IBlockAccess;
import resonantinduction.core.energy.battery.BlockBattery;
import resonantinduction.core.energy.battery.RenderBattery;
import resonantinduction.core.energy.tesla.BlockTesla;
import resonantinduction.core.energy.tesla.RenderTesla;
import resonantinduction.core.transport.levitator.BlockLevitator;
import resonantinduction.core.transport.levitator.RenderLevitator;
import resonantinduction.energy.battery.BlockBattery;
import resonantinduction.energy.battery.RenderBattery;
import resonantinduction.energy.tesla.BlockTesla;
import resonantinduction.energy.tesla.RenderTesla;
import resonantinduction.transport.levitator.BlockLevitator;
import resonantinduction.transport.levitator.RenderLevitator;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;

2
src/main/java/resonantinduction/core/core/render/InvertX.java → src/main/java/resonantinduction/core/render/InvertX.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.core.render;
package resonantinduction.core.render;
import codechicken.lib.vec.Matrix4;
import codechicken.lib.vec.Transformation;

10
src/main/java/resonantinduction/core/core/render/RenderRIItem.java → src/main/java/resonantinduction/core/render/RenderRIItem.java
View file

@ -1,14 +1,14 @@
package resonantinduction.core.core.render;
package resonantinduction.core.render;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
import resonantinduction.core.core.multimeter.ItemMultimeter;
import resonantinduction.core.core.multimeter.RenderMultimeter;
import resonantinduction.core.energy.transformer.ItemTransformer;
import resonantinduction.core.energy.transformer.RenderTransformer;
import resonantinduction.core.multimeter.ItemMultimeter;
import resonantinduction.core.multimeter.RenderMultimeter;
import resonantinduction.energy.transformer.ItemTransformer;
import resonantinduction.energy.transformer.RenderTransformer;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/main/java/resonantinduction/core/energy/ILinkable.java → src/main/java/resonantinduction/energy/ILinkable.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.energy;
package resonantinduction.energy;
import net.minecraft.entity.player.EntityPlayer;
import universalelectricity.api.vector.VectorWorld;

2
src/main/java/resonantinduction/core/energy/LinkEvent.java → src/main/java/resonantinduction/energy/LinkEvent.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.core.energy;
package resonantinduction.energy;
import codechicken.multipart.ControlKeyModifer;
import net.minecraft.item.ItemStack;

2
src/main/java/resonantinduction/core/energy/battery/BatteryStructure.java → src/main/java/resonantinduction/energy/battery/BatteryStructure.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.energy.battery;
package resonantinduction.energy.battery;
import java.util.Arrays;

6
src/main/java/resonantinduction/core/energy/battery/BlockBattery.java → src/main/java/resonantinduction/energy/battery/BlockBattery.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.core.energy.battery;
package resonantinduction.energy.battery;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.entity.EntityLivingBase;
@ -12,8 +12,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.core.base.BlockIOBase;
import resonantinduction.core.core.render.BlockRenderingHandler;
import resonantinduction.core.base.BlockIOBase;
import resonantinduction.core.render.BlockRenderingHandler;
import universalelectricity.api.CompatibilityModule;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/main/java/resonantinduction/assemblyline/machine/BlockEnergyStorage.java → src/main/java/resonantinduction/energy/battery/BlockEnergyStorage.java
View file

@ -1,4 +1,4 @@
package resonantinduction.assemblyline.machine;
package resonantinduction.energy.battery;
import java.util.List;
import java.util.Set;

2
src/main/java/resonantinduction/assemblyline/machine/ContainerBatteryBox.java → src/main/java/resonantinduction/energy/battery/ContainerBatteryBox.java
View file

@ -1,4 +1,4 @@
package resonantinduction.assemblyline.machine;
package resonantinduction.energy.battery;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;

2
src/main/java/resonantinduction/core/energy/battery/ItemBlockBattery.java → src/main/java/resonantinduction/energy/battery/ItemBlockBattery.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.energy.battery;
package resonantinduction.energy.battery;
import java.util.List;

2
src/main/java/resonantinduction/assemblyline/machine/ItemBlockEnergyStorage.java → src/main/java/resonantinduction/energy/battery/ItemBlockEnergyStorage.java
View file

@ -1,4 +1,4 @@
package resonantinduction.assemblyline.machine;
package resonantinduction.energy.battery;
import java.util.List;

2
src/main/java/resonantinduction/core/energy/battery/RenderBattery.java → src/main/java/resonantinduction/energy/battery/RenderBattery.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.core.energy.battery;
package resonantinduction.energy.battery;
import static org.lwjgl.opengl.GL11.glPopMatrix;
import static org.lwjgl.opengl.GL11.glPushMatrix;

2
src/main/java/resonantinduction/core/energy/battery/TileBattery.java → src/main/java/resonantinduction/energy/battery/TileBattery.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.energy.battery;
package resonantinduction.energy.battery;
import java.util.ArrayList;
import java.util.EnumSet;

2
src/main/java/resonantinduction/assemblyline/machine/TileEntityBatteryBox.java → src/main/java/resonantinduction/energy/battery/TileEntityBatteryBox.java
View file

@ -1,4 +1,4 @@
package resonantinduction.assemblyline.machine;
package resonantinduction.energy.battery;
import java.util.EnumSet;

2
src/main/java/resonantinduction/core/energy/fx/FXElectricBolt.java → src/main/java/resonantinduction/energy/fx/FXElectricBolt.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.energy.fx;
package resonantinduction.energy.fx;
import static org.lwjgl.opengl.GL11.GL_BLEND;
import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA;

2
src/main/java/resonantinduction/assemblyline/machine/BlockMechanicalGenerator.java → src/main/java/resonantinduction/energy/generator/BlockMechanicalGenerator.java
View file

@ -1,4 +1,4 @@
package resonantinduction.assemblyline.machine;
package resonantinduction.energy.generator;
import java.util.ArrayList;
import java.util.Set;

2
src/main/java/resonantinduction/assemblyline/machine/BlockRod.java → src/main/java/resonantinduction/energy/generator/BlockRod.java
View file

@ -1,4 +1,4 @@
package resonantinduction.assemblyline.machine;
package resonantinduction.energy.generator;
import java.util.Set;

2
src/main/java/resonantinduction/assemblyline/machine/TileEntityGenerator.java → src/main/java/resonantinduction/energy/generator/TileEntityGenerator.java
View file

@ -1,4 +1,4 @@
package resonantinduction.assemblyline.machine;
package resonantinduction.energy.generator;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;

2
src/main/java/resonantinduction/assemblyline/machine/TileEntitySteamPiston.java → src/main/java/resonantinduction/energy/generator/TileEntitySteamPiston.java
View file

@ -1,4 +1,4 @@
package resonantinduction.assemblyline.machine;
package resonantinduction.energy.generator;
import com.builtbroken.minecraft.prefab.TileEntityEnergyMachine;

6
src/main/java/resonantinduction/core/energy/gui/GuiMultimeter.java → src/main/java/resonantinduction/energy/gui/GuiMultimeter.java
View file

@ -1,15 +1,15 @@
/**
*
*/
package resonantinduction.core.energy.gui;
package resonantinduction.energy.gui;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiTextField;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.core.multimeter.ContainerMultimeter;
import resonantinduction.core.core.multimeter.PartMultimeter;
import resonantinduction.core.multimeter.ContainerMultimeter;
import resonantinduction.core.multimeter.PartMultimeter;
import universalelectricity.api.energy.UnitDisplay.Unit;
import calclavia.lib.gui.GuiContainerBase;
import calclavia.lib.render.EnumColor;

2
src/main/java/resonantinduction/core/energy/model/ModelBattery.java → src/main/java/resonantinduction/energy/model/ModelBattery.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.energy.model;
package resonantinduction.energy.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

2
src/main/java/resonantinduction/core/energy/model/ModelEMContractor.java → src/main/java/resonantinduction/energy/model/ModelEMContractor.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.energy.model;
package resonantinduction.energy.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

2
src/main/java/resonantinduction/core/energy/model/ModelInsulation.java → src/main/java/resonantinduction/energy/model/ModelInsulation.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.energy.model;
package resonantinduction.energy.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

2
src/main/java/resonantinduction/core/energy/model/ModelMultimeter.java → src/main/java/resonantinduction/energy/model/ModelMultimeter.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.energy.model;
package resonantinduction.energy.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

2
src/main/java/resonantinduction/core/energy/model/ModelTeslaBottom.java → src/main/java/resonantinduction/energy/model/ModelTeslaBottom.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.energy.model;
package resonantinduction.energy.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

2
src/main/java/resonantinduction/core/energy/model/ModelTeslaMiddle.java → src/main/java/resonantinduction/energy/model/ModelTeslaMiddle.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.energy.model;
package resonantinduction.energy.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

2
src/main/java/resonantinduction/core/energy/model/ModelTeslaTop.java → src/main/java/resonantinduction/energy/model/ModelTeslaTop.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.energy.model;
package resonantinduction.energy.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

2
src/main/java/resonantinduction/core/energy/model/ModelWire.java → src/main/java/resonantinduction/energy/model/ModelWire.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.energy.model;
package resonantinduction.energy.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

8
src/main/java/resonantinduction/core/energy/tesla/BlockTesla.java → src/main/java/resonantinduction/energy/tesla/BlockTesla.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.core.energy.tesla;
package resonantinduction.energy.tesla;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.entity.player.EntityPlayer;
@ -10,9 +10,9 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.Utility;
import resonantinduction.core.core.base.BlockIOBase;
import resonantinduction.core.core.render.BlockRenderingHandler;
import resonantinduction.core.transport.levitator.TileEMLevitator;
import resonantinduction.core.base.BlockIOBase;
import resonantinduction.core.render.BlockRenderingHandler;
import resonantinduction.transport.levitator.TileEMLevitator;
import universalelectricity.api.vector.Vector3;
import universalelectricity.api.vector.VectorWorld;
import calclavia.lib.prefab.item.ItemCoordLink;

8
src/main/java/resonantinduction/core/energy/tesla/RenderTesla.java → src/main/java/resonantinduction/energy/tesla/RenderTesla.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.core.energy.tesla;
package resonantinduction.energy.tesla;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
@ -10,9 +10,9 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.energy.model.ModelTeslaBottom;
import resonantinduction.core.energy.model.ModelTeslaMiddle;
import resonantinduction.core.energy.model.ModelTeslaTop;
import resonantinduction.energy.model.ModelTeslaBottom;
import resonantinduction.energy.model.ModelTeslaMiddle;
import resonantinduction.energy.model.ModelTeslaTop;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/main/java/resonantinduction/core/energy/tesla/TeslaGrid.java → src/main/java/resonantinduction/energy/tesla/TeslaGrid.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.core.energy.tesla;
package resonantinduction.energy.tesla;
import java.util.HashSet;
import java.util.Iterator;

4
src/main/java/resonantinduction/core/energy/tesla/TileTesla.java → src/main/java/resonantinduction/energy/tesla/TileTesla.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.core.energy.tesla;
package resonantinduction.energy.tesla;
import java.util.ArrayList;
import java.util.Collections;
@ -21,7 +21,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.api.ITesla;
import resonantinduction.core.energy.ILinkable;
import resonantinduction.energy.ILinkable;
import universalelectricity.api.energy.EnergyStorageHandler;
import universalelectricity.api.vector.Vector3;
import universalelectricity.api.vector.VectorWorld;

6
src/main/java/resonantinduction/core/energy/transformer/ItemTransformer.java → src/main/java/resonantinduction/energy/transformer/ItemTransformer.java
View file

@ -1,11 +1,11 @@
package resonantinduction.core.energy.transformer;
package resonantinduction.energy.transformer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import resonantinduction.core.core.base.ItemMultipartBase;
import resonantinduction.core.energy.wire.EnumWireMaterial;
import resonantinduction.core.base.ItemMultipartBase;
import resonantinduction.energy.wire.EnumWireMaterial;
import codechicken.lib.vec.BlockCoord;
import codechicken.lib.vec.Vector3;
import codechicken.multipart.MultiPartRegistry;

2
src/main/java/resonantinduction/core/energy/transformer/ModelTransformer.java → src/main/java/resonantinduction/energy/transformer/ModelTransformer.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.energy.transformer;
package resonantinduction.energy.transformer;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

2
src/main/java/resonantinduction/core/energy/transformer/PartTransformer.java → src/main/java/resonantinduction/energy/transformer/PartTransformer.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.energy.transformer;
package resonantinduction.energy.transformer;
import java.lang.reflect.Method;
import java.util.ArrayList;

2
src/main/java/resonantinduction/core/energy/transformer/RenderTransformer.java → src/main/java/resonantinduction/energy/transformer/RenderTransformer.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.energy.transformer;
package resonantinduction.energy.transformer;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;

2
src/main/java/resonantinduction/core/energy/wire/EnumWireMaterial.java → src/main/java/resonantinduction/energy/wire/EnumWireMaterial.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.energy.wire;
package resonantinduction.energy.wire;
import net.minecraft.block.Block;
import net.minecraft.item.Item;

10
src/main/java/resonantinduction/core/energy/wire/ItemWire.java → src/main/java/resonantinduction/energy/wire/ItemWire.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.energy.wire;
package resonantinduction.energy.wire;
import java.util.List;
@ -16,10 +16,10 @@ import org.lwjgl.input.Keyboard;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.TabRI;
import resonantinduction.core.Utility;
import resonantinduction.core.energy.wire.flat.PartFlatWire;
import resonantinduction.core.energy.wire.flat.RenderFlatWire;
import resonantinduction.core.energy.wire.framed.PartFramedWire;
import resonantinduction.core.energy.wire.framed.RenderPartWire;
import resonantinduction.energy.wire.flat.PartFlatWire;
import resonantinduction.energy.wire.flat.RenderFlatWire;
import resonantinduction.energy.wire.framed.PartFramedWire;
import resonantinduction.energy.wire.framed.RenderPartWire;
import universalelectricity.api.energy.UnitDisplay;
import universalelectricity.api.energy.UnitDisplay.Unit;
import calclavia.lib.render.EnumColor;

Some files were not shown because too many files have changed in this diff Show more