More refactor and clean up
This commit is contained in:
Calclavia
parent
27107a8ba1
commit
b8fecae832
43 changed files with 73 additions and 1070 deletions
|
|
@ -28,7 +28,7 @@ import resonantinduction.client.render.RenderTank;
|
|||
import resonantinduction.client.render.RenderTestCar;
|
||||
import resonantinduction.client.render.RenderTurkey;
|
||||
import resonantinduction.core.recipe.RecipeLoader;
|
||||
import resonantinduction.energy.battery.TileEntityBatteryBox;
|
||||
import resonantinduction.energy.battery.TileBatteryBox;
|
||||
import resonantinduction.fluid.pipes.TileEntityPipe;
|
||||
import resonantinduction.fluid.pump.TileEntityConstructionPump;
|
||||
import resonantinduction.fluid.pump.TileEntityStarterPump;
|
||||
|
|
@ -114,7 +114,7 @@ public class ClientProxy extends CommonProxy
|
|||
return new GuiProcessor(player.inventory, (TileEntityProcessor) tileEntity);
|
||||
}
|
||||
case GUI_BATTERY_BOX:
|
||||
return new GuiBatteryBox(player.inventory, (TileEntityBatteryBox) tileEntity);
|
||||
return new GuiBatteryBox(player.inventory, (TileBatteryBox) tileEntity);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import net.minecraft.util.StatCollector;
|
|||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import resonantinduction.energy.battery.ContainerBatteryBox;
|
||||
import resonantinduction.energy.battery.TileEntityBatteryBox;
|
||||
import resonantinduction.energy.battery.TileBatteryBox;
|
||||
import resonantinduction.transport.ResonantInductionTransport;
|
||||
import universalelectricity.api.energy.UnitDisplay;
|
||||
import universalelectricity.api.energy.UnitDisplay.Unit;
|
||||
|
|
@ -20,12 +20,12 @@ public class GuiBatteryBox extends GuiContainer
|
|||
{
|
||||
private static final ResourceLocation TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.GUI_DIRECTORY + "battery_box.png");
|
||||
|
||||
private TileEntityBatteryBox tileEntity;
|
||||
private TileBatteryBox tileEntity;
|
||||
|
||||
private int containerWidth;
|
||||
private int containerHeight;
|
||||
|
||||
public GuiBatteryBox(InventoryPlayer par1InventoryPlayer, TileEntityBatteryBox batteryBox)
|
||||
public GuiBatteryBox(InventoryPlayer par1InventoryPlayer, TileBatteryBox batteryBox)
|
||||
{
|
||||
super(new ContainerBatteryBox(par1InventoryPlayer, batteryBox));
|
||||
this.tileEntity = batteryBox;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package resonantinduction.core;
|
||||
|
||||
import resonantinduction.core.multimeter.PartMultimeter;
|
||||
import resonantinduction.energy.multimeter.PartMultimeter;
|
||||
import resonantinduction.energy.transformer.PartTransformer;
|
||||
import resonantinduction.energy.wire.flat.PartFlatSwitchWire;
|
||||
import resonantinduction.energy.wire.flat.PartFlatWire;
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
|||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import resonantinduction.energy.multimeter.PartMultimeter;
|
||||
|
||||
/**
|
||||
* @author Calclavia
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import net.minecraft.util.Icon;
|
|||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import resonantinduction.core.base.ItemMultipartBase;
|
||||
import resonantinduction.energy.multimeter.PartMultimeter;
|
||||
import resonantinduction.energy.wire.EnumWireMaterial;
|
||||
import calclavia.lib.utility.LanguageUtility;
|
||||
import codechicken.lib.vec.BlockCoord;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ import net.minecraftforge.common.ForgeDirection;
|
|||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import resonantinduction.energy.generator.TileEntityGenerator;
|
||||
import resonantinduction.mechanics.generator.TileEntityGenerator;
|
||||
import resonantinduction.transport.ResonantInductionTransport;
|
||||
import universalelectricity.api.electricity.IVoltageInput;
|
||||
import universalelectricity.api.electricity.IVoltageOutput;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,8 @@ import net.minecraftforge.common.ForgeDirection;
|
|||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import resonantinduction.Reference;
|
||||
import resonantinduction.energy.model.ModelMultimeter;
|
||||
import resonantinduction.energy.multimeter.ModelMultimeter;
|
||||
import resonantinduction.energy.multimeter.PartMultimeter;
|
||||
import universalelectricity.api.energy.UnitDisplay;
|
||||
import universalelectricity.api.energy.UnitDisplay.Unit;
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ import net.minecraft.entity.player.EntityPlayer;
|
|||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.MinecraftForgeClient;
|
||||
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.multimeter.GuiMultimeter;
|
||||
import resonantinduction.energy.multimeter.PartMultimeter;
|
||||
import resonantinduction.energy.tesla.RenderTesla;
|
||||
import resonantinduction.energy.tesla.TileTesla;
|
||||
import resonantinduction.transport.levitator.RenderLevitator;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
|||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import resonantinduction.core.multimeter.ContainerMultimeter;
|
||||
import resonantinduction.core.multimeter.PartMultimeter;
|
||||
import resonantinduction.energy.multimeter.PartMultimeter;
|
||||
import universalelectricity.api.vector.Vector3;
|
||||
import codechicken.lib.colour.ColourRGBA;
|
||||
import codechicken.multipart.TMultiPart;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,9 @@ import net.minecraft.world.IBlockAccess;
|
|||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import resonantinduction.core.ResonantInductionTabs;
|
||||
import resonantinduction.transport.ResonantInductionTransport;
|
||||
import resonantinduction.core.Settings;
|
||||
import resonantinduction.energy.CommonProxy;
|
||||
import resonantinduction.energy.ResonantInductionEnergy;
|
||||
import universalelectricity.api.UniversalElectricity;
|
||||
import universalelectricity.api.energy.IConductor;
|
||||
import universalelectricity.api.vector.Vector3;
|
||||
|
|
@ -27,12 +29,12 @@ import com.builtbroken.minecraft.prefab.BlockMachine;
|
|||
*
|
||||
* @author Rseifert
|
||||
*/
|
||||
public class BlockEnergyStorage extends BlockMachine
|
||||
public class BlockBatteryBox extends BlockMachine
|
||||
{
|
||||
public BlockEnergyStorage()
|
||||
public BlockBatteryBox()
|
||||
{
|
||||
super(ResonantInductionTransport.CONFIGURATION, "DMEnergyStorage", UniversalElectricity.machine);
|
||||
this.setCreativeTab(ResonantInductionTabs.tabIndustrial());
|
||||
super(Settings.CONFIGURATION, "DMEnergyStorage", UniversalElectricity.machine);
|
||||
this.setCreativeTab(ResonantInductionTabs.CORE);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -55,7 +57,7 @@ public class BlockEnergyStorage extends BlockMachine
|
|||
|
||||
if (!par1World.isRemote)
|
||||
{
|
||||
par5EntityPlayer.openGui(ResonantInductionTransport.instance, CommonProxy.GUI_BATTERY_BOX, par1World, x, y, z);
|
||||
par5EntityPlayer.openGui(ResonantInductionEnergy.INSTANCE, 0, par1World, x, y, z);
|
||||
|
||||
}
|
||||
return true;
|
||||
|
|
@ -111,14 +113,14 @@ public class BlockEnergyStorage extends BlockMachine
|
|||
@Override
|
||||
public void getTileEntities(int blockID, Set<Pair<String, Class<? extends TileEntity>>> list)
|
||||
{
|
||||
list.add(new Pair<String, Class<? extends TileEntity>>("DCTileBatBox", TileEntityBatteryBox.class));
|
||||
list.add(new Pair<String, Class<? extends TileEntity>>("DCTileBatBox", TileBatteryBox.class));
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, int metadata)
|
||||
{
|
||||
return new TileEntityBatteryBox();
|
||||
return new TileBatteryBox();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -11,9 +11,9 @@ import com.builtbroken.minecraft.prefab.invgui.SlotSpecific;
|
|||
|
||||
public class ContainerBatteryBox extends Container
|
||||
{
|
||||
private TileEntityBatteryBox tileEntity;
|
||||
private TileBatteryBox tileEntity;
|
||||
|
||||
public ContainerBatteryBox(InventoryPlayer par1InventoryPlayer, TileEntityBatteryBox batteryBox)
|
||||
public ContainerBatteryBox(InventoryPlayer par1InventoryPlayer, TileBatteryBox batteryBox)
|
||||
{
|
||||
this.tileEntity = batteryBox;
|
||||
// Top slot for battery output
|
||||
|
|
|
|||
|
|
@ -1,68 +0,0 @@
|
|||
package resonantinduction.energy.battery;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.Configuration;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import resonantinduction.core.ResonantInductionTabs;
|
||||
import resonantinduction.transport.ResonantInductionTransport;
|
||||
import universalelectricity.api.item.ItemElectric;
|
||||
|
||||
import com.builtbroken.minecraft.DarkCore;
|
||||
import com.builtbroken.minecraft.IExtraInfo.IExtraItemInfo;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
/**
|
||||
* Simple battery to store energy
|
||||
*
|
||||
* @author DarkGuardsman
|
||||
*/
|
||||
public class ItemBattery extends ItemElectric implements IExtraItemInfo
|
||||
{
|
||||
public ItemBattery()
|
||||
{
|
||||
super(ResonantInductionTransport.CONFIGURATION.getItem("Battery", DarkCore.getNextItemId()).getInt());
|
||||
this.setUnlocalizedName(ResonantInductionTransport.PREFIX + "Battery");
|
||||
this.setCreativeTab(ResonantInductionTabs.tabIndustrial());
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerIcons(IconRegister iconRegister)
|
||||
{
|
||||
this.itemIcon = iconRegister.registerIcon(this.getUnlocalizedName().replace("item.", ""));
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getVoltage(ItemStack itemStack)
|
||||
{
|
||||
return 25;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getEnergyCapacity(ItemStack theItem)
|
||||
{
|
||||
return 5000000;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasExtraConfigs()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void loadExtraConfigs(Configuration config)
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void loadOreNames()
|
||||
{
|
||||
OreDictionary.registerOre("Battery", this);
|
||||
}
|
||||
}
|
||||
|
|
@ -74,17 +74,17 @@ public class ItemBlockEnergyStorage extends ItemBlock
|
|||
if (stack.getTagCompound() != null && stack.getTagCompound().hasKey("wrenched"))
|
||||
{
|
||||
TileEntity entity = world.getBlockTileEntity(x, y, z);
|
||||
if (entity instanceof TileEntityBatteryBox)
|
||||
if (entity instanceof TileBatteryBox)
|
||||
{
|
||||
((TileEntityBatteryBox) entity).getInventory().loadInv(stack.getTagCompound());
|
||||
((TileBatteryBox) entity).getInventory().loadInv(stack.getTagCompound());
|
||||
NBTBase energy = stack.getTagCompound().getTag("energy");
|
||||
if (energy instanceof NBTTagFloat)
|
||||
{
|
||||
((TileEntityBatteryBox) entity).setEnergy(ForgeDirection.UNKNOWN, (long) (stack.getTagCompound().getFloat("energy") * 1000));
|
||||
((TileBatteryBox) entity).setEnergy(ForgeDirection.UNKNOWN, (long) (stack.getTagCompound().getFloat("energy") * 1000));
|
||||
}
|
||||
else if (energy instanceof NBTTagLong)
|
||||
{
|
||||
((TileEntityBatteryBox) entity).setEnergy(ForgeDirection.UNKNOWN, stack.getTagCompound().getLong("energy"));
|
||||
((TileBatteryBox) entity).setEnergy(ForgeDirection.UNKNOWN, stack.getTagCompound().getLong("energy"));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -98,16 +98,16 @@ public class ItemBlockEnergyStorage extends ItemBlock
|
|||
{
|
||||
ItemStack itemStack = new ItemStack(RecipeLoader.blockBatBox);
|
||||
TileEntity entity = vec.getTileEntity(world);
|
||||
if (entity instanceof TileEntityBatteryBox)
|
||||
if (entity instanceof TileBatteryBox)
|
||||
{
|
||||
if (itemStack.getTagCompound() == null)
|
||||
{
|
||||
itemStack.setTagCompound(new NBTTagCompound());
|
||||
}
|
||||
itemStack.getTagCompound().setBoolean("wrenched", true);
|
||||
itemStack.getTagCompound().setFloat("energy", ((TileEntityBatteryBox) entity).getEnergyStored());
|
||||
((TileEntityBatteryBox) entity).getInventory().saveInv(itemStack.getTagCompound());
|
||||
((TileEntityBatteryBox) entity).getInventory().clear();
|
||||
itemStack.getTagCompound().setFloat("energy", ((TileBatteryBox) entity).getEnergyStored());
|
||||
((TileBatteryBox) entity).getInventory().saveInv(itemStack.getTagCompound());
|
||||
((TileBatteryBox) entity).getInventory().clear();
|
||||
}
|
||||
return itemStack;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
|
|||
*
|
||||
* @author DarkGuardsman
|
||||
*/
|
||||
public class TileEntityBatteryBox extends TileEntityEnergyMachine
|
||||
public class TileBatteryBox extends TileEntityEnergyMachine
|
||||
{
|
||||
public TileEntityBatteryBox()
|
||||
public TileBatteryBox()
|
||||
{
|
||||
super(10000, 5000000);
|
||||
this.invSlots = 2;
|
||||
|
|
@ -1,348 +0,0 @@
|
|||
package resonantinduction.energy.model;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
|
||||
public class ModelBattery extends ModelBase
|
||||
{
|
||||
// fields
|
||||
ModelRenderer BackInnerPanel;
|
||||
ModelRenderer Slide1;
|
||||
ModelRenderer Slide2;
|
||||
ModelRenderer Slide3;
|
||||
ModelRenderer Slide4;
|
||||
ModelRenderer Slide5;
|
||||
ModelRenderer Slide6;
|
||||
ModelRenderer Slide7;
|
||||
ModelRenderer Slide8;
|
||||
ModelRenderer Slide9;
|
||||
ModelRenderer Slide10;
|
||||
ModelRenderer Slide11;
|
||||
ModelRenderer Slide12;
|
||||
ModelRenderer Slide13;
|
||||
ModelRenderer Slide14;
|
||||
ModelRenderer Slide15;
|
||||
ModelRenderer Slide16;
|
||||
ModelRenderer Slide17;
|
||||
ModelRenderer Slide18;
|
||||
ModelRenderer Slide19;
|
||||
ModelRenderer Slide20;
|
||||
ModelRenderer Slide21;
|
||||
ModelRenderer Slide22;
|
||||
ModelRenderer Slide23;
|
||||
ModelRenderer Slide24;
|
||||
ModelRenderer Slide25;
|
||||
ModelRenderer Slide26;
|
||||
ModelRenderer Slide27;
|
||||
ModelRenderer Slide28;
|
||||
ModelRenderer FrontInnerPanel;
|
||||
ModelRenderer RightInnerPanel;
|
||||
ModelRenderer LeftInnerPanel;
|
||||
ModelRenderer Podium;
|
||||
ModelRenderer BottomBase;
|
||||
ModelRenderer PodiumBase;
|
||||
ModelRenderer TapNode1;
|
||||
ModelRenderer TapNode2;
|
||||
ModelRenderer TapNode3;
|
||||
ModelRenderer TapNode4;
|
||||
ModelRenderer ElectricalConduit;
|
||||
|
||||
public ModelBattery()
|
||||
{
|
||||
textureWidth = 128;
|
||||
textureHeight = 128;
|
||||
|
||||
BackInnerPanel = new ModelRenderer(this, 0, 46);
|
||||
BackInnerPanel.addBox(0F, 0F, 0F, 14, 15, 3);
|
||||
BackInnerPanel.setRotationPoint(-7F, 9F, 4F);
|
||||
BackInnerPanel.setTextureSize(64, 32);
|
||||
BackInnerPanel.mirror = true;
|
||||
setRotation(BackInnerPanel, 0F, 0F, 0F);
|
||||
Slide1 = new ModelRenderer(this, 39, 0);
|
||||
Slide1.addBox(0F, 0F, 0F, 14, 1, 1);
|
||||
Slide1.setRotationPoint(-7F, 15F, 7F);
|
||||
Slide1.setTextureSize(64, 32);
|
||||
Slide1.mirror = true;
|
||||
setRotation(Slide1, 0F, 0F, 0F);
|
||||
Slide2 = new ModelRenderer(this, 39, 0);
|
||||
Slide2.addBox(0F, 0F, 0F, 14, 1, 1);
|
||||
Slide2.setRotationPoint(-7F, 15F, -8F);
|
||||
Slide2.setTextureSize(64, 32);
|
||||
Slide2.mirror = true;
|
||||
setRotation(Slide2, 0F, 0F, 0F);
|
||||
Slide3 = new ModelRenderer(this, 35, 0);
|
||||
Slide3.addBox(0F, 0F, 0F, 16, 1, 1);
|
||||
Slide3.setRotationPoint(-8F, 23F, -8F);
|
||||
Slide3.setTextureSize(64, 32);
|
||||
Slide3.mirror = true;
|
||||
setRotation(Slide3, 0F, 0F, 0F);
|
||||
Slide4 = new ModelRenderer(this, 35, 0);
|
||||
Slide4.addBox(0F, 0F, 0F, 16, 1, 1);
|
||||
Slide4.setRotationPoint(-8F, 23F, 7F);
|
||||
Slide4.setTextureSize(64, 32);
|
||||
Slide4.mirror = true;
|
||||
setRotation(Slide4, 0F, 0F, 0F);
|
||||
Slide5 = new ModelRenderer(this, 0, 19);
|
||||
Slide5.addBox(0F, 0F, 0F, 1, 1, 14);
|
||||
Slide5.setRotationPoint(-8F, 16F, -7F);
|
||||
Slide5.setTextureSize(64, 32);
|
||||
Slide5.mirror = true;
|
||||
setRotation(Slide5, 0F, 0F, 0F);
|
||||
Slide6 = new ModelRenderer(this, 0, 19);
|
||||
Slide6.addBox(0F, 0F, 0F, 1, 1, 14);
|
||||
Slide6.setRotationPoint(7F, 16F, -7F);
|
||||
Slide6.setTextureSize(64, 32);
|
||||
Slide6.mirror = true;
|
||||
setRotation(Slide6, 0F, 0F, 0F);
|
||||
Slide7 = new ModelRenderer(this, 0, 19);
|
||||
Slide7.addBox(0F, 0F, 0F, 1, 1, 14);
|
||||
Slide7.setRotationPoint(7F, 23F, -7F);
|
||||
Slide7.setTextureSize(64, 32);
|
||||
Slide7.mirror = true;
|
||||
setRotation(Slide7, 0F, 0F, 0F);
|
||||
Slide8 = new ModelRenderer(this, 0, 19);
|
||||
Slide8.addBox(0F, 0F, 0F, 1, 1, 14);
|
||||
Slide8.setRotationPoint(-8F, 23F, -7F);
|
||||
Slide8.setTextureSize(64, 32);
|
||||
Slide8.mirror = true;
|
||||
setRotation(Slide8, 0F, 0F, 0F);
|
||||
Slide9 = new ModelRenderer(this, 0, 0);
|
||||
Slide9.addBox(0F, 0F, 0F, 1, 14, 1);
|
||||
Slide9.setRotationPoint(7F, 9F, 0F);
|
||||
Slide9.setTextureSize(64, 32);
|
||||
Slide9.mirror = true;
|
||||
setRotation(Slide9, 0F, 0F, 0F);
|
||||
Slide10 = new ModelRenderer(this, 0, 0);
|
||||
Slide10.addBox(0F, 0F, 0F, 1, 14, 1);
|
||||
Slide10.setRotationPoint(7F, 9F, -8F);
|
||||
Slide10.setTextureSize(64, 32);
|
||||
Slide10.mirror = true;
|
||||
setRotation(Slide10, 0F, 0F, 0F);
|
||||
Slide11 = new ModelRenderer(this, 0, 0);
|
||||
Slide11.addBox(0F, 0F, 0F, 1, 14, 1);
|
||||
Slide11.setRotationPoint(0F, 9F, -8F);
|
||||
Slide11.setTextureSize(64, 32);
|
||||
Slide11.mirror = true;
|
||||
setRotation(Slide11, 0F, 0F, 0F);
|
||||
Slide12 = new ModelRenderer(this, 0, 0);
|
||||
Slide12.addBox(0F, 0F, 0F, 1, 14, 1);
|
||||
Slide12.setRotationPoint(0F, 9F, 7F);
|
||||
Slide12.setTextureSize(64, 32);
|
||||
Slide12.mirror = true;
|
||||
setRotation(Slide12, 0F, 0F, 0F);
|
||||
Slide13 = new ModelRenderer(this, 0, 0);
|
||||
Slide13.addBox(0F, 0F, 0F, 1, 14, 1);
|
||||
Slide13.setRotationPoint(-8F, 9F, -8F);
|
||||
Slide13.setTextureSize(64, 32);
|
||||
Slide13.mirror = true;
|
||||
setRotation(Slide13, 0F, 0F, 0F);
|
||||
Slide14 = new ModelRenderer(this, 0, 0);
|
||||
Slide14.addBox(0F, 0F, 0F, 1, 14, 1);
|
||||
Slide14.setRotationPoint(-8F, 9F, 0F);
|
||||
Slide14.setTextureSize(64, 32);
|
||||
Slide14.mirror = true;
|
||||
setRotation(Slide14, 0F, 0F, 0F);
|
||||
Slide15 = new ModelRenderer(this, 0, 0);
|
||||
Slide15.addBox(0F, 0F, 0F, 1, 14, 1);
|
||||
Slide15.setRotationPoint(-1F, 9F, -8F);
|
||||
Slide15.setTextureSize(64, 32);
|
||||
Slide15.mirror = true;
|
||||
setRotation(Slide15, 0F, 0F, 0F);
|
||||
Slide16 = new ModelRenderer(this, 0, 0);
|
||||
Slide16.addBox(0F, 0F, 0F, 1, 14, 1);
|
||||
Slide16.setRotationPoint(-1F, 9F, 7F);
|
||||
Slide16.setTextureSize(64, 32);
|
||||
Slide16.mirror = true;
|
||||
setRotation(Slide16, 0F, 0F, 0F);
|
||||
Slide17 = new ModelRenderer(this, 0, 0);
|
||||
Slide17.addBox(0F, 0F, 0F, 1, 14, 1);
|
||||
Slide17.setRotationPoint(7F, 9F, 7F);
|
||||
Slide17.setTextureSize(64, 32);
|
||||
Slide17.mirror = true;
|
||||
setRotation(Slide17, 0F, 0F, 0F);
|
||||
Slide18 = new ModelRenderer(this, 0, 0);
|
||||
Slide18.addBox(0F, 0F, 0F, 1, 14, 1);
|
||||
Slide18.setRotationPoint(-8F, 9F, 7F);
|
||||
Slide18.setTextureSize(64, 32);
|
||||
Slide18.mirror = true;
|
||||
setRotation(Slide18, 0F, 0F, 0F);
|
||||
Slide19 = new ModelRenderer(this, 0, 0);
|
||||
Slide19.addBox(0F, 0F, 0F, 1, 14, 1);
|
||||
Slide19.setRotationPoint(7F, 9F, -1F);
|
||||
Slide19.setTextureSize(64, 32);
|
||||
Slide19.mirror = true;
|
||||
setRotation(Slide19, 0F, 0F, 0F);
|
||||
Slide20 = new ModelRenderer(this, 0, 0);
|
||||
Slide20.addBox(0F, 0F, 0F, 1, 14, 1);
|
||||
Slide20.setRotationPoint(-8F, 9F, -1F);
|
||||
Slide20.setTextureSize(64, 32);
|
||||
Slide20.mirror = true;
|
||||
setRotation(Slide20, 0F, 0F, 0F);
|
||||
Slide21 = new ModelRenderer(this, 0, 19);
|
||||
Slide21.addBox(0F, 0F, 0F, 1, 1, 14);
|
||||
Slide21.setRotationPoint(-8F, 15F, -7F);
|
||||
Slide21.setTextureSize(64, 32);
|
||||
Slide21.mirror = true;
|
||||
setRotation(Slide21, 0F, 0F, 0F);
|
||||
Slide22 = new ModelRenderer(this, 0, 19);
|
||||
Slide22.addBox(0F, 0F, 0F, 1, 1, 14);
|
||||
Slide22.setRotationPoint(7F, 8F, -7F);
|
||||
Slide22.setTextureSize(64, 32);
|
||||
Slide22.mirror = true;
|
||||
setRotation(Slide22, 0F, 0F, 0F);
|
||||
Slide23 = new ModelRenderer(this, 0, 19);
|
||||
Slide23.addBox(0F, 0F, 0F, 1, 1, 14);
|
||||
Slide23.setRotationPoint(-8F, 8F, -7F);
|
||||
Slide23.setTextureSize(64, 32);
|
||||
Slide23.mirror = true;
|
||||
setRotation(Slide23, 0F, 0F, 0F);
|
||||
Slide24 = new ModelRenderer(this, 0, 19);
|
||||
Slide24.addBox(0F, 0F, 0F, 1, 1, 14);
|
||||
Slide24.setRotationPoint(7F, 15F, -7F);
|
||||
Slide24.setTextureSize(64, 32);
|
||||
Slide24.mirror = true;
|
||||
setRotation(Slide24, 0F, 0F, 0F);
|
||||
Slide25 = new ModelRenderer(this, 35, 0);
|
||||
Slide25.addBox(0F, 0F, 0F, 16, 1, 1);
|
||||
Slide25.setRotationPoint(-8F, 8F, 7F);
|
||||
Slide25.setTextureSize(64, 32);
|
||||
Slide25.mirror = true;
|
||||
setRotation(Slide25, 0F, 0F, 0F);
|
||||
Slide26 = new ModelRenderer(this, 35, 0);
|
||||
Slide26.addBox(0F, 0F, 0F, 16, 1, 1);
|
||||
Slide26.setRotationPoint(-8F, 8F, -8F);
|
||||
Slide26.setTextureSize(64, 32);
|
||||
Slide26.mirror = true;
|
||||
setRotation(Slide26, 0F, 0F, 0F);
|
||||
Slide27 = new ModelRenderer(this, 39, 0);
|
||||
Slide27.addBox(0F, 0F, 0F, 14, 1, 1);
|
||||
Slide27.setRotationPoint(-7F, 16F, 7F);
|
||||
Slide27.setTextureSize(64, 32);
|
||||
Slide27.mirror = true;
|
||||
setRotation(Slide27, 0F, 0F, 0F);
|
||||
Slide28 = new ModelRenderer(this, 39, 0);
|
||||
Slide28.addBox(0F, 0F, 0F, 14, 1, 1);
|
||||
Slide28.setRotationPoint(-7F, 16F, -8F);
|
||||
Slide28.setTextureSize(64, 32);
|
||||
Slide28.mirror = true;
|
||||
setRotation(Slide28, 0F, 0F, 0F);
|
||||
FrontInnerPanel = new ModelRenderer(this, 0, 46);
|
||||
FrontInnerPanel.addBox(0F, 0F, 0F, 14, 15, 3);
|
||||
FrontInnerPanel.setRotationPoint(-7F, 9F, -7F);
|
||||
FrontInnerPanel.setTextureSize(64, 32);
|
||||
FrontInnerPanel.mirror = true;
|
||||
setRotation(FrontInnerPanel, 0F, 0F, 0F);
|
||||
RightInnerPanel = new ModelRenderer(this, 0, 65);
|
||||
RightInnerPanel.addBox(0F, 0F, 0F, 3, 15, 8);
|
||||
RightInnerPanel.setRotationPoint(-7F, 9F, -4F);
|
||||
RightInnerPanel.setTextureSize(64, 32);
|
||||
RightInnerPanel.mirror = true;
|
||||
setRotation(RightInnerPanel, 0F, 0F, 0F);
|
||||
LeftInnerPanel = new ModelRenderer(this, 0, 65);
|
||||
LeftInnerPanel.addBox(0F, 0F, 0F, 3, 15, 8);
|
||||
LeftInnerPanel.setRotationPoint(4F, 9F, -4F);
|
||||
LeftInnerPanel.setTextureSize(64, 32);
|
||||
LeftInnerPanel.mirror = true;
|
||||
setRotation(LeftInnerPanel, 0F, 0F, 0F);
|
||||
Podium = new ModelRenderer(this, 23, 65);
|
||||
Podium.addBox(0F, 0F, 0F, 1, 9, 1);
|
||||
Podium.setRotationPoint(-0.5F, 12F, -0.5F);
|
||||
Podium.setTextureSize(64, 32);
|
||||
Podium.mirror = true;
|
||||
setRotation(Podium, 0F, 0F, 0F);
|
||||
BottomBase = new ModelRenderer(this, 0, 36);
|
||||
BottomBase.addBox(0F, 0F, 0F, 8, 1, 8);
|
||||
BottomBase.setRotationPoint(-4F, 23F, -4F);
|
||||
BottomBase.setTextureSize(64, 32);
|
||||
BottomBase.mirror = true;
|
||||
setRotation(BottomBase, 0F, 0F, 0F);
|
||||
PodiumBase = new ModelRenderer(this, 0, 89);
|
||||
PodiumBase.addBox(0F, 0F, 0F, 4, 2, 4);
|
||||
PodiumBase.setRotationPoint(-2F, 21F, -2F);
|
||||
PodiumBase.setTextureSize(64, 32);
|
||||
PodiumBase.mirror = true;
|
||||
setRotation(PodiumBase, 0F, 0F, 0F);
|
||||
TapNode1 = new ModelRenderer(this, 23, 76);
|
||||
TapNode1.addBox(0F, 0F, 0F, 1, 2, 1);
|
||||
TapNode1.setRotationPoint(-0.5F, 15F, 3F);
|
||||
TapNode1.setTextureSize(64, 32);
|
||||
TapNode1.mirror = true;
|
||||
setRotation(TapNode1, 0F, 0F, 0F);
|
||||
TapNode2 = new ModelRenderer(this, 23, 76);
|
||||
TapNode2.addBox(0F, 0F, 0F, 1, 2, 1);
|
||||
TapNode2.setRotationPoint(3F, 15F, -0.5F);
|
||||
TapNode2.setTextureSize(64, 32);
|
||||
TapNode2.mirror = true;
|
||||
setRotation(TapNode2, 0F, 0F, 0F);
|
||||
TapNode3 = new ModelRenderer(this, 23, 76);
|
||||
TapNode3.addBox(0F, 0F, 0F, 1, 2, 1);
|
||||
TapNode3.setRotationPoint(-0.5F, 15F, -4F);
|
||||
TapNode3.setTextureSize(64, 32);
|
||||
TapNode3.mirror = true;
|
||||
setRotation(TapNode3, 0F, 0F, 0F);
|
||||
TapNode4 = new ModelRenderer(this, 23, 76);
|
||||
TapNode4.addBox(0F, 0F, 0F, 1, 2, 1);
|
||||
TapNode4.setRotationPoint(-4F, 15F, -0.5F);
|
||||
TapNode4.setTextureSize(64, 32);
|
||||
TapNode4.mirror = true;
|
||||
setRotation(TapNode4, 0F, 0F, 0F);
|
||||
ElectricalConduit = new ModelRenderer(this, 17, 89);
|
||||
ElectricalConduit.addBox(0F, 0F, 0F, 3, 3, 3);
|
||||
ElectricalConduit.setRotationPoint(-1.5F, 11F, -1.5F);
|
||||
ElectricalConduit.setTextureSize(64, 32);
|
||||
ElectricalConduit.mirror = true;
|
||||
setRotation(ElectricalConduit, 0F, 0F, 0F);
|
||||
}
|
||||
|
||||
public void render(float f5)
|
||||
{
|
||||
BackInnerPanel.render(f5);
|
||||
Slide1.render(f5);
|
||||
Slide2.render(f5);
|
||||
Slide3.render(f5);
|
||||
Slide4.render(f5);
|
||||
Slide5.render(f5);
|
||||
Slide6.render(f5);
|
||||
Slide7.render(f5);
|
||||
Slide8.render(f5);
|
||||
Slide9.render(f5);
|
||||
Slide10.render(f5);
|
||||
Slide11.render(f5);
|
||||
Slide12.render(f5);
|
||||
Slide13.render(f5);
|
||||
Slide14.render(f5);
|
||||
Slide15.render(f5);
|
||||
Slide16.render(f5);
|
||||
Slide17.render(f5);
|
||||
Slide18.render(f5);
|
||||
Slide19.render(f5);
|
||||
Slide20.render(f5);
|
||||
Slide21.render(f5);
|
||||
Slide22.render(f5);
|
||||
Slide23.render(f5);
|
||||
Slide24.render(f5);
|
||||
Slide25.render(f5);
|
||||
Slide26.render(f5);
|
||||
Slide27.render(f5);
|
||||
Slide28.render(f5);
|
||||
FrontInnerPanel.render(f5);
|
||||
RightInnerPanel.render(f5);
|
||||
LeftInnerPanel.render(f5);
|
||||
Podium.render(f5);
|
||||
BottomBase.render(f5);
|
||||
PodiumBase.render(f5);
|
||||
TapNode1.render(f5);
|
||||
TapNode2.render(f5);
|
||||
TapNode3.render(f5);
|
||||
TapNode4.render(f5);
|
||||
ElectricalConduit.render(f5);
|
||||
}
|
||||
|
||||
private void setRotation(ModelRenderer model, float x, float y, float z)
|
||||
{
|
||||
model.rotateAngleX = x;
|
||||
model.rotateAngleY = y;
|
||||
model.rotateAngleZ = z;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,454 +0,0 @@
|
|||
package resonantinduction.energy.model;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
import net.minecraft.entity.Entity;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ModelInsulation extends ModelBase
|
||||
{
|
||||
// fields
|
||||
ModelRenderer Middle;
|
||||
ModelRenderer ToBLeft;
|
||||
ModelRenderer BoBLeft;
|
||||
ModelRenderer ToBRight;
|
||||
ModelRenderer BoBRight;
|
||||
ModelRenderer BoBFront;
|
||||
ModelRenderer BoBBack;
|
||||
ModelRenderer ToBFront;
|
||||
ModelRenderer ToBBack;
|
||||
ModelRenderer BoTLeft;
|
||||
ModelRenderer ToTRight;
|
||||
ModelRenderer BoTRight;
|
||||
ModelRenderer BoTFront;
|
||||
ModelRenderer ToTLeft;
|
||||
ModelRenderer BoTBack;
|
||||
ModelRenderer ToTBack;
|
||||
ModelRenderer ToTFront;
|
||||
ModelRenderer LoFFront;
|
||||
ModelRenderer BoFBack;
|
||||
ModelRenderer RoFFront;
|
||||
ModelRenderer BoFFront;
|
||||
ModelRenderer ToFBack;
|
||||
ModelRenderer ToFFront;
|
||||
ModelRenderer RoFBack;
|
||||
ModelRenderer LoFBack;
|
||||
ModelRenderer BoBackBack;
|
||||
ModelRenderer ToBackBack;
|
||||
ModelRenderer RoBackBack;
|
||||
ModelRenderer RoBackFront;
|
||||
ModelRenderer LoBackFront;
|
||||
ModelRenderer BoBackFront;
|
||||
ModelRenderer ToBackFront;
|
||||
ModelRenderer LoBackFront2;
|
||||
ModelRenderer BToRLeft;
|
||||
ModelRenderer FoRRight;
|
||||
ModelRenderer ToRLeft;
|
||||
ModelRenderer BToRRight;
|
||||
ModelRenderer BoRLeft;
|
||||
ModelRenderer ToRRight;
|
||||
ModelRenderer FoRLeft;
|
||||
ModelRenderer BoRRight;
|
||||
ModelRenderer BoLRight;
|
||||
ModelRenderer BToLRight;
|
||||
ModelRenderer FoLLeft;
|
||||
ModelRenderer ToLRight;
|
||||
ModelRenderer FoLRight;
|
||||
ModelRenderer BoLLeft;
|
||||
ModelRenderer ToLLeft;
|
||||
ModelRenderer BToLLeft;
|
||||
|
||||
public ModelInsulation()
|
||||
{
|
||||
textureWidth = 128;
|
||||
textureHeight = 128;
|
||||
|
||||
Middle = new ModelRenderer(this, 0, 0);
|
||||
Middle.addBox(0F, 0F, 0F, 6, 6, 6);
|
||||
Middle.setRotationPoint(-3F, 13F, -3F);
|
||||
Middle.setTextureSize(128, 128);
|
||||
Middle.mirror = true;
|
||||
setRotation(Middle, 0F, 0F, 0F);
|
||||
ToBLeft = new ModelRenderer(this, 25, 0);
|
||||
ToBLeft.addBox(0F, 0F, 0F, 1, 2, 4);
|
||||
ToBLeft.setRotationPoint(-3F, 19F, -2F);
|
||||
ToBLeft.setTextureSize(128, 128);
|
||||
ToBLeft.mirror = true;
|
||||
setRotation(ToBLeft, 0F, 0F, 0F);
|
||||
BoBLeft = new ModelRenderer(this, 25, 0);
|
||||
BoBLeft.addBox(0F, 0F, 0F, 1, 2, 4);
|
||||
BoBLeft.setRotationPoint(-3F, 22F, -2F);
|
||||
BoBLeft.setTextureSize(128, 128);
|
||||
BoBLeft.mirror = true;
|
||||
setRotation(BoBLeft, 0F, 0F, 0F);
|
||||
ToBRight = new ModelRenderer(this, 36, 0);
|
||||
ToBRight.addBox(0F, 0F, 0F, 1, 2, 4);
|
||||
ToBRight.setRotationPoint(2F, 19F, -2F);
|
||||
ToBRight.setTextureSize(128, 128);
|
||||
ToBRight.mirror = true;
|
||||
setRotation(ToBRight, 0F, 0F, 0F);
|
||||
BoBRight = new ModelRenderer(this, 36, 0);
|
||||
BoBRight.addBox(0F, 0F, 0F, 1, 2, 4);
|
||||
BoBRight.setRotationPoint(2F, 22F, -2F);
|
||||
BoBRight.setTextureSize(128, 128);
|
||||
BoBRight.mirror = true;
|
||||
setRotation(BoBRight, 0F, 0F, 0F);
|
||||
BoBFront = new ModelRenderer(this, 25, 7);
|
||||
BoBFront.addBox(0F, 0F, 0F, 6, 2, 1);
|
||||
BoBFront.setRotationPoint(-3F, 22F, -3F);
|
||||
BoBFront.setTextureSize(128, 128);
|
||||
BoBFront.mirror = true;
|
||||
setRotation(BoBFront, 0F, 0F, 0F);
|
||||
BoBBack = new ModelRenderer(this, 40, 7);
|
||||
BoBBack.addBox(0F, 0F, 0F, 6, 2, 1);
|
||||
BoBBack.setRotationPoint(-3F, 22F, 2F);
|
||||
BoBBack.setTextureSize(128, 128);
|
||||
BoBBack.mirror = true;
|
||||
setRotation(BoBBack, 0F, 0F, 0F);
|
||||
ToBFront = new ModelRenderer(this, 25, 7);
|
||||
ToBFront.addBox(0F, 0F, 0F, 6, 2, 1);
|
||||
ToBFront.setRotationPoint(-3F, 19F, -3F);
|
||||
ToBFront.setTextureSize(128, 128);
|
||||
ToBFront.mirror = true;
|
||||
setRotation(ToBFront, 0F, 0F, 0F);
|
||||
ToBBack = new ModelRenderer(this, 40, 7);
|
||||
ToBBack.addBox(0F, 0F, 0F, 6, 2, 1);
|
||||
ToBBack.setRotationPoint(-3F, 19F, 2F);
|
||||
ToBBack.setTextureSize(128, 128);
|
||||
ToBBack.mirror = true;
|
||||
setRotation(ToBBack, 0F, 0F, 0F);
|
||||
BoTLeft = new ModelRenderer(this, 57, 0);
|
||||
BoTLeft.addBox(0F, 0F, 0F, 1, 2, 4);
|
||||
BoTLeft.setRotationPoint(-3F, 11F, -2F);
|
||||
BoTLeft.setTextureSize(128, 128);
|
||||
BoTLeft.mirror = true;
|
||||
setRotation(BoTLeft, 0F, 0F, 0F);
|
||||
ToTRight = new ModelRenderer(this, 68, 0);
|
||||
ToTRight.addBox(0F, 0F, 0F, 1, 2, 4);
|
||||
ToTRight.setRotationPoint(2F, 8F, -2F);
|
||||
ToTRight.setTextureSize(128, 128);
|
||||
ToTRight.mirror = true;
|
||||
setRotation(ToTRight, 0F, 0F, 0F);
|
||||
BoTRight = new ModelRenderer(this, 68, 0);
|
||||
BoTRight.addBox(0F, 0F, 0F, 1, 2, 4);
|
||||
BoTRight.setRotationPoint(2F, 11F, -2F);
|
||||
BoTRight.setTextureSize(128, 128);
|
||||
BoTRight.mirror = true;
|
||||
setRotation(BoTRight, 0F, 0F, 0F);
|
||||
BoTFront = new ModelRenderer(this, 57, 7);
|
||||
BoTFront.addBox(0F, 0F, 0F, 6, 2, 1);
|
||||
BoTFront.setRotationPoint(-3F, 11F, -3F);
|
||||
BoTFront.setTextureSize(128, 128);
|
||||
BoTFront.mirror = true;
|
||||
setRotation(BoTFront, 0F, 0F, 0F);
|
||||
ToTLeft = new ModelRenderer(this, 57, 0);
|
||||
ToTLeft.addBox(0F, 0F, 0F, 1, 2, 4);
|
||||
ToTLeft.setRotationPoint(-3F, 8F, -2F);
|
||||
ToTLeft.setTextureSize(128, 128);
|
||||
ToTLeft.mirror = true;
|
||||
setRotation(ToTLeft, 0F, 0F, 0F);
|
||||
BoTBack = new ModelRenderer(this, 72, 7);
|
||||
BoTBack.addBox(0F, 0F, 0F, 6, 2, 1);
|
||||
BoTBack.setRotationPoint(-3F, 11F, 2F);
|
||||
BoTBack.setTextureSize(128, 128);
|
||||
BoTBack.mirror = true;
|
||||
setRotation(BoTBack, 0F, 0F, 0F);
|
||||
ToTBack = new ModelRenderer(this, 72, 7);
|
||||
ToTBack.addBox(0F, 0F, 0F, 6, 2, 1);
|
||||
ToTBack.setRotationPoint(-3F, 8F, 2F);
|
||||
ToTBack.setTextureSize(128, 128);
|
||||
ToTBack.mirror = true;
|
||||
setRotation(ToTBack, 0F, 0F, 0F);
|
||||
ToTFront = new ModelRenderer(this, 57, 7);
|
||||
ToTFront.addBox(0F, 0F, 0F, 6, 2, 1);
|
||||
ToTFront.setRotationPoint(-3F, 8F, -3F);
|
||||
ToTFront.setTextureSize(128, 128);
|
||||
ToTFront.mirror = true;
|
||||
setRotation(ToTFront, 0F, 0F, 0F);
|
||||
LoFFront = new ModelRenderer(this, 25, 14);
|
||||
LoFFront.addBox(0F, 0F, 0F, 1, 4, 2);
|
||||
LoFFront.setRotationPoint(-3F, 14F, -8F);
|
||||
LoFFront.setTextureSize(128, 128);
|
||||
LoFFront.mirror = true;
|
||||
setRotation(LoFFront, 0F, 0F, 0F);
|
||||
BoFBack = new ModelRenderer(this, 32, 14);
|
||||
BoFBack.addBox(0F, 0F, 0F, 6, 1, 2);
|
||||
BoFBack.setRotationPoint(-3F, 18F, -5F);
|
||||
BoFBack.setTextureSize(128, 128);
|
||||
BoFBack.mirror = true;
|
||||
setRotation(BoFBack, 0F, 0F, 0F);
|
||||
RoFFront = new ModelRenderer(this, 25, 21);
|
||||
RoFFront.addBox(0F, 0F, 0F, 1, 4, 2);
|
||||
RoFFront.setRotationPoint(2F, 14F, -8F);
|
||||
RoFFront.setTextureSize(128, 128);
|
||||
RoFFront.mirror = true;
|
||||
setRotation(RoFFront, 0F, 0F, 0F);
|
||||
BoFFront = new ModelRenderer(this, 32, 14);
|
||||
BoFFront.addBox(0F, 0F, 0F, 6, 1, 2);
|
||||
BoFFront.setRotationPoint(-3F, 18F, -8F);
|
||||
BoFFront.setTextureSize(128, 128);
|
||||
BoFFront.mirror = true;
|
||||
setRotation(BoFFront, 0F, 0F, 0F);
|
||||
ToFBack = new ModelRenderer(this, 32, 18);
|
||||
ToFBack.addBox(0F, 0F, 0F, 6, 1, 2);
|
||||
ToFBack.setRotationPoint(-3F, 13F, -5F);
|
||||
ToFBack.setTextureSize(128, 128);
|
||||
ToFBack.mirror = true;
|
||||
setRotation(ToFBack, 0F, 0F, 0F);
|
||||
ToFFront = new ModelRenderer(this, 32, 18);
|
||||
ToFFront.addBox(0F, 0F, 0F, 6, 1, 2);
|
||||
ToFFront.setRotationPoint(-3F, 13F, -8F);
|
||||
ToFFront.setTextureSize(128, 128);
|
||||
ToFFront.mirror = true;
|
||||
setRotation(ToFFront, 0F, 0F, 0F);
|
||||
RoFBack = new ModelRenderer(this, 25, 21);
|
||||
RoFBack.addBox(0F, 0F, 0F, 1, 4, 2);
|
||||
RoFBack.setRotationPoint(2F, 14F, -5F);
|
||||
RoFBack.setTextureSize(128, 128);
|
||||
RoFBack.mirror = true;
|
||||
setRotation(RoFBack, 0F, 0F, 0F);
|
||||
LoFBack = new ModelRenderer(this, 25, 14);
|
||||
LoFBack.addBox(0F, 0F, 0F, 1, 4, 2);
|
||||
LoFBack.setRotationPoint(-3F, 14F, -5F);
|
||||
LoFBack.setTextureSize(128, 128);
|
||||
LoFBack.mirror = true;
|
||||
setRotation(LoFBack, 0F, 0F, 0F);
|
||||
BoBackBack = new ModelRenderer(this, 57, 14);
|
||||
BoBackBack.addBox(0F, 0F, 0F, 6, 1, 2);
|
||||
BoBackBack.setRotationPoint(-3F, 18F, 6F);
|
||||
BoBackBack.setTextureSize(128, 128);
|
||||
BoBackBack.mirror = true;
|
||||
setRotation(BoBackBack, 0F, 0F, 0F);
|
||||
ToBackBack = new ModelRenderer(this, 57, 18);
|
||||
ToBackBack.addBox(0F, 0F, 0F, 6, 1, 2);
|
||||
ToBackBack.setRotationPoint(-3F, 13F, 6F);
|
||||
ToBackBack.setTextureSize(128, 128);
|
||||
ToBackBack.mirror = true;
|
||||
setRotation(ToBackBack, 0F, 0F, 0F);
|
||||
RoBackBack = new ModelRenderer(this, 74, 14);
|
||||
RoBackBack.addBox(0F, 0F, 0F, 1, 4, 2);
|
||||
RoBackBack.setRotationPoint(-3F, 14F, 6F);
|
||||
RoBackBack.setTextureSize(128, 128);
|
||||
RoBackBack.mirror = true;
|
||||
setRotation(RoBackBack, 0F, 0F, 0F);
|
||||
RoBackFront = new ModelRenderer(this, 74, 14);
|
||||
RoBackFront.addBox(0F, 0F, 0F, 1, 4, 2);
|
||||
RoBackFront.setRotationPoint(-3F, 14F, 3F);
|
||||
RoBackFront.setTextureSize(128, 128);
|
||||
RoBackFront.mirror = true;
|
||||
setRotation(RoBackFront, 0F, 0F, 0F);
|
||||
LoBackFront = new ModelRenderer(this, 74, 21);
|
||||
LoBackFront.addBox(0F, 0F, 0F, 1, 4, 2);
|
||||
LoBackFront.setRotationPoint(2F, 14F, 3F);
|
||||
LoBackFront.setTextureSize(128, 128);
|
||||
LoBackFront.mirror = true;
|
||||
setRotation(LoBackFront, 0F, 0F, 0F);
|
||||
BoBackFront = new ModelRenderer(this, 57, 14);
|
||||
BoBackFront.addBox(0F, 0F, 0F, 6, 1, 2);
|
||||
BoBackFront.setRotationPoint(-3F, 18F, 3F);
|
||||
BoBackFront.setTextureSize(128, 128);
|
||||
BoBackFront.mirror = true;
|
||||
setRotation(BoBackFront, 0F, 0F, 0F);
|
||||
ToBackFront = new ModelRenderer(this, 57, 18);
|
||||
ToBackFront.addBox(0F, 0F, 0F, 6, 1, 2);
|
||||
ToBackFront.setRotationPoint(-3F, 13F, 3F);
|
||||
ToBackFront.setTextureSize(128, 128);
|
||||
ToBackFront.mirror = true;
|
||||
setRotation(ToBackFront, 0F, 0F, 0F);
|
||||
LoBackFront2 = new ModelRenderer(this, 74, 21);
|
||||
LoBackFront2.addBox(0F, 0F, 0F, 1, 4, 2);
|
||||
LoBackFront2.setRotationPoint(2F, 14F, 6F);
|
||||
LoBackFront2.setTextureSize(128, 128);
|
||||
LoBackFront2.mirror = true;
|
||||
setRotation(LoBackFront2, 0F, 0F, 0F);
|
||||
BToRLeft = new ModelRenderer(this, 0, 30);
|
||||
BToRLeft.addBox(0F, 0F, 0F, 2, 1, 4);
|
||||
BToRLeft.setRotationPoint(3F, 18F, -2F);
|
||||
BToRLeft.setTextureSize(128, 128);
|
||||
BToRLeft.mirror = true;
|
||||
setRotation(BToRLeft, 0F, 0F, 0F);
|
||||
FoRRight = new ModelRenderer(this, 0, 22);
|
||||
FoRRight.addBox(0F, 0F, 0F, 2, 6, 1);
|
||||
FoRRight.setRotationPoint(6F, 13F, -3F);
|
||||
FoRRight.setTextureSize(128, 128);
|
||||
FoRRight.mirror = true;
|
||||
setRotation(FoRRight, 0F, 0F, 0F);
|
||||
ToRLeft = new ModelRenderer(this, 0, 36);
|
||||
ToRLeft.addBox(0F, 0F, 0F, 2, 1, 4);
|
||||
ToRLeft.setRotationPoint(3F, 13F, -2F);
|
||||
ToRLeft.setTextureSize(128, 128);
|
||||
ToRLeft.mirror = true;
|
||||
setRotation(ToRLeft, 0F, 0F, 0F);
|
||||
BToRRight = new ModelRenderer(this, 0, 30);
|
||||
BToRRight.addBox(0F, 0F, 0F, 2, 1, 4);
|
||||
BToRRight.setRotationPoint(6F, 18F, -2F);
|
||||
BToRRight.setTextureSize(128, 128);
|
||||
BToRRight.mirror = true;
|
||||
setRotation(BToRRight, 0F, 0F, 0F);
|
||||
BoRLeft = new ModelRenderer(this, 7, 22);
|
||||
BoRLeft.addBox(0F, 0F, 0F, 2, 6, 1);
|
||||
BoRLeft.setRotationPoint(3F, 13F, 2F);
|
||||
BoRLeft.setTextureSize(128, 128);
|
||||
BoRLeft.mirror = true;
|
||||
setRotation(BoRLeft, 0F, 0F, 0F);
|
||||
ToRRight = new ModelRenderer(this, 0, 36);
|
||||
ToRRight.addBox(0F, 0F, 0F, 2, 1, 4);
|
||||
ToRRight.setRotationPoint(6F, 13F, -2F);
|
||||
ToRRight.setTextureSize(128, 128);
|
||||
ToRRight.mirror = true;
|
||||
setRotation(ToRRight, 0F, 0F, 0F);
|
||||
FoRLeft = new ModelRenderer(this, 0, 22);
|
||||
FoRLeft.addBox(0F, 0F, 0F, 2, 6, 1);
|
||||
FoRLeft.setRotationPoint(3F, 13F, -3F);
|
||||
FoRLeft.setTextureSize(128, 128);
|
||||
FoRLeft.mirror = true;
|
||||
setRotation(FoRLeft, 0F, 0F, 0F);
|
||||
BoRRight = new ModelRenderer(this, 7, 22);
|
||||
BoRRight.addBox(0F, 0F, 0F, 2, 6, 1);
|
||||
BoRRight.setRotationPoint(6F, 13F, 2F);
|
||||
BoRRight.setTextureSize(128, 128);
|
||||
BoRRight.mirror = true;
|
||||
setRotation(BoRRight, 0F, 0F, 0F);
|
||||
BoLRight = new ModelRenderer(this, 0, 45);
|
||||
BoLRight.addBox(0F, 0F, 0F, 2, 6, 1);
|
||||
BoLRight.setRotationPoint(-5F, 13F, 2F);
|
||||
BoLRight.setTextureSize(128, 128);
|
||||
BoLRight.mirror = true;
|
||||
setRotation(BoLRight, 0F, 0F, 0F);
|
||||
BToLRight = new ModelRenderer(this, 0, 53);
|
||||
BToLRight.addBox(0F, 0F, 0F, 2, 1, 4);
|
||||
BToLRight.setRotationPoint(-5F, 18F, -2F);
|
||||
BToLRight.setTextureSize(128, 128);
|
||||
BToLRight.mirror = true;
|
||||
setRotation(BToLRight, 0F, 0F, 0F);
|
||||
FoLLeft = new ModelRenderer(this, 7, 45);
|
||||
FoLLeft.addBox(0F, 0F, 0F, 2, 6, 1);
|
||||
FoLLeft.setRotationPoint(-8F, 13F, -3F);
|
||||
FoLLeft.setTextureSize(128, 128);
|
||||
FoLLeft.mirror = true;
|
||||
setRotation(FoLLeft, 0F, 0F, 0F);
|
||||
ToLRight = new ModelRenderer(this, 0, 59);
|
||||
ToLRight.addBox(0F, 0F, 0F, 2, 1, 4);
|
||||
ToLRight.setRotationPoint(-5F, 13F, -2F);
|
||||
ToLRight.setTextureSize(128, 128);
|
||||
ToLRight.mirror = true;
|
||||
setRotation(ToLRight, 0F, 0F, 0F);
|
||||
FoLRight = new ModelRenderer(this, 7, 45);
|
||||
FoLRight.addBox(0F, 0F, 0F, 2, 6, 1);
|
||||
FoLRight.setRotationPoint(-5F, 13F, -3F);
|
||||
FoLRight.setTextureSize(128, 128);
|
||||
FoLRight.mirror = true;
|
||||
setRotation(FoLRight, 0F, 0F, 0F);
|
||||
BoLLeft = new ModelRenderer(this, 0, 45);
|
||||
BoLLeft.addBox(0F, 0F, 0F, 2, 6, 1);
|
||||
BoLLeft.setRotationPoint(-8F, 13F, 2F);
|
||||
BoLLeft.setTextureSize(128, 128);
|
||||
BoLLeft.mirror = true;
|
||||
setRotation(BoLLeft, 0F, 0F, 0F);
|
||||
ToLLeft = new ModelRenderer(this, 0, 59);
|
||||
ToLLeft.addBox(0F, 0F, 0F, 2, 1, 4);
|
||||
ToLLeft.setRotationPoint(-8F, 13F, -2F);
|
||||
ToLLeft.setTextureSize(128, 128);
|
||||
ToLLeft.mirror = true;
|
||||
setRotation(ToLLeft, 0F, 0F, 0F);
|
||||
BToLLeft = new ModelRenderer(this, 0, 53);
|
||||
BToLLeft.addBox(0F, 0F, 0F, 2, 1, 4);
|
||||
BToLLeft.setRotationPoint(-8F, 18F, -2F);
|
||||
BToLLeft.setTextureSize(128, 128);
|
||||
BToLLeft.mirror = true;
|
||||
setRotation(BToLLeft, 0F, 0F, 0F);
|
||||
}
|
||||
|
||||
public void renderMiddle(float f5)
|
||||
{
|
||||
Middle.render(f5);
|
||||
}
|
||||
|
||||
public void renderBottom(float f5)
|
||||
{
|
||||
ToBLeft.render(f5);
|
||||
BoBLeft.render(f5);
|
||||
ToBRight.render(f5);
|
||||
BoBRight.render(f5);
|
||||
BoBFront.render(f5);
|
||||
BoBBack.render(f5);
|
||||
ToBFront.render(f5);
|
||||
ToBBack.render(f5);
|
||||
}
|
||||
|
||||
public void renderTop(float f5)
|
||||
{
|
||||
BoTLeft.render(f5);
|
||||
ToTRight.render(f5);
|
||||
BoTRight.render(f5);
|
||||
BoTFront.render(f5);
|
||||
ToTLeft.render(f5);
|
||||
BoTBack.render(f5);
|
||||
ToTBack.render(f5);
|
||||
ToTFront.render(f5);
|
||||
}
|
||||
|
||||
public void renderLeft(float f5)
|
||||
{
|
||||
BoLRight.render(f5);
|
||||
BToLRight.render(f5);
|
||||
FoLLeft.render(f5);
|
||||
ToLRight.render(f5);
|
||||
FoLRight.render(f5);
|
||||
BoLLeft.render(f5);
|
||||
ToLLeft.render(f5);
|
||||
BToLLeft.render(f5);
|
||||
}
|
||||
|
||||
public void renderRight(float f5)
|
||||
{
|
||||
BToRLeft.render(f5);
|
||||
FoRRight.render(f5);
|
||||
ToRLeft.render(f5);
|
||||
BToRRight.render(f5);
|
||||
BoRLeft.render(f5);
|
||||
ToRRight.render(f5);
|
||||
FoRLeft.render(f5);
|
||||
BoRRight.render(f5);
|
||||
}
|
||||
|
||||
public void renderBack(float f5)
|
||||
{
|
||||
BoBackBack.render(f5);
|
||||
ToBackBack.render(f5);
|
||||
RoBackBack.render(f5);
|
||||
RoBackFront.render(f5);
|
||||
LoBackFront.render(f5);
|
||||
BoBackFront.render(f5);
|
||||
ToBackFront.render(f5);
|
||||
LoBackFront2.render(f5);
|
||||
}
|
||||
|
||||
public void renderFront(float f5)
|
||||
{
|
||||
LoFFront.render(f5);
|
||||
BoFBack.render(f5);
|
||||
RoFFront.render(f5);
|
||||
BoFFront.render(f5);
|
||||
ToFBack.render(f5);
|
||||
ToFFront.render(f5);
|
||||
RoFBack.render(f5);
|
||||
LoFBack.render(f5);
|
||||
|
||||
}
|
||||
|
||||
private void setRotation(ModelRenderer model, float x, float y, float z)
|
||||
{
|
||||
model.rotateAngleX = x;
|
||||
model.rotateAngleY = y;
|
||||
model.rotateAngleZ = z;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setRotationAngles(float x, float y, float z, float f3, float f4, float f5, Entity entity)
|
||||
{
|
||||
super.setRotationAngles(x, y, z, f3, f4, f5, entity);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,130 +0,0 @@
|
|||
package resonantinduction.energy.model;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
import net.minecraft.entity.Entity;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ModelWire extends ModelBase
|
||||
{
|
||||
// fields
|
||||
ModelRenderer Middle;
|
||||
ModelRenderer Right;
|
||||
ModelRenderer Left;
|
||||
ModelRenderer Back;
|
||||
ModelRenderer Front;
|
||||
ModelRenderer Top;
|
||||
ModelRenderer Bottom;
|
||||
|
||||
public ModelWire()
|
||||
{
|
||||
textureWidth = 64;
|
||||
textureHeight = 32;
|
||||
Middle = new ModelRenderer(this, 0, 0);
|
||||
Middle.addBox(-1F, -1F, -1F, 4, 4, 4);
|
||||
Middle.setRotationPoint(-1F, 15F, -1F);
|
||||
Middle.setTextureSize(64, 32);
|
||||
Middle.mirror = true;
|
||||
setRotation(Middle, 0F, 0F, 0F);
|
||||
Right = new ModelRenderer(this, 21, 0);
|
||||
Right.addBox(0F, 0F, 0F, 6, 4, 4);
|
||||
Right.setRotationPoint(2F, 14F, -2F);
|
||||
Right.setTextureSize(64, 32);
|
||||
Right.mirror = true;
|
||||
setRotation(Right, 0F, 0F, 0F);
|
||||
Left = new ModelRenderer(this, 21, 0);
|
||||
Left.addBox(0F, 0F, 0F, 6, 4, 4);
|
||||
Left.setRotationPoint(-8F, 14F, -2F);
|
||||
Left.setTextureSize(64, 32);
|
||||
Left.mirror = true;
|
||||
setRotation(Left, 0F, 0F, 0F);
|
||||
Back = new ModelRenderer(this, 0, 11);
|
||||
Back.addBox(0F, 0F, 0F, 4, 4, 6);
|
||||
Back.setRotationPoint(-2F, 14F, 2F);
|
||||
Back.setTextureSize(64, 32);
|
||||
Back.mirror = true;
|
||||
setRotation(Back, 0F, 0F, 0F);
|
||||
Front = new ModelRenderer(this, 0, 11);
|
||||
Front.addBox(0F, 0F, 0F, 4, 4, 6);
|
||||
Front.setRotationPoint(-2F, 14F, -8F);
|
||||
Front.setTextureSize(64, 32);
|
||||
Front.mirror = true;
|
||||
setRotation(Front, 0F, 0F, 0F);
|
||||
Top = new ModelRenderer(this, 21, 11);
|
||||
Top.addBox(0F, 0F, 0F, 4, 6, 4);
|
||||
Top.setRotationPoint(-2F, 8F, -2F);
|
||||
Top.setTextureSize(64, 32);
|
||||
Top.mirror = true;
|
||||
setRotation(Top, 0F, 0F, 0F);
|
||||
Bottom = new ModelRenderer(this, 21, 11);
|
||||
Bottom.addBox(0F, 0F, 0F, 4, 6, 4);
|
||||
Bottom.setRotationPoint(-2F, 18F, -2F);
|
||||
Bottom.setTextureSize(64, 32);
|
||||
Bottom.mirror = true;
|
||||
setRotation(Bottom, 0F, 0F, 0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
||||
{
|
||||
super.render(entity, f, f1, f2, f3, f4, f5);
|
||||
this.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
|
||||
this.renderMiddle();
|
||||
this.renderBottom();
|
||||
this.renderTop();
|
||||
this.renderLeft();
|
||||
this.renderRight();
|
||||
this.renderBack();
|
||||
this.renderFront();
|
||||
}
|
||||
|
||||
public void renderMiddle()
|
||||
{
|
||||
Middle.render(0.0625F);
|
||||
}
|
||||
|
||||
public void renderBottom()
|
||||
{
|
||||
Bottom.render(0.0625F);
|
||||
}
|
||||
|
||||
public void renderTop()
|
||||
{
|
||||
Top.render(0.0625F);
|
||||
}
|
||||
|
||||
public void renderLeft()
|
||||
{
|
||||
Left.render(0.0625F);
|
||||
}
|
||||
|
||||
public void renderRight()
|
||||
{
|
||||
Right.render(0.0625F);
|
||||
}
|
||||
|
||||
public void renderBack()
|
||||
{
|
||||
Back.render(0.0625F);
|
||||
}
|
||||
|
||||
public void renderFront()
|
||||
{
|
||||
Front.render(0.0625F);
|
||||
}
|
||||
|
||||
private void setRotation(ModelRenderer model, float x, float y, float z)
|
||||
{
|
||||
model.rotateAngleX = x;
|
||||
model.rotateAngleY = y;
|
||||
model.rotateAngleZ = z;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setRotationAngles(float x, float y, float z, float f3, float f4, float f5, Entity entity)
|
||||
{
|
||||
super.setRotationAngles(x, y, z, f3, f4, f5, entity);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/**
|
||||
*
|
||||
*/
|
||||
package resonantinduction.energy.gui;
|
||||
package resonantinduction.energy.multimeter;
|
||||
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.client.gui.GuiTextField;
|
||||
|
|
@ -9,7 +9,6 @@ import net.minecraft.entity.player.InventoryPlayer;
|
|||
import net.minecraft.util.ResourceLocation;
|
||||
import resonantinduction.Reference;
|
||||
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;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package resonantinduction.energy.model;
|
||||
package resonantinduction.energy.multimeter;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/**
|
||||
*
|
||||
*/
|
||||
package resonantinduction.core.multimeter;
|
||||
package resonantinduction.energy.multimeter;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
|
|
@ -16,6 +16,8 @@ import net.minecraft.tileentity.TileEntity;
|
|||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import resonantinduction.core.ResonantInduction;
|
||||
import resonantinduction.core.multimeter.RenderMultimeter;
|
||||
import resonantinduction.energy.ResonantInductionEnergy;
|
||||
import universalelectricity.api.CompatibilityModule;
|
||||
import universalelectricity.api.energy.IConductor;
|
||||
import universalelectricity.api.energy.IEnergyNetwork;
|
||||
|
|
@ -349,7 +351,7 @@ public class PartMultimeter extends JCuboidPart implements IPacketReceiver, TFac
|
|||
|
||||
protected ItemStack getItem()
|
||||
{
|
||||
return new ItemStack(ResonantInduction.itemMultimeter);
|
||||
return new ItemStack(ResonantInductionEnergy.itemMultimeter);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package resonantinduction.energy.model;
|
||||
package resonantinduction.energy.tesla;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package resonantinduction.energy.model;
|
||||
package resonantinduction.energy.tesla;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package resonantinduction.energy.model;
|
||||
package resonantinduction.energy.tesla;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
|
|
@ -10,9 +10,6 @@ import net.minecraft.util.ResourceLocation;
|
|||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import resonantinduction.Reference;
|
||||
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;
|
||||
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ import net.minecraft.world.World;
|
|||
import net.minecraftforge.common.ForgeDirection;
|
||||
import resonantinduction.Reference;
|
||||
import resonantinduction.core.ResonantInduction;
|
||||
import resonantinduction.core.Settings;
|
||||
import resonantinduction.core.api.ITesla;
|
||||
import resonantinduction.energy.ILinkable;
|
||||
import universalelectricity.api.energy.EnergyStorageHandler;
|
||||
|
|
@ -128,7 +129,7 @@ public class TileTesla extends TileElectrical implements ITesla, IPacketSender,
|
|||
{
|
||||
this.transfer(((TileTesla) transferTile), Math.min(this.energy.getEmptySpace(), TRANSFER_CAP));
|
||||
|
||||
if (this.zapCounter % 5 == 0 && ResonantInduction.SOUND_FXS)
|
||||
if (this.zapCounter % 5 == 0 && Settings.SOUND_FXS)
|
||||
{
|
||||
this.worldObj.playSoundEffect(this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5, Reference.PREFIX + "electricshock", (float) this.energy.getEnergy() / (float) TRANSFER_CAP, 1.3f - 0.5f * (this.dyeID / 16f));
|
||||
}
|
||||
|
|
@ -204,7 +205,7 @@ public class TileTesla extends TileElectrical implements ITesla, IPacketSender,
|
|||
boolean sentPacket = false;
|
||||
for (ITesla tesla : transferTeslaCoils)
|
||||
{
|
||||
if (this.zapCounter % 5 == 0 && ResonantInduction.SOUND_FXS)
|
||||
if (this.zapCounter % 5 == 0 && Settings.SOUND_FXS)
|
||||
{
|
||||
this.worldObj.playSoundEffect(this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5, Reference.PREFIX + "electricshock", (float) this.energy.getEnergy() / (float) TRANSFER_CAP, 1.3f - 0.5f * (this.dyeID / 16f));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@ import net.minecraft.client.gui.GuiScreen;
|
|||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import resonantinduction.core.multimeter.PartMultimeter;
|
||||
import resonantinduction.core.render.BlockRenderingHandler;
|
||||
import resonantinduction.energy.fx.FXElectricBolt;
|
||||
import resonantinduction.energy.gui.GuiMultimeter;
|
||||
import resonantinduction.energy.multimeter.GuiMultimeter;
|
||||
import resonantinduction.energy.multimeter.PartMultimeter;
|
||||
import universalelectricity.api.vector.Vector3;
|
||||
import codechicken.multipart.TMultiPart;
|
||||
import codechicken.multipart.TileMultipart;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
|||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import resonantinduction.core.multimeter.ContainerMultimeter;
|
||||
import resonantinduction.core.multimeter.PartMultimeter;
|
||||
import resonantinduction.energy.multimeter.PartMultimeter;
|
||||
import codechicken.multipart.TMultiPart;
|
||||
import codechicken.multipart.TileMultipart;
|
||||
import cpw.mods.fml.common.network.IGuiHandler;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package resonantinduction.energy.generator;
|
||||
package resonantinduction.mechanics.generator;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Set;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package resonantinduction.energy.generator;
|
||||
package resonantinduction.mechanics.generator;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package resonantinduction.energy.generator;
|
||||
package resonantinduction.mechanics.generator;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package resonantinduction.energy.generator;
|
||||
package resonantinduction.mechanics.generator;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package resonantinduction.energy.generator;
|
||||
package resonantinduction.mechanics.generator;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package resonantinduction.energy.generator;
|
||||
package resonantinduction.mechanics.generator;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package resonantinduction.energy.generator;
|
||||
package resonantinduction.mechanics.generator;
|
||||
|
||||
/** TileEntity that acts as the connection node for the solar panel */
|
||||
public class TileEntitySolarBox extends TileEntityGenerator
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package resonantinduction.energy.generator;
|
||||
package resonantinduction.mechanics.generator;
|
||||
|
||||
import java.util.EnumSet;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package resonantinduction.energy.generator;
|
||||
package resonantinduction.mechanics.generator;
|
||||
|
||||
public class TileEntitySteamFan extends TileEntitySteamPiston
|
||||
{
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package resonantinduction.energy.generator;
|
||||
package resonantinduction.mechanics.generator;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package resonantinduction.energy.generator;
|
||||
package resonantinduction.mechanics.generator;
|
||||
|
||||
import java.util.EnumSet;
|
||||
|
||||
|
|
@ -10,9 +10,9 @@ import net.minecraft.entity.player.EntityPlayer;
|
|||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import resonantinduction.energy.battery.ContainerBatteryBox;
|
||||
import resonantinduction.energy.battery.TileEntityBatteryBox;
|
||||
import resonantinduction.energy.generator.ContainerCoalGenerator;
|
||||
import resonantinduction.energy.generator.TileEntitySteamGen;
|
||||
import resonantinduction.energy.battery.TileBatteryBox;
|
||||
import resonantinduction.mechanics.generator.ContainerCoalGenerator;
|
||||
import resonantinduction.mechanics.generator.TileEntitySteamGen;
|
||||
import resonantinduction.mechanics.processor.ContainerProcessor;
|
||||
import resonantinduction.mechanics.processor.TileEntityProcessor;
|
||||
import resonantinduction.transport.encoder.ContainerEncoder;
|
||||
|
|
@ -148,9 +148,9 @@ public class CommonProxy implements IGuiHandler
|
|||
return new ContainerCoalGenerator(player.inventory, ((TileEntitySteamGen) tileEntity));
|
||||
}
|
||||
case GUI_BATTERY_BOX:
|
||||
if (tileEntity instanceof TileEntityBatteryBox)
|
||||
if (tileEntity instanceof TileBatteryBox)
|
||||
{
|
||||
return new ContainerBatteryBox(player.inventory, (TileEntityBatteryBox) tileEntity);
|
||||
return new ContainerBatteryBox(player.inventory, (TileBatteryBox) tileEntity);
|
||||
}
|
||||
default:
|
||||
return new ContainerFake(tileEntity);
|
||||
|
|
|
|||
|
|
@ -35,11 +35,9 @@ import resonantinduction.core.resource.ItemBlockOre;
|
|||
import resonantinduction.core.resource.ItemOreDirv;
|
||||
import resonantinduction.core.resource.ItemParts;
|
||||
import resonantinduction.core.resource.ItemParts.Parts;
|
||||
import resonantinduction.energy.battery.BlockEnergyStorage;
|
||||
import resonantinduction.energy.battery.BlockBatteryBox;
|
||||
import resonantinduction.energy.battery.ItemBattery;
|
||||
import resonantinduction.energy.battery.ItemBlockEnergyStorage;
|
||||
import resonantinduction.energy.generator.BlockSmallSteamGen;
|
||||
import resonantinduction.energy.generator.BlockSolarPanel;
|
||||
import resonantinduction.fluid.EnumGas;
|
||||
import resonantinduction.fluid.pipes.BlockPipe;
|
||||
import resonantinduction.fluid.pipes.FluidPartsMaterial;
|
||||
|
|
@ -66,6 +64,8 @@ import resonantinduction.mechanics.armbot.command.TaskRotateTo;
|
|||
import resonantinduction.mechanics.armbot.command.TaskStart;
|
||||
import resonantinduction.mechanics.armbot.command.TaskTake;
|
||||
import resonantinduction.mechanics.armbot.command.TaskUse;
|
||||
import resonantinduction.mechanics.generator.BlockSmallSteamGen;
|
||||
import resonantinduction.mechanics.generator.BlockSolarPanel;
|
||||
import resonantinduction.mechanics.processor.BlockProcessor;
|
||||
import resonantinduction.misc.EntityFarmEgg;
|
||||
import resonantinduction.misc.EnumBird;
|
||||
|
|
@ -313,7 +313,7 @@ public class ResonantInductionTransport
|
|||
RecipeLoader.blockGlowGlass = CoreRegistry.createNewBlock("DMBlockGlowGlass", ResonantInductionTransport.MOD_ID, BlockColorGlowGlass.class, ItemBlockColored.class);
|
||||
RecipeLoader.blockSolar = CoreRegistry.createNewBlock("DMBlockSolar", ResonantInductionTransport.MOD_ID, BlockSolarPanel.class, ItemBlockHolder.class);
|
||||
RecipeLoader.blockGas = CoreRegistry.createNewBlock("DMBlockGas", ResonantInductionTransport.MOD_ID, BlockGasOre.class, ItemBlockHolder.class);
|
||||
RecipeLoader.blockBatBox = CoreRegistry.createNewBlock("DMBlockBatBox", ResonantInductionTransport.MOD_ID, BlockEnergyStorage.class, ItemBlockEnergyStorage.class);
|
||||
RecipeLoader.blockBatBox = CoreRegistry.createNewBlock("DMBlockBatBox", ResonantInductionTransport.MOD_ID, BlockBatteryBox.class, ItemBlockEnergyStorage.class);
|
||||
|
||||
/* ITEMS */
|
||||
RecipeLoader.itemTool = CoreRegistry.createNewItem("DMReadoutTools", ResonantInductionTransport.MOD_ID, ItemReadoutTools.class, true);
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import net.minecraft.tileentity.TileEntity;
|
|||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
import resonantinduction.blocks.BlockHydraulic;
|
||||
import resonantinduction.energy.generator.TileEntitySteamPiston;
|
||||
import resonantinduction.mechanics.generator.TileEntitySteamPiston;
|
||||
|
||||
import com.builtbroken.common.Pair;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package resonantinduction.energy.model;
|
||||
package resonantinduction.transport.levitator;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
|
|
@ -8,7 +8,6 @@ import org.lwjgl.opengl.GL11;
|
|||
|
||||
import resonantinduction.Reference;
|
||||
import resonantinduction.core.ResonantInduction;
|
||||
import resonantinduction.energy.model.ModelEMContractor;
|
||||
|
||||
public class RenderLevitator extends TileEntitySpecialRenderer
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue