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

Some loader refactor

Browse source
This commit is contained in:
Calclavia 2014-01-08 21:42:52 +08:00
parent 3697ad371a
commit 193eacea96
113 changed files with 353 additions and 417 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/main/java/resonantinduction/IndustryTabs.java
View file

@ -1,68 +0,0 @@
package resonantinduction;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
public class IndustryTabs extends CreativeTabs
{
public ItemStack itemStack = new ItemStack(Item.ingotIron, 1, 0);
private static IndustryTabs tabAutomation;
private static IndustryTabs tabIndustrial;
private static IndustryTabs tabHydrualic;
private static IndustryTabs tabMining;
private static IndustryTabs tabWar;
public IndustryTabs(String label)
{
super(label);
}
@Override
public ItemStack getIconItemStack()
{
return this.itemStack;
}
public void setIconItemStack(ItemStack stack)
{
this.itemStack = stack;
}
public static IndustryTabs tabAutomation()
{
if (tabAutomation == null)
{
tabAutomation = new IndustryTabs("Automation");
}
return tabAutomation;
}
public static IndustryTabs tabWar()
{
if (tabWar == null)
{
tabWar = new IndustryTabs("War");
}
return tabWar;
}
public static IndustryTabs tabIndustrial()
{
if (tabIndustrial == null)
{
tabIndustrial = new IndustryTabs("Industrial");
}
return tabIndustrial;
}
public static IndustryTabs tabHydraulic()
{
if (tabHydrualic == null)
{
tabHydrualic = new IndustryTabs("Hydraulic");
}
return tabHydrualic;
}
}

14
src/main/java/resonantinduction/Reference.java Normal file
View file

@ -0,0 +1,14 @@
package resonantinduction;
/**
* A class for static references.
* @author Calclavia
*/
public class Reference
{
public static final String MAJOR_VERSION = "@MAJOR@";
public static final String MINOR_VERSION = "@MINOR@";
public static final String REVISION_VERSION = "@REVIS@";
public static final String BUILD_VERSION = "@BUILD@";
public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + REVISION_VERSION;
}

2
src/main/java/resonantinduction/armbot/BlockArmbot.java
View file

@ -29,7 +29,7 @@ public class BlockArmbot extends BlockAssembly
public BlockArmbot()
{
super("armbot", UniversalElectricity.machine);
DarkCore.requestMultiBlock(AssemblyLine.MOD_ID);
DarkCore.requestMultiBlock(ResonantInductionTransport.MOD_ID);
}
@Override

10
src/main/java/resonantinduction/armbot/TileEntityArmbot.java
View file

@ -1,6 +1,5 @@
package resonantinduction.armbot;
import resonantinduction.ALRecipeLoader;
import resonantinduction.AssemblyLine;
import resonantinduction.api.IArmbot;
import resonantinduction.api.coding.IProgram;
@ -10,6 +9,7 @@ import resonantinduction.armbot.command.TaskGOTO;
import resonantinduction.armbot.command.TaskGrabItem;
import resonantinduction.armbot.command.TaskReturn;
import resonantinduction.armbot.command.TaskRotateTo;
import resonantinduction.core.recipe.RecipeLoader;
import resonantinduction.machine.TileEntityAssembly;
import resonantinduction.transport.encoder.ItemDisk;
import net.minecraft.entity.Entity;
@ -300,18 +300,18 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock,
@Override
public Packet getDescriptionPacket()
{
return AssemblyLine.getTilePacket().getPacket(this, "armbot", this.functioning, this.targetYaw, this.targetPitch, this.actualYaw, this.actualPitch);
return ResonantInductionTransport.getTilePacket().getPacket(this, "armbot", this.functioning, this.targetYaw, this.targetPitch, this.actualYaw, this.actualPitch);
}
public void sendGrabItemToClient()
{
if (this.grabbedObject instanceof ItemStack)
{
PacketHandler.sendPacketToClients(AssemblyLine.getTilePacket().getPacket(this, "armbotItem", true, ((ItemStack) this.grabbedObject).writeToNBT(new NBTTagCompound())), worldObj, new Vector3(this), 64);
PacketHandler.sendPacketToClients(ResonantInductionTransport.getTilePacket().getPacket(this, "armbotItem", true, ((ItemStack) this.grabbedObject).writeToNBT(new NBTTagCompound())), worldObj, new Vector3(this), 64);
}
else
{
PacketHandler.sendPacketToClients(AssemblyLine.getTilePacket().getPacket(this, "armbotItem", false), worldObj, new Vector3(this), 64);
PacketHandler.sendPacketToClients(ResonantInductionTransport.getTilePacket().getPacket(this, "armbotItem", false), worldObj, new Vector3(this), 64);
}
}
@ -413,7 +413,7 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock,
@Override
public boolean isItemValidForSlot(int i, ItemStack itemstack)
{
return itemstack != null && itemstack.itemID == ALRecipeLoader.itemDisk.itemID;
return itemstack != null && itemstack.itemID == RecipeLoader.itemDisk.itemID;
}
@Override

6
src/main/java/resonantinduction/blocks/BlockAssembly.java
View file

@ -1,7 +1,7 @@
package resonantinduction.blocks;
import resonantinduction.AssemblyLine;
import resonantinduction.IndustryTabs;
import resonantinduction.ResonantInductionTabs;
import resonantinduction.machine.TileEntityAssembly;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
@ -15,8 +15,8 @@ public class BlockAssembly extends BlockMachine
{
public BlockAssembly(String blockName, Material material)
{
super(AssemblyLine.CONFIGURATION, blockName, material);
this.setCreativeTab(IndustryTabs.tabAutomation());
super(ResonantInductionTransport.CONFIGURATION, blockName, material);
this.setCreativeTab(ResonantInductionTabs.tabAutomation());
}
@Override

4
src/main/java/resonantinduction/blocks/BlockBasalt.java
View file

@ -38,7 +38,7 @@ public class BlockBasalt extends Block
public BlockBasalt()
{
super(AssemblyLine.CONFIGURATION.getBlock("basalt", DarkCore.getNextID()).getInt(), Material.rock);
super(ResonantInductionTransport.CONFIGURATION.getBlock("basalt", DarkCore.getNextID()).getInt(), Material.rock);
this.setCreativeTab(CreativeTabs.tabDecorations);
this.setHardness(2f);
this.setResistance(2f);
@ -86,7 +86,7 @@ public class BlockBasalt extends Block
for (int i = 0; i < BlockBasalt.blockNames.length; ++i)
{
this.icons[i] = iconReg.registerIcon(AssemblyLine.PREFIX + BlockBasalt.blockNames[i]);
this.icons[i] = iconReg.registerIcon(ResonantInductionTransport.PREFIX + BlockBasalt.blockNames[i]);
}
}

2
src/main/java/resonantinduction/blocks/BlockColorGlass.java
View file

@ -16,7 +16,7 @@ public class BlockColorGlass extends BlockColored
public BlockColorGlass(String name)
{
super(name, AssemblyLine.CONFIGURATION.getBlock(name, DarkCore.getNextID()).getInt(), Material.glass);
super(name, ResonantInductionTransport.CONFIGURATION.getBlock(name, DarkCore.getNextID()).getInt(), Material.glass);
this.setCreativeTab(CreativeTabs.tabDecorations);
this.setHardness(.5f);
this.setResistance(.5f);

2
src/main/java/resonantinduction/blocks/BlockColorSand.java
View file

@ -15,7 +15,7 @@ public class BlockColorSand extends BlockColored
{
public BlockColorSand()
{
super("colorSand", AssemblyLine.CONFIGURATION.getBlock("colorSand", DarkCore.getNextID()).getInt(), Material.sand);
super("colorSand", ResonantInductionTransport.CONFIGURATION.getBlock("colorSand", DarkCore.getNextID()).getInt(), Material.sand);
this.setCreativeTab(CreativeTabs.tabDecorations);
this.setHardness(1f);
this.setResistance(.5f);

4
src/main/java/resonantinduction/blocks/BlockColored.java
View file

@ -66,7 +66,7 @@ public class BlockColored extends Block
{
if (colorized)
{
this.blockIcon = iconReg.registerIcon(AssemblyLine.PREFIX + this.getUnlocalizedName().replace("tile.", ""));
this.blockIcon = iconReg.registerIcon(ResonantInductionTransport.PREFIX + this.getUnlocalizedName().replace("tile.", ""));
}
else
{
@ -74,7 +74,7 @@ public class BlockColored extends Block
for (int i = 0; i < this.icons.length; ++i)
{
this.icons[i] = iconReg.registerIcon(AssemblyLine.PREFIX + ColorCode.get(~i & 15).name + this.getUnlocalizedName().replace("tile.", ""));
this.icons[i] = iconReg.registerIcon(ResonantInductionTransport.PREFIX + ColorCode.get(~i & 15).name + this.getUnlocalizedName().replace("tile.", ""));
}
}
}

8
src/main/java/resonantinduction/blocks/BlockGasOre.java
View file

@ -5,7 +5,7 @@ import java.util.List;
import java.util.Random;
import resonantinduction.AssemblyLine;
import resonantinduction.IndustryTabs;
import resonantinduction.ResonantInductionTabs;
import resonantinduction.fluid.EnumGas;
import net.minecraft.block.Block;
import net.minecraft.block.material.MapColor;
@ -42,9 +42,9 @@ public class BlockGasOre extends Block implements IFluidBlock
public BlockGasOre()
{
super(AssemblyLine.CONFIGURATION.getBlock("GasBlock", DarkCore.getNextID()).getInt(), gas);
super(ResonantInductionTransport.CONFIGURATION.getBlock("GasBlock", DarkCore.getNextID()).getInt(), gas);
this.setUnlocalizedName("DMBlockGas");
this.setCreativeTab(IndustryTabs.tabIndustrial());
this.setCreativeTab(ResonantInductionTabs.tabIndustrial());
this.setTickRandomly(true);
}
@ -147,7 +147,7 @@ public class BlockGasOre extends Block implements IFluidBlock
@Override
public void registerIcons(IconRegister par1IconRegister)
{
this.blockIcon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + "gas");
this.blockIcon = par1IconRegister.registerIcon(ResonantInductionTransport.PREFIX + "gas");
}
@Override

6
src/main/java/resonantinduction/blocks/BlockHydraulic.java
View file

@ -1,7 +1,7 @@
package resonantinduction.blocks;
import resonantinduction.AssemblyLine;
import resonantinduction.IndustryTabs;
import resonantinduction.ResonantInductionTabs;
import net.minecraft.block.material.Material;
import com.builtbroken.minecraft.prefab.BlockMachine;
@ -11,7 +11,7 @@ public abstract class BlockHydraulic extends BlockMachine
public BlockHydraulic(String name, Material material)
{
super(AssemblyLine.CONFIGURATION, name, material);
this.setCreativeTab(IndustryTabs.tabHydraulic());
super(ResonantInductionTransport.CONFIGURATION, name, material);
this.setCreativeTab(ResonantInductionTabs.tabHydraulic());
}
}

12
src/main/java/resonantinduction/blocks/BlockOre.java
View file

@ -3,8 +3,8 @@ package resonantinduction.blocks;
import java.util.List;
import java.util.Set;
import resonantinduction.ALRecipeLoader;
import resonantinduction.AssemblyLine;
import resonantinduction.core.recipe.RecipeLoader;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -32,9 +32,9 @@ public class BlockOre extends Block implements IExtraBlockInfo
public BlockOre()
{
super(AssemblyLine.CONFIGURATION.getBlock("Ore", DarkCore.getNextID()).getInt(), Material.rock);
super(ResonantInductionTransport.CONFIGURATION.getBlock("Ore", DarkCore.getNextID()).getInt(), Material.rock);
this.setCreativeTab(CreativeTabs.tabBlock);
this.setUnlocalizedName(AssemblyLine.PREFIX + "Ore");
this.setUnlocalizedName(ResonantInductionTransport.PREFIX + "Ore");
this.setHardness(2.5f);
this.setResistance(5.0f);
@ -65,7 +65,7 @@ public class BlockOre extends Block implements IExtraBlockInfo
{
for (OreData data : OreData.values())
{
data.oreIcon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + data.name + "Ore");
data.oreIcon = par1IconRegister.registerIcon(ResonantInductionTransport.PREFIX + data.name + "Ore");
}
}
@ -123,8 +123,8 @@ public class BlockOre extends Block implements IExtraBlockInfo
{
if (this.doWorldGen)
{
ItemStack stack = new ItemStack(ALRecipeLoader.blockOre, 1, this.ordinal());
return (OreGenReplaceStone) new OreGenReplaceStone(this.name, this.name + "Ore", stack, this.maxY, this.ammount, this.branch).enable(AssemblyLine.CONFIGURATION);
ItemStack stack = new ItemStack(RecipeLoader.blockOre, 1, this.ordinal());
return (OreGenReplaceStone) new OreGenReplaceStone(this.name, this.name + "Ore", stack, this.maxY, this.ammount, this.branch).enable(ResonantInductionTransport.CONFIGURATION);
}
return null;
}

4
src/main/java/resonantinduction/blocks/GasOreGenerator.java
View file

@ -2,7 +2,7 @@ package resonantinduction.blocks;
import java.util.Random;
import resonantinduction.ALRecipeLoader;
import resonantinduction.core.recipe.RecipeLoader;
import net.minecraft.block.Block;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
@ -101,7 +101,7 @@ public class GasOreGenerator implements IWorldGenerator
Block block = Block.blocksList[blockid];
if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && (block == null || block.isAirBlock(world, x, y, z) || block.canBeReplacedByLeaves(world, x, y, z) || blockid == this.replaceID))
{
world.setBlock(x, y, z, ALRecipeLoader.blockGas.blockID, 10 + world.rand.nextInt(5), 2);
world.setBlock(x, y, z, RecipeLoader.blockGas.blockID, 10 + world.rand.nextInt(5), 2);
}
}
}

12
src/main/java/resonantinduction/client/ClientProxy.java
View file

@ -1,6 +1,5 @@
package resonantinduction.client;
import resonantinduction.ALRecipeLoader;
import resonantinduction.CommonProxy;
import resonantinduction.client.gui.GuiBatteryBox;
import resonantinduction.client.gui.GuiEncoderCoder;
@ -21,6 +20,7 @@ import resonantinduction.client.render.RenderSink;
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.fluid.pipes.TileEntityPipe;
import resonantinduction.fluid.pump.TileEntityConstructionPump;
@ -74,14 +74,14 @@ public class ClientProxy extends CommonProxy
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityConstructionPump.class, new RenderConstructionPump());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTank.class, new RenderTank());
MinecraftForgeClient.registerItemRenderer(ALRecipeLoader.blockPipe.blockID, new ItemPipeRenderer());
MinecraftForgeClient.registerItemRenderer(ALRecipeLoader.blockTank.blockID, new ItemTankRenderer());
MinecraftForgeClient.registerItemRenderer(ALRecipeLoader.blockReleaseValve.blockID, new ItemPipeRenderer());
MinecraftForgeClient.registerItemRenderer(RecipeLoader.blockPipe.blockID, new ItemPipeRenderer());
MinecraftForgeClient.registerItemRenderer(RecipeLoader.blockTank.blockID, new ItemTankRenderer());
MinecraftForgeClient.registerItemRenderer(RecipeLoader.blockReleaseValve.blockID, new ItemPipeRenderer());
RenderingRegistry.registerBlockHandler(new BlockRenderHelper());
RenderingRegistry.registerBlockHandler(new BlockRenderingHandler());
if (ALRecipeLoader.itemFluidCan != null)
MinecraftForgeClient.registerItemRenderer(ALRecipeLoader.itemFluidCan.itemID, new ItemRenderFluidCan());
if (RecipeLoader.itemFluidCan != null)
MinecraftForgeClient.registerItemRenderer(RecipeLoader.itemFluidCan.itemID, new ItemRenderFluidCan());
}
@Override

2
src/main/java/resonantinduction/client/SoundHandler.java
View file

@ -18,7 +18,7 @@ public class SoundHandler
{
for (int i = 0; i < SOUND_FILES.length; i++)
{
event.manager.soundPoolSounds.addSound(AssemblyLine.DIRECTORY_NO_SLASH + SOUND_FILES[i]);
event.manager.soundPoolSounds.addSound(ResonantInductionTransport.DIRECTORY_NO_SLASH + SOUND_FILES[i]);
}
}
}

2
src/main/java/resonantinduction/client/gui/GuiBatteryBox.java
View file

@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class GuiBatteryBox extends GuiContainer
{
private static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.GUI_DIRECTORY + "battery_box.png");
private static final ResourceLocation TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.GUI_DIRECTORY + "battery_box.png");
private TileEntityBatteryBox tileEntity;

2
src/main/java/resonantinduction/client/gui/GuiEditTask.java
View file

@ -22,7 +22,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
public class GuiEditTask extends GuiBase implements IMessageBoxDialog
{
public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.GUI_DIRECTORY + "gui_task_edit.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.GUI_DIRECTORY + "gui_task_edit.png");
protected GuiEncoderCoder gui;
protected ITask task, editTask;

2
src/main/java/resonantinduction/client/gui/GuiEncoderBase.java
View file

@ -14,7 +14,7 @@ public class GuiEncoderBase extends GuiMachineContainer
//
public GuiEncoderBase(InventoryPlayer player, TileEntityMachine tileEntity, Container container)
{
super(AssemblyLine.instance, container, player, tileEntity);
super(ResonantInductionTransport.instance, container, player, tileEntity);
this.guiID = CommonProxy.GUI_ENCODER;
this.guiID2 = CommonProxy.GUI_ENCODER_CODE;
this.guiID3 = CommonProxy.GUI_ENCODER_HELP;

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

@ -7,7 +7,7 @@ import net.minecraft.util.ResourceLocation;
public class GuiEncoderHelp extends GuiEncoderBase
{
public static final ResourceLocation TEXTURE_CODE_BACK = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.GUI_DIRECTORY + "gui_encoder_coder.png");
public static final ResourceLocation TEXTURE_CODE_BACK = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.GUI_DIRECTORY + "gui_encoder_coder.png");
public GuiEncoderHelp(InventoryPlayer player, TileEntityEncoder tileEntity)
{

2
src/main/java/resonantinduction/client/gui/GuiEncoderInventory.java
View file

@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class GuiEncoderInventory extends GuiEncoderBase
{
public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.GUI_DIRECTORY + "gui_encoder_slot.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.GUI_DIRECTORY + "gui_encoder_slot.png");
public GuiEncoderInventory(InventoryPlayer inventoryPlayer, TileEntityEncoder tileEntity)
{

2
src/main/java/resonantinduction/client/gui/GuiImprinter.java
View file

@ -42,7 +42,7 @@ public class GuiImprinter extends GuiContainer
@Override
protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
{
this.mc.renderEngine.bindTexture(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.GUI_DIRECTORY + "gui_imprinter.png"));
this.mc.renderEngine.bindTexture(new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.GUI_DIRECTORY + "gui_imprinter.png"));
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.containerWidth = (this.width - this.xSize) / 2;
this.containerHeight = (this.height - this.ySize) / 2;

2
src/main/java/resonantinduction/client/gui/GuiProcessor.java
View file

@ -16,7 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class GuiProcessor extends GuiContainer
{
private static final ResourceLocation gui_texture = new ResourceLocation(AssemblyLine.instance.PREFIX + AssemblyLine.GUI_DIRECTORY + "processor.png");
private static final ResourceLocation gui_texture = new ResourceLocation(ResonantInductionTransport.instance.PREFIX + ResonantInductionTransport.GUI_DIRECTORY + "processor.png");
private TileEntityProcessor tileEntity;
public GuiProcessor(InventoryPlayer par1InventoryPlayer, TileEntityProcessor par2TileEntityFurnace)

10
src/main/java/resonantinduction/client/gui/GuiTask.java
View file

@ -17,7 +17,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class GuiTask extends Gui
{
boolean isLeft = false;
private ResourceLocation gui_pic = new ResourceLocation(AssemblyLine.GUI_DIRECTORY + "gui@.png");
private ResourceLocation gui_pic = new ResourceLocation(ResonantInductionTransport.GUI_DIRECTORY + "gui@.png");
/** Button width in pixels */
protected int width;
@ -53,16 +53,16 @@ public class GuiTask extends Gui
switch (task.getType())
{
case DATA:
gui_pic = new ResourceLocation(AssemblyLine.GUI_DIRECTORY + "logic/DATA.png");
gui_pic = new ResourceLocation(ResonantInductionTransport.GUI_DIRECTORY + "logic/DATA.png");
break;
case PROCESS:
gui_pic = new ResourceLocation(AssemblyLine.GUI_DIRECTORY + "logic/PROCESS.png");
gui_pic = new ResourceLocation(ResonantInductionTransport.GUI_DIRECTORY + "logic/PROCESS.png");
break;
case DEFINEDPROCESS:
gui_pic = new ResourceLocation(AssemblyLine.GUI_DIRECTORY + "logic/DEFINEDPROCESS.png");
gui_pic = new ResourceLocation(ResonantInductionTransport.GUI_DIRECTORY + "logic/DEFINEDPROCESS.png");
break;
case DECISION:
gui_pic = new ResourceLocation(AssemblyLine.GUI_DIRECTORY + "logic/IF.png");
gui_pic = new ResourceLocation(ResonantInductionTransport.GUI_DIRECTORY + "logic/IF.png");
break;
}
}

22
src/main/java/resonantinduction/client/render/BlockRenderHelper.java
View file

@ -7,13 +7,13 @@ import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import resonantinduction.ALRecipeLoader;
import resonantinduction.AssemblyLine;
import resonantinduction.client.model.ModelConstructionPump;
import resonantinduction.client.model.ModelGearRod;
import resonantinduction.client.model.ModelGenerator;
import resonantinduction.client.model.ModelPump;
import resonantinduction.client.model.ModelSink;
import resonantinduction.core.recipe.RecipeLoader;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
@ -35,46 +35,46 @@ public class BlockRenderHelper implements ISimpleBlockRenderingHandler
public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer)
{
GL11.glPushMatrix();
if (ALRecipeLoader.blockPumpMachine != null && block.blockID == ALRecipeLoader.blockPumpMachine.blockID && metadata < 4)
if (RecipeLoader.blockPumpMachine != null && block.blockID == RecipeLoader.blockPumpMachine.blockID && metadata < 4)
{
GL11.glTranslatef(0.0F, 1.1F, 0.0F);
GL11.glRotatef(180f, 0f, 0f, 1f);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "pumps/WaterPump.png"));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "pumps/WaterPump.png"));
modelPump.render(0.0725F);
modelPump.renderMotion(0.0725F, 0);
}
else if (ALRecipeLoader.blockSink != null && block.blockID == ALRecipeLoader.blockSink.blockID)
else if (RecipeLoader.blockSink != null && block.blockID == RecipeLoader.blockSink.blockID)
{
GL11.glTranslatef(0.0F, .8F, 0.0F);
GL11.glRotatef(180f, 0f, 0f, 1f);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "Sink.png"));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "Sink.png"));
sink.render(0.0565F);
}
else if (ALRecipeLoader.blockRod != null && block.blockID == ALRecipeLoader.blockRod.blockID)
else if (RecipeLoader.blockRod != null && block.blockID == RecipeLoader.blockRod.blockID)
{
GL11.glTranslatef(0.0F, 1.5F, 0.0F);
GL11.glRotatef(180f, 0f, 0f, 1f);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "mechanical/GearRod.png"));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "mechanical/GearRod.png"));
modelRod.render(0.0825F, 0);
}
else if (ALRecipeLoader.blockConPump != null && block.blockID == ALRecipeLoader.blockConPump.blockID && metadata < 4)
else if (RecipeLoader.blockConPump != null && block.blockID == RecipeLoader.blockConPump.blockID && metadata < 4)
{
GL11.glTranslatef(0.0F, 1.2F, 0.0F);
GL11.glRotatef(180f, 0f, 0f, 1f);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "ConstructionPump.png"));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "ConstructionPump.png"));
conPump.render(0.0725F);
conPump.renderMotor(0.0725F);
}
else if (ALRecipeLoader.frackingPipe != null && block.blockID == ALRecipeLoader.frackingPipe.blockID)
else if (RecipeLoader.frackingPipe != null && block.blockID == RecipeLoader.frackingPipe.blockID)
{
FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderFrackingPipe.TEXTURE);
GL11.glTranslatef(0, 1F, 0);
GL11.glScalef(1.0F, -1F, -1F);
RenderFrackingPipe.model.renderAll();
}
else if (ALRecipeLoader.laserSentry != null && block.blockID == ALRecipeLoader.laserSentry.blockID)
else if (RecipeLoader.laserSentry != null && block.blockID == RecipeLoader.laserSentry.blockID)
{
FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderMiningLaser.TEXTURE);
GL11.glTranslatef(0, 1.7F, 0);

30
src/main/java/resonantinduction/client/render/BlockRenderingHandler.java
View file

@ -7,7 +7,6 @@ import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import resonantinduction.ALRecipeLoader;
import resonantinduction.AssemblyLine;
import resonantinduction.client.model.ModelConveyorBelt;
import resonantinduction.client.model.ModelCrusher;
@ -16,6 +15,7 @@ import resonantinduction.client.model.ModelMachine;
import resonantinduction.client.model.ModelManipulator;
import resonantinduction.client.model.ModelRejectorPiston;
import resonantinduction.client.model.ModelSolarPanel;
import resonantinduction.core.recipe.RecipeLoader;
import resonantinduction.transport.hopper.BlockAdvancedHopper;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -38,18 +38,18 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
@Override
public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer)
{
if (ALRecipeLoader.blockConveyorBelt != null && block.blockID == ALRecipeLoader.blockConveyorBelt.blockID)
if (RecipeLoader.blockConveyorBelt != null && block.blockID == RecipeLoader.blockConveyorBelt.blockID)
{
GL11.glPushMatrix();
GL11.glTranslatef(0.0F, 1.5F, 0.0F);
GL11.glRotatef(180f, 0f, 0f, 1f);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "belt/frame0.png"));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "belt/frame0.png"));
modelConveyorBelt.render(0.0625F, 0, false, false, false, false);
GL11.glPopMatrix();
}
else if (ALRecipeLoader.blockRejector != null && block.blockID == ALRecipeLoader.blockRejector.blockID)
else if (RecipeLoader.blockRejector != null && block.blockID == RecipeLoader.blockRejector.blockID)
{
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "rejector.png"));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "rejector.png"));
GL11.glPushMatrix();
GL11.glTranslatef(0.6F, 1.5F, 0.6F);
GL11.glRotatef(180f, 0f, 0f, 1f);
@ -58,9 +58,9 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
modelEjector.renderPiston(0.0625F, 1);
GL11.glPopMatrix();
}
else if (ALRecipeLoader.blockManipulator != null && block.blockID == ALRecipeLoader.blockManipulator.blockID)
else if (RecipeLoader.blockManipulator != null && block.blockID == RecipeLoader.blockManipulator.blockID)
{
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "manipulator1.png"));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "manipulator1.png"));
GL11.glPushMatrix();
GL11.glTranslatef(0.6F, 1.5F, 0.6F);
GL11.glRotatef(180f, 0f, 0f, 1f);
@ -68,9 +68,9 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
modelInjector.render(0.0625F, true, 0);
GL11.glPopMatrix();
}
else if (ALRecipeLoader.blockArmbot != null && block.blockID == ALRecipeLoader.blockArmbot.blockID)
else if (RecipeLoader.blockArmbot != null && block.blockID == RecipeLoader.blockArmbot.blockID)
{
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + RenderArmbot.TEXTURE));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + RenderArmbot.TEXTURE));
GL11.glPushMatrix();
GL11.glTranslatef(0.4f, 0.8f, 0f);
GL11.glScalef(0.7f, 0.7f, 0.7f);
@ -79,9 +79,9 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
RenderArmbot.MODEL.render(0.0625F, 0, 0);
GL11.glPopMatrix();
}
else if (ALRecipeLoader.processorMachine != null && block.blockID == ALRecipeLoader.processorMachine.blockID && metadata == 0)
else if (RecipeLoader.processorMachine != null && block.blockID == RecipeLoader.processorMachine.blockID && metadata == 0)
{
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "CrusherBlock.png"));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "CrusherBlock.png"));
GL11.glPushMatrix();
GL11.glTranslatef(0f, 1f, 0f);
GL11.glRotatef(180f, 0f, 0f, 1f);
@ -90,9 +90,9 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
this.modelCrushor.renderPiston(0.0625f, 4);
GL11.glPopMatrix();
}
else if (ALRecipeLoader.processorMachine != null && block.blockID == ALRecipeLoader.processorMachine.blockID && metadata == 4)
else if (RecipeLoader.processorMachine != null && block.blockID == RecipeLoader.processorMachine.blockID && metadata == 4)
{
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "GrinderBlock.png"));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "GrinderBlock.png"));
GL11.glPushMatrix();
GL11.glTranslatef(0f, 1f, 0f);
GL11.glRotatef(180f, 0f, 0f, 1f);
@ -101,14 +101,14 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
this.grinderModel.renderRotation(0.0625f, 0);
GL11.glPopMatrix();
}
else if (ALRecipeLoader.blockSolar != null && block.blockID == ALRecipeLoader.blockSolar.blockID)
else if (RecipeLoader.blockSolar != null && block.blockID == RecipeLoader.blockSolar.blockID)
{
FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderBlockSolarPanel.TEXTURE);
GL11.glTranslatef(0.0F, 1.1F, 0.0F);
GL11.glRotatef(180f, 0f, 0f, 1f);
solarPanelModel.render(0.0625F);
}
else if (ALRecipeLoader.blockSteamGen != null && block.blockID == ALRecipeLoader.blockSteamGen.blockID)
else if (RecipeLoader.blockSteamGen != null && block.blockID == RecipeLoader.blockSteamGen.blockID)
{
ModelMachine model = RenderSteamGen.getModel(metadata);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderSteamGen.getTexture(metadata));

8
src/main/java/resonantinduction/client/render/ItemPipeRenderer.java
View file

@ -6,9 +6,9 @@ import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
import resonantinduction.ALRecipeLoader;
import resonantinduction.AssemblyLine;
import resonantinduction.client.model.ModelReleaseValve;
import resonantinduction.core.recipe.RecipeLoader;
import resonantinduction.fluid.pipes.FluidPartsMaterial;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
@ -38,7 +38,7 @@ public class ItemPipeRenderer implements IItemRenderer
GL11.glRotatef(180f, 0f, 0f, 1f);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderPipe.getTexture(item.getItemDamage()));
int meta = item.getItemDamage();
if (ALRecipeLoader.blockReleaseValve != null && item.itemID == ALRecipeLoader.blockReleaseValve.blockID)
if (RecipeLoader.blockReleaseValve != null && item.itemID == RecipeLoader.blockReleaseValve.blockID)
{
meta = FluidPartsMaterial.IRON.getMeta();
}
@ -66,9 +66,9 @@ public class ItemPipeRenderer implements IItemRenderer
{
RenderPipe.render(item.getItemDamage(), new boolean[] { false, false, true, true, false, false });
}
if (ALRecipeLoader.blockReleaseValve != null && item.itemID == ALRecipeLoader.blockReleaseValve.blockID)
if (RecipeLoader.blockReleaseValve != null && item.itemID == RecipeLoader.blockReleaseValve.blockID)
{
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "ReleaseValve.png"));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "ReleaseValve.png"));
valve.render();
}
GL11.glPopMatrix();

10
src/main/java/resonantinduction/client/render/ItemRenderFluidCan.java
View file

@ -8,9 +8,9 @@ import net.minecraftforge.fluids.FluidStack;
import org.lwjgl.opengl.GL11;
import resonantinduction.ALRecipeLoader;
import resonantinduction.AssemblyLine;
import resonantinduction.client.model.ModelSmallFluidCan;
import resonantinduction.core.recipe.RecipeLoader;
import resonantinduction.transport.fluid.ItemFluidCan;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
@ -21,7 +21,7 @@ public class ItemRenderFluidCan implements IItemRenderer
{
public static final ModelSmallFluidCan CAN_MODEL = new ModelSmallFluidCan();
public static final ResourceLocation CAN_TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "FluidCanA.png");
public static final ResourceLocation CAN_TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "FluidCanA.png");
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type)
@ -38,9 +38,9 @@ public class ItemRenderFluidCan implements IItemRenderer
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data)
{
if (ALRecipeLoader.itemFluidCan != null && item.itemID == ALRecipeLoader.itemFluidCan.itemID)
if (RecipeLoader.itemFluidCan != null && item.itemID == RecipeLoader.itemFluidCan.itemID)
{
FluidStack liquid = ((ItemFluidCan) ALRecipeLoader.itemFluidCan).drain(item, Integer.MAX_VALUE, false);
FluidStack liquid = ((ItemFluidCan) RecipeLoader.itemFluidCan).drain(item, Integer.MAX_VALUE, false);
if (liquid != null && liquid.amount > 100)
{
@ -75,7 +75,7 @@ public class ItemRenderFluidCan implements IItemRenderer
FMLClientHandler.instance().getClient().renderEngine.bindTexture((RenderFluidHelper.getFluidSheet(liquid)));
int cap = ((ItemFluidCan) ALRecipeLoader.itemFluidCan).getCapacity(item);
int cap = ((ItemFluidCan) RecipeLoader.itemFluidCan).getCapacity(item);
if (liquid.getFluid().isGaseous())
{
cap = liquid.amount;

6
src/main/java/resonantinduction/client/render/ItemTankRenderer.java
View file

@ -9,9 +9,9 @@ import net.minecraftforge.fluids.FluidStack;
import org.lwjgl.opengl.GL11;
import resonantinduction.ALRecipeLoader;
import resonantinduction.AssemblyLine;
import resonantinduction.client.model.ModelTankSide;
import resonantinduction.core.recipe.RecipeLoader;
import resonantinduction.transport.fluid.BlockTank;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
@ -37,7 +37,7 @@ public class ItemTankRenderer implements IItemRenderer
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data)
{
if (item.itemID == ALRecipeLoader.blockTank.blockID)
if (item.itemID == RecipeLoader.blockTank.blockID)
{
GL11.glPushMatrix();
@ -59,7 +59,7 @@ public class ItemTankRenderer implements IItemRenderer
GL11.glTranslatef(0.7F, .4F, 0.7F);
}
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(AssemblyLine.DOMAIN, item.getItemDamage() == 1 ? "textures/blocks/obsidian.png" : "textures/blocks/iron_block.png"));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(ResonantInductionTransport.DOMAIN, item.getItemDamage() == 1 ? "textures/blocks/obsidian.png" : "textures/blocks/iron_block.png"));
GL11.glTranslatef(0.0F, -0.9F, 0.0F);
tank.render(0.0625F, false, false, false, false);
GL11.glRotatef(90f, 0f, 1f, 0f);

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

@ -16,7 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class RenderAdvancedHopper extends RenderImprintable
{
private static final ModelAdvancedHopper MODEL = new ModelAdvancedHopper();
public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.instance.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "AdvancedHopper.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(ResonantInductionTransport.instance.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "AdvancedHopper.png");
private void renderAModelAt(TileEntityAdvancedHopper tileEntity, double x, double y, double z, float f)
{

2
src/main/java/resonantinduction/client/render/RenderArmbot.java
View file

@ -46,7 +46,7 @@ public class RenderArmbot extends TileEntitySpecialRenderer
}
}
}
ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + TEXTURE);
ResourceLocation name = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + TEXTURE);
bindTexture(name);
GL11.glPushMatrix();

2
src/main/java/resonantinduction/client/render/RenderBlockSolarPanel.java
View file

@ -14,7 +14,7 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class RenderBlockSolarPanel extends TileEntitySpecialRenderer
{
public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "SolarPanel.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "SolarPanel.png");
public static final ModelSolarPanel model = new ModelSolarPanel();

2
src/main/java/resonantinduction/client/render/RenderBlockWire.java
View file

@ -16,7 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class RenderBlockWire extends TileEntitySpecialRenderer
{
public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, "textures/models/copperWire.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, "textures/models/copperWire.png");
public static final ModelCopperWire model = new ModelCopperWire();

2
src/main/java/resonantinduction/client/render/RenderConstructionPump.java
View file

@ -17,7 +17,7 @@ public class RenderConstructionPump extends TileEntitySpecialRenderer
{
int type = 0;
private ModelConstructionPump model;
public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "ConstructionPump.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "ConstructionPump.png");
public RenderConstructionPump()
{

8
src/main/java/resonantinduction/client/render/RenderConveyorBelt.java
View file

@ -51,7 +51,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
if (slantType == SlantType.UP)
{
ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "slantedbelt/frame" + frame + ".png");
ResourceLocation name = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "slantedbelt/frame" + frame + ".png");
bindTexture(name);
GL11.glTranslatef(0f, 0.8f, -0.8f);
@ -73,7 +73,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
}
else if (slantType == SlantType.DOWN)
{
ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "slantedbelt/frame" + frame + ".png");
ResourceLocation name = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "slantedbelt/frame" + frame + ".png");
bindTexture(name);
GL11.glRotatef(180f, 0f, 1f, 0f);
boolean slantAdjust = false;
@ -94,7 +94,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
}
else
{
ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "belt/frame" + frame + ".png");
ResourceLocation name = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "belt/frame" + frame + ".png");
bindTexture(name);
GL11.glRotatef(180, 0f, 1f, 0f);
GL11.glTranslatef(0f, -0.68f, 0f);
@ -118,7 +118,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
GL11.glRotatef(90f, 0f, 1f, 0f);
break;
}
ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "belt/frame" + frame + ".png");
ResourceLocation name = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "belt/frame" + frame + ".png");
bindTexture(name);
MODEL.render(0.0625F, (float) Math.toRadians(tileEntity.wheelRotation), false, false, false, true);

2
src/main/java/resonantinduction/client/render/RenderFrackingPipe.java
View file

@ -14,7 +14,7 @@ public class RenderFrackingPipe extends TileEntitySpecialRenderer
{
public static final ModelFrackingPipe model = new ModelFrackingPipe();
public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "frackingpipe.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "frackingpipe.png");
@Override
public void renderTileEntityAt(TileEntity tileEntity, double d, double d1, double d2, float f)

2
src/main/java/resonantinduction/client/render/RenderFurnace.java
View file

@ -16,7 +16,7 @@ public class RenderFurnace extends TileEntitySpecialRenderer
{
int type = 0;
private ModelFurnace model;
public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "Furnace.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "Furnace.png");
public RenderFurnace()
{

2
src/main/java/resonantinduction/client/render/RenderGearPiston.java
View file

@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class RenderGearPiston extends TileEntitySpecialRenderer
{
private ModelGearPiston model;
public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "GearShaftPiston.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "GearShaftPiston.png");
public RenderGearPiston()
{

4
src/main/java/resonantinduction/client/render/RenderManipulator.java
View file

@ -26,12 +26,12 @@ public class RenderManipulator extends RenderImprintable
if (tileEntity.isOutput())
{
ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "manipulator1.png");
ResourceLocation name = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "manipulator1.png");
bindTexture(name);
}
else
{
ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "manipulator2.png");
ResourceLocation name = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "manipulator2.png");
bindTexture(name);
}

2
src/main/java/resonantinduction/client/render/RenderMiningLaser.java
View file

@ -15,7 +15,7 @@ public class RenderMiningLaser extends TileEntitySpecialRenderer
{
public static final ModelLaserTile model = new ModelLaserTile();
public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "LaserTile.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "LaserTile.png");
@Override
public void renderTileEntityAt(TileEntity tileEntity, double d, double d1, double d2, float f)

2
src/main/java/resonantinduction/client/render/RenderMiningLaserGun.java
View file

@ -18,7 +18,7 @@ public class RenderMiningLaserGun implements IItemRenderer
{
private static final ModelMiningLaserGun MODEL = new ModelMiningLaserGun();
private static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "LaserGun.png");
private static final ResourceLocation TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "LaserGun.png");
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type)

4
src/main/java/resonantinduction/client/render/RenderPipe.java
View file

@ -27,7 +27,7 @@ public class RenderPipe extends TileEntitySpecialRenderer
public static ModelLargePipe MODEL_PIPE = new ModelLargePipe();
public static ModelOpenTrough MODEL_TROUGH_PIPE = new ModelOpenTrough();
private static HashMap<Pair<FluidPartsMaterial, Integer>, ResourceLocation> TEXTURES = new HashMap<Pair<FluidPartsMaterial, Integer>, ResourceLocation>();
public static ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "pipes/Pipe.png");
public static ResourceLocation TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "pipes/Pipe.png");
@Override
public void renderTileEntityAt(TileEntity te, double d, double d1, double d2, float f)
@ -168,7 +168,7 @@ public class RenderPipe extends TileEntitySpecialRenderer
{
pipeName = EnumPipeType.get(pipeID).getName(pipeID);
}
TEXTURES.put(index, new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "pipes/" + mat.matName + "/" + pipeName + "Pipe.png"));
TEXTURES.put(index, new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "pipes/" + mat.matName + "/" + pipeName + "Pipe.png"));
}
return TEXTURES.get(index);
}

4
src/main/java/resonantinduction/client/render/RenderProcessor.java
View file

@ -79,11 +79,11 @@ public class RenderProcessor extends TileEntitySpecialRenderer
int g = meta / 4;
if (g == 0)
{
return new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "CrusherBlock.png");
return new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "CrusherBlock.png");
}
else if (g == 1)
{
return new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "GrinderBlock.png");
return new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "GrinderBlock.png");
}
return null;

2
src/main/java/resonantinduction/client/render/RenderPump.java
View file

@ -17,7 +17,7 @@ public class RenderPump extends TileEntitySpecialRenderer
{
int type = 0;
private ModelPump model;
public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "pumps/WaterPump.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "pumps/WaterPump.png");
public RenderPump()
{

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

@ -26,7 +26,7 @@ public class RenderRejector extends RenderImprintable
{
pos = 8;
}
ResourceLocation name = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "rejector.png");
ResourceLocation name = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "rejector.png");
bindTexture(name);
GL11.glPushMatrix();
GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);

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

@ -20,7 +20,7 @@ public class RenderReleaseValve extends TileEntitySpecialRenderer
private ModelReleaseValve valve;
private TileEntity[] ents = new TileEntity[6];
public static final ResourceLocation VALVE_TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "ReleaseValve.png");
public static final ResourceLocation VALVE_TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "ReleaseValve.png");
public RenderReleaseValve()
{

2
src/main/java/resonantinduction/client/render/RenderSink.java
View file

@ -17,7 +17,7 @@ public class RenderSink extends TileEntitySpecialRenderer
int type = 0;
private ModelSink model;
public static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "Sink.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "Sink.png");
public RenderSink()
{

4
src/main/java/resonantinduction/client/render/RenderSteamGen.java
View file

@ -23,8 +23,8 @@ public class RenderSteamGen extends TileEntitySpecialRenderer
public static final ModelSteamTurbine TURBINE_MODEL = new ModelSteamTurbine();
public static final ModelSteamGen STEAM_GEN_MODEL = new ModelSteamGen();
public static final ResourceLocation TURBINE_TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "SmallSteamFan.png");
public static final ResourceLocation STEAM_GEN_TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "SteamGenerator.png");
public static final ResourceLocation TURBINE_TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "SmallSteamFan.png");
public static final ResourceLocation STEAM_GEN_TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "SteamGenerator.png");
private static float rot1 = 0;
@Override

2
src/main/java/resonantinduction/client/render/RenderTestCar.java
View file

@ -17,7 +17,7 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class RenderTestCar extends Render
{
private static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "TestCar.png");
private static final ResourceLocation TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "TestCar.png");
/** instance of ModelBoat for rendering */
protected ModelBase modelBoat;

2
src/main/java/resonantinduction/client/render/RenderTurkey.java
View file

@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class RenderTurkey extends RenderLiving
{
private static final ResourceLocation TEXTURE = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.MODEL_DIRECTORY + "Turkey.png");
private static final ResourceLocation TEXTURE = new ResourceLocation(ResonantInductionTransport.DOMAIN, ResonantInductionTransport.MODEL_DIRECTORY + "Turkey.png");
public RenderTurkey()
{

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

@ -26,6 +26,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
import org.modstats.ModstatInfo;
import org.modstats.Modstats;
import resonantinduction.Reference;
import resonantinduction.core.multimeter.ItemMultimeter;
import resonantinduction.energy.LinkEvent;
import resonantinduction.energy.battery.BlockBattery;
@ -77,7 +78,7 @@ import cpw.mods.fml.relauncher.SideOnly;
* @author Calclavia
*
*/
@Mod(modid = ResonantInduction.ID, name = ResonantInduction.NAME, version = ResonantInduction.VERSION, dependencies = "required-after:CalclaviaCore;before:ThermalExpansion;before:IC2")
@Mod(modid = ResonantInduction.ID, name = ResonantInduction.NAME, version = Reference.VERSION, dependencies = "required-after:CalclaviaCore;before:ThermalExpansion;before:IC2")
@NetworkMod(channels = ResonantInduction.CHANNEL, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
@ModstatInfo(prefix = "resonantin")
public class ResonantInduction
@ -89,12 +90,6 @@ public class ResonantInduction
public static final String NAME = "Resonant Induction";
public static final String CHANNEL = "RESIND";
public static final String MAJOR_VERSION = "@MAJOR@";
public static final String MINOR_VERSION = "@MINOR@";
public static final String REVISION_VERSION = "@REVIS@";
public static final String BUILD_VERSION = "@BUILD@";
public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + REVISION_VERSION;
@Instance(ID)
public static ResonantInduction INSTANCE;
@ -253,7 +248,7 @@ public class ResonantInduction
/**
* Set reference itemstacks
*/
TabRI.ITEMSTACK = new ItemStack(blockBattery);
ResonantInductionTabs.ITEMSTACK = new ItemStack(blockBattery);
for (EnumWireMaterial material : EnumWireMaterial.values())
{
@ -274,7 +269,7 @@ public class ResonantInduction
metadata.description = LanguageUtility.getLocal("meta.resonantinduction.description");
metadata.url = "http://calclavia.com/resonant-induction";
metadata.logoFile = "ri_logo.png";
metadata.version = VERSION + "." + BUILD_VERSION;
metadata.version = Reference.VERSION + "." + Reference.BUILD_VERSION;
metadata.authorList = Arrays.asList(new String[] { "Calclavia", "Alex_hawks" });
metadata.credits = LanguageUtility.getLocal("meta.resonantinduction.credits");
metadata.autogenerated = false;

6
src/main/java/resonantinduction/core/TabRI.java → src/main/java/resonantinduction/core/ResonantInductionTabs.java
View file

@ -10,12 +10,12 @@ import net.minecraft.item.ItemStack;
* @author Calclavia
*
*/
public class TabRI extends CreativeTabs
public class ResonantInductionTabs extends CreativeTabs
{
public static final TabRI INSTANCE = new TabRI(CreativeTabs.getNextID(), ResonantInduction.ID);
public static final ResonantInductionTabs CORE = new ResonantInductionTabs(CreativeTabs.getNextID(), ResonantInduction.ID);
public static ItemStack ITEMSTACK;
public TabRI(int par1, String par2Str)
public ResonantInductionTabs(int par1, String par2Str)
{
super(par1, par2Str);

4
src/main/java/resonantinduction/core/base/BlockBase.java
View file

@ -6,7 +6,7 @@ package resonantinduction.core.base;
import net.minecraft.block.material.Material;
import net.minecraftforge.common.Configuration;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.TabRI;
import resonantinduction.core.ResonantInductionTabs;
import universalelectricity.api.UniversalElectricity;
import calclavia.lib.prefab.block.BlockAdvanced;
@ -19,7 +19,7 @@ public class BlockBase extends BlockAdvanced
public BlockBase(String name, int id)
{
super(ResonantInduction.CONFIGURATION.get(Configuration.CATEGORY_BLOCK, name, id).getInt(id), UniversalElectricity.machine);
this.setCreativeTab(TabRI.INSTANCE);
this.setCreativeTab(ResonantInductionTabs.CORE);
this.setUnlocalizedName(ResonantInduction.PREFIX + name);
this.setTextureName(ResonantInduction.PREFIX + name);
this.setHardness(1f);

4
src/main/java/resonantinduction/core/base/BlockIOBase.java
View file

@ -6,7 +6,7 @@ package resonantinduction.core.base;
import net.minecraft.block.material.Material;
import net.minecraftforge.common.Configuration;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.TabRI;
import resonantinduction.core.ResonantInductionTabs;
import calclavia.lib.prefab.block.BlockSidedIO;
/**
@ -18,7 +18,7 @@ public class BlockIOBase extends BlockSidedIO
public BlockIOBase(String name, int id)
{
super(ResonantInduction.CONFIGURATION.get(Configuration.CATEGORY_BLOCK, name, id).getInt(id), Material.piston);
this.setCreativeTab(TabRI.INSTANCE);
this.setCreativeTab(ResonantInductionTabs.CORE);
this.setUnlocalizedName(ResonantInduction.PREFIX + name);
this.setTextureName(ResonantInduction.PREFIX + name);
this.setHardness(1f);

4
src/main/java/resonantinduction/core/base/BlockRotatableBase.java
View file

@ -7,7 +7,7 @@ import calclavia.lib.prefab.block.BlockRotatable;
import net.minecraft.block.material.Material;
import net.minecraftforge.common.Configuration;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.TabRI;
import resonantinduction.core.ResonantInductionTabs;
import universalelectricity.api.UniversalElectricity;
/**
@ -19,7 +19,7 @@ public class BlockRotatableBase extends BlockRotatable
public BlockRotatableBase(String name, int id)
{
super(ResonantInduction.CONFIGURATION.get(Configuration.CATEGORY_BLOCK, name, id).getInt(id), UniversalElectricity.machine);
this.setCreativeTab(TabRI.INSTANCE);
this.setCreativeTab(ResonantInductionTabs.CORE);
this.setUnlocalizedName(ResonantInduction.PREFIX + name);
this.setTextureName(ResonantInduction.PREFIX + name);
this.setHardness(1f);

4
src/main/java/resonantinduction/core/base/ItemBase.java
View file

@ -3,7 +3,7 @@ package resonantinduction.core.base;
import net.minecraft.item.Item;
import net.minecraftforge.common.Configuration;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.TabRI;
import resonantinduction.core.ResonantInductionTabs;
/**
*
@ -15,7 +15,7 @@ public class ItemBase extends Item
public ItemBase(String name, int id)
{
super(ResonantInduction.CONFIGURATION.get(Configuration.CATEGORY_ITEM, name, id).getInt(id));
this.setCreativeTab(TabRI.INSTANCE);
this.setCreativeTab(ResonantInductionTabs.CORE);
this.setUnlocalizedName(ResonantInduction.PREFIX + name);
this.setTextureName(ResonantInduction.PREFIX + name);
}

4
src/main/java/resonantinduction/core/base/ItemMultipartBase.java
View file

@ -2,7 +2,7 @@ package resonantinduction.core.base;
import net.minecraftforge.common.Configuration;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.TabRI;
import resonantinduction.core.ResonantInductionTabs;
import codechicken.multipart.JItemMultiPart;
/**
@ -14,7 +14,7 @@ public abstract class ItemMultipartBase extends JItemMultiPart
public ItemMultipartBase(String name, int id)
{
super(ResonantInduction.CONFIGURATION.get(Configuration.CATEGORY_ITEM, name, id).getInt(id));
this.setCreativeTab(TabRI.INSTANCE);
this.setCreativeTab(ResonantInductionTabs.CORE);
this.setUnlocalizedName(ResonantInduction.PREFIX + name);
this.setTextureName(ResonantInduction.PREFIX + name);
}

8
src/main/java/resonantinduction/core/debug/BlockDebug.java
View file

@ -4,7 +4,7 @@ import java.util.List;
import java.util.Set;
import resonantinduction.AssemblyLine;
import resonantinduction.IndustryTabs;
import resonantinduction.ResonantInductionTabs;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
@ -27,8 +27,8 @@ public class BlockDebug extends BlockMachine
public BlockDebug()
{
super(AssemblyLine.CONFIGURATION, "DebugBlock", Material.clay);
this.setCreativeTab(IndustryTabs.tabIndustrial());
super(ResonantInductionTransport.CONFIGURATION, "DebugBlock", Material.clay);
this.setCreativeTab(ResonantInductionTabs.tabIndustrial());
}
@Override
@ -40,7 +40,7 @@ public class BlockDebug extends BlockMachine
{
if (block.enabled)
{
block.icon = iconReg.registerIcon(AssemblyLine.PREFIX + block.getTextureName());
block.icon = iconReg.registerIcon(ResonantInductionTransport.PREFIX + block.getTextureName());
}
}
}

6
src/main/java/resonantinduction/core/multimeter/ItemReadoutTools.java
View file

@ -42,7 +42,7 @@ public class ItemReadoutTools extends ItemBasic
public ItemReadoutTools()
{
super(DarkCore.getNextItemId(), "DMTools", AssemblyLine.CONFIGURATION);
super(DarkCore.getNextItemId(), "DMTools", ResonantInductionTransport.CONFIGURATION);
this.setHasSubtypes(true);
this.setCreativeTab(CreativeTabs.tabTools);
this.setMaxStackSize(1);
@ -53,8 +53,8 @@ public class ItemReadoutTools extends ItemBasic
@Override
public void registerIcons(IconRegister iconRegister)
{
this.pipeGuage = iconRegister.registerIcon(AssemblyLine.PREFIX + "readout.PipeGauge");
this.multiMeter = iconRegister.registerIcon(AssemblyLine.PREFIX + "readout.multi-Meter");
this.pipeGuage = iconRegister.registerIcon(ResonantInductionTransport.PREFIX + "readout.PipeGauge");
this.multiMeter = iconRegister.registerIcon(ResonantInductionTransport.PREFIX + "readout.multi-Meter");
}
@SideOnly(Side.CLIENT)

10
src/main/java/resonantinduction/ALRecipeLoader.java → src/main/java/resonantinduction/core/recipe/RecipeLoader.java
View file

@ -1,4 +1,4 @@
package resonantinduction;
package resonantinduction.core.recipe;
import java.util.List;
@ -27,7 +27,7 @@ import com.builtbroken.minecraft.recipes.ProcessorType;
import cpw.mods.fml.common.registry.GameRegistry;
public class ALRecipeLoader
public class RecipeLoader
{
public static Block blockConveyorBelt;
@ -79,15 +79,15 @@ public class ALRecipeLoader
public static Item itemVehicleTest;
public static Item itemMPWire;
private static ALRecipeLoader instance;
private static RecipeLoader instance;
public static final String COPPER_WIRE = "wireCopper";
public static ALRecipeLoader instance()
public static RecipeLoader instance()
{
if (instance == null)
{
instance = new ALRecipeLoader();
instance = new RecipeLoader();
}
return instance;
}

2
src/main/java/resonantinduction/core/resource/ItemBlockOre.java
View file

@ -26,7 +26,7 @@ public class ItemBlockOre extends ItemBlock
{
if (par1ItemStack != null && par1ItemStack.getItemDamage() < OreData.values().length)
{
return "tile." + AssemblyLine.PREFIX + OreData.values()[par1ItemStack.getItemDamage()].name + "Ore";
return "tile." + ResonantInductionTransport.PREFIX + OreData.values()[par1ItemStack.getItemDamage()].name + "Ore";
}
return super.getUnlocalizedName();
}

6
src/main/java/resonantinduction/core/resource/ItemOreDirv.java
View file

@ -30,7 +30,7 @@ public class ItemOreDirv extends ItemBasic implements IExtraItemInfo
{
public ItemOreDirv()
{
super(DarkCore.getNextItemId(), "Metal_Parts", AssemblyLine.CONFIGURATION);
super(DarkCore.getNextItemId(), "Metal_Parts", ResonantInductionTransport.CONFIGURATION);
this.setHasSubtypes(true);
this.setCreativeTab(CreativeTabs.tabMaterials);
MinecraftForge.EVENT_BUS.register(this);
@ -41,7 +41,7 @@ public class ItemOreDirv extends ItemBasic implements IExtraItemInfo
{
if (itemStack != null)
{
return "item." + AssemblyLine.PREFIX + EnumOrePart.getFullName(itemStack.getItemDamage());
return "item." + ResonantInductionTransport.PREFIX + EnumOrePart.getFullName(itemStack.getItemDamage());
}
else
{
@ -66,7 +66,7 @@ public class ItemOreDirv extends ItemBasic implements IExtraItemInfo
{
if (mat.shouldCreateItem(part))
{
mat.itemIcons[part.ordinal()] = iconRegister.registerIcon(AssemblyLine.PREFIX + mat.simpleName + part.simpleName);
mat.itemIcons[part.ordinal()] = iconRegister.registerIcon(ResonantInductionTransport.PREFIX + mat.simpleName + part.simpleName);
}
}
}

4
src/main/java/resonantinduction/core/resource/ItemParts.java
View file

@ -25,7 +25,7 @@ public class ItemParts extends ItemBasic implements IExtraItemInfo
{
public ItemParts()
{
super(DarkCore.getNextItemId(), "DMParts", AssemblyLine.CONFIGURATION);
super(DarkCore.getNextItemId(), "DMParts", ResonantInductionTransport.CONFIGURATION);
this.setHasSubtypes(true);
this.setMaxDamage(0);
this.setMaxStackSize(64);
@ -60,7 +60,7 @@ public class ItemParts extends ItemBasic implements IExtraItemInfo
super.registerIcons(iconRegister);
for (Parts part : Parts.values())
{
part.icon = iconRegister.registerIcon(AssemblyLine.PREFIX + "part." + part.name);
part.icon = iconRegister.registerIcon(ResonantInductionTransport.PREFIX + "part." + part.name);
}
}

8
src/main/java/resonantinduction/energy/battery/BlockEnergyStorage.java
View file

@ -5,7 +5,7 @@ import java.util.Set;
import resonantinduction.AssemblyLine;
import resonantinduction.CommonProxy;
import resonantinduction.IndustryTabs;
import resonantinduction.ResonantInductionTabs;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -30,8 +30,8 @@ public class BlockEnergyStorage extends BlockMachine
{
public BlockEnergyStorage()
{
super(AssemblyLine.CONFIGURATION, "DMEnergyStorage", UniversalElectricity.machine);
this.setCreativeTab(IndustryTabs.tabIndustrial());
super(ResonantInductionTransport.CONFIGURATION, "DMEnergyStorage", UniversalElectricity.machine);
this.setCreativeTab(ResonantInductionTabs.tabIndustrial());
}
@Override
@ -54,7 +54,7 @@ public class BlockEnergyStorage extends BlockMachine
if (!par1World.isRemote)
{
par5EntityPlayer.openGui(AssemblyLine.instance, CommonProxy.GUI_BATTERY_BOX, par1World, x, y, z);
par5EntityPlayer.openGui(ResonantInductionTransport.instance, CommonProxy.GUI_BATTERY_BOX, par1World, x, y, z);
}
return true;

8
src/main/java/resonantinduction/energy/battery/ItemBattery.java
View file

@ -1,7 +1,7 @@
package resonantinduction.energy.battery;
import resonantinduction.AssemblyLine;
import resonantinduction.IndustryTabs;
import resonantinduction.ResonantInductionTabs;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.Configuration;
@ -21,9 +21,9 @@ public class ItemBattery extends ItemElectric implements IExtraItemInfo
{
public ItemBattery()
{
super(AssemblyLine.CONFIGURATION.getItem("Battery", DarkCore.getNextItemId()).getInt());
this.setUnlocalizedName(AssemblyLine.PREFIX + "Battery");
this.setCreativeTab(IndustryTabs.tabIndustrial());
super(ResonantInductionTransport.CONFIGURATION.getItem("Battery", DarkCore.getNextItemId()).getInt());
this.setUnlocalizedName(ResonantInductionTransport.PREFIX + "Battery");
this.setCreativeTab(ResonantInductionTabs.tabIndustrial());
}
@SideOnly(Side.CLIENT)

4
src/main/java/resonantinduction/energy/battery/ItemBlockEnergyStorage.java
View file

@ -2,7 +2,7 @@ package resonantinduction.energy.battery;
import java.util.List;
import resonantinduction.ALRecipeLoader;
import resonantinduction.core.recipe.RecipeLoader;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
@ -94,7 +94,7 @@ public class ItemBlockEnergyStorage extends ItemBlock
public static ItemStack getWrenchedBatteryBox(World world, Vector3 vec)
{
ItemStack itemStack = new ItemStack(ALRecipeLoader.blockBatBox);
ItemStack itemStack = new ItemStack(RecipeLoader.blockBatBox);
TileEntity entity = vec.getTileEntity(world);
if (entity instanceof TileEntityBatteryBox)
{

4
src/main/java/resonantinduction/energy/generator/BlockMechanicalGenerator.java
View file

@ -3,9 +3,9 @@ package resonantinduction.energy.generator;
import java.util.ArrayList;
import java.util.Set;
import resonantinduction.ALRecipeLoader;
import resonantinduction.blocks.BlockHydraulic;
import resonantinduction.client.render.BlockRenderHelper;
import resonantinduction.core.recipe.RecipeLoader;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@ -40,7 +40,7 @@ public class BlockMechanicalGenerator extends BlockHydraulic
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z)
{
return new ItemStack(ALRecipeLoader.blockGenerator, 1);
return new ItemStack(RecipeLoader.blockGenerator, 1);
}
@Override

4
src/main/java/resonantinduction/energy/generator/BlockRod.java
View file

@ -2,9 +2,9 @@ package resonantinduction.energy.generator;
import java.util.Set;
import resonantinduction.ALRecipeLoader;
import resonantinduction.blocks.BlockHydraulic;
import resonantinduction.client.render.BlockRenderHelper;
import resonantinduction.core.recipe.RecipeLoader;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@ -90,7 +90,7 @@ public class BlockRod extends BlockHydraulic
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z)
{
return new ItemStack(ALRecipeLoader.blockRod, 1, 0);
return new ItemStack(RecipeLoader.blockRod, 1, 0);
}
@Override

6
src/main/java/resonantinduction/energy/generator/BlockSmallSteamGen.java
View file

@ -5,7 +5,7 @@ import java.util.Random;
import java.util.Set;
import resonantinduction.AssemblyLine;
import resonantinduction.IndustryTabs;
import resonantinduction.ResonantInductionTabs;
import resonantinduction.client.render.BlockRenderingHandler;
import resonantinduction.client.render.RenderSteamGen;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@ -36,9 +36,9 @@ public class BlockSmallSteamGen extends BlockMachine
public BlockSmallSteamGen()
{
super(AssemblyLine.CONFIGURATION, "StarterSteamGen", UniversalElectricity.machine);
super(ResonantInductionTransport.CONFIGURATION, "StarterSteamGen", UniversalElectricity.machine);
this.setStepSound(soundMetalFootstep);
this.setCreativeTab(IndustryTabs.tabIndustrial());
this.setCreativeTab(ResonantInductionTabs.tabIndustrial());
}
@Override

6
src/main/java/resonantinduction/energy/generator/BlockSolarPanel.java
View file

@ -4,7 +4,7 @@ import java.util.List;
import java.util.Set;
import resonantinduction.AssemblyLine;
import resonantinduction.IndustryTabs;
import resonantinduction.ResonantInductionTabs;
import resonantinduction.client.render.BlockRenderingHandler;
import resonantinduction.client.render.RenderBlockSolarPanel;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@ -30,9 +30,9 @@ public class BlockSolarPanel extends BlockMachine
public BlockSolarPanel()
{
super(AssemblyLine.CONFIGURATION, "BlockSolarPanel", UniversalElectricity.machine);
super(ResonantInductionTransport.CONFIGURATION, "BlockSolarPanel", UniversalElectricity.machine);
this.setBlockBounds(0, 0, 0, 1f, .6f, 1f);
this.setCreativeTab(IndustryTabs.tabIndustrial());
this.setCreativeTab(ResonantInductionTabs.tabIndustrial());
}
@Override

4
src/main/java/resonantinduction/energy/wire/ItemWire.java
View file

@ -14,7 +14,7 @@ import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.input.Keyboard;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.TabRI;
import resonantinduction.core.ResonantInductionTabs;
import resonantinduction.core.Utility;
import resonantinduction.energy.wire.flat.PartFlatWire;
import resonantinduction.energy.wire.flat.RenderFlatWire;
@ -41,7 +41,7 @@ public class ItemWire extends JItemMultiPart
{
super(ResonantInduction.CONFIGURATION.get(Configuration.CATEGORY_ITEM, "wire", id).getInt(id));
this.setUnlocalizedName(ResonantInduction.PREFIX + "wire");
this.setCreativeTab(TabRI.INSTANCE);
this.setCreativeTab(ResonantInductionTabs.CORE);
this.setHasSubtypes(true);
this.setMaxDamage(0);
}

6
src/main/java/resonantinduction/fluid/pipes/FluidPartsMaterial.java
View file

@ -3,7 +3,7 @@ package resonantinduction.fluid.pipes;
import java.util.ArrayList;
import java.util.List;
import resonantinduction.ALRecipeLoader;
import resonantinduction.core.recipe.RecipeLoader;
import resonantinduction.fluid.prefab.TileEntityFluidNetworkTile;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@ -125,12 +125,12 @@ public enum FluidPartsMaterial
public ItemStack getStack(int s)
{
return new ItemStack(ALRecipeLoader.blockPipe, s, (this.ordinal() * spacing));
return new ItemStack(RecipeLoader.blockPipe, s, (this.ordinal() * spacing));
}
public ItemStack getStack(int s, ColorCode color)
{
return new ItemStack(ALRecipeLoader.blockPipe, s, (this.ordinal() * spacing) + color.ordinal() + 1);
return new ItemStack(RecipeLoader.blockPipe, s, (this.ordinal() * spacing) + color.ordinal() + 1);
}
public int getMeta(int typeID)

4
src/main/java/resonantinduction/fluid/pipes/ItemBlockPipe.java
View file

@ -2,7 +2,7 @@ package resonantinduction.fluid.pipes;
import java.util.List;
import resonantinduction.ALRecipeLoader;
import resonantinduction.core.recipe.RecipeLoader;
import resonantinduction.fluid.prefab.TileEntityFluidNetworkTile;
import resonantinduction.transport.fluid.TileEntityTank;
import net.minecraft.block.Block;
@ -54,7 +54,7 @@ public class ItemBlockPipe extends ItemBlock
TileEntity entity = vec.getTileEntity(world);
if (entity instanceof TileEntityTank && ((TileEntityTank) entity).getTankInfo() != null && ((TileEntityTank) entity).getTankInfo()[0] != null)
{
ItemStack itemStack = new ItemStack(ALRecipeLoader.blockTank);
ItemStack itemStack = new ItemStack(RecipeLoader.blockTank);
FluidStack stack = ((TileEntityTank) entity).getTankInfo()[0].fluid;
if (itemStack.getTagCompound() == null)

6
src/main/java/resonantinduction/fluid/prefab/TileEntityFluidNetworkTile.java
View file

@ -428,7 +428,7 @@ public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice i
data[6] = this.renderConnection[5];
data[7] = this.getTank().getCapacity();
data[8] = this.getTank().writeToNBT(new NBTTagCompound());
return AssemblyLine.getTilePacket().getPacket(this, "DescriptionPacket", data);
return ResonantInductionTransport.getTilePacket().getPacket(this, "DescriptionPacket", data);
}
public void sendRenderUpdate()
@ -441,14 +441,14 @@ public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice i
data[4] = this.renderConnection[3];
data[5] = this.renderConnection[4];
data[6] = this.renderConnection[5];
PacketHandler.sendPacketToClients(AssemblyLine.getTilePacket().getPacket(this, "RenderPacket", data));
PacketHandler.sendPacketToClients(ResonantInductionTransport.getTilePacket().getPacket(this, "RenderPacket", data));
}
public void sendTankUpdate(int index)
{
if (this.getTank() != null && index == 0)
{
PacketHandler.sendPacketToClients(AssemblyLine.getTilePacket().getPacket(this, "SingleTank", this.getTank().getCapacity(), this.getTank().writeToNBT(new NBTTagCompound())), this.worldObj, new Vector3(this), 60);
PacketHandler.sendPacketToClients(ResonantInductionTransport.getTilePacket().getPacket(this, "SingleTank", this.getTank().getCapacity(), this.getTank().writeToNBT(new NBTTagCompound())), this.worldObj, new Vector3(this), 60);
}
}

6
src/main/java/resonantinduction/fluid/pump/BlockConstructionPump.java
View file

@ -3,10 +3,10 @@ package resonantinduction.fluid.pump;
import java.util.List;
import java.util.Set;
import resonantinduction.ALRecipeLoader;
import resonantinduction.AssemblyLine;
import resonantinduction.blocks.BlockHydraulic;
import resonantinduction.client.render.BlockRenderHelper;
import resonantinduction.core.recipe.RecipeLoader;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
@ -39,7 +39,7 @@ public class BlockConstructionPump extends BlockHydraulic
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister par1IconRegister)
{
this.blockIcon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + "ironMachineSide");
this.blockIcon = par1IconRegister.registerIcon(ResonantInductionTransport.PREFIX + "ironMachineSide");
}
@Override
@ -71,7 +71,7 @@ public class BlockConstructionPump extends BlockHydraulic
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z)
{
return new ItemStack(ALRecipeLoader.blockConPump, 1, 0);
return new ItemStack(RecipeLoader.blockConPump, 1, 0);
}
@Override

6
src/main/java/resonantinduction/fluid/pump/BlockDrain.java
View file

@ -39,9 +39,9 @@ public class BlockDrain extends BlockHydraulic
@Override
public void registerIcons(IconRegister par1IconRegister)
{
this.blockIcon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + "ironMachineSide");
this.drainIcon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + "drain");
this.fillIcon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + "drain2");
this.blockIcon = par1IconRegister.registerIcon(ResonantInductionTransport.PREFIX + "ironMachineSide");
this.drainIcon = par1IconRegister.registerIcon(ResonantInductionTransport.PREFIX + "drain");
this.fillIcon = par1IconRegister.registerIcon(ResonantInductionTransport.PREFIX + "drain2");
}
@Override

4
src/main/java/resonantinduction/fluid/pump/BlockPumpMachine.java
View file

@ -3,9 +3,9 @@ package resonantinduction.fluid.pump;
import java.util.List;
import java.util.Set;
import resonantinduction.ALRecipeLoader;
import resonantinduction.blocks.BlockHydraulic;
import resonantinduction.client.render.BlockRenderHelper;
import resonantinduction.core.recipe.RecipeLoader;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
@ -69,7 +69,7 @@ public class BlockPumpMachine extends BlockHydraulic
if (meta < 4)
{
return new ItemStack(ALRecipeLoader.blockPumpMachine, 1, 0);
return new ItemStack(RecipeLoader.blockPumpMachine, 1, 0);
}
return null;

2
src/main/java/resonantinduction/mechanics/mining/BlockApertureExcavator.java
View file

@ -16,7 +16,7 @@ public class BlockApertureExcavator extends BlockMachine
public BlockApertureExcavator()
{
super(AssemblyLine.CONFIGURATION, "Machine_ApertureExcavator", UniversalElectricity.machine);
super(ResonantInductionTransport.CONFIGURATION, "Machine_ApertureExcavator", UniversalElectricity.machine);
}
@Override

2
src/main/java/resonantinduction/mechanics/mining/BlockFracker.java
View file

@ -17,7 +17,7 @@ public class BlockFracker extends BlockMachine
public BlockFracker()
{
super(AssemblyLine.CONFIGURATION, "Machine_Fracker", UniversalElectricity.machine);
super(ResonantInductionTransport.CONFIGURATION, "Machine_Fracker", UniversalElectricity.machine);
}
@Override

2
src/main/java/resonantinduction/mechanics/mining/BlockFrackingPipe.java
View file

@ -18,7 +18,7 @@ public class BlockFrackingPipe extends BlockMachine
public BlockFrackingPipe()
{
super(AssemblyLine.CONFIGURATION, "Fracking_Pipe", Material.wood);
super(ResonantInductionTransport.CONFIGURATION, "Fracking_Pipe", Material.wood);
}
@Override

2
src/main/java/resonantinduction/mechanics/mining/BlockLaserDrill.java
View file

@ -17,7 +17,7 @@ public class BlockLaserDrill extends BlockMachine
public BlockLaserDrill()
{
super(AssemblyLine.CONFIGURATION, "Machine_LaserDrill", Material.iron);
super(ResonantInductionTransport.CONFIGURATION, "Machine_LaserDrill", Material.iron);
}
@Override

2
src/main/java/resonantinduction/mechanics/mining/BlockMiningLaser.java
View file

@ -20,7 +20,7 @@ public class BlockMiningLaser extends BlockMachine
{
public BlockMiningLaser()
{
super(AssemblyLine.CONFIGURATION, "LaserMiner", Material.iron);
super(ResonantInductionTransport.CONFIGURATION, "LaserMiner", Material.iron);
}
@Override

2
src/main/java/resonantinduction/mechanics/mining/ItemMiningLaser.java
View file

@ -65,7 +65,7 @@ public class ItemMiningLaser extends ItemElectric implements IExtraItemInfo
public ItemMiningLaser()
{
super(AssemblyLine.CONFIGURATION.getItem("LaserMiningGun", DarkCore.getNextItemId()).getInt());
super(ResonantInductionTransport.CONFIGURATION.getItem("LaserMiningGun", DarkCore.getNextItemId()).getInt());
this.setUnlocalizedName("MiningLaser");
this.setMaxStackSize(1);
this.setCreativeTab(CreativeTabs.tabTools);

4
src/main/java/resonantinduction/mechanics/mining/TileFracker.java
View file

@ -1,6 +1,6 @@
package resonantinduction.mechanics.mining;
import resonantinduction.ALRecipeLoader;
import resonantinduction.core.recipe.RecipeLoader;
import resonantinduction.fluid.EnumGas;
import resonantinduction.fluid.GasTank;
import net.minecraft.block.Block;
@ -76,7 +76,7 @@ public class TileFracker extends TileEntityEnergyMachine implements IFluidHandle
worldObj.setBlockToAir(target.intX(), target.intY(), target.intZ());
this.consumePower(2, true);
}
worldObj.setBlock(target.intX(), target.intY(), target.intZ(), ALRecipeLoader.frackingPipe.blockID);
worldObj.setBlock(target.intX(), target.intY(), target.intZ(), RecipeLoader.frackingPipe.blockID);
this.consumePower(500, true);
}
}

8
src/main/java/resonantinduction/mechanics/processor/BlockProcessor.java
View file

@ -5,7 +5,7 @@ import java.util.Set;
import resonantinduction.AssemblyLine;
import resonantinduction.CommonProxy;
import resonantinduction.IndustryTabs;
import resonantinduction.ResonantInductionTabs;
import resonantinduction.client.render.BlockRenderingHandler;
import resonantinduction.client.render.RenderProcessor;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@ -33,8 +33,8 @@ public class BlockProcessor extends BlockMachine
public BlockProcessor()
{
super(AssemblyLine.CONFIGURATION, "OreProcessor", UniversalElectricity.machine);
this.setCreativeTab(IndustryTabs.tabIndustrial());
super(ResonantInductionTransport.CONFIGURATION, "OreProcessor", UniversalElectricity.machine);
this.setCreativeTab(ResonantInductionTabs.tabIndustrial());
}
@Override
@ -48,7 +48,7 @@ public class BlockProcessor extends BlockMachine
}
else
{
entityPlayer.openGui(AssemblyLine.instance, CommonProxy.GUI_PROCESSOR, world, x, y, z);
entityPlayer.openGui(ResonantInductionTransport.instance, CommonProxy.GUI_PROCESSOR, world, x, y, z);
return true;
}
}

2
src/main/java/resonantinduction/misc/EnumBird.java
View file

@ -37,7 +37,7 @@ public enum EnumBird
public void register()
{
EntityRegistry.registerGlobalEntityID(EntityTurkey.class, "FTTurkey", EntityRegistry.findGlobalUniqueEntityId(), 5651507, Color.red.getRGB());
EntityRegistry.registerModEntity(EntityTurkey.class, "FTTurkey", AssemblyLine.entitiesIds++, AssemblyLine.instance, 64, 1, true);
EntityRegistry.registerModEntity(EntityTurkey.class, "FTTurkey", ResonantInductionTransport.entitiesIds++, ResonantInductionTransport.instance, 64, 1, true);
EntityRegistry.addSpawn(EntityTurkey.class, 3, 1, 10, EnumCreatureType.creature, BiomeGenBase.forest, BiomeGenBase.river);
}

6
src/main/java/resonantinduction/tool/EnumTool.java
View file

@ -3,7 +3,7 @@ package resonantinduction.tool;
import java.util.ArrayList;
import java.util.List;
import resonantinduction.ALRecipeLoader;
import resonantinduction.core.recipe.RecipeLoader;
import net.minecraft.block.material.Material;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
@ -89,9 +89,9 @@ public enum EnumTool
public ItemStack getTool(EnumMaterial mat)
{
ItemStack stack = null;
if (ALRecipeLoader.itemDiggingTool instanceof ItemCommonTool)
if (RecipeLoader.itemDiggingTool instanceof ItemCommonTool)
{
stack = new ItemStack(ALRecipeLoader.itemDiggingTool.itemID, 1, (mat.ordinal() * toolCountPerMaterial) + this.ordinal());
stack = new ItemStack(RecipeLoader.itemDiggingTool.itemID, 1, (mat.ordinal() * toolCountPerMaterial) + this.ordinal());
}
return stack;
}

4
src/main/java/resonantinduction/tool/ItemColoredDust.java
View file

@ -22,7 +22,7 @@ public class ItemColoredDust extends ItemBasic
public ItemColoredDust()
{
super(DarkCore.getNextItemId(), "GlowRefinedSand", AssemblyLine.CONFIGURATION);
super(DarkCore.getNextItemId(), "GlowRefinedSand", ResonantInductionTransport.CONFIGURATION);
this.setMaxDamage(0);
this.setHasSubtypes(true);
this.setCreativeTab(CreativeTabs.tabMaterials);
@ -46,7 +46,7 @@ public class ItemColoredDust extends ItemBasic
@Override
public void registerIcons(IconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + "dust");
this.itemIcon = par1IconRegister.registerIcon(ResonantInductionTransport.PREFIX + "dust");
this.theIcon = par1IconRegister.registerIcon("glowingPowder_overlay");
}

6
src/main/java/resonantinduction/tool/ItemCommonTool.java
View file

@ -55,7 +55,7 @@ public class ItemCommonTool extends Item implements IExtraItemInfo
public ItemCommonTool()
{
super(AssemblyLine.CONFIGURATION.getItem("Items", "CommonTools", DarkCore.getNextItemId()).getInt());
super(ResonantInductionTransport.CONFIGURATION.getItem("Items", "CommonTools", DarkCore.getNextItemId()).getInt());
this.maxStackSize = 1;
this.setCreativeTab(CreativeTabs.tabTools);
}
@ -435,7 +435,7 @@ public class ItemCommonTool extends Item implements IExtraItemInfo
{
if (itemStack != null)
{
return "item." + AssemblyLine.PREFIX + EnumTool.getFullName(itemStack.getItemDamage());
return "item." + ResonantInductionTransport.PREFIX + EnumTool.getFullName(itemStack.getItemDamage());
}
else
{
@ -475,7 +475,7 @@ public class ItemCommonTool extends Item implements IExtraItemInfo
if (tool.enabled)
{
tool.toolIcons[mat.ordinal()] = iconRegister.registerIcon(AssemblyLine.PREFIX + "tool." + mat.simpleName + tool.name);
tool.toolIcons[mat.ordinal()] = iconRegister.registerIcon(ResonantInductionTransport.PREFIX + "tool." + mat.simpleName + tool.name);
}
}
}

6
src/main/java/resonantinduction/tool/ItemFarmBucket.java
View file

@ -19,19 +19,19 @@ public class ItemFarmBucket extends ItemBucket
{
public ItemFarmBucket(int itemID, int blockID)
{
super(AssemblyLine.CONFIGURATION.getItem("Bucket", itemID).getInt(), blockID);
super(ResonantInductionTransport.CONFIGURATION.getItem("Bucket", itemID).getInt(), blockID);
this.setCreativeTab(CreativeTabs.tabMisc);
this.setHasSubtypes(true);
this.setContainerItem(Item.bucketEmpty);
this.setUnlocalizedName("farmBucket");
this.setTextureName(AssemblyLine.PREFIX + "farmBucket");
this.setTextureName(ResonantInductionTransport.PREFIX + "farmBucket");
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + "compostBucket");
this.itemIcon = par1IconRegister.registerIcon(ResonantInductionTransport.PREFIX + "compostBucket");
}
@SideOnly(Side.CLIENT)

4
src/main/java/resonantinduction/tool/ItemFarmFood.java
View file

@ -35,7 +35,7 @@ public class ItemFarmFood extends Item implements IExtraItemInfo
public ItemFarmFood(int par1)
{
super(AssemblyLine.CONFIGURATION.getItem("Food", DarkCore.getNextID()).getInt());
super(ResonantInductionTransport.CONFIGURATION.getItem("Food", DarkCore.getNextID()).getInt());
this.setHasSubtypes(true);
this.setCreativeTab(CreativeTabs.tabFood);
this.setUnlocalizedName("FarmFood");
@ -112,7 +112,7 @@ public class ItemFarmFood extends Item implements IExtraItemInfo
{
for (FarmFood food : FarmFood.values())
{
food.icon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + "food_" + food.name);
food.icon = par1IconRegister.registerIcon(ResonantInductionTransport.PREFIX + "food_" + food.name);
}
}

2
src/main/java/resonantinduction/transport/BlockTurntable.java
View file

@ -44,7 +44,7 @@ public class BlockTurntable extends BlockAssembly
public void registerIcons(IconRegister iconReg)
{
super.registerIcons(iconReg);
this.top = iconReg.registerIcon(AssemblyLine.PREFIX + "turntable");
this.top = iconReg.registerIcon(ResonantInductionTransport.PREFIX + "turntable");
}
@Override

2
src/main/java/resonantinduction/CommonProxy.java → src/main/java/resonantinduction/transport/CommonProxy.java
View file

@ -1,4 +1,4 @@
package resonantinduction;
package resonantinduction.transport;
import java.io.File;
import java.io.FileInputStream;

147
src/main/java/resonantinduction/AssemblyLine.java → src/main/java/resonantinduction/transport/ResonantInductionTransport.java
View file

@ -1,4 +1,4 @@
package resonantinduction;
package resonantinduction.transport;
import java.io.File;
import java.util.Arrays;
@ -48,6 +48,7 @@ import resonantinduction.blocks.BlockOre.OreData;
import resonantinduction.core.debug.BlockDebug;
import resonantinduction.core.multimeter.ItemReadoutTools;
import resonantinduction.core.network.PacketIDTile;
import resonantinduction.core.recipe.RecipeLoader;
import resonantinduction.core.resource.ItemBlockOre;
import resonantinduction.core.resource.ItemOreDirv;
import resonantinduction.core.resource.ItemParts;
@ -127,10 +128,9 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.TickRegistry;
import cpw.mods.fml.relauncher.Side;
@ModstatInfo(prefix = "asmline")
@Mod(modid = AssemblyLine.MOD_ID, name = AssemblyLine.MOD_NAME, version = AssemblyLine.VERSION, useMetadata = true)
@NetworkMod(channels = { AssemblyLine.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
public class AssemblyLine
@Mod(modid = ResonantInductionTransport.MOD_ID, name = ResonantInductionTransport.MOD_NAME, version = ResonantInductionTransport.VERSION, useMetadata = true)
@NetworkMod(channels = { ResonantInductionTransport.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
public class ResonantInductionTransport
{
public static final String TEXTURE_DIRECTORY = "textures/";
public static final String BLOCK_DIRECTORY = TEXTURE_DIRECTORY + "blocks/";
@ -139,11 +139,6 @@ public class AssemblyLine
public static final String GUI_DIRECTORY = TEXTURE_DIRECTORY + "gui/";
public static final String CHANNEL = "ALChannel";
public static final String MAJOR_VERSION = "@MAJOR@";
public static final String MINOR_VERSION = "@MINOR@";
public static final String REVIS_VERSION = "@REVIS@";
public static final String BUILD_VERSION = "@BUILD@";
public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + REVIS_VERSION + "." + BUILD_VERSION;
// @Mod
public static final String MOD_ID = "AssemblyLine";
public static final String MOD_NAME = "Assembly Line";
@ -159,17 +154,17 @@ public class AssemblyLine
@SidedProxy(clientSide = "com.builtbroken.assemblyline.client.ClientProxy", serverSide = "com.builtbroken.assemblyline.CommonProxy")
public static CommonProxy proxy;
@Instance(AssemblyLine.MOD_ID)
public static AssemblyLine instance;
@Instance(ResonantInductionTransport.MOD_ID)
public static ResonantInductionTransport instance;
@Metadata(AssemblyLine.MOD_ID)
@Metadata(ResonantInductionTransport.MOD_ID)
public static ModMetadata meta;
private static final String[] LANGUAGES_SUPPORTED = new String[] { "en_US", "de_DE" };
public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir(), "AssemblyLine.cfg"));
public static Logger FMLog = Logger.getLogger(AssemblyLine.MOD_NAME);
public static Logger FMLog = Logger.getLogger(ResonantInductionTransport.MOD_NAME);
public static boolean VINALLA_RECIPES = false;
@ -181,7 +176,7 @@ public class AssemblyLine
{
if (tilePacket == null)
{
tilePacket = new PacketIDTile(AssemblyLine.CHANNEL);
tilePacket = new PacketIDTile(ResonantInductionTransport.CHANNEL);
}
return tilePacket;
}
@ -198,7 +193,7 @@ public class AssemblyLine
MinecraftForge.EVENT_BUS.register(new FluidHelper());
MinecraftForge.EVENT_BUS.register(SaveManager.instance());
TickRegistry.registerTickHandler(NetworkUpdateHandler.instance(), Side.SERVER);
TickRegistry.registerScheduledTickHandler(new PlayerKeyHandler(AssemblyLine.CHANNEL), Side.CLIENT);
TickRegistry.registerScheduledTickHandler(new PlayerKeyHandler(ResonantInductionTransport.CHANNEL), Side.CLIENT);
MinecraftForge.EVENT_BUS.register(new LaserEntityDamageSource(null));
NetworkRegistry.instance().registerGuiHandler(this, proxy);
@ -236,15 +231,15 @@ public class AssemblyLine
{
FluidRegistry.registerFluid(gas.getGas());
}
if (ALRecipeLoader.blockGas != null)
if (RecipeLoader.blockGas != null)
{
EnumGas.NATURAL_GAS.getGas().setBlockID(ALRecipeLoader.blockGas);
EnumGas.NATURAL_GAS.getGas().setBlockID(RecipeLoader.blockGas);
}
if (ALRecipeLoader.blockGas != null)
if (RecipeLoader.blockGas != null)
{
GameRegistry.registerWorldGenerator(new GasOreGenerator());
}
if (ALRecipeLoader.blockOre != null)
if (RecipeLoader.blockOre != null)
{
for (OreData data : OreData.values())
{
@ -258,11 +253,11 @@ public class AssemblyLine
}
}
}
if (ALRecipeLoader.itemParts != null)
if (RecipeLoader.itemParts != null)
{
for (Parts part : Parts.values())
{
OreDictionary.registerOre(part.name, new ItemStack(ALRecipeLoader.itemParts, 1, part.ordinal()));
OreDictionary.registerOre(part.name, new ItemStack(RecipeLoader.itemParts, 1, part.ordinal()));
}
}
proxy.init();
@ -273,7 +268,7 @@ public class AssemblyLine
{
DarkCore.instance().postLoad();
proxy.postInit();
ALRecipeLoader.instance().loadRecipes();
RecipeLoader.instance().loadRecipes();
CONFIGURATION.save();
}
@ -282,62 +277,62 @@ public class AssemblyLine
{
/* BLOCKS */
ALRecipeLoader.blockConveyorBelt = CoreRegistry.createNewBlock("ALBlockConveyor", AssemblyLine.MOD_ID, BlockConveyorBelt.class);
ALRecipeLoader.blockManipulator = CoreRegistry.createNewBlock("Manipulator", AssemblyLine.MOD_ID, BlockManipulator.class);
ALRecipeLoader.blockCrate = (BlockCrate) CoreRegistry.createNewBlock("Crate", AssemblyLine.MOD_ID, BlockCrate.class, ItemBlockCrate.class);
ALRecipeLoader.blockImprinter = CoreRegistry.createNewBlock("Imprinter", AssemblyLine.MOD_ID, BlockImprinter.class);
ALRecipeLoader.blockDetector = CoreRegistry.createNewBlock("Detector", AssemblyLine.MOD_ID, BlockDetector.class);
RecipeLoader.blockConveyorBelt = CoreRegistry.createNewBlock("ALBlockConveyor", ResonantInductionTransport.MOD_ID, BlockConveyorBelt.class);
RecipeLoader.blockManipulator = CoreRegistry.createNewBlock("Manipulator", ResonantInductionTransport.MOD_ID, BlockManipulator.class);
RecipeLoader.blockCrate = (BlockCrate) CoreRegistry.createNewBlock("Crate", ResonantInductionTransport.MOD_ID, BlockCrate.class, ItemBlockCrate.class);
RecipeLoader.blockImprinter = CoreRegistry.createNewBlock("Imprinter", ResonantInductionTransport.MOD_ID, BlockImprinter.class);
RecipeLoader.blockDetector = CoreRegistry.createNewBlock("Detector", ResonantInductionTransport.MOD_ID, BlockDetector.class);
ALRecipeLoader.blockRejector = CoreRegistry.createNewBlock("Rejector", AssemblyLine.MOD_ID, BlockRejector.class);
ALRecipeLoader.blockEncoder = CoreRegistry.createNewBlock("Encoder", AssemblyLine.MOD_ID, BlockEncoder.class);
ALRecipeLoader.blockArmbot = CoreRegistry.createNewBlock("Armbot", AssemblyLine.MOD_ID, BlockArmbot.class);
ALRecipeLoader.blockTurntable = CoreRegistry.createNewBlock("Turntable", AssemblyLine.MOD_ID, BlockTurntable.class);
ALRecipeLoader.processorMachine = CoreRegistry.createNewBlock("ALBlockProcessor", AssemblyLine.MOD_ID, BlockProcessor.class, ItemBlockHolder.class);
RecipeLoader.blockRejector = CoreRegistry.createNewBlock("Rejector", ResonantInductionTransport.MOD_ID, BlockRejector.class);
RecipeLoader.blockEncoder = CoreRegistry.createNewBlock("Encoder", ResonantInductionTransport.MOD_ID, BlockEncoder.class);
RecipeLoader.blockArmbot = CoreRegistry.createNewBlock("Armbot", ResonantInductionTransport.MOD_ID, BlockArmbot.class);
RecipeLoader.blockTurntable = CoreRegistry.createNewBlock("Turntable", ResonantInductionTransport.MOD_ID, BlockTurntable.class);
RecipeLoader.processorMachine = CoreRegistry.createNewBlock("ALBlockProcessor", ResonantInductionTransport.MOD_ID, BlockProcessor.class, ItemBlockHolder.class);
ALRecipeLoader.blockAdvancedHopper = CoreRegistry.createNewBlock("ALBlockHopper", AssemblyLine.MOD_ID, BlockAdvancedHopper.class, ItemBlockHolder.class);
ALRecipeLoader.blockPipe = CoreRegistry.createNewBlock("FMBlockPipe", AssemblyLine.MOD_ID, BlockPipe.class, ItemBlockPipe.class);
ALRecipeLoader.blockPumpMachine = CoreRegistry.createNewBlock("FMBlockPump", AssemblyLine.MOD_ID, BlockPumpMachine.class, ItemBlockHolder.class);
ALRecipeLoader.blockReleaseValve = CoreRegistry.createNewBlock("FMBlockReleaseValve", AssemblyLine.MOD_ID, BlockReleaseValve.class, ItemBlockHolder.class);
ALRecipeLoader.blockTank = CoreRegistry.createNewBlock("FMBlockTank", AssemblyLine.MOD_ID, BlockTank.class, ItemBlockPipe.class);
RecipeLoader.blockAdvancedHopper = CoreRegistry.createNewBlock("ALBlockHopper", ResonantInductionTransport.MOD_ID, BlockAdvancedHopper.class, ItemBlockHolder.class);
RecipeLoader.blockPipe = CoreRegistry.createNewBlock("FMBlockPipe", ResonantInductionTransport.MOD_ID, BlockPipe.class, ItemBlockPipe.class);
RecipeLoader.blockPumpMachine = CoreRegistry.createNewBlock("FMBlockPump", ResonantInductionTransport.MOD_ID, BlockPumpMachine.class, ItemBlockHolder.class);
RecipeLoader.blockReleaseValve = CoreRegistry.createNewBlock("FMBlockReleaseValve", ResonantInductionTransport.MOD_ID, BlockReleaseValve.class, ItemBlockHolder.class);
RecipeLoader.blockTank = CoreRegistry.createNewBlock("FMBlockTank", ResonantInductionTransport.MOD_ID, BlockTank.class, ItemBlockPipe.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);
ALRecipeLoader.blockOre = CoreRegistry.createNewBlock("DMBlockOre", AssemblyLine.MOD_ID, BlockOre.class, ItemBlockOre.class);
RecipeLoader.blockSink = CoreRegistry.createNewBlock("FMBlockSink", ResonantInductionTransport.MOD_ID, BlockKitchenSink.class, ItemBlockHolder.class);
RecipeLoader.blockDrain = CoreRegistry.createNewBlock("FMBlockDrain", ResonantInductionTransport.MOD_ID, BlockDrain.class, ItemBlockHolder.class);
RecipeLoader.blockConPump = CoreRegistry.createNewBlock("FMBlockConstructionPump", ResonantInductionTransport.MOD_ID, BlockConstructionPump.class, ItemBlockHolder.class);
RecipeLoader.blockSteamGen = CoreRegistry.createNewBlock("DMBlockSteamMachine", ResonantInductionTransport.MOD_ID, BlockSmallSteamGen.class, ItemBlockHolder.class);
RecipeLoader.blockOre = CoreRegistry.createNewBlock("DMBlockOre", ResonantInductionTransport.MOD_ID, BlockOre.class, ItemBlockOre.class);
ALRecipeLoader.blockWire = CoreRegistry.createNewBlock("DMBlockWire", AssemblyLine.MOD_ID, BlockWire.class, ItemBlockWire.class);
ALRecipeLoader.blockDebug = CoreRegistry.createNewBlock("DMBlockDebug", AssemblyLine.MOD_ID, BlockDebug.class, ItemBlockHolder.class);
ALRecipeLoader.blockStainGlass = CoreRegistry.createNewBlock("DMBlockStainedGlass", AssemblyLine.MOD_ID, BlockColorGlass.class, ItemBlockColored.class);
ALRecipeLoader.blockColorSand = CoreRegistry.createNewBlock("DMBlockColorSand", AssemblyLine.MOD_ID, BlockColorSand.class, ItemBlockColored.class);
ALRecipeLoader.blockBasalt = CoreRegistry.createNewBlock("DMBlockBasalt", AssemblyLine.MOD_ID, BlockBasalt.class, ItemBlockColored.class);
RecipeLoader.blockWire = CoreRegistry.createNewBlock("DMBlockWire", ResonantInductionTransport.MOD_ID, BlockWire.class, ItemBlockWire.class);
RecipeLoader.blockDebug = CoreRegistry.createNewBlock("DMBlockDebug", ResonantInductionTransport.MOD_ID, BlockDebug.class, ItemBlockHolder.class);
RecipeLoader.blockStainGlass = CoreRegistry.createNewBlock("DMBlockStainedGlass", ResonantInductionTransport.MOD_ID, BlockColorGlass.class, ItemBlockColored.class);
RecipeLoader.blockColorSand = CoreRegistry.createNewBlock("DMBlockColorSand", ResonantInductionTransport.MOD_ID, BlockColorSand.class, ItemBlockColored.class);
RecipeLoader.blockBasalt = CoreRegistry.createNewBlock("DMBlockBasalt", ResonantInductionTransport.MOD_ID, BlockBasalt.class, ItemBlockColored.class);
ALRecipeLoader.blockGlowGlass = CoreRegistry.createNewBlock("DMBlockGlowGlass", AssemblyLine.MOD_ID, BlockColorGlowGlass.class, ItemBlockColored.class);
ALRecipeLoader.blockSolar = CoreRegistry.createNewBlock("DMBlockSolar", AssemblyLine.MOD_ID, BlockSolarPanel.class, ItemBlockHolder.class);
ALRecipeLoader.blockGas = CoreRegistry.createNewBlock("DMBlockGas", AssemblyLine.MOD_ID, BlockGasOre.class, ItemBlockHolder.class);
ALRecipeLoader.blockBatBox = CoreRegistry.createNewBlock("DMBlockBatBox", AssemblyLine.MOD_ID, BlockEnergyStorage.class, ItemBlockEnergyStorage.class);
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);
/* ITEMS */
ALRecipeLoader.itemTool = CoreRegistry.createNewItem("DMReadoutTools", AssemblyLine.MOD_ID, ItemReadoutTools.class, true);
ALRecipeLoader.battery = CoreRegistry.createNewItem("DMItemBattery", AssemblyLine.MOD_ID, ItemBattery.class, true);
ALRecipeLoader.wrench = CoreRegistry.createNewItem("DMWrench", AssemblyLine.MOD_ID, ItemWrench.class, true);
ALRecipeLoader.itemGlowingSand = CoreRegistry.createNewItem("DMItemGlowingSand", AssemblyLine.MOD_ID, ItemColoredDust.class, true);
ALRecipeLoader.itemDiggingTool = CoreRegistry.createNewItem("ItemDiggingTools", AssemblyLine.MOD_ID, ItemCommonTool.class, true);
RecipeLoader.itemTool = CoreRegistry.createNewItem("DMReadoutTools", ResonantInductionTransport.MOD_ID, ItemReadoutTools.class, true);
RecipeLoader.battery = CoreRegistry.createNewItem("DMItemBattery", ResonantInductionTransport.MOD_ID, ItemBattery.class, true);
RecipeLoader.wrench = CoreRegistry.createNewItem("DMWrench", ResonantInductionTransport.MOD_ID, ItemWrench.class, true);
RecipeLoader.itemGlowingSand = CoreRegistry.createNewItem("DMItemGlowingSand", ResonantInductionTransport.MOD_ID, ItemColoredDust.class, true);
RecipeLoader.itemDiggingTool = CoreRegistry.createNewItem("ItemDiggingTools", ResonantInductionTransport.MOD_ID, ItemCommonTool.class, true);
ALRecipeLoader.itemVehicleTest = CoreRegistry.createNewItem("ItemVehicleTest", AssemblyLine.MOD_ID, ItemVehicleSpawn.class, true);
ALRecipeLoader.itemImprint = new ItemImprinter(CONFIGURATION.getItem("Imprint", DarkCore.getNextItemId()).getInt());
ALRecipeLoader.itemDisk = new ItemDisk(CONFIGURATION.getItem("Disk", DarkCore.getNextItemId()).getInt());
ALRecipeLoader.itemFluidCan = CoreRegistry.createNewItem("ItemFluidCan", AssemblyLine.MOD_ID, ItemFluidCan.class, true);
ALRecipeLoader.itemParts = CoreRegistry.createNewItem("DMCraftingParts", AssemblyLine.MOD_ID, ItemParts.class, true);
RecipeLoader.itemVehicleTest = CoreRegistry.createNewItem("ItemVehicleTest", ResonantInductionTransport.MOD_ID, ItemVehicleSpawn.class, true);
RecipeLoader.itemImprint = new ItemImprinter(CONFIGURATION.getItem("Imprint", DarkCore.getNextItemId()).getInt());
RecipeLoader.itemDisk = new ItemDisk(CONFIGURATION.getItem("Disk", DarkCore.getNextItemId()).getInt());
RecipeLoader.itemFluidCan = CoreRegistry.createNewItem("ItemFluidCan", ResonantInductionTransport.MOD_ID, ItemFluidCan.class, true);
RecipeLoader.itemParts = CoreRegistry.createNewItem("DMCraftingParts", ResonantInductionTransport.MOD_ID, ItemParts.class, true);
ALRecipeLoader.itemMetals = CoreRegistry.createNewItem("DMOreDirvParts", AssemblyLine.MOD_ID, ItemOreDirv.class, true);
RecipeLoader.itemMetals = CoreRegistry.createNewItem("DMOreDirvParts", ResonantInductionTransport.MOD_ID, ItemOreDirv.class, true);
//ALRecipeLoader.itemMPWire = CoreRegistry.createNewItem("DMMPWire", AssemblyLine.MOD_ID, ItemWire.class, true);
TileEntityAssembly.refresh_diff = CONFIGURATION.get("TileSettings", "RefreshRandomRange", 9, "n = value of config, 1 + n, random number range from 1 to n that will be added to the lowest refresh value").getInt();
TileEntityAssembly.refresh_min_rate = CONFIGURATION.get("TileSettings", "RefreshLowestValue", 20, "Lowest value the refresh rate of the tile network will be").getInt();
//Entities
if (AssemblyLine.CONFIGURATION.get("Override", "Eggs", true).getBoolean(true))
if (ResonantInductionTransport.CONFIGURATION.get("Override", "Eggs", true).getBoolean(true))
{
Item.itemsList[Item.egg.itemID] = null;
Item.egg = null;
@ -359,39 +354,39 @@ public class AssemblyLine
}
}
//Post object creation, normally creative tab icon setup
if (ALRecipeLoader.blockPipe != null)
if (RecipeLoader.blockPipe != null)
{
IndustryTabs.tabHydraulic().setIconItemStack(FluidPartsMaterial.IRON.getStack());
ResonantInductionTabs.tabHydraulic().setIconItemStack(FluidPartsMaterial.IRON.getStack());
}
else
{
IndustryTabs.tabHydraulic().setIconItemStack(new ItemStack(Item.bucketWater));
ResonantInductionTabs.tabHydraulic().setIconItemStack(new ItemStack(Item.bucketWater));
}
if (ALRecipeLoader.itemMetals != null)
if (RecipeLoader.itemMetals != null)
{
IndustryTabs.tabIndustrial().itemStack = EnumMaterial.getStack(ALRecipeLoader.itemMetals, EnumMaterial.IRON, EnumOrePart.GEARS, 1);
ALRecipeLoader.parseOreNames(CONFIGURATION);
ResonantInductionTabs.tabIndustrial().itemStack = EnumMaterial.getStack(RecipeLoader.itemMetals, EnumMaterial.IRON, EnumOrePart.GEARS, 1);
RecipeLoader.parseOreNames(CONFIGURATION);
}
else
{
}
if (ALRecipeLoader.blockConveyorBelt != null)
if (RecipeLoader.blockConveyorBelt != null)
{
IndustryTabs.tabAutomation().setIconItemStack(new ItemStack(ALRecipeLoader.blockConveyorBelt));
ResonantInductionTabs.tabAutomation().setIconItemStack(new ItemStack(RecipeLoader.blockConveyorBelt));
}
else
{
IndustryTabs.tabAutomation().setIconItemStack(new ItemStack(Block.pistonStickyBase));
ResonantInductionTabs.tabAutomation().setIconItemStack(new ItemStack(Block.pistonStickyBase));
}
}
public void loadModMeta()
{
meta.modId = AssemblyLine.MOD_ID;
meta.name = AssemblyLine.MOD_NAME;
meta.version = AssemblyLine.VERSION;
meta.modId = ResonantInductionTransport.MOD_ID;
meta.name = ResonantInductionTransport.MOD_NAME;
meta.version = ResonantInductionTransport.VERSION;
meta.description = "Simi Realistic factory system for minecraft bring in conveyor belts, robotic arms, and simple machines";
meta.url = "http://www.universalelectricity.com/coremachine";
meta.logoFile = "/al_logo.png";

4
src/main/java/resonantinduction/transport/belt/TileEntityConveyorBelt.java
View file

@ -4,8 +4,8 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import resonantinduction.ALRecipeLoader;
import resonantinduction.api.IBelt;
import resonantinduction.core.recipe.RecipeLoader;
import resonantinduction.machine.TileEntityAssembly;
import net.minecraft.entity.Entity;
import net.minecraft.nbt.NBTTagCompound;
@ -71,7 +71,7 @@ public class TileEntityConveyorBelt extends TileEntityAssembly implements IBelt,
}
if (this.worldObj.isRemote && this.isFunctioning())
{
if (this.ticks % 10 == 0 && this.worldObj.isRemote && this.worldObj.getBlockId(this.xCoord - 1, this.yCoord, this.zCoord) != ALRecipeLoader.blockConveyorBelt.blockID && this.worldObj.getBlockId(xCoord, yCoord, zCoord - 1) != ALRecipeLoader.blockConveyorBelt.blockID)
if (this.ticks % 10 == 0 && this.worldObj.isRemote && this.worldObj.getBlockId(this.xCoord - 1, this.yCoord, this.zCoord) != RecipeLoader.blockConveyorBelt.blockID && this.worldObj.getBlockId(xCoord, yCoord, zCoord - 1) != RecipeLoader.blockConveyorBelt.blockID)
{
this.worldObj.playSound(this.xCoord, this.yCoord, this.zCoord, "mods.assemblyline.conveyor", 0.5f, 0.7f, true);
}

2
src/main/java/resonantinduction/transport/crafting/BlockCraftingTable.java
View file

@ -26,7 +26,7 @@ public class BlockCraftingTable extends BlockMachine
public BlockCraftingTable()
{
super(AssemblyLine.CONFIGURATION, "CraftingTable", Material.rock);
super(ResonantInductionTransport.CONFIGURATION, "CraftingTable", Material.rock);
}
@Override

6
src/main/java/resonantinduction/transport/crate/BlockCrate.java
View file

@ -42,9 +42,9 @@ public class BlockCrate extends BlockAssembly
@Override
public void registerIcons(IconRegister iconReg)
{
this.blockIcon = iconReg.registerIcon(AssemblyLine.PREFIX + "crate");
this.adv = iconReg.registerIcon(AssemblyLine.PREFIX + "crate_adv");
this.elt = iconReg.registerIcon(AssemblyLine.PREFIX + "crate_elt");
this.blockIcon = iconReg.registerIcon(ResonantInductionTransport.PREFIX + "crate");
this.adv = iconReg.registerIcon(ResonantInductionTransport.PREFIX + "crate_adv");
this.elt = iconReg.registerIcon(ResonantInductionTransport.PREFIX + "crate_elt");
}
@Override

4
src/main/java/resonantinduction/transport/crate/TileEntityCrate.java
View file

@ -226,11 +226,11 @@ public class TileEntityCrate extends TileEntityInv implements ISimplePacketRecei
ItemStack stack = this.getSampleStack();
if (stack != null)
{
return PacketHandler.instance().getTilePacket(AssemblyLine.CHANNEL, "InventoryItem", this, true, stack.writeToNBT(new NBTTagCompound()), stack.stackSize);
return PacketHandler.instance().getTilePacket(ResonantInductionTransport.CHANNEL, "InventoryItem", this, true, stack.writeToNBT(new NBTTagCompound()), stack.stackSize);
}
else
{
return PacketHandler.instance().getTilePacket(AssemblyLine.CHANNEL, "InventoryItem", this, false);
return PacketHandler.instance().getTilePacket(ResonantInductionTransport.CHANNEL, "InventoryItem", this, false);
}
}

8
src/main/java/resonantinduction/transport/encoder/BlockEncoder.java
View file

@ -33,9 +33,9 @@ public class BlockEncoder extends BlockAssembly
@Override
public void registerIcons(IconRegister iconReg)
{
this.encoder_side = iconReg.registerIcon(AssemblyLine.PREFIX + "encoder_side");
this.encoder_top = iconReg.registerIcon(AssemblyLine.PREFIX + "encoder_top");
this.encoder_bottom = iconReg.registerIcon(AssemblyLine.PREFIX + "encoder_bottom");
this.encoder_side = iconReg.registerIcon(ResonantInductionTransport.PREFIX + "encoder_side");
this.encoder_top = iconReg.registerIcon(ResonantInductionTransport.PREFIX + "encoder_top");
this.encoder_bottom = iconReg.registerIcon(ResonantInductionTransport.PREFIX + "encoder_bottom");
}
/** Returns the block texture based on the side being looked at. Args: side */
@ -71,7 +71,7 @@ public class BlockEncoder extends BlockAssembly
{
if (!world.isRemote)
{
entityPlayer.openGui(AssemblyLine.instance, CommonProxy.GUI_ENCODER, world, x, y, z);
entityPlayer.openGui(ResonantInductionTransport.instance, CommonProxy.GUI_ENCODER, world, x, y, z);
}
return true;

6
src/main/java/resonantinduction/transport/encoder/ItemDisk.java
View file

@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import resonantinduction.AssemblyLine;
import resonantinduction.IndustryTabs;
import resonantinduction.ResonantInductionTabs;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@ -20,7 +20,7 @@ public class ItemDisk extends Item
{
super(id);
this.setUnlocalizedName("disk");
this.setCreativeTab(IndustryTabs.tabAutomation());
this.setCreativeTab(ResonantInductionTabs.tabAutomation());
this.setHasSubtypes(true);
}
@ -28,7 +28,7 @@ public class ItemDisk extends Item
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(AssemblyLine.PREFIX + "disk");
this.itemIcon = par1IconRegister.registerIcon(ResonantInductionTransport.PREFIX + "disk");
}
@Override

4
src/main/java/resonantinduction/transport/encoder/SlotDisk.java
View file

@ -1,6 +1,6 @@
package resonantinduction.transport.encoder;
import resonantinduction.ALRecipeLoader;
import resonantinduction.core.recipe.RecipeLoader;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
@ -16,7 +16,7 @@ public class SlotDisk extends Slot
@Override
public boolean isItemValid(ItemStack itemStack)
{
return itemStack.itemID == ALRecipeLoader.itemDisk.itemID;
return itemStack.itemID == RecipeLoader.itemDisk.itemID;
}
}

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