Conflicts:
	src/main/java/techreborn/asm/LoadingPlugin.java
	src/main/java/techreborn/client/gui/GuiBlastFurnace.java
	src/main/java/techreborn/client/render/MultiblockRenderEvent.java
	src/main/java/techreborn/compat/recipes/RecipesIC2.java
	src/main/java/techreborn/init/ModItems.java
	src/main/java/techreborn/lib/Location.java
	src/main/java/techreborn/packets/PacketPipeline.java
	src/main/java/techreborn/partSystem/fmp/CableConverter.java
This commit is contained in:
modmuss50 2015-11-08 12:34:18 +00:00
commit ef03cf50a9
23 changed files with 888 additions and 654 deletions

View file

@ -66,9 +66,9 @@ configurations {
def ENV = System.getenv() def ENV = System.getenv()
if (ENV.BUILD_NUMBER) { if (ENV.BUILD_NUMBER) {
version = "0.5.5." + "${System.getenv().BUILD_NUMBER}" version = "0.5.6." + "${System.getenv().BUILD_NUMBER}"
} else { } else {
version = "0.5.5.BUILD" version = "0.5.6.BUILD"
} }
minecraft { minecraft {
@ -116,8 +116,8 @@ dependencies {
compile 'Azanor:Thaumcraft:4.2.3.5:deobf@jar' compile 'Azanor:Thaumcraft:4.2.3.5:deobf@jar'
compile "com.github.azanor:baubles:1.0.1.10:deobf@jar" compile "com.github.azanor:baubles:1.0.1.10:deobf@jar"
compile name: "MineTweaker3", version: "1.7.10-3.0.9C", classifier: "Dev" compile name: "MineTweaker3", version: "1.7.10-3.0.9C", classifier: "Dev"
shade 'IC2-Classic-API-STANDALONE:IC2-Classic-API-STANDALONE:0.0.0.1:dev' shade 'IC2-Classic-API-STANDALONE:IC2-Classic-API-STANDALONE:1.1.0.19-5:api'
compile 'RebornCore:RebornCore:1.1.0.19-5:api' compile 'RebornCore:RebornCore:0.0.0.3:dev'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

View file

@ -0,0 +1,68 @@
package techreborn.asm;
import cpw.mods.fml.common.DummyModContainer;
import cpw.mods.fml.common.ModMetadata;
import cpw.mods.fml.relauncher.IFMLCallHook;
import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
import techreborn.lib.ModInfo;
import java.util.Map;
@IFMLLoadingPlugin.MCVersion("1.7.10")
public class LoadingPlugin implements IFMLLoadingPlugin {
public static boolean runtimeDeobfEnabled = false;
public static int stripedClases = 0;
// @Override
// public String[] getASMTransformerClass() {
// return new String[]{"techreborn.asm.ClassTransformation"};
// }
@Override
public String[] getASMTransformerClass() {
return new String[0];
}
@Override
public String getModContainerClass() {
return DummyMod.class.getName();
}
@Override
public String getSetupClass() {
return DummyMod.class.getName();
}
@Override
public void injectData(Map<String, Object> data) {
runtimeDeobfEnabled = (Boolean) data.get("runtimeDeobfuscationEnabled");
}
@Override
public String getAccessTransformerClass() {
return null;
}
public static class DummyMod extends DummyModContainer implements IFMLCallHook {
public DummyMod() {
super(new ModMetadata());
ModMetadata md = getMetadata();
md.autogenerated = true;
md.modId = ModInfo.MOD_ID + "asm";
md.name = md.description = "Techreborn-ASM";
md.parent = ModInfo.MOD_ID;
md.version = "000";
}
@Override
public void injectData(Map<String, Object> data) {
}
@Override
public Void call() throws Exception {
return null;
}
}
}

View file

@ -64,4 +64,15 @@ public class BlockDigitalChest extends BlockMachineBase {
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
: (side == metadata ? this.iconFront : this.blockIcon)); : (side == metadata ? this.iconFront : this.blockIcon));
} }
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){
return this.iconTop;
} else if(side == 3){
return this.iconFront;
} else {
return this.blockIcon;
}
}
} }

View file

@ -41,6 +41,13 @@ public class GuiBlastFurnace extends GuiContainer {
GuiButton button = new GuiButton(212, k + 4, l + 6, 20, 20, ""); GuiButton button = new GuiButton(212, k + 4, l + 6, 20, 20, "");
buttonList.add(button); buttonList.add(button);
super.initGui(); super.initGui();
ChunkCoordinates coordinates = new ChunkCoordinates(blastfurnace.xCoord - (ForgeDirection.getOrientation(blastfurnace.getRotation()).offsetX * 2), blastfurnace.yCoord - 1, blastfurnace.zCoord - (ForgeDirection.getOrientation(blastfurnace.getRotation()).offsetZ * 2));
if(coordinates.equals(ClientProxy.multiblockRenderEvent.anchor) && blastfurnace.getHeat() != 0){
ClientProxy.multiblockRenderEvent.setMultiblock(null);
button.displayString = "B";
} else {
button.displayString = "A";
}
} }
@Override @Override
@ -79,59 +86,61 @@ public class GuiBlastFurnace extends GuiContainer {
this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752);
} }
@Override @Override
public void actionPerformed(GuiButton button) { public void actionPerformed(GuiButton button) {
super.actionPerformed(button); super.actionPerformed(button);
if (button.id == 212) { if(button.id == 212){
if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) { if(ClientProxy.multiblockRenderEvent.currentMultiblock == null){
{//This code here makes a basic multiblock and then sets to the selected one. {//This code here makes a basic multiblock and then sets to the selected one.
Multiblock multiblock = new Multiblock(); Multiblock multiblock = new Multiblock();
multiblock.addComponent(0, 0, 0, ModBlocks.MachineCasing, 0); multiblock.addComponent(0, 0, 0, ModBlocks.MachineCasing, 0);
multiblock.addComponent(1, 0, 0, ModBlocks.MachineCasing, 0); multiblock.addComponent(1, 0, 0, ModBlocks.MachineCasing, 0);
multiblock.addComponent(0, 0, 1, ModBlocks.MachineCasing, 0); multiblock.addComponent(0, 0, 1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(-1, 0, 0, ModBlocks.MachineCasing, 0); multiblock.addComponent(-1, 0, 0, ModBlocks.MachineCasing, 0);
multiblock.addComponent(0, 0, -1, ModBlocks.MachineCasing, 0); multiblock.addComponent(0, 0, -1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(-1, 0, -1, ModBlocks.MachineCasing, 0); multiblock.addComponent(-1, 0, -1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(-1, 0, 1, ModBlocks.MachineCasing, 0); multiblock.addComponent(-1, 0, 1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(1, 0, -1, ModBlocks.MachineCasing, 0); multiblock.addComponent(1, 0, -1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(1, 0, 1, ModBlocks.MachineCasing, 0); multiblock.addComponent(1, 0, 1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(1, 1, 0, ModBlocks.MachineCasing, 0); multiblock.addComponent(1, 1, 0, ModBlocks.MachineCasing, 0);
multiblock.addComponent(0, 1, 1, ModBlocks.MachineCasing, 0); multiblock.addComponent(0, 1, 1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(-1, 1, 0, ModBlocks.MachineCasing, 0); multiblock.addComponent(-1, 1, 0, ModBlocks.MachineCasing, 0);
multiblock.addComponent(0, 1, -1, ModBlocks.MachineCasing, 0); multiblock.addComponent(0, 1, -1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(-1, 1, -1, ModBlocks.MachineCasing, 0); multiblock.addComponent(-1, 1, -1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(-1, 1, 1, ModBlocks.MachineCasing, 0); multiblock.addComponent(-1, 1, 1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(1, 1, -1, ModBlocks.MachineCasing, 0); multiblock.addComponent(1, 1, -1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(1, 1, 1, ModBlocks.MachineCasing, 0); multiblock.addComponent(1, 1, 1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(1, 2, 0, ModBlocks.MachineCasing, 0); multiblock.addComponent(1, 2, 0, ModBlocks.MachineCasing, 0);
multiblock.addComponent(0, 2, 1, ModBlocks.MachineCasing, 0); multiblock.addComponent(0, 2, 1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(-1, 2, 0, ModBlocks.MachineCasing, 0); multiblock.addComponent(-1, 2, 0, ModBlocks.MachineCasing, 0);
multiblock.addComponent(0, 2, -1, ModBlocks.MachineCasing, 0); multiblock.addComponent(0, 2, -1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(-1, 2, -1, ModBlocks.MachineCasing, 0); multiblock.addComponent(-1, 2, -1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(-1, 2, 1, ModBlocks.MachineCasing, 0); multiblock.addComponent(-1, 2, 1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(1, 2, -1, ModBlocks.MachineCasing, 0); multiblock.addComponent(1, 2, -1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(1, 2, 1, ModBlocks.MachineCasing, 0); multiblock.addComponent(1, 2, 1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(1, 3, 0, ModBlocks.MachineCasing, 0); multiblock.addComponent(0, 3, 0, ModBlocks.MachineCasing, 0);
multiblock.addComponent(0, 3, 1, ModBlocks.MachineCasing, 0); multiblock.addComponent(1, 3, 0, ModBlocks.MachineCasing, 0);
multiblock.addComponent(-1, 3, 0, ModBlocks.MachineCasing, 0); multiblock.addComponent(0, 3, 1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(0, 3, -1, ModBlocks.MachineCasing, 0); multiblock.addComponent(-1, 3, 0, ModBlocks.MachineCasing, 0);
multiblock.addComponent(-1, 3, -1, ModBlocks.MachineCasing, 0); multiblock.addComponent(0, 3, -1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(-1, 3, 1, ModBlocks.MachineCasing, 0); multiblock.addComponent(-1, 3, -1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(1, 3, -1, ModBlocks.MachineCasing, 0); multiblock.addComponent(-1, 3, 1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(1, 3, 1, ModBlocks.MachineCasing, 0); multiblock.addComponent(1, 3, -1, ModBlocks.MachineCasing, 0);
multiblock.addComponent(1, 3, 1, ModBlocks.MachineCasing, 0);
MultiblockSet set = new MultiblockSet(multiblock); MultiblockSet set = new MultiblockSet(multiblock);
ClientProxy.multiblockRenderEvent.setMultiblock(set); ClientProxy.multiblockRenderEvent.setMultiblock(set);
ClientProxy.multiblockRenderEvent.anchor = new ChunkCoordinates(blastfurnace.xCoord - (ForgeDirection.getOrientation(blastfurnace.getRotation()).offsetX * 2), blastfurnace.yCoord - 1, blastfurnace.zCoord - (ForgeDirection.getOrientation(blastfurnace.getRotation()).offsetZ * 2)); ClientProxy.multiblockRenderEvent.partent = new Location(blastfurnace.xCoord, blastfurnace.yCoord, blastfurnace.zCoord, blastfurnace.getWorldObj());
} ClientProxy.multiblockRenderEvent.anchor = new ChunkCoordinates(blastfurnace.xCoord - (ForgeDirection.getOrientation(blastfurnace.getRotation()).offsetX * 2), blastfurnace.yCoord - 1, blastfurnace.zCoord - (ForgeDirection.getOrientation(blastfurnace.getRotation()).offsetZ * 2));
button.displayString = "A"; }
} else { button.displayString = "A";
ClientProxy.multiblockRenderEvent.setMultiblock(null); } else {
button.displayString = "B"; ClientProxy.multiblockRenderEvent.setMultiblock(null);
} button.displayString = "B";
} }
} }
}
} }

View file

@ -43,57 +43,56 @@ public class ChargeHud {
public void drawChargeHud(ScaledResolution res) { public void drawChargeHud(ScaledResolution res) {
EntityPlayer player = mc.thePlayer; EntityPlayer player = mc.thePlayer;
ItemStack stack = player.getCurrentArmor(2); ItemStack armorstack = player.getCurrentArmor(2);
ItemStack stack2 = mc.thePlayer.inventory.getCurrentItem(); ItemStack stack = mc.thePlayer.inventory.getCurrentItem();
if (showHud) {
if (stack2 != null) {
if ((stack2.getItem() instanceof IEnergyInterfaceItem)) {
double MaxCharge = ((IEnergyInterfaceItem) stack2.getItem()).getMaxPower(stack2);
double CurrentCharge = ((IEnergyInterfaceItem) stack2.getItem()).getEnergy(stack2);
Color color = Color.GREEN;
double quarter = MaxCharge / 4;
double half = MaxCharge / 2;
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
GL11.glEnable(32826);
RenderHelper.enableStandardItemLighting();
RenderHelper.enableGUIStandardItemLighting();
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack2, 0, 20);
RenderItem.getInstance().renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, stack2, 0, 20);
if (CurrentCharge <= half) {
color = Color.YELLOW;
}
if (CurrentCharge <= quarter) {
color = Color.DARK_RED;
}
mc.fontRenderer.drawString(color + GetEUString(CurrentCharge) + "/" + GetEUString(MaxCharge), 20, 25, 0);
} int y = 5;
if (armorstack != null && ConfigTechReborn.ShowChargeHud && armorstack.getItem() instanceof IEnergyInterfaceItem) {
double MaxCharge = ((IEnergyInterfaceItem) armorstack.getItem()).getMaxPower(armorstack);
double CurrentCharge = ((IEnergyInterfaceItem) armorstack.getItem()).getEnergy(armorstack);
Color color = Color.GREEN;
double quarter = MaxCharge / 4;
double half = MaxCharge / 2;
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
GL11.glEnable(32826);
RenderHelper.enableStandardItemLighting();
RenderHelper.enableGUIStandardItemLighting();
//Render the stack
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, armorstack, 0, y - 5);
//Render Overlay
RenderItem.getInstance().renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, armorstack, 0, y - 5);
//Get the color depending on current charge
if (CurrentCharge <= half) {
color = Color.YELLOW;
} }
if (CurrentCharge <= quarter) {
color = Color.DARK_RED;
}
mc.fontRenderer.drawString(color + GetEUString(CurrentCharge) + "/" + GetEUString(MaxCharge), 20, y, 0);
y += 20;
}
if (stack != null) { if (showHud) {
if ((stack.getItem() instanceof IEnergyInterfaceItem) && ConfigTechReborn.ShowChargeHud) { if (stack != null && stack.getItem() instanceof IEnergyInterfaceItem) {
double MaxCharge = ((IEnergyInterfaceItem) stack.getItem()).getMaxPower(stack); double MaxCharge = ((IEnergyInterfaceItem) stack.getItem()).getMaxPower(stack);
double CurrentCharge = ((IEnergyInterfaceItem) stack2.getItem()).getEnergy(stack2); double CurrentCharge = ((IEnergyInterfaceItem) stack.getItem()).getEnergy(stack);
Color color = Color.GREEN; Color color = Color.GREEN;
double quarter = MaxCharge / 4; double quarter = MaxCharge / 4;
double half = MaxCharge / 2; double half = MaxCharge / 2;
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
GL11.glEnable(32826); GL11.glEnable(32826);
RenderHelper.enableStandardItemLighting(); RenderHelper.enableStandardItemLighting();
RenderHelper.enableGUIStandardItemLighting(); RenderHelper.enableGUIStandardItemLighting();
//Render the stack RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, 0, y - 5);
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, 0, 0); RenderItem.getInstance().renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, stack, 0, y - 5);
//Render Overlay if (CurrentCharge <= half) {
RenderItem.getInstance().renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, stack, 0, 0); color = Color.YELLOW;
//Get the color depending on current charge
if (CurrentCharge <= half) {
color = Color.YELLOW;
}
if (CurrentCharge <= quarter) {
color = Color.DARK_RED;
}
mc.fontRenderer.drawString(color + GetEUString(CurrentCharge) + "/" + GetEUString(MaxCharge), 20, 5, 0);
} }
if (CurrentCharge <= quarter) {
color = Color.DARK_RED;
}
mc.fontRenderer.drawString(color + GetEUString(CurrentCharge) + "/" + GetEUString(MaxCharge), 20, y, 0);
} }
} }
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);

View file

@ -1,105 +0,0 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
* <p/>
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*/
package techreborn.client.render;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.*;
import net.minecraft.world.World;
import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action;
import org.lwjgl.opengl.GL11;
import reborncore.client.multiblock.IMultiblockRenderHook;
import reborncore.client.multiblock.Multiblock;
import reborncore.client.multiblock.MultiblockSet;
import reborncore.client.multiblock.component.MultiblockComponent;
public class MultiblockRenderEvent {
public static boolean rendering = false;
private static RenderBlocks blockRender = RenderBlocks.getInstance();
public MultiblockSet currentMultiblock;
public static ChunkCoordinates anchor;
public static int angle;
public void setMultiblock(MultiblockSet set) {
currentMultiblock = set;
anchor = null;
angle = 0;
}
@SubscribeEvent
public void onWorldRenderLast(RenderWorldLastEvent event) {
Minecraft mc = Minecraft.getMinecraft();
if (mc.thePlayer != null && mc.objectMouseOver != null && !mc.thePlayer.isSneaking()) {
mc.thePlayer.getCurrentEquippedItem();
renderPlayerLook(mc.thePlayer, mc.objectMouseOver);
}
}
@SubscribeEvent
public void onPlayerInteract(PlayerInteractEvent event) {
if (currentMultiblock != null && anchor == null && event.action == Action.RIGHT_CLICK_BLOCK && event.entityPlayer == Minecraft.getMinecraft().thePlayer) {
anchor = new ChunkCoordinates(event.x, event.y, event.z);
angle = MathHelper.floor_double(event.entityPlayer.rotationYaw * 4.0 / 360.0 + 0.5) & 3;
event.setCanceled(true);
}
}
private void renderPlayerLook(EntityPlayer player, MovingObjectPosition src) {
if (currentMultiblock != null) {
int anchorX = anchor != null ? anchor.posX : src.blockX;
int anchorY = anchor != null ? anchor.posY + 1 : src.blockY + 1;
int anchorZ = anchor != null ? anchor.posZ : src.blockZ;
rendering = true;
Multiblock mb = currentMultiblock.getForEntity(player);
boolean didAny = false;
for (MultiblockComponent comp : mb.getComponents())
if (renderComponent(player.worldObj, mb, comp, anchorX, anchorY, anchorZ))
didAny = true;
rendering = false;
if (!didAny) {
setMultiblock(null);
player.addChatComponentMessage(new ChatComponentText("Structure Complete!").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GREEN)));
}
}
}
private boolean renderComponent(World world, Multiblock mb, MultiblockComponent comp, int anchorX, int anchorY, int anchorZ) {
ChunkCoordinates pos = comp.getRelativePosition();
int x = pos.posX + anchorX;
int y = pos.posY + anchorY;
int z = pos.posZ + anchorZ;
GL11.glPushMatrix();
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glDisable(GL11.GL_DEPTH_TEST);
GL11.glColor4f(1F, 1F, 1F, 0.4F);
GL11.glTranslated(x + 0.5 - RenderManager.renderPosX, y + 0.5 - RenderManager.renderPosY, z + 0.5 - RenderManager.renderPosZ);
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
blockRender.useInventoryTint = false;
Block block = comp.getBlock();
if (IMultiblockRenderHook.renderHooks.containsKey(block))
IMultiblockRenderHook.renderHooks.get(block).renderBlockForMultiblock(world, mb, block, comp.getMeta(), blockRender);
else blockRender.renderBlockAsItem(comp.getBlock(), comp.getMeta(), 1F);
GL11.glEnable(GL11.GL_DEPTH_TEST);
GL11.glPopMatrix();
return true;
}
}

View file

@ -31,6 +31,10 @@ public class NEIConfig implements IConfigureNEI {
API.registerUsageHandler(alloy); API.registerUsageHandler(alloy);
API.registerRecipeHandler(alloy); API.registerRecipeHandler(alloy);
IronAlloySmelterRecipeHandler ironAlloy = new IronAlloySmelterRecipeHandler();
API.registerUsageHandler(ironAlloy);
API.registerRecipeHandler(ironAlloy);
IndustrialSawmillRecipeHandler sawmill = new IndustrialSawmillRecipeHandler(); IndustrialSawmillRecipeHandler sawmill = new IndustrialSawmillRecipeHandler();
API.registerUsageHandler(sawmill); API.registerUsageHandler(sawmill);
API.registerRecipeHandler(sawmill); API.registerRecipeHandler(sawmill);

View file

@ -29,7 +29,7 @@ public class ShapedRollingMachineHandler extends ShapedRecipeHandler {
@Override @Override
public String getRecipeName() { public String getRecipeName() {
return "rollingcrafting"; return "Shaped Rolling Machine";
} }
@Override @Override
@ -103,4 +103,9 @@ public class ShapedRollingMachineHandler extends ShapedRecipeHandler {
} }
} }
} }
@Override
public String getGuiTexture() {
return "techreborn:textures/gui/rolling_machine.png";
}
} }

View file

@ -108,4 +108,9 @@ public class ShapelessRollingMachineHandler extends ShapelessRecipeHandler {
return new CachedShapelessRecipe(recipe.recipeItems, return new CachedShapelessRecipe(recipe.recipeItems,
recipe.getRecipeOutput()); recipe.getRecipeOutput());
} }
@Override
public String getGuiTexture() {
return "techreborn:textures/gui/rolling_machine.png";
}
} }

View file

@ -12,6 +12,7 @@ import java.awt.*;
import java.util.List; import java.util.List;
public class AlloySmelterRecipeHandler extends GenericRecipeHander implements INeiBaseRecipe { public class AlloySmelterRecipeHandler extends GenericRecipeHander implements INeiBaseRecipe {
@Override @Override
public void addPositionedStacks(List<PositionedStack> input, List<PositionedStack> outputs, IBaseRecipeType recipeType) { public void addPositionedStacks(List<PositionedStack> input, List<PositionedStack> outputs, IBaseRecipeType recipeType) {
int offset = 4; int offset = 4;

View file

@ -85,7 +85,7 @@ public abstract class GenericRecipeHander extends TemplateRecipeHandler {
DecimalFormatSymbols symbols = formatter.getDecimalFormatSymbols(); DecimalFormatSymbols symbols = formatter.getDecimalFormatSymbols();
symbols.setGroupingSeparator('.'); symbols.setGroupingSeparator('.');
formatter.setDecimalFormatSymbols(symbols); formatter.setDecimalFormatSymbols(symbols);
GuiDraw.drawString("EU needed:" + formatter.format(new Integer(genericRecipe.recipie.euPerTick() * genericRecipe.recipie.tickTime()).longValue()), 16, 105, -1); GuiDraw.drawString("EU needed: " + formatter.format(new Integer(genericRecipe.recipie.euPerTick() * genericRecipe.recipie.tickTime()).longValue()), 16, 105, -1);
GuiDraw.drawString("Ticks to process: " + genericRecipe.recipie.tickTime(), 14, 115, -1); GuiDraw.drawString("Ticks to process: " + genericRecipe.recipie.tickTime(), 14, 115, -1);
GuiDraw.drawString("Time to process: " + genericRecipe.recipie.tickTime() / 20 + " seconds", 14, 125, -1); GuiDraw.drawString("Time to process: " + genericRecipe.recipie.tickTime() / 20 + " seconds", 14, 125, -1);
} }

View file

@ -0,0 +1,86 @@
package techreborn.compat.nei.recipes;
import codechicken.lib.gui.GuiDraw;
import codechicken.nei.ItemList;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.TemplateRecipeHandler;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntityFurnace;
import org.lwjgl.opengl.GL11;
import reborncore.common.util.ItemUtils;
import techreborn.api.recipe.IBaseRecipeType;
import techreborn.client.gui.GuiAlloyFurnace;
import techreborn.lib.Reference;
import java.awt.*;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
/**
* Created by MrBretzel on 01/11/2015.
*/
public class IronAlloySmelterRecipeHandler extends GenericRecipeHander implements INeiBaseRecipe {
@Override
public void addPositionedStacks(List<PositionedStack> input, List<PositionedStack> outputs, IBaseRecipeType recipeType) {
int offset = 4;
PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 46 - offset, 9 - offset, false);
input.add(pStack);
PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 64 - offset, 9 - offset, false);
input.add(pStack2);
Iterator i = ItemList.items.iterator();
List<ItemStack> fuels = new ArrayList<ItemStack>();
while(i.hasNext()) {
ItemStack item = (ItemStack) i.next();
if(!fuels.contains(new ItemStack(item.getItem()))) {
int burnTime = TileEntityFurnace.getItemBurnTime(item);
if(burnTime > 0) {
fuels.add(new ItemStack(item.getItem()));
}
}
}
PositionedStack pStack3 = new PositionedStack(fuels, 51, 42, false);
input.add(pStack3);
PositionedStack pStack4 = new PositionedStack(recipeType.getOutput(0), 115 - offset, 28 - offset, false);
outputs.add(pStack4);
}
@Override
public String getRecipeName() {
return Reference.ironalloySmelteRecipe;
}
@Override
public String getGuiTexture() {
return "techreborn:textures/gui/alloy_furnace.png";
}
@Override
public Class<? extends GuiContainer> getGuiClass() {
return GuiAlloyFurnace.class;
}
@Override
public INeiBaseRecipe getNeiBaseRecipe() {
return this;
}
@Override
public void loadTransferRects() {
this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(
new Rectangle(75, 20, 25, 20), Reference.alloySmelteRecipe, new Object[0]));
}
@Override
public void drawBackground(int recipeIndex) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
GuiDraw.changeTexture(getGuiTexture());
GuiDraw.drawTexturedModalRect(0, 0, 5, 11, 166, 65);
}
}

View file

@ -20,6 +20,7 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.util.CraftingHelper; import reborncore.common.util.CraftingHelper;
import reborncore.common.util.OreUtil;
import reborncore.common.util.RecipeRemover; import reborncore.common.util.RecipeRemover;
import techreborn.Core; import techreborn.Core;
import techreborn.api.recipe.RecipeHandler; import techreborn.api.recipe.RecipeHandler;
@ -452,7 +453,7 @@ public class RecipesIC2 implements ICompatModule {
//Copper Ore //Copper Ore
if (OreDictionary.doesOreNameExist("oreCopper")) { if (OreUtil.doesOreExistAndValid("oreCopper")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreCopper").get(0); ItemStack oreStack = OreDictionary.getOres("oreCopper").get(0);
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("copper", 2), ItemDustsSmall.getSmallDustByName("Gold", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), IC2Items.getItem("cell"), 100, 120)); RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("copper", 2), ItemDustsSmall.getSmallDustByName("Gold", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), IC2Items.getItem("cell"), 100, 120));
@ -466,7 +467,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Tin Ore //Tin Ore
if (OreDictionary.doesOreNameExist("oreTin")) { if (OreUtil.doesOreExistAndValid("oreTin")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreTin").get(0); ItemStack oreStack = OreDictionary.getOres("oreTin").get(0);
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("tin", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDustsSmall.getSmallDustByName("Zinc", 1), IC2Items.getItem("cell"), 100, 120)); RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("tin", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDustsSmall.getSmallDustByName("Zinc", 1), IC2Items.getItem("cell"), 100, 120));
@ -477,7 +478,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Nickel Ore //Nickel Ore
if (OreDictionary.doesOreNameExist("oreNickel")) { if (OreUtil.doesOreExistAndValid("oreNickel")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreNickel").get(0); ItemStack oreStack = OreDictionary.getOres("oreNickel").get(0);
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("nickel", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDustsSmall.getSmallDustByName("Platinum", 1), IC2Items.getItem("cell"), 100, 120)); RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("nickel", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDustsSmall.getSmallDustByName("Platinum", 1), IC2Items.getItem("cell"), 100, 120));
@ -489,7 +490,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Zinc Ore //Zinc Ore
if (OreDictionary.doesOreNameExist("oreZinc")) { if (OreUtil.doesOreExistAndValid("oreZinc")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreZinc").get(0); ItemStack oreStack = OreDictionary.getOres("oreZinc").get(0);
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("zinc", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDustsSmall.getSmallDustByName("Tin", 1), IC2Items.getItem("cell"), 100, 120)); RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("zinc", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDustsSmall.getSmallDustByName("Tin", 1), IC2Items.getItem("cell"), 100, 120));
@ -500,7 +501,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Silver Ore //Silver Ore
if (OreDictionary.doesOreNameExist("oreSilver")) { if (OreUtil.doesOreExistAndValid("oreSilver")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreSilver").get(0); ItemStack oreStack = OreDictionary.getOres("oreSilver").get(0);
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("silver", 2), ItemDustsSmall.getSmallDustByName("Lead", 1), ItemDustsSmall.getSmallDustByName("Sulfur", 1), IC2Items.getItem("cell"), 100, 120)); RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("silver", 2), ItemDustsSmall.getSmallDustByName("Lead", 1), ItemDustsSmall.getSmallDustByName("Sulfur", 1), IC2Items.getItem("cell"), 100, 120));
@ -511,7 +512,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Lead Ore //Lead Ore
if (OreDictionary.doesOreNameExist("oreLead")) { if (OreUtil.doesOreExistAndValid("oreLead")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreLead").get(0); ItemStack oreStack = OreDictionary.getOres("oreLead").get(0);
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("lead", 2), ItemDustsSmall.getSmallDustByName("Silver", 1), ItemDustsSmall.getSmallDustByName("Sulfur", 1), IC2Items.getItem("cell"), 100, 120)); RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("lead", 2), ItemDustsSmall.getSmallDustByName("Silver", 1), ItemDustsSmall.getSmallDustByName("Sulfur", 1), IC2Items.getItem("cell"), 100, 120));
@ -522,7 +523,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Uranium Ore //Uranium Ore
if (OreDictionary.doesOreNameExist("oreUranium")) { if (OreUtil.doesOreExistAndValid("oreUranium")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreUranium").get(0); ItemStack oreStack = OreDictionary.getOres("oreUranium").get(0);
ItemStack uranium238Stack = IC2Items.getItem("Uran238"); ItemStack uranium238Stack = IC2Items.getItem("Uran238");
@ -538,7 +539,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Pitchblende Ore //Pitchblende Ore
if (OreDictionary.doesOreNameExist("orePitchblende")) { if (OreUtil.doesOreExistAndValid("orePitchblende")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("orePitchblende").get(0); ItemStack oreStack = OreDictionary.getOres("orePitchblende").get(0);
ItemStack uranium238Stack = IC2Items.getItem("Uran238"); ItemStack uranium238Stack = IC2Items.getItem("Uran238");
@ -554,7 +555,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Aluminum Ore //Aluminum Ore
if (OreDictionary.doesOreNameExist("oreAluminum")) { if (OreUtil.doesOreExistAndValid("oreAluminum")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreAluminum").get(0); ItemStack oreStack = OreDictionary.getOres("oreAluminum").get(0);
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("aluminum", 2), ItemDustsSmall.getSmallDustByName("Bauxite", 1), ItemDustsSmall.getSmallDustByName("Bauxite", 1), IC2Items.getItem("cell"), 100, 120)); RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("aluminum", 2), ItemDustsSmall.getSmallDustByName("Bauxite", 1), ItemDustsSmall.getSmallDustByName("Bauxite", 1), IC2Items.getItem("cell"), 100, 120));
@ -564,7 +565,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Ardite Ore //Ardite Ore
if (OreDictionary.doesOreNameExist("oreArdite")) { if (OreUtil.doesOreExistAndValid("oreArdite")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreArdite").get(0); ItemStack oreStack = OreDictionary.getOres("oreArdite").get(0);
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("ardite", 2), ItemDustsSmall.getSmallDustByName("Ardite", 1), ItemDustsSmall.getSmallDustByName("Ardite", 1), IC2Items.getItem("cell"), 100, 120)); RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("ardite", 2), ItemDustsSmall.getSmallDustByName("Ardite", 1), ItemDustsSmall.getSmallDustByName("Ardite", 1), IC2Items.getItem("cell"), 100, 120));
@ -574,7 +575,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Cobalt Ore //Cobalt Ore
if (OreDictionary.doesOreNameExist("oreCobalt")) { if (OreUtil.doesOreExistAndValid("oreCobalt")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreCobalt").get(0); ItemStack oreStack = OreDictionary.getOres("oreCobalt").get(0);
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("cobalt", 2), ItemDustsSmall.getSmallDustByName("Cobalt", 1), ItemDustsSmall.getSmallDustByName("Cobalt", 1), IC2Items.getItem("cell"), 100, 120)); RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("cobalt", 2), ItemDustsSmall.getSmallDustByName("Cobalt", 1), ItemDustsSmall.getSmallDustByName("Cobalt", 1), IC2Items.getItem("cell"), 100, 120));
@ -584,7 +585,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Dark Iron Ore //Dark Iron Ore
if (OreDictionary.doesOreNameExist("oreDarkIron")) { if (OreUtil.doesOreExistAndValid("oreDarkIron")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreDarkIron").get(0); ItemStack oreStack = OreDictionary.getOres("oreDarkIron").get(0);
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("darkIron", 2), ItemDustsSmall.getSmallDustByName("DarkIron", 1), ItemDustsSmall.getSmallDustByName("Iron", 1), IC2Items.getItem("cell"), 100, 120)); RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("darkIron", 2), ItemDustsSmall.getSmallDustByName("DarkIron", 1), ItemDustsSmall.getSmallDustByName("Iron", 1), IC2Items.getItem("cell"), 100, 120));
@ -594,7 +595,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Cadmium Ore //Cadmium Ore
if (OreDictionary.doesOreNameExist("oreCadmium")) { if (OreUtil.doesOreExistAndValid("oreCadmium")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreCadmium").get(0); ItemStack oreStack = OreDictionary.getOres("oreCadmium").get(0);
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("cadmium", 2), ItemDustsSmall.getSmallDustByName("Cadmium", 1), ItemDustsSmall.getSmallDustByName("Cadmium", 1), IC2Items.getItem("cell"), 100, 120)); RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("cadmium", 2), ItemDustsSmall.getSmallDustByName("Cadmium", 1), ItemDustsSmall.getSmallDustByName("Cadmium", 1), IC2Items.getItem("cell"), 100, 120));
@ -604,7 +605,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Indium Ore //Indium Ore
if (OreDictionary.doesOreNameExist("oreIndium")) { if (OreUtil.doesOreExistAndValid("oreIndium")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreIndium").get(0); ItemStack oreStack = OreDictionary.getOres("oreIndium").get(0);
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("indium", 2), ItemDustsSmall.getSmallDustByName("Indium", 1), ItemDustsSmall.getSmallDustByName("Indium", 1), IC2Items.getItem("cell"), 100, 120)); RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("indium", 2), ItemDustsSmall.getSmallDustByName("Indium", 1), ItemDustsSmall.getSmallDustByName("Indium", 1), IC2Items.getItem("cell"), 100, 120));
@ -614,7 +615,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Calcite Ore //Calcite Ore
if (OreDictionary.doesOreNameExist("oreCalcite") && OreDictionary.doesOreNameExist("gemCalcite")) { if (OreUtil.doesOreExistAndValid("oreCalcite") && OreUtil.doesOreExistAndValid("gemCalcite")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreCalcite").get(0); ItemStack oreStack = OreDictionary.getOres("oreCalcite").get(0);
ItemStack gemStack = OreDictionary.getOres("gemCalcite").get(0); ItemStack gemStack = OreDictionary.getOres("gemCalcite").get(0);
@ -625,7 +626,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Magnetite Ore //Magnetite Ore
if (OreDictionary.doesOreNameExist("oreMagnetite") && OreDictionary.doesOreNameExist("chunkMagnetite")) { if (OreUtil.doesOreExistAndValid("oreMagnetite") && OreUtil.doesOreExistAndValid("chunkMagnetite")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreMagnetite").get(0); ItemStack oreStack = OreDictionary.getOres("oreMagnetite").get(0);
ItemStack chunkStack = OreDictionary.getOres("chunkMagnetite").get(0); ItemStack chunkStack = OreDictionary.getOres("chunkMagnetite").get(0);
@ -636,7 +637,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Graphite Ore //Graphite Ore
if (OreDictionary.doesOreNameExist("oreGraphite") && OreDictionary.doesOreNameExist("chunkGraphite")) { if (OreUtil.doesOreExistAndValid("oreGraphite") && OreUtil.doesOreExistAndValid("chunkGraphite")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreGraphite").get(0); ItemStack oreStack = OreDictionary.getOres("oreGraphite").get(0);
ItemStack chunkStack = OreDictionary.getOres("chunkGraphite").get(0); ItemStack chunkStack = OreDictionary.getOres("chunkGraphite").get(0);
@ -647,7 +648,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Osmium Ore //Osmium Ore
if (OreDictionary.doesOreNameExist("oreOsmium")) { if (OreUtil.doesOreExistAndValid("oreOsmium")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreOsmium").get(0); ItemStack oreStack = OreDictionary.getOres("oreOsmium").get(0);
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("osmium", 2), ItemDustsSmall.getSmallDustByName("Osmium", 1), ItemDustsSmall.getSmallDustByName("Osmium", 1), IC2Items.getItem("cell"), 100, 120)); RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("osmium", 2), ItemDustsSmall.getSmallDustByName("Osmium", 1), ItemDustsSmall.getSmallDustByName("Osmium", 1), IC2Items.getItem("cell"), 100, 120));
@ -657,7 +658,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Teslatite Ore //Teslatite Ore
if (OreDictionary.doesOreNameExist("oreTeslatite") && OreDictionary.doesOreNameExist("dustTeslatite")) { if (OreUtil.doesOreExistAndValid("oreTeslatite") && OreUtil.doesOreExistAndValid("dustTeslatite")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreTeslatite").get(0); ItemStack oreStack = OreDictionary.getOres("oreTeslatite").get(0);
ItemStack dustStack = OreDictionary.getOres("dustTeslatite").get(0); ItemStack dustStack = OreDictionary.getOres("dustTeslatite").get(0);
@ -669,7 +670,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Sulfur Ore //Sulfur Ore
if (OreDictionary.doesOreNameExist("oreSulfur")) { if (OreUtil.doesOreExistAndValid("oreSulfur")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreSulfur").get(0); ItemStack oreStack = OreDictionary.getOres("oreSulfur").get(0);
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("sulfur", 2), ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDustsSmall.getSmallDustByName("Sulfur", 1), IC2Items.getItem("cell"), 100, 120)); RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("sulfur", 2), ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDustsSmall.getSmallDustByName("Sulfur", 1), IC2Items.getItem("cell"), 100, 120));
@ -679,7 +680,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Saltpeter Ore //Saltpeter Ore
if (OreDictionary.doesOreNameExist("oreSaltpeter")) { if (OreUtil.doesOreExistAndValid("oreSaltpeter")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreSaltpeter").get(0); ItemStack oreStack = OreDictionary.getOres("oreSaltpeter").get(0);
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("saltpeter", 2), ItemDustsSmall.getSmallDustByName("Saltpeter", 1), ItemDustsSmall.getSmallDustByName("Saltpeter", 1), IC2Items.getItem("cell"), 100, 120)); RecipeHandler.addRecipe(new GrinderRecipe(oreStack, IC2Items.getItem("waterCell"), null, ItemDusts.getDustByName("saltpeter", 2), ItemDustsSmall.getSmallDustByName("Saltpeter", 1), ItemDustsSmall.getSmallDustByName("Saltpeter", 1), IC2Items.getItem("cell"), 100, 120));
@ -689,7 +690,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Apatite Ore //Apatite Ore
if (OreDictionary.doesOreNameExist("oreApatite") & OreDictionary.doesOreNameExist("gemApatite")) { if (OreUtil.doesOreExistAndValid("oreApatite") & OreUtil.doesOreExistAndValid("gemApatite")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreApatite").get(0); ItemStack oreStack = OreDictionary.getOres("oreApatite").get(0);
ItemStack gemStack = OreDictionary.getOres("gemApatite").get(0); ItemStack gemStack = OreDictionary.getOres("gemApatite").get(0);
@ -701,7 +702,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Nether Quartz Ore //Nether Quartz Ore
if (OreDictionary.doesOreNameExist("dustNetherQuartz")) { if (OreUtil.doesOreExistAndValid("dustNetherQuartz")) {
try { try {
ItemStack dustStack = OreDictionary.getOres("dustNetherQuartz").get(0); ItemStack dustStack = OreDictionary.getOres("dustNetherQuartz").get(0);
dustStack.stackSize = 4; dustStack.stackSize = 4;
@ -712,7 +713,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Certus Quartz Ore //Certus Quartz Ore
if (OreDictionary.doesOreNameExist("oreCertusQuartz")) { if (OreUtil.doesOreExistAndValid("oreCertusQuartz")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreCertusQuartz").get(0); ItemStack oreStack = OreDictionary.getOres("oreCertusQuartz").get(0);
ItemStack gemStack = OreDictionary.getOres("crystalCertusQuartz").get(0); ItemStack gemStack = OreDictionary.getOres("crystalCertusQuartz").get(0);
@ -725,7 +726,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Charged Certus Quartz Ore //Charged Certus Quartz Ore
if (OreDictionary.doesOreNameExist("oreChargedCertusQuartz")) { if (OreUtil.doesOreExistAndValid("oreChargedCertusQuartz")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreChargedCertusQuartz").get(0); ItemStack oreStack = OreDictionary.getOres("oreChargedCertusQuartz").get(0);
ItemStack gemStack = OreDictionary.getOres("crystalChargedCertusQuartz").get(0); ItemStack gemStack = OreDictionary.getOres("crystalChargedCertusQuartz").get(0);
@ -738,7 +739,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Amethyst Ore //Amethyst Ore
if (OreDictionary.doesOreNameExist("oreAmethyst") && OreDictionary.doesOreNameExist("gemAmethyst")) { if (OreUtil.doesOreExistAndValid("oreAmethyst") && OreUtil.doesOreExistAndValid("gemAmethyst")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreAmethyst").get(0); ItemStack oreStack = OreDictionary.getOres("oreAmethyst").get(0);
ItemStack gemStack = OreDictionary.getOres("gemAmethyst").get(0); ItemStack gemStack = OreDictionary.getOres("gemAmethyst").get(0);
@ -752,7 +753,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Topaz Ore //Topaz Ore
if (OreDictionary.doesOreNameExist("oreTopaz") && OreDictionary.doesOreNameExist("gemTopaz")) { if (OreUtil.doesOreExistAndValid("oreTopaz") && OreUtil.doesOreExistAndValid("gemTopaz")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreTopaz").get(0); ItemStack oreStack = OreDictionary.getOres("oreTopaz").get(0);
ItemStack gemStack = OreDictionary.getOres("gemTopaz").get(0); ItemStack gemStack = OreDictionary.getOres("gemTopaz").get(0);
@ -766,7 +767,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Tanzanite Ore //Tanzanite Ore
if (OreDictionary.doesOreNameExist("oreTanzanite") && OreDictionary.doesOreNameExist("gemTanzanite")) { if (OreUtil.doesOreExistAndValid("oreTanzanite") && OreUtil.doesOreExistAndValid("gemTanzanite")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreTanzanite").get(0); ItemStack oreStack = OreDictionary.getOres("oreTanzanite").get(0);
ItemStack gemStack = OreDictionary.getOres("gemTanzanite").get(0); ItemStack gemStack = OreDictionary.getOres("gemTanzanite").get(0);
@ -780,7 +781,7 @@ public class RecipesIC2 implements ICompatModule {
} }
//Malachite Ore //Malachite Ore
if (OreDictionary.doesOreNameExist("oreMalachite") && OreDictionary.doesOreNameExist("gemMalachite")) { if (OreUtil.doesOreExistAndValid("oreMalachite") && OreUtil.doesOreExistAndValid("gemMalachite")) {
try { try {
ItemStack oreStack = OreDictionary.getOres("oreMalachite").get(0); ItemStack oreStack = OreDictionary.getOres("oreMalachite").get(0);
ItemStack gemStack = OreDictionary.getOres("gemMalachite").get(0); ItemStack gemStack = OreDictionary.getOres("gemMalachite").get(0);
@ -1089,7 +1090,7 @@ public class RecipesIC2 implements ICompatModule {
20, 30 20, 30
)); ));
if (OreDictionary.doesOreNameExist("dustSalt")) { if (OreUtil.doesOreExistAndValid("dustSalt")) {
ItemStack salt = OreDictionary.getOres("dustSalt").get(0); ItemStack salt = OreDictionary.getOres("dustSalt").get(0);
salt.stackSize = 2; salt.stackSize = 2;
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe( RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(
@ -1184,137 +1185,137 @@ public class RecipesIC2 implements ICompatModule {
static void addTRMaceratorRecipes() { static void addTRMaceratorRecipes() {
//Macerator //Macerator
if (OreDictionary.doesOreNameExist("oreAluminum")) { if (OreUtil.doesOreExistAndValid("oreAluminum")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreAluminum"), null, ItemCrushedOre.getCrushedOreByName("Aluminum", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreAluminum"), null, ItemCrushedOre.getCrushedOreByName("Aluminum", 2));
} }
if (OreDictionary.doesOreNameExist("oreArdite")) { if (OreUtil.doesOreExistAndValid("oreArdite")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreArdite"), null, ItemCrushedOre.getCrushedOreByName("Ardite", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreArdite"), null, ItemCrushedOre.getCrushedOreByName("Ardite", 2));
} }
if (OreDictionary.doesOreNameExist("oreBauxite")) { if (OreUtil.doesOreExistAndValid("oreBauxite")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreBauxite"), null, ItemCrushedOre.getCrushedOreByName("Bauxite", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreBauxite"), null, ItemCrushedOre.getCrushedOreByName("Bauxite", 2));
} }
if (OreDictionary.doesOreNameExist("oreCadmium")) { if (OreUtil.doesOreExistAndValid("oreCadmium")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreCadmium"), null, ItemCrushedOre.getCrushedOreByName("Cadmium", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreCadmium"), null, ItemCrushedOre.getCrushedOreByName("Cadmium", 2));
} }
if (OreDictionary.doesOreNameExist("oreCinnabar")) { if (OreUtil.doesOreExistAndValid("oreCinnabar")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreCinnabar"), null, ItemCrushedOre.getCrushedOreByName("Cinnabar", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreCinnabar"), null, ItemCrushedOre.getCrushedOreByName("Cinnabar", 2));
} }
if (OreDictionary.doesOreNameExist("oreCobalt")) { if (OreUtil.doesOreExistAndValid("oreCobalt")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreCobalt"), null, ItemCrushedOre.getCrushedOreByName("Cobalt", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreCobalt"), null, ItemCrushedOre.getCrushedOreByName("Cobalt", 2));
} }
if (OreDictionary.doesOreNameExist("oreDarkIron")) { if (OreUtil.doesOreExistAndValid("oreDarkIron")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreDarkIron"), null, ItemCrushedOre.getCrushedOreByName("DarkIron", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreDarkIron"), null, ItemCrushedOre.getCrushedOreByName("DarkIron", 2));
} }
if (OreDictionary.doesOreNameExist("oreIndium")) { if (OreUtil.doesOreExistAndValid("oreIndium")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreIndium"), null, ItemCrushedOre.getCrushedOreByName("Indium", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreIndium"), null, ItemCrushedOre.getCrushedOreByName("Indium", 2));
} }
if (OreDictionary.doesOreNameExist("oreIridium")) { if (OreUtil.doesOreExistAndValid("oreIridium")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreIridium"), null, ItemCrushedOre.getCrushedOreByName("Iridium", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreIridium"), null, ItemCrushedOre.getCrushedOreByName("Iridium", 2));
} }
if (OreDictionary.doesOreNameExist("oreNickel")) { if (OreUtil.doesOreExistAndValid("oreNickel")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreNickel"), null, ItemCrushedOre.getCrushedOreByName("Nickel", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreNickel"), null, ItemCrushedOre.getCrushedOreByName("Nickel", 2));
} }
if (OreDictionary.doesOreNameExist("orePlatinum")) { if (OreUtil.doesOreExistAndValid("orePlatinum")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("orePlatinum"), null, ItemCrushedOre.getCrushedOreByName("Platinum", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("orePlatinum"), null, ItemCrushedOre.getCrushedOreByName("Platinum", 2));
} }
if (OreDictionary.doesOreNameExist("orePyrite")) { if (OreUtil.doesOreExistAndValid("orePyrite")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("orePyrite"), null, ItemCrushedOre.getCrushedOreByName("Pyrite", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("orePyrite"), null, ItemCrushedOre.getCrushedOreByName("Pyrite", 2));
} }
if (OreDictionary.doesOreNameExist("oreSphalerite")) { if (OreUtil.doesOreExistAndValid("oreSphalerite")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSphalerite"), null, ItemCrushedOre.getCrushedOreByName("Sphalerite", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSphalerite"), null, ItemCrushedOre.getCrushedOreByName("Sphalerite", 2));
} }
if (OreDictionary.doesOreNameExist("oreTetrahedrite")) { if (OreUtil.doesOreExistAndValid("oreTetrahedrite")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreTetrahedrite"), null, ItemCrushedOre.getCrushedOreByName("Tetrahedrite", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreTetrahedrite"), null, ItemCrushedOre.getCrushedOreByName("Tetrahedrite", 2));
} }
if (OreDictionary.doesOreNameExist("oreTungsten")) { if (OreUtil.doesOreExistAndValid("oreTungsten")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreTungsten"), null, ItemCrushedOre.getCrushedOreByName("Tungsten", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreTungsten"), null, ItemCrushedOre.getCrushedOreByName("Tungsten", 2));
} }
if (OreDictionary.doesOreNameExist("oreGalena")) { if (OreUtil.doesOreExistAndValid("oreGalena")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreGalena"), null, ItemCrushedOre.getCrushedOreByName("Galena", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreGalena"), null, ItemCrushedOre.getCrushedOreByName("Galena", 2));
} }
if (!IC2Classic.isIc2ClassicLoaded() && OreDictionary.doesOreNameExist("oreRedstone")) { if (!IC2Classic.isIc2ClassicLoaded() && OreUtil.doesOreExistAndValid("oreRedstone")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreRedstone"), null, new ItemStack(Items.redstone, 10)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreRedstone"), null, new ItemStack(Items.redstone, 10));
} }
if (OreDictionary.doesOreNameExist("oreLapis")) { if (OreUtil.doesOreExistAndValid("oreLapis")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreLapis"), null, ItemDusts.getDustByName("lapis", 12)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreLapis"), null, ItemDusts.getDustByName("lapis", 12));
} }
if (OreDictionary.doesOreNameExist("oreDiamond")) { if (OreUtil.doesOreExistAndValid("oreDiamond")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreDiamond"), null, ItemDusts.getDustByName("diamond", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreDiamond"), null, ItemDusts.getDustByName("diamond", 2));
} }
if (OreDictionary.doesOreNameExist("oreEmerald")) { if (OreUtil.doesOreExistAndValid("oreEmerald")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreEmerald"), null, ItemDusts.getDustByName("emerald", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreEmerald"), null, ItemDusts.getDustByName("emerald", 2));
} }
if (OreDictionary.doesOreNameExist("oreRuby")) { if (OreUtil.doesOreExistAndValid("oreRuby")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreRuby"), null, ItemGems.getGemByName("ruby", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreRuby"), null, ItemGems.getGemByName("ruby", 2));
} }
if (OreDictionary.doesOreNameExist("oreSapphire")) { if (OreUtil.doesOreExistAndValid("oreSapphire")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSapphire"), null, ItemDusts.getDustByName("sapphire", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSapphire"), null, ItemDusts.getDustByName("sapphire", 2));
} }
if (OreDictionary.doesOreNameExist("orePeridot")) { if (OreUtil.doesOreExistAndValid("orePeridot")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("orePeridot"), null, ItemDusts.getDustByName("peridot", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("orePeridot"), null, ItemDusts.getDustByName("peridot", 2));
} }
if (OreDictionary.doesOreNameExist("oreSulfur")) { if (OreUtil.doesOreExistAndValid("oreSulfur")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSulfur"), null, ItemDusts.getDustByName("sulfur", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSulfur"), null, ItemDusts.getDustByName("sulfur", 2));
} }
if (OreDictionary.doesOreNameExist("oreSaltpeter")) { if (OreUtil.doesOreExistAndValid("oreSaltpeter")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSaltpeter"), null, ItemDusts.getDustByName("saltpeter", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSaltpeter"), null, ItemDusts.getDustByName("saltpeter", 2));
} }
if (OreDictionary.doesOreNameExist("oreTeslatite")) { if (OreUtil.doesOreExistAndValid("oreTeslatite")) {
ItemStack teslatiteStack = OreDictionary.getOres("dustTeslatite").get(0); ItemStack teslatiteStack = OreDictionary.getOres("dustTeslatite").get(0);
teslatiteStack.stackSize = 10; teslatiteStack.stackSize = 10;
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreTeslatite"), null, teslatiteStack); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreTeslatite"), null, teslatiteStack);
} }
if (OreDictionary.doesOreNameExist("oreMithril")) { if (OreUtil.doesOreExistAndValid("oreMithril")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreMithril"), null, ItemDusts.getDustByName("mithril", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreMithril"), null, ItemDusts.getDustByName("mithril", 2));
} }
if (OreDictionary.doesOreNameExist("oreVinteum")) { if (OreUtil.doesOreExistAndValid("oreVinteum")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreVinteum"), null, ItemDusts.getDustByName("vinteum", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreVinteum"), null, ItemDusts.getDustByName("vinteum", 2));
} }
if (OreDictionary.doesOreNameExist("limestone")) { if (OreUtil.doesOreExistAndValid("limestone")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("limestone"), null, ItemDusts.getDustByName("limestone", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("limestone"), null, ItemDusts.getDustByName("limestone", 2));
} }
if (OreDictionary.doesOreNameExist("stoneNetherrack")) { if (OreUtil.doesOreExistAndValid("stoneNetherrack")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("stoneNetherrack"), null, ItemDusts.getDustByName("netherrack", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("stoneNetherrack"), null, ItemDusts.getDustByName("netherrack", 2));
} }
if (OreDictionary.doesOreNameExist("stoneEndstone")) { if (OreUtil.doesOreExistAndValid("stoneEndstone")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("stoneEndstone"), null, ItemDusts.getDustByName("endstone", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("stoneEndstone"), null, ItemDusts.getDustByName("endstone", 2));
} }
if (OreDictionary.doesOreNameExist("stoneRedrock")) { if (OreUtil.doesOreExistAndValid("stoneRedrock")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("stoneRedrock"), null, ItemDusts.getDustByName("redrock", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("stoneRedrock"), null, ItemDusts.getDustByName("redrock", 2));
} }
if (OreDictionary.doesOreNameExist("oreMagnetite")) { if (OreUtil.doesOreExistAndValid("oreMagnetite")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreMagnetite"), null, ItemDusts.getDustByName("magnetite", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreMagnetite"), null, ItemDusts.getDustByName("magnetite", 2));
} }
if (OreDictionary.doesOreNameExist("oreLodestone")) { if (OreUtil.doesOreExistAndValid("oreLodestone")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreLodestone"), null, ItemDusts.getDustByName("lodestone", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreLodestone"), null, ItemDusts.getDustByName("lodestone", 2));
} }
if (OreDictionary.doesOreNameExist("oreTellurium")) { if (OreUtil.doesOreExistAndValid("oreTellurium")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreTellurium"), null, ItemDusts.getDustByName("tellurium", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreTellurium"), null, ItemDusts.getDustByName("tellurium", 2));
} }
if (OreDictionary.doesOreNameExist("oreSilicon")) { if (OreUtil.doesOreExistAndValid("oreSilicon")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSilicon"), null, ItemDusts.getDustByName("silicon", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSilicon"), null, ItemDusts.getDustByName("silicon", 2));
} }
if (OreDictionary.doesOreNameExist("oreVoidstone")) { if (OreUtil.doesOreExistAndValid("oreVoidstone")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreVoidstone"), null, ItemDusts.getDustByName("voidstone", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreVoidstone"), null, ItemDusts.getDustByName("voidstone", 2));
} }
if (OreDictionary.doesOreNameExist("oreCalcite")) { if (OreUtil.doesOreExistAndValid("oreCalcite")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreCalcite"), null, ItemDusts.getDustByName("calcite", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreCalcite"), null, ItemDusts.getDustByName("calcite", 2));
} }
if (OreDictionary.doesOreNameExist("oreSodalite")) { if (OreUtil.doesOreExistAndValid("oreSodalite")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSodalite"), null, ItemDusts.getDustByName("sodalite", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSodalite"), null, ItemDusts.getDustByName("sodalite", 2));
} }
if (OreDictionary.doesOreNameExist("oreGraphite")) { if (OreUtil.doesOreExistAndValid("oreGraphite")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreGraphite"), null, ItemDusts.getDustByName("graphite", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreGraphite"), null, ItemDusts.getDustByName("graphite", 2));
} }
if (OreDictionary.doesOreNameExist("blockMarble")) { if (OreUtil.doesOreExistAndValid("blockMarble")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("blockMarble"), null, ItemDusts.getDustByName("marble", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("blockMarble"), null, ItemDusts.getDustByName("marble", 2));
} }
if (OreDictionary.doesOreNameExist("blockBasalt")) { if (OreUtil.doesOreExistAndValid("blockBasalt")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("blockBasalt"), null, ItemDusts.getDustByName("basalt", 2)); Recipes.macerator.addRecipe(new RecipeInputOreDict("blockBasalt"), null, ItemDusts.getDustByName("basalt", 2));
} }
if (OreDictionary.doesOreNameExist("gemRuby")) { if (OreUtil.doesOreExistAndValid("gemRuby")) {
Recipes.macerator.getRecipes().put(new RecipeInputOreDict("gemRuby"), new RecipeOutput(new NBTTagCompound(), ItemDusts.getDustByName("ruby"))); Recipes.macerator.getRecipes().put(new RecipeInputOreDict("gemRuby"), new RecipeOutput(new NBTTagCompound(), ItemDusts.getDustByName("ruby")));
} }
} }

View file

@ -0,0 +1,44 @@
package techreborn.events;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.event.entity.player.PlayerUseItemEvent;
import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.util.ItemUtils;
import java.util.HashMap;
public class OreUnifier {
public static HashMap<String, ItemStack> oreHash = new HashMap<String, ItemStack>();
@SubscribeEvent
public void itemTick(PlayerUseItemEvent.Tick event) {
int[] oreIds = OreDictionary.getOreIDs(event.item);
for(int id : oreIds){
String oreName = OreDictionary.getOreName(id);
if(oreHash.containsKey(oreName)){
if(ItemUtils.isItemEqual(event.item, oreHash.get(oreName), true, true, true) && !ItemUtils.isItemEqual(event.item, oreHash.get(oreName), true, true, false)){
//TODO set new item
}
}
}
}
public static void registerOre(String name, ItemStack ore) {
oreHash.put(name, ore);
OreDictionary.registerOre(name, ore);
}
public static void registerOre(String name, Item ore) {
registerOre(name, new ItemStack(ore));
}
public static void registerOre(String name, Block ore) {
registerOre(name, new ItemStack(ore));
}
}

View file

@ -12,6 +12,7 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.util.BucketHandler; import reborncore.common.util.BucketHandler;
import techreborn.Core; import techreborn.Core;
import techreborn.events.OreUnifier;
import techreborn.items.*; import techreborn.items.*;
import techreborn.items.armor.ItemLapotronPack; import techreborn.items.armor.ItemLapotronPack;
import techreborn.items.armor.ItemLithiumBatpack; import techreborn.items.armor.ItemLithiumBatpack;
@ -268,343 +269,343 @@ public class ModItems {
public static void registerOreDict() { public static void registerOreDict() {
OreDictionary.registerOre("gemRuby", ItemGems.getGemByName("ruby")); OreUnifier.registerOre("gemRuby", ItemGems.getGemByName("ruby"));
OreDictionary.registerOre("gemSapphire", ItemGems.getGemByName("sapphire")); OreUnifier.registerOre("gemSapphire", ItemGems.getGemByName("sapphire"));
OreDictionary.registerOre("gemPeridot", ItemGems.getGemByName("peridot")); OreUnifier.registerOre("gemPeridot", ItemGems.getGemByName("peridot"));
OreDictionary.registerOre("gemRedGarnet", ItemGems.getGemByName("redGarnet")); OreUnifier.registerOre("gemRedGarnet", ItemGems.getGemByName("redGarnet"));
OreDictionary.registerOre("gemYellowGarnet", ItemGems.getGemByName("yellowGarnet")); OreUnifier.registerOre("gemYellowGarnet", ItemGems.getGemByName("yellowGarnet"));
// Dusts // Dusts
OreDictionary.registerOre("dustAlmandine", ItemDusts.getDustByName("almandine")); OreUnifier.registerOre("dustAlmandine", ItemDusts.getDustByName("almandine"));
OreDictionary.registerOre("dustAluminumBrass", ItemDusts.getDustByName("aluminumBrass")); OreUnifier.registerOre("dustAluminumBrass", ItemDusts.getDustByName("aluminumBrass"));
OreDictionary.registerOre("dustAluminum", ItemDusts.getDustByName("aluminum")); OreUnifier.registerOre("dustAluminum", ItemDusts.getDustByName("aluminum"));
OreDictionary.registerOre("dustAluminium", ItemDusts.getDustByName("aluminum")); OreUnifier.registerOre("dustAluminium", ItemDusts.getDustByName("aluminum"));
OreDictionary.registerOre("dustAlumite", ItemDusts.getDustByName("alumite")); OreUnifier.registerOre("dustAlumite", ItemDusts.getDustByName("alumite"));
OreDictionary.registerOre("dustAndradite", ItemDusts.getDustByName("andradite")); OreUnifier.registerOre("dustAndradite", ItemDusts.getDustByName("andradite"));
OreDictionary.registerOre("dustAntimony", ItemDusts.getDustByName("antimony")); OreUnifier.registerOre("dustAntimony", ItemDusts.getDustByName("antimony"));
OreDictionary.registerOre("dustArdite", ItemDusts.getDustByName("ardite")); OreUnifier.registerOre("dustArdite", ItemDusts.getDustByName("ardite"));
OreDictionary.registerOre("dustAsh", ItemDusts.getDustByName("ashes")); OreUnifier.registerOre("dustAsh", ItemDusts.getDustByName("ashes"));
OreDictionary.registerOre("dustBasalt", ItemDusts.getDustByName("basalt")); OreUnifier.registerOre("dustBasalt", ItemDusts.getDustByName("basalt"));
OreDictionary.registerOre("dustBauxite", ItemDusts.getDustByName("bauxite")); OreUnifier.registerOre("dustBauxite", ItemDusts.getDustByName("bauxite"));
OreDictionary.registerOre("dustBiotite", ItemDusts.getDustByName("biotite")); OreUnifier.registerOre("dustBiotite", ItemDusts.getDustByName("biotite"));
OreDictionary.registerOre("dustBrass", ItemDusts.getDustByName("brass")); OreUnifier.registerOre("dustBrass", ItemDusts.getDustByName("brass"));
OreDictionary.registerOre("dustBronze", ItemDusts.getDustByName("bronze")); OreUnifier.registerOre("dustBronze", ItemDusts.getDustByName("bronze"));
OreDictionary.registerOre("dustCadmium", ItemDusts.getDustByName("cadmium")); OreUnifier.registerOre("dustCadmium", ItemDusts.getDustByName("cadmium"));
OreDictionary.registerOre("dustCalcite", ItemDusts.getDustByName("calcite")); OreUnifier.registerOre("dustCalcite", ItemDusts.getDustByName("calcite"));
OreDictionary.registerOre("dustCharcoal", ItemDusts.getDustByName("charcoal")); OreUnifier.registerOre("dustCharcoal", ItemDusts.getDustByName("charcoal"));
OreDictionary.registerOre("dustChrome", ItemDusts.getDustByName("chrome")); OreUnifier.registerOre("dustChrome", ItemDusts.getDustByName("chrome"));
OreDictionary.registerOre("dustCinnabar", ItemDusts.getDustByName("cinnabar")); OreUnifier.registerOre("dustCinnabar", ItemDusts.getDustByName("cinnabar"));
OreDictionary.registerOre("dustClay", ItemDusts.getDustByName("clay")); OreUnifier.registerOre("dustClay", ItemDusts.getDustByName("clay"));
OreDictionary.registerOre("dustCoal", ItemDusts.getDustByName("coal")); OreUnifier.registerOre("dustCoal", ItemDusts.getDustByName("coal"));
OreDictionary.registerOre("dustCobalt", ItemDusts.getDustByName("cobalt")); OreUnifier.registerOre("dustCobalt", ItemDusts.getDustByName("cobalt"));
OreDictionary.registerOre("dustCopper", ItemDusts.getDustByName("copper")); OreUnifier.registerOre("dustCopper", ItemDusts.getDustByName("copper"));
OreDictionary.registerOre("dustCupronickel", ItemDusts.getDustByName("cupronickel")); OreUnifier.registerOre("dustCupronickel", ItemDusts.getDustByName("cupronickel"));
OreDictionary.registerOre("dustDarkAsh", ItemDusts.getDustByName("darkAshes")); OreUnifier.registerOre("dustDarkAsh", ItemDusts.getDustByName("darkAshes"));
OreDictionary.registerOre("dustDarkIron", ItemDusts.getDustByName("darkIron")); OreUnifier.registerOre("dustDarkIron", ItemDusts.getDustByName("darkIron"));
OreDictionary.registerOre("dustDiamond", ItemDusts.getDustByName("diamond")); OreUnifier.registerOre("dustDiamond", ItemDusts.getDustByName("diamond"));
OreDictionary.registerOre("dustElectrum", ItemDusts.getDustByName("electrum")); OreUnifier.registerOre("dustElectrum", ItemDusts.getDustByName("electrum"));
OreDictionary.registerOre("dustEmerald", ItemDusts.getDustByName("emerald")); OreUnifier.registerOre("dustEmerald", ItemDusts.getDustByName("emerald"));
OreDictionary.registerOre("dustEnderEye", ItemDusts.getDustByName("enderEye")); OreUnifier.registerOre("dustEnderEye", ItemDusts.getDustByName("enderEye"));
OreDictionary.registerOre("dustEnderPearl", ItemDusts.getDustByName("enderPearl")); OreUnifier.registerOre("dustEnderPearl", ItemDusts.getDustByName("enderPearl"));
OreDictionary.registerOre("dustEndstone", ItemDusts.getDustByName("endstone")); OreUnifier.registerOre("dustEndstone", ItemDusts.getDustByName("endstone"));
OreDictionary.registerOre("dustFlint", ItemDusts.getDustByName("flint")); OreUnifier.registerOre("dustFlint", ItemDusts.getDustByName("flint"));
OreDictionary.registerOre("dustGalena", ItemDusts.getDustByName("galena")); OreUnifier.registerOre("dustGalena", ItemDusts.getDustByName("galena"));
OreDictionary.registerOre("dustGold", ItemDusts.getDustByName("gold")); OreUnifier.registerOre("dustGold", ItemDusts.getDustByName("gold"));
OreDictionary.registerOre("dustGraphite", ItemDusts.getDustByName("graphite")); OreUnifier.registerOre("dustGraphite", ItemDusts.getDustByName("graphite"));
OreDictionary.registerOre("dustGrossular", ItemDusts.getDustByName("grossular")); OreUnifier.registerOre("dustGrossular", ItemDusts.getDustByName("grossular"));
OreDictionary.registerOre("dustIndium", ItemDusts.getDustByName("indium")); OreUnifier.registerOre("dustIndium", ItemDusts.getDustByName("indium"));
OreDictionary.registerOre("dustInvar", ItemDusts.getDustByName("invar")); OreUnifier.registerOre("dustInvar", ItemDusts.getDustByName("invar"));
OreDictionary.registerOre("dustIridium", ItemDusts.getDustByName("iridium")); OreUnifier.registerOre("dustIridium", ItemDusts.getDustByName("iridium"));
OreDictionary.registerOre("dustIron", ItemDusts.getDustByName("iron")); OreUnifier.registerOre("dustIron", ItemDusts.getDustByName("iron"));
OreDictionary.registerOre("dustKanthal", ItemDusts.getDustByName("kanthal")); OreUnifier.registerOre("dustKanthal", ItemDusts.getDustByName("kanthal"));
OreDictionary.registerOre("dustLapis", ItemDusts.getDustByName("lapis")); OreUnifier.registerOre("dustLapis", ItemDusts.getDustByName("lapis"));
OreDictionary.registerOre("dustLazurite", ItemDusts.getDustByName("lazurite")); OreUnifier.registerOre("dustLazurite", ItemDusts.getDustByName("lazurite"));
OreDictionary.registerOre("dustLead", ItemDusts.getDustByName("lead")); OreUnifier.registerOre("dustLead", ItemDusts.getDustByName("lead"));
OreDictionary.registerOre("dustLimestone", ItemDusts.getDustByName("limestone")); OreUnifier.registerOre("dustLimestone", ItemDusts.getDustByName("limestone"));
OreDictionary.registerOre("dustLodestone", ItemDusts.getDustByName("lodestone")); OreUnifier.registerOre("dustLodestone", ItemDusts.getDustByName("lodestone"));
OreDictionary.registerOre("dustMagnesium", ItemDusts.getDustByName("magnesium")); OreUnifier.registerOre("dustMagnesium", ItemDusts.getDustByName("magnesium"));
OreDictionary.registerOre("dustMagnetite", ItemDusts.getDustByName("magnetite")); OreUnifier.registerOre("dustMagnetite", ItemDusts.getDustByName("magnetite"));
OreDictionary.registerOre("dustManganese", ItemDusts.getDustByName("manganese")); OreUnifier.registerOre("dustManganese", ItemDusts.getDustByName("manganese"));
OreDictionary.registerOre("dustManyullyn", ItemDusts.getDustByName("manyullyn")); OreUnifier.registerOre("dustManyullyn", ItemDusts.getDustByName("manyullyn"));
OreDictionary.registerOre("dustMarble", ItemDusts.getDustByName("marble")); OreUnifier.registerOre("dustMarble", ItemDusts.getDustByName("marble"));
OreDictionary.registerOre("dustMithril", ItemDusts.getDustByName("mithril")); OreUnifier.registerOre("dustMithril", ItemDusts.getDustByName("mithril"));
OreDictionary.registerOre("dustNetherrack", ItemDusts.getDustByName("netherrack")); OreUnifier.registerOre("dustNetherrack", ItemDusts.getDustByName("netherrack"));
OreDictionary.registerOre("dustNichrome", ItemDusts.getDustByName("nichrome")); OreUnifier.registerOre("dustNichrome", ItemDusts.getDustByName("nichrome"));
OreDictionary.registerOre("dustNickel", ItemDusts.getDustByName("nickel")); OreUnifier.registerOre("dustNickel", ItemDusts.getDustByName("nickel"));
OreDictionary.registerOre("dustObsidian", ItemDusts.getDustByName("obsidian")); OreUnifier.registerOre("dustObsidian", ItemDusts.getDustByName("obsidian"));
OreDictionary.registerOre("dustOsmium", ItemDusts.getDustByName("osmium")); OreUnifier.registerOre("dustOsmium", ItemDusts.getDustByName("osmium"));
OreDictionary.registerOre("dustPeridot", ItemDusts.getDustByName("peridot")); OreUnifier.registerOre("dustPeridot", ItemDusts.getDustByName("peridot"));
OreDictionary.registerOre("dustPhosphorous", ItemDusts.getDustByName("phosphorous")); OreUnifier.registerOre("dustPhosphorous", ItemDusts.getDustByName("phosphorous"));
OreDictionary.registerOre("dustPlatinum", ItemDusts.getDustByName("platinum")); OreUnifier.registerOre("dustPlatinum", ItemDusts.getDustByName("platinum"));
OreDictionary.registerOre("dustPotassiumFeldspar", ItemDusts.getDustByName("potassiumFeldspar")); OreUnifier.registerOre("dustPotassiumFeldspar", ItemDusts.getDustByName("potassiumFeldspar"));
OreDictionary.registerOre("dustPyrite", ItemDusts.getDustByName("pyrite")); OreUnifier.registerOre("dustPyrite", ItemDusts.getDustByName("pyrite"));
OreDictionary.registerOre("dustPyrope", ItemDusts.getDustByName("pyrope")); OreUnifier.registerOre("dustPyrope", ItemDusts.getDustByName("pyrope"));
OreDictionary.registerOre("dustRedGarnet", ItemDusts.getDustByName("redGarnet")); OreUnifier.registerOre("dustRedGarnet", ItemDusts.getDustByName("redGarnet"));
OreDictionary.registerOre("dustRedrock", ItemDusts.getDustByName("redrock")); OreUnifier.registerOre("dustRedrock", ItemDusts.getDustByName("redrock"));
OreDictionary.registerOre("dustRuby", ItemDusts.getDustByName("ruby")); OreUnifier.registerOre("dustRuby", ItemDusts.getDustByName("ruby"));
OreDictionary.registerOre("dustSaltpeter", ItemDusts.getDustByName("saltpeter")); OreUnifier.registerOre("dustSaltpeter", ItemDusts.getDustByName("saltpeter"));
OreDictionary.registerOre("dustSapphire", ItemDusts.getDustByName("sapphire")); OreUnifier.registerOre("dustSapphire", ItemDusts.getDustByName("sapphire"));
OreDictionary.registerOre("dustSilver", ItemDusts.getDustByName("silver")); OreUnifier.registerOre("dustSilver", ItemDusts.getDustByName("silver"));
OreDictionary.registerOre("dustSilicon", ItemDusts.getDustByName("silicon")); OreUnifier.registerOre("dustSilicon", ItemDusts.getDustByName("silicon"));
OreDictionary.registerOre("dustSodalite", ItemDusts.getDustByName("sodalite")); OreUnifier.registerOre("dustSodalite", ItemDusts.getDustByName("sodalite"));
OreDictionary.registerOre("dustSpessartine", ItemDusts.getDustByName("spessartine")); OreUnifier.registerOre("dustSpessartine", ItemDusts.getDustByName("spessartine"));
OreDictionary.registerOre("dustSphalerite", ItemDusts.getDustByName("sphalerite")); OreUnifier.registerOre("dustSphalerite", ItemDusts.getDustByName("sphalerite"));
OreDictionary.registerOre("dustSteel", ItemDusts.getDustByName("steel")); OreUnifier.registerOre("dustSteel", ItemDusts.getDustByName("steel"));
OreDictionary.registerOre("dustSulfur", ItemDusts.getDustByName("sulfur")); OreUnifier.registerOre("dustSulfur", ItemDusts.getDustByName("sulfur"));
OreDictionary.registerOre("dustTellurium", ItemDusts.getDustByName("tellurium")); OreUnifier.registerOre("dustTellurium", ItemDusts.getDustByName("tellurium"));
OreDictionary.registerOre("dustTeslatite", ItemDusts.getDustByName("teslatite")); OreUnifier.registerOre("dustTeslatite", ItemDusts.getDustByName("teslatite"));
OreDictionary.registerOre("dustTetrahedrite", ItemDusts.getDustByName("tetrahedrite")); OreUnifier.registerOre("dustTetrahedrite", ItemDusts.getDustByName("tetrahedrite"));
OreDictionary.registerOre("dustCopper", ItemDusts.getDustByName("copper")); OreUnifier.registerOre("dustCopper", ItemDusts.getDustByName("copper"));
OreDictionary.registerOre("dustTin", ItemDusts.getDustByName("tin")); OreUnifier.registerOre("dustTin", ItemDusts.getDustByName("tin"));
OreDictionary.registerOre("dustTitanium", ItemDusts.getDustByName("titanium")); OreUnifier.registerOre("dustTitanium", ItemDusts.getDustByName("titanium"));
OreDictionary.registerOre("dustTungsten", ItemDusts.getDustByName("tungsten")); OreUnifier.registerOre("dustTungsten", ItemDusts.getDustByName("tungsten"));
OreDictionary.registerOre("dustUvarovite", ItemDusts.getDustByName("uvarovite")); OreUnifier.registerOre("dustUvarovite", ItemDusts.getDustByName("uvarovite"));
OreDictionary.registerOre("dustVinteum", ItemDusts.getDustByName("vinteum")); OreUnifier.registerOre("dustVinteum", ItemDusts.getDustByName("vinteum"));
OreDictionary.registerOre("dustVoidstone", ItemDusts.getDustByName("voidstone")); OreUnifier.registerOre("dustVoidstone", ItemDusts.getDustByName("voidstone"));
OreDictionary.registerOre("dustYellowGarnet", ItemDusts.getDustByName("yellowGarnet")); OreUnifier.registerOre("dustYellowGarnet", ItemDusts.getDustByName("yellowGarnet"));
OreDictionary.registerOre("dustZinc", ItemDusts.getDustByName("zinc")); OreUnifier.registerOre("dustZinc", ItemDusts.getDustByName("zinc"));
OreDictionary.registerOre("pulpWood", ItemDusts.getDustByName("sawDust")); OreUnifier.registerOre("pulpWood", ItemDusts.getDustByName("sawDust"));
// Small Dusts // Small Dusts
OreDictionary.registerOre("dustSmallAlmandine", ItemDustsSmall.getSmallDustByName("Almandine")); OreUnifier.registerOre("dustSmallAlmandine", ItemDustsSmall.getSmallDustByName("Almandine"));
OreDictionary.registerOre("dustSmallAluminumBrass", ItemDustsSmall.getSmallDustByName("AluminumBrass")); OreUnifier.registerOre("dustSmallAluminumBrass", ItemDustsSmall.getSmallDustByName("AluminumBrass"));
OreDictionary.registerOre("dustSmallAluminum", ItemDustsSmall.getSmallDustByName("Aluminum")); OreUnifier.registerOre("dustSmallAluminum", ItemDustsSmall.getSmallDustByName("Aluminum"));
OreDictionary.registerOre("dustSmallAluminium", ItemDustsSmall.getSmallDustByName("Aluminum")); OreUnifier.registerOre("dustSmallAluminium", ItemDustsSmall.getSmallDustByName("Aluminum"));
OreDictionary.registerOre("dustSmallAlumite", ItemDustsSmall.getSmallDustByName("Alumite")); OreUnifier.registerOre("dustSmallAlumite", ItemDustsSmall.getSmallDustByName("Alumite"));
OreDictionary.registerOre("dustSmallAndradite", ItemDustsSmall.getSmallDustByName("Andradite")); OreUnifier.registerOre("dustSmallAndradite", ItemDustsSmall.getSmallDustByName("Andradite"));
OreDictionary.registerOre("dustSmallAntimony", ItemDustsSmall.getSmallDustByName("Antimony")); OreUnifier.registerOre("dustSmallAntimony", ItemDustsSmall.getSmallDustByName("Antimony"));
OreDictionary.registerOre("dustSmallArdite", ItemDustsSmall.getSmallDustByName("Ardite")); OreUnifier.registerOre("dustSmallArdite", ItemDustsSmall.getSmallDustByName("Ardite"));
OreDictionary.registerOre("dustSmallAsh", ItemDustsSmall.getSmallDustByName("Ashes")); OreUnifier.registerOre("dustSmallAsh", ItemDustsSmall.getSmallDustByName("Ashes"));
OreDictionary.registerOre("dustSmallBasalt", ItemDustsSmall.getSmallDustByName("Basalt")); OreUnifier.registerOre("dustSmallBasalt", ItemDustsSmall.getSmallDustByName("Basalt"));
OreDictionary.registerOre("dustSmallBauxite", ItemDustsSmall.getSmallDustByName("Bauxite")); OreUnifier.registerOre("dustSmallBauxite", ItemDustsSmall.getSmallDustByName("Bauxite"));
OreDictionary.registerOre("dustSmallBiotite", ItemDustsSmall.getSmallDustByName("Biotite")); OreUnifier.registerOre("dustSmallBiotite", ItemDustsSmall.getSmallDustByName("Biotite"));
OreDictionary.registerOre("dustSmallBrass", ItemDustsSmall.getSmallDustByName("Brass")); OreUnifier.registerOre("dustSmallBrass", ItemDustsSmall.getSmallDustByName("Brass"));
OreDictionary.registerOre("dustSmallBronze", ItemDustsSmall.getSmallDustByName("Bronze")); OreUnifier.registerOre("dustSmallBronze", ItemDustsSmall.getSmallDustByName("Bronze"));
OreDictionary.registerOre("dustSmallCadmium", ItemDustsSmall.getSmallDustByName("Cadmium")); OreUnifier.registerOre("dustSmallCadmium", ItemDustsSmall.getSmallDustByName("Cadmium"));
OreDictionary.registerOre("dustSmallCalcite", ItemDustsSmall.getSmallDustByName("Calcite")); OreUnifier.registerOre("dustSmallCalcite", ItemDustsSmall.getSmallDustByName("Calcite"));
OreDictionary.registerOre("dustSmallCharcoal", ItemDustsSmall.getSmallDustByName("Charcoal")); OreUnifier.registerOre("dustSmallCharcoal", ItemDustsSmall.getSmallDustByName("Charcoal"));
OreDictionary.registerOre("dustSmallChrome", ItemDustsSmall.getSmallDustByName("Chrome")); OreUnifier.registerOre("dustSmallChrome", ItemDustsSmall.getSmallDustByName("Chrome"));
OreDictionary.registerOre("dustSmallCinnabar", ItemDustsSmall.getSmallDustByName("Cinnabar")); OreUnifier.registerOre("dustSmallCinnabar", ItemDustsSmall.getSmallDustByName("Cinnabar"));
OreDictionary.registerOre("dustSmallClay", ItemDustsSmall.getSmallDustByName("Clay")); OreUnifier.registerOre("dustSmallClay", ItemDustsSmall.getSmallDustByName("Clay"));
OreDictionary.registerOre("dustSmallCoal", ItemDustsSmall.getSmallDustByName("Coal")); OreUnifier.registerOre("dustSmallCoal", ItemDustsSmall.getSmallDustByName("Coal"));
OreDictionary.registerOre("dustSmallCobalt", ItemDustsSmall.getSmallDustByName("Cobalt")); OreUnifier.registerOre("dustSmallCobalt", ItemDustsSmall.getSmallDustByName("Cobalt"));
OreDictionary.registerOre("dustSmallCopper", ItemDustsSmall.getSmallDustByName("Copper")); OreUnifier.registerOre("dustSmallCopper", ItemDustsSmall.getSmallDustByName("Copper"));
OreDictionary.registerOre("dustSmallCupronickel", ItemDustsSmall.getSmallDustByName("Cupronickel")); OreUnifier.registerOre("dustSmallCupronickel", ItemDustsSmall.getSmallDustByName("Cupronickel"));
OreDictionary.registerOre("dustSmallDarkAsh", ItemDustsSmall.getSmallDustByName("DarkAshes")); OreUnifier.registerOre("dustSmallDarkAsh", ItemDustsSmall.getSmallDustByName("DarkAshes"));
OreDictionary.registerOre("dustSmallDarkIron", ItemDustsSmall.getSmallDustByName("DarkIron")); OreUnifier.registerOre("dustSmallDarkIron", ItemDustsSmall.getSmallDustByName("DarkIron"));
OreDictionary.registerOre("dustSmallDiamond", ItemDustsSmall.getSmallDustByName("Diamond")); OreUnifier.registerOre("dustSmallDiamond", ItemDustsSmall.getSmallDustByName("Diamond"));
OreDictionary.registerOre("dustSmallElectrum", ItemDustsSmall.getSmallDustByName("Electrum")); OreUnifier.registerOre("dustSmallElectrum", ItemDustsSmall.getSmallDustByName("Electrum"));
OreDictionary.registerOre("dustSmallEmerald", ItemDustsSmall.getSmallDustByName("Emerald")); OreUnifier.registerOre("dustSmallEmerald", ItemDustsSmall.getSmallDustByName("Emerald"));
OreDictionary.registerOre("dustSmallEnderEye", ItemDustsSmall.getSmallDustByName("EnderEye")); OreUnifier.registerOre("dustSmallEnderEye", ItemDustsSmall.getSmallDustByName("EnderEye"));
OreDictionary.registerOre("dustSmallEnderPearl", ItemDustsSmall.getSmallDustByName("EnderPearl")); OreUnifier.registerOre("dustSmallEnderPearl", ItemDustsSmall.getSmallDustByName("EnderPearl"));
OreDictionary.registerOre("dustSmallEndstone", ItemDustsSmall.getSmallDustByName("Endstone")); OreUnifier.registerOre("dustSmallEndstone", ItemDustsSmall.getSmallDustByName("Endstone"));
OreDictionary.registerOre("dustSmallFlint", ItemDustsSmall.getSmallDustByName("Flint")); OreUnifier.registerOre("dustSmallFlint", ItemDustsSmall.getSmallDustByName("Flint"));
OreDictionary.registerOre("dustSmallGalena", ItemDustsSmall.getSmallDustByName("Galena")); OreUnifier.registerOre("dustSmallGalena", ItemDustsSmall.getSmallDustByName("Galena"));
OreDictionary.registerOre("dustSmallGlowstone", ItemDustsSmall.getSmallDustByName("Glowstone")); OreUnifier.registerOre("dustSmallGlowstone", ItemDustsSmall.getSmallDustByName("Glowstone"));
OreDictionary.registerOre("dustSmallGold", ItemDustsSmall.getSmallDustByName("Gold")); OreUnifier.registerOre("dustSmallGold", ItemDustsSmall.getSmallDustByName("Gold"));
OreDictionary.registerOre("dustSmallGraphite", ItemDustsSmall.getSmallDustByName("Graphite")); OreUnifier.registerOre("dustSmallGraphite", ItemDustsSmall.getSmallDustByName("Graphite"));
OreDictionary.registerOre("dustSmallGrossular", ItemDustsSmall.getSmallDustByName("Grossular")); OreUnifier.registerOre("dustSmallGrossular", ItemDustsSmall.getSmallDustByName("Grossular"));
OreDictionary.registerOre("dustSmallGunpowder", ItemDustsSmall.getSmallDustByName("Gunpowder")); OreUnifier.registerOre("dustSmallGunpowder", ItemDustsSmall.getSmallDustByName("Gunpowder"));
OreDictionary.registerOre("dustSmallIndium", ItemDustsSmall.getSmallDustByName("Indium")); OreUnifier.registerOre("dustSmallIndium", ItemDustsSmall.getSmallDustByName("Indium"));
OreDictionary.registerOre("dustSmallInvar", ItemDustsSmall.getSmallDustByName("Invar")); OreUnifier.registerOre("dustSmallInvar", ItemDustsSmall.getSmallDustByName("Invar"));
OreDictionary.registerOre("dustSmallIridium", ItemDustsSmall.getSmallDustByName("Iridium")); OreUnifier.registerOre("dustSmallIridium", ItemDustsSmall.getSmallDustByName("Iridium"));
OreDictionary.registerOre("dustSmallIron", ItemDustsSmall.getSmallDustByName("Iron")); OreUnifier.registerOre("dustSmallIron", ItemDustsSmall.getSmallDustByName("Iron"));
OreDictionary.registerOre("dustSmallKanthal", ItemDustsSmall.getSmallDustByName("Kanthal")); OreUnifier.registerOre("dustSmallKanthal", ItemDustsSmall.getSmallDustByName("Kanthal"));
OreDictionary.registerOre("dustSmallLapis", ItemDustsSmall.getSmallDustByName("Lapis")); OreUnifier.registerOre("dustSmallLapis", ItemDustsSmall.getSmallDustByName("Lapis"));
OreDictionary.registerOre("dustSmallLazurite", ItemDustsSmall.getSmallDustByName("Lazurite")); OreUnifier.registerOre("dustSmallLazurite", ItemDustsSmall.getSmallDustByName("Lazurite"));
OreDictionary.registerOre("dustSmallLead", ItemDustsSmall.getSmallDustByName("Lead")); OreUnifier.registerOre("dustSmallLead", ItemDustsSmall.getSmallDustByName("Lead"));
OreDictionary.registerOre("dustSmallLimestone", ItemDustsSmall.getSmallDustByName("Limestone")); OreUnifier.registerOre("dustSmallLimestone", ItemDustsSmall.getSmallDustByName("Limestone"));
OreDictionary.registerOre("dustSmallLodestone", ItemDustsSmall.getSmallDustByName("Lodestone")); OreUnifier.registerOre("dustSmallLodestone", ItemDustsSmall.getSmallDustByName("Lodestone"));
OreDictionary.registerOre("dustSmallMagnesium", ItemDustsSmall.getSmallDustByName("Magnesium")); OreUnifier.registerOre("dustSmallMagnesium", ItemDustsSmall.getSmallDustByName("Magnesium"));
OreDictionary.registerOre("dustSmallMagnetite", ItemDustsSmall.getSmallDustByName("Magnetite")); OreUnifier.registerOre("dustSmallMagnetite", ItemDustsSmall.getSmallDustByName("Magnetite"));
OreDictionary.registerOre("dustSmallManganese", ItemDustsSmall.getSmallDustByName("Manganese")); OreUnifier.registerOre("dustSmallManganese", ItemDustsSmall.getSmallDustByName("Manganese"));
OreDictionary.registerOre("dustSmallManyullyn", ItemDustsSmall.getSmallDustByName("Manyullyn")); OreUnifier.registerOre("dustSmallManyullyn", ItemDustsSmall.getSmallDustByName("Manyullyn"));
OreDictionary.registerOre("dustSmallMarble", ItemDustsSmall.getSmallDustByName("Marble")); OreUnifier.registerOre("dustSmallMarble", ItemDustsSmall.getSmallDustByName("Marble"));
OreDictionary.registerOre("dustSmallMithril", ItemDustsSmall.getSmallDustByName("Mithril")); OreUnifier.registerOre("dustSmallMithril", ItemDustsSmall.getSmallDustByName("Mithril"));
OreDictionary.registerOre("dustSmallNetherrack", ItemDustsSmall.getSmallDustByName("Netherrack")); OreUnifier.registerOre("dustSmallNetherrack", ItemDustsSmall.getSmallDustByName("Netherrack"));
OreDictionary.registerOre("dustSmallNichrome", ItemDustsSmall.getSmallDustByName("Nichrome")); OreUnifier.registerOre("dustSmallNichrome", ItemDustsSmall.getSmallDustByName("Nichrome"));
OreDictionary.registerOre("dustSmallNickel", ItemDustsSmall.getSmallDustByName("Nickel")); OreUnifier.registerOre("dustSmallNickel", ItemDustsSmall.getSmallDustByName("Nickel"));
OreDictionary.registerOre("dustSmallObsidian", ItemDustsSmall.getSmallDustByName("Obsidian")); OreUnifier.registerOre("dustSmallObsidian", ItemDustsSmall.getSmallDustByName("Obsidian"));
OreDictionary.registerOre("dustSmallOsmium", ItemDustsSmall.getSmallDustByName("Osmium")); OreUnifier.registerOre("dustSmallOsmium", ItemDustsSmall.getSmallDustByName("Osmium"));
OreDictionary.registerOre("dustSmallPeridot", ItemDustsSmall.getSmallDustByName("Peridot")); OreUnifier.registerOre("dustSmallPeridot", ItemDustsSmall.getSmallDustByName("Peridot"));
OreDictionary.registerOre("dustSmallPhosphorous", ItemDustsSmall.getSmallDustByName("Phosphorous")); OreUnifier.registerOre("dustSmallPhosphorous", ItemDustsSmall.getSmallDustByName("Phosphorous"));
OreDictionary.registerOre("dustSmallPlatinum", ItemDustsSmall.getSmallDustByName("Platinum")); OreUnifier.registerOre("dustSmallPlatinum", ItemDustsSmall.getSmallDustByName("Platinum"));
OreDictionary.registerOre("dustSmallPotassiumFeldspar", ItemDustsSmall.getSmallDustByName("PotassiumFeldspar")); OreUnifier.registerOre("dustSmallPotassiumFeldspar", ItemDustsSmall.getSmallDustByName("PotassiumFeldspar"));
OreDictionary.registerOre("dustSmallPyrite", ItemDustsSmall.getSmallDustByName("Pyrite")); OreUnifier.registerOre("dustSmallPyrite", ItemDustsSmall.getSmallDustByName("Pyrite"));
OreDictionary.registerOre("dustSmallPyrope", ItemDustsSmall.getSmallDustByName("Pyrope")); OreUnifier.registerOre("dustSmallPyrope", ItemDustsSmall.getSmallDustByName("Pyrope"));
OreDictionary.registerOre("dustSmallRedGarnet", ItemDustsSmall.getSmallDustByName("RedGarnet")); OreUnifier.registerOre("dustSmallRedGarnet", ItemDustsSmall.getSmallDustByName("RedGarnet"));
OreDictionary.registerOre("dustSmallRedrock", ItemDustsSmall.getSmallDustByName("Redrock")); OreUnifier.registerOre("dustSmallRedrock", ItemDustsSmall.getSmallDustByName("Redrock"));
OreDictionary.registerOre("dustSmallRedstone", ItemDustsSmall.getSmallDustByName("Redstone")); OreUnifier.registerOre("dustSmallRedstone", ItemDustsSmall.getSmallDustByName("Redstone"));
OreDictionary.registerOre("dustSmallRuby", ItemDustsSmall.getSmallDustByName("Ruby")); OreUnifier.registerOre("dustSmallRuby", ItemDustsSmall.getSmallDustByName("Ruby"));
OreDictionary.registerOre("dustSmallSaltpeter", ItemDustsSmall.getSmallDustByName("Saltpeter")); OreUnifier.registerOre("dustSmallSaltpeter", ItemDustsSmall.getSmallDustByName("Saltpeter"));
OreDictionary.registerOre("dustSmallSapphire", ItemDustsSmall.getSmallDustByName("Sapphire")); OreUnifier.registerOre("dustSmallSapphire", ItemDustsSmall.getSmallDustByName("Sapphire"));
OreDictionary.registerOre("dustSmallSilver", ItemDustsSmall.getSmallDustByName("Silver")); OreUnifier.registerOre("dustSmallSilver", ItemDustsSmall.getSmallDustByName("Silver"));
OreDictionary.registerOre("dustSmallSilicon", ItemDustsSmall.getSmallDustByName("Silicon")); OreUnifier.registerOre("dustSmallSilicon", ItemDustsSmall.getSmallDustByName("Silicon"));
OreDictionary.registerOre("dustSmallSodalite", ItemDustsSmall.getSmallDustByName("Sodalite")); OreUnifier.registerOre("dustSmallSodalite", ItemDustsSmall.getSmallDustByName("Sodalite"));
OreDictionary.registerOre("dustSmallSpessartine", ItemDustsSmall.getSmallDustByName("Spessartine")); OreUnifier.registerOre("dustSmallSpessartine", ItemDustsSmall.getSmallDustByName("Spessartine"));
OreDictionary.registerOre("dustSmallSphalerite", ItemDustsSmall.getSmallDustByName("Sphalerite")); OreUnifier.registerOre("dustSmallSphalerite", ItemDustsSmall.getSmallDustByName("Sphalerite"));
OreDictionary.registerOre("dustSmallSteel", ItemDustsSmall.getSmallDustByName("Steel")); OreUnifier.registerOre("dustSmallSteel", ItemDustsSmall.getSmallDustByName("Steel"));
OreDictionary.registerOre("dustSmallSulfur", ItemDustsSmall.getSmallDustByName("Sulfur")); OreUnifier.registerOre("dustSmallSulfur", ItemDustsSmall.getSmallDustByName("Sulfur"));
OreDictionary.registerOre("dustSmallTellurium", ItemDustsSmall.getSmallDustByName("Tellurium")); OreUnifier.registerOre("dustSmallTellurium", ItemDustsSmall.getSmallDustByName("Tellurium"));
OreDictionary.registerOre("dustSmallTeslatite", ItemDustsSmall.getSmallDustByName("Teslatite")); OreUnifier.registerOre("dustSmallTeslatite", ItemDustsSmall.getSmallDustByName("Teslatite"));
OreDictionary.registerOre("dustSmallTetrahedrite", ItemDustsSmall.getSmallDustByName("Tetrahedrite")); OreUnifier.registerOre("dustSmallTetrahedrite", ItemDustsSmall.getSmallDustByName("Tetrahedrite"));
OreDictionary.registerOre("dustSmallCopper", ItemDustsSmall.getSmallDustByName("Copper")); OreUnifier.registerOre("dustSmallCopper", ItemDustsSmall.getSmallDustByName("Copper"));
OreDictionary.registerOre("dustSmallTin", ItemDustsSmall.getSmallDustByName("Tin")); OreUnifier.registerOre("dustSmallTin", ItemDustsSmall.getSmallDustByName("Tin"));
OreDictionary.registerOre("dustSmallTitanium", ItemDustsSmall.getSmallDustByName("Titanium")); OreUnifier.registerOre("dustSmallTitanium", ItemDustsSmall.getSmallDustByName("Titanium"));
OreDictionary.registerOre("dustSmallTungsten", ItemDustsSmall.getSmallDustByName("Tungsten")); OreUnifier.registerOre("dustSmallTungsten", ItemDustsSmall.getSmallDustByName("Tungsten"));
OreDictionary.registerOre("dustSmallUvarovite", ItemDustsSmall.getSmallDustByName("Uvarovite")); OreUnifier.registerOre("dustSmallUvarovite", ItemDustsSmall.getSmallDustByName("Uvarovite"));
OreDictionary.registerOre("dustSmallVinteum", ItemDustsSmall.getSmallDustByName("Vinteum")); OreUnifier.registerOre("dustSmallVinteum", ItemDustsSmall.getSmallDustByName("Vinteum"));
OreDictionary.registerOre("dustSmallVoidstone", ItemDustsSmall.getSmallDustByName("Voidstone")); OreUnifier.registerOre("dustSmallVoidstone", ItemDustsSmall.getSmallDustByName("Voidstone"));
OreDictionary.registerOre("dustSmallYellowGarnet", ItemDustsSmall.getSmallDustByName("YellowGarnet")); OreUnifier.registerOre("dustSmallYellowGarnet", ItemDustsSmall.getSmallDustByName("YellowGarnet"));
OreDictionary.registerOre("dustSmallZinc", ItemDustsSmall.getSmallDustByName("Zinc")); OreUnifier.registerOre("dustSmallZinc", ItemDustsSmall.getSmallDustByName("Zinc"));
// Ingots // Ingots
OreDictionary.registerOre("ingotAluminum", ItemIngots.getIngotByName("aluminum")); OreUnifier.registerOre("ingotAluminum", ItemIngots.getIngotByName("aluminum"));
OreDictionary.registerOre("ingotAluminium", ItemIngots.getIngotByName("aluminum")); OreUnifier.registerOre("ingotAluminium", ItemIngots.getIngotByName("aluminum"));
OreDictionary.registerOre("ingotAntimony", ItemIngots.getIngotByName("antimony")); OreUnifier.registerOre("ingotAntimony", ItemIngots.getIngotByName("antimony"));
OreDictionary.registerOre("ingotBatteryAlloy", ItemIngots.getIngotByName("batteryAlloy")); OreUnifier.registerOre("ingotBatteryAlloy", ItemIngots.getIngotByName("batteryAlloy"));
OreDictionary.registerOre("ingotBlueAlloy", ItemIngots.getIngotByName("blueAlloy")); OreUnifier.registerOre("ingotBlueAlloy", ItemIngots.getIngotByName("blueAlloy"));
OreDictionary.registerOre("ingotBrass", ItemIngots.getIngotByName("brass")); OreUnifier.registerOre("ingotBrass", ItemIngots.getIngotByName("brass"));
OreDictionary.registerOre("ingotBronze", ItemIngots.getIngotByName("bronze")); OreUnifier.registerOre("ingotBronze", ItemIngots.getIngotByName("bronze"));
OreDictionary.registerOre("ingotCadmium", ItemIngots.getIngotByName("cadmium")); OreUnifier.registerOre("ingotCadmium", ItemIngots.getIngotByName("cadmium"));
OreDictionary.registerOre("ingotChrome", ItemIngots.getIngotByName("chrome")); OreUnifier.registerOre("ingotChrome", ItemIngots.getIngotByName("chrome"));
OreDictionary.registerOre("ingotCopper", ItemIngots.getIngotByName("copper")); OreUnifier.registerOre("ingotCopper", ItemIngots.getIngotByName("copper"));
OreDictionary.registerOre("ingotCupronickel", ItemIngots.getIngotByName("cupronickel")); OreUnifier.registerOre("ingotCupronickel", ItemIngots.getIngotByName("cupronickel"));
OreDictionary.registerOre("ingotElectrum", ItemIngots.getIngotByName("electrum")); OreUnifier.registerOre("ingotElectrum", ItemIngots.getIngotByName("electrum"));
OreDictionary.registerOre("ingotIndium", ItemIngots.getIngotByName("indium")); OreUnifier.registerOre("ingotIndium", ItemIngots.getIngotByName("indium"));
OreDictionary.registerOre("ingotInvar", ItemIngots.getIngotByName("invar")); OreUnifier.registerOre("ingotInvar", ItemIngots.getIngotByName("invar"));
OreDictionary.registerOre("ingotIridium", ItemIngots.getIngotByName("iridium")); OreUnifier.registerOre("ingotIridium", ItemIngots.getIngotByName("iridium"));
OreDictionary.registerOre("ingotKanthal", ItemIngots.getIngotByName("kanthal")); OreUnifier.registerOre("ingotKanthal", ItemIngots.getIngotByName("kanthal"));
OreDictionary.registerOre("ingotLead", ItemIngots.getIngotByName("lead")); OreUnifier.registerOre("ingotLead", ItemIngots.getIngotByName("lead"));
OreDictionary.registerOre("ingotLodestone", ItemIngots.getIngotByName("lodestone")); OreUnifier.registerOre("ingotLodestone", ItemIngots.getIngotByName("lodestone"));
OreDictionary.registerOre("ingotMagnalium", ItemIngots.getIngotByName("magnalium")); OreUnifier.registerOre("ingotMagnalium", ItemIngots.getIngotByName("magnalium"));
OreDictionary.registerOre("ingotNichrome", ItemIngots.getIngotByName("nichrome")); OreUnifier.registerOre("ingotNichrome", ItemIngots.getIngotByName("nichrome"));
OreDictionary.registerOre("ingotNickel", ItemIngots.getIngotByName("nickel")); OreUnifier.registerOre("ingotNickel", ItemIngots.getIngotByName("nickel"));
OreDictionary.registerOre("ingotOsmium", ItemIngots.getIngotByName("osmium")); OreUnifier.registerOre("ingotOsmium", ItemIngots.getIngotByName("osmium"));
OreDictionary.registerOre("ingotPlatinum", ItemIngots.getIngotByName("platinum")); OreUnifier.registerOre("ingotPlatinum", ItemIngots.getIngotByName("platinum"));
OreDictionary.registerOre("ingotRedAlloy", ItemIngots.getIngotByName("redAlloy")); OreUnifier.registerOre("ingotRedAlloy", ItemIngots.getIngotByName("redAlloy"));
OreDictionary.registerOre("ingotSilver", ItemIngots.getIngotByName("silver")); OreUnifier.registerOre("ingotSilver", ItemIngots.getIngotByName("silver"));
OreDictionary.registerOre("ingotSteel", ItemIngots.getIngotByName("steel")); OreUnifier.registerOre("ingotSteel", ItemIngots.getIngotByName("steel"));
OreDictionary.registerOre("ingotTellurium", ItemIngots.getIngotByName("tellurium")); OreUnifier.registerOre("ingotTellurium", ItemIngots.getIngotByName("tellurium"));
OreDictionary.registerOre("ingotTin", ItemIngots.getIngotByName("tin")); OreUnifier.registerOre("ingotTin", ItemIngots.getIngotByName("tin"));
OreDictionary.registerOre("ingotTitanium", ItemIngots.getIngotByName("titanium")); OreUnifier.registerOre("ingotTitanium", ItemIngots.getIngotByName("titanium"));
OreDictionary.registerOre("ingotTungsten", ItemIngots.getIngotByName("tungsten")); OreUnifier.registerOre("ingotTungsten", ItemIngots.getIngotByName("tungsten"));
OreDictionary.registerOre("ingotTungstensteel", ItemIngots.getIngotByName("tungstensteel")); OreUnifier.registerOre("ingotTungstensteel", ItemIngots.getIngotByName("tungstensteel"));
OreDictionary.registerOre("ingotHotTungstenSteel", ItemIngots.getIngotByName("hotTungstensteel")); OreUnifier.registerOre("ingotHotTungstenSteel", ItemIngots.getIngotByName("hotTungstensteel"));
OreDictionary.registerOre("ingotZinc", ItemIngots.getIngotByName("zinc")); OreUnifier.registerOre("ingotZinc", ItemIngots.getIngotByName("zinc"));
// Nuggets // Nuggets
OreDictionary.registerOre("nuggetAluminum", ItemNuggets.getNuggetByName("aluminum")); OreUnifier.registerOre("nuggetAluminum", ItemNuggets.getNuggetByName("aluminum"));
OreDictionary.registerOre("nuggetAluminium", ItemNuggets.getNuggetByName("aluminum")); OreUnifier.registerOre("nuggetAluminium", ItemNuggets.getNuggetByName("aluminum"));
OreDictionary.registerOre("nuggetAntimony", ItemNuggets.getNuggetByName("antimony")); OreUnifier.registerOre("nuggetAntimony", ItemNuggets.getNuggetByName("antimony"));
OreDictionary.registerOre("nuggetBrass", ItemNuggets.getNuggetByName("brass")); OreUnifier.registerOre("nuggetBrass", ItemNuggets.getNuggetByName("brass"));
OreDictionary.registerOre("nuggetBronze", ItemNuggets.getNuggetByName("bronze")); OreUnifier.registerOre("nuggetBronze", ItemNuggets.getNuggetByName("bronze"));
OreDictionary.registerOre("nuggetChrome", ItemNuggets.getNuggetByName("chrome")); OreUnifier.registerOre("nuggetChrome", ItemNuggets.getNuggetByName("chrome"));
OreDictionary.registerOre("nuggetCopper", ItemNuggets.getNuggetByName("copper")); OreUnifier.registerOre("nuggetCopper", ItemNuggets.getNuggetByName("copper"));
OreDictionary.registerOre("nuggetElectrum", ItemNuggets.getNuggetByName("electrum")); OreUnifier.registerOre("nuggetElectrum", ItemNuggets.getNuggetByName("electrum"));
OreDictionary.registerOre("nuggetInvar", ItemNuggets.getNuggetByName("invar")); OreUnifier.registerOre("nuggetInvar", ItemNuggets.getNuggetByName("invar"));
OreDictionary.registerOre("nuggetIridium", ItemNuggets.getNuggetByName("iridium")); OreUnifier.registerOre("nuggetIridium", ItemNuggets.getNuggetByName("iridium"));
OreDictionary.registerOre("nuggetIron", ItemNuggets.getNuggetByName("iron")); OreUnifier.registerOre("nuggetIron", ItemNuggets.getNuggetByName("iron"));
OreDictionary.registerOre("nuggetLead", ItemNuggets.getNuggetByName("lead")); OreUnifier.registerOre("nuggetLead", ItemNuggets.getNuggetByName("lead"));
OreDictionary.registerOre("nuggetNickel", ItemNuggets.getNuggetByName("nickel")); OreUnifier.registerOre("nuggetNickel", ItemNuggets.getNuggetByName("nickel"));
OreDictionary.registerOre("nuggetOsmium", ItemNuggets.getNuggetByName("osmium")); OreUnifier.registerOre("nuggetOsmium", ItemNuggets.getNuggetByName("osmium"));
OreDictionary.registerOre("nuggetPlatinum", ItemNuggets.getNuggetByName("platinum")); OreUnifier.registerOre("nuggetPlatinum", ItemNuggets.getNuggetByName("platinum"));
OreDictionary.registerOre("nuggetSilver", ItemNuggets.getNuggetByName("silver")); OreUnifier.registerOre("nuggetSilver", ItemNuggets.getNuggetByName("silver"));
OreDictionary.registerOre("nuggetSteel", ItemNuggets.getNuggetByName("steel")); OreUnifier.registerOre("nuggetSteel", ItemNuggets.getNuggetByName("steel"));
OreDictionary.registerOre("nuggetTin", ItemNuggets.getNuggetByName("tin")); OreUnifier.registerOre("nuggetTin", ItemNuggets.getNuggetByName("tin"));
OreDictionary.registerOre("nuggetTitanium", ItemNuggets.getNuggetByName("titanium")); OreUnifier.registerOre("nuggetTitanium", ItemNuggets.getNuggetByName("titanium"));
OreDictionary.registerOre("nuggetTungsten", ItemNuggets.getNuggetByName("tungsten")); OreUnifier.registerOre("nuggetTungsten", ItemNuggets.getNuggetByName("tungsten"));
OreDictionary.registerOre("nuggetZinc", ItemNuggets.getNuggetByName("zinc")); OreUnifier.registerOre("nuggetZinc", ItemNuggets.getNuggetByName("zinc"));
// Plates // Plates
OreDictionary.registerOre("plateAluminum", ItemPlates.getPlateByName("aluminum")); OreUnifier.registerOre("plateAluminum", ItemPlates.getPlateByName("aluminum"));
OreDictionary.registerOre("plateAluminium", ItemPlates.getPlateByName("aluminum")); OreUnifier.registerOre("plateAluminium", ItemPlates.getPlateByName("aluminum"));
OreDictionary.registerOre("plateBatteryAlloy", ItemPlates.getPlateByName("batteryAlloy")); OreUnifier.registerOre("plateBatteryAlloy", ItemPlates.getPlateByName("batteryAlloy"));
OreDictionary.registerOre("plateBrass", ItemPlates.getPlateByName("brass")); OreUnifier.registerOre("plateBrass", ItemPlates.getPlateByName("brass"));
OreDictionary.registerOre("plateBronze", ItemPlates.getPlateByName("bronze")); OreUnifier.registerOre("plateBronze", ItemPlates.getPlateByName("bronze"));
OreDictionary.registerOre("plateCoal", ItemPlates.getPlateByName("coal")); OreUnifier.registerOre("plateCoal", ItemPlates.getPlateByName("coal"));
OreDictionary.registerOre("plateChrome", ItemPlates.getPlateByName("chrome")); OreUnifier.registerOre("plateChrome", ItemPlates.getPlateByName("chrome"));
OreDictionary.registerOre("plateCopper", ItemPlates.getPlateByName("copper")); OreUnifier.registerOre("plateCopper", ItemPlates.getPlateByName("copper"));
OreDictionary.registerOre("plateDiamond", ItemPlates.getPlateByName("diamond")); OreUnifier.registerOre("plateDiamond", ItemPlates.getPlateByName("diamond"));
OreDictionary.registerOre("plateElectrum", ItemPlates.getPlateByName("electrum")); OreUnifier.registerOre("plateElectrum", ItemPlates.getPlateByName("electrum"));
OreDictionary.registerOre("plateEmerald", ItemPlates.getPlateByName("emerald")); OreUnifier.registerOre("plateEmerald", ItemPlates.getPlateByName("emerald"));
OreDictionary.registerOre("plateGold", ItemPlates.getPlateByName("gold")); OreUnifier.registerOre("plateGold", ItemPlates.getPlateByName("gold"));
OreDictionary.registerOre("plateInvar", ItemPlates.getPlateByName("invar")); OreUnifier.registerOre("plateInvar", ItemPlates.getPlateByName("invar"));
OreDictionary.registerOre("plateIridium", ItemPlates.getPlateByName("iridium")); OreUnifier.registerOre("plateIridium", ItemPlates.getPlateByName("iridium"));
OreDictionary.registerOre("plateIron", ItemPlates.getPlateByName("iron")); OreUnifier.registerOre("plateIron", ItemPlates.getPlateByName("iron"));
OreDictionary.registerOre("plateLapis", ItemPlates.getPlateByName("lapis")); OreUnifier.registerOre("plateLapis", ItemPlates.getPlateByName("lapis"));
OreDictionary.registerOre("plateLead", ItemPlates.getPlateByName("lead")); OreUnifier.registerOre("plateLead", ItemPlates.getPlateByName("lead"));
OreDictionary.registerOre("plateMagnalium", ItemPlates.getPlateByName("magnalium")); OreUnifier.registerOre("plateMagnalium", ItemPlates.getPlateByName("magnalium"));
OreDictionary.registerOre("plateNickel", ItemPlates.getPlateByName("nickel")); OreUnifier.registerOre("plateNickel", ItemPlates.getPlateByName("nickel"));
OreDictionary.registerOre("plateObsidian", ItemPlates.getPlateByName("obsidian")); OreUnifier.registerOre("plateObsidian", ItemPlates.getPlateByName("obsidian"));
OreDictionary.registerOre("plateOsmium", ItemPlates.getPlateByName("osmium")); OreUnifier.registerOre("plateOsmium", ItemPlates.getPlateByName("osmium"));
OreDictionary.registerOre("platePeridot", ItemPlates.getPlateByName("peridot")); OreUnifier.registerOre("platePeridot", ItemPlates.getPlateByName("peridot"));
OreDictionary.registerOre("platePlatinum", ItemPlates.getPlateByName("platinum")); OreUnifier.registerOre("platePlatinum", ItemPlates.getPlateByName("platinum"));
OreDictionary.registerOre("plateRedGarnet", ItemPlates.getPlateByName("redGarnet")); OreUnifier.registerOre("plateRedGarnet", ItemPlates.getPlateByName("redGarnet"));
OreDictionary.registerOre("plateRedstone", ItemPlates.getPlateByName("redstone")); OreUnifier.registerOre("plateRedstone", ItemPlates.getPlateByName("redstone"));
OreDictionary.registerOre("plateRedstoneAlloy", ItemPlates.getPlateByName("redstone")); OreUnifier.registerOre("plateRedstoneAlloy", ItemPlates.getPlateByName("redstone"));
OreDictionary.registerOre("plateRuby", ItemPlates.getPlateByName("ruby")); OreUnifier.registerOre("plateRuby", ItemPlates.getPlateByName("ruby"));
OreDictionary.registerOre("plateSapphire", ItemPlates.getPlateByName("sapphire")); OreUnifier.registerOre("plateSapphire", ItemPlates.getPlateByName("sapphire"));
OreDictionary.registerOre("plateSilicon", ItemPlates.getPlateByName("silicon")); OreUnifier.registerOre("plateSilicon", ItemPlates.getPlateByName("silicon"));
OreDictionary.registerOre("plateSilver", ItemPlates.getPlateByName("silver")); OreUnifier.registerOre("plateSilver", ItemPlates.getPlateByName("silver"));
OreDictionary.registerOre("plateSteel", ItemPlates.getPlateByName("steel")); OreUnifier.registerOre("plateSteel", ItemPlates.getPlateByName("steel"));
OreDictionary.registerOre("plateTeslatite", ItemPlates.getPlateByName("teslatite")); OreUnifier.registerOre("plateTeslatite", ItemPlates.getPlateByName("teslatite"));
OreDictionary.registerOre("plateTin", ItemPlates.getPlateByName("tin")); OreUnifier.registerOre("plateTin", ItemPlates.getPlateByName("tin"));
OreDictionary.registerOre("plateTitanium", ItemPlates.getPlateByName("titanium")); OreUnifier.registerOre("plateTitanium", ItemPlates.getPlateByName("titanium"));
OreDictionary.registerOre("plateTungsten", ItemPlates.getPlateByName("tungsten")); OreUnifier.registerOre("plateTungsten", ItemPlates.getPlateByName("tungsten"));
OreDictionary.registerOre("plateTungstensteel", ItemPlates.getPlateByName("tungstensteel")); OreUnifier.registerOre("plateTungstensteel", ItemPlates.getPlateByName("tungstensteel"));
OreDictionary.registerOre("plateYellowGarnet", ItemPlates.getPlateByName("yellowGarnet")); OreUnifier.registerOre("plateYellowGarnet", ItemPlates.getPlateByName("yellowGarnet"));
OreDictionary.registerOre("plateZinc", ItemPlates.getPlateByName("zinc")); OreUnifier.registerOre("plateZinc", ItemPlates.getPlateByName("zinc"));
// Crushed Ore // Crushed Ore
OreDictionary.registerOre("crushedAluminum", ItemCrushedOre.getCrushedOreByName("Aluminum")); OreUnifier.registerOre("crushedAluminum", ItemCrushedOre.getCrushedOreByName("Aluminum"));
OreDictionary.registerOre("crushedAluminium", ItemCrushedOre.getCrushedOreByName("Aluminum")); OreUnifier.registerOre("crushedAluminium", ItemCrushedOre.getCrushedOreByName("Aluminum"));
OreDictionary.registerOre("crushedArdite", ItemCrushedOre.getCrushedOreByName("Ardite")); OreUnifier.registerOre("crushedArdite", ItemCrushedOre.getCrushedOreByName("Ardite"));
OreDictionary.registerOre("crushedBauxite", ItemCrushedOre.getCrushedOreByName("Bauxite")); OreUnifier.registerOre("crushedBauxite", ItemCrushedOre.getCrushedOreByName("Bauxite"));
OreDictionary.registerOre("crushedCadmium", ItemCrushedOre.getCrushedOreByName("Cadmium")); OreUnifier.registerOre("crushedCadmium", ItemCrushedOre.getCrushedOreByName("Cadmium"));
OreDictionary.registerOre("crushedCinnabar", ItemCrushedOre.getCrushedOreByName("Cinnabar")); OreUnifier.registerOre("crushedCinnabar", ItemCrushedOre.getCrushedOreByName("Cinnabar"));
OreDictionary.registerOre("crushedCobalt", ItemCrushedOre.getCrushedOreByName("Cobalt")); OreUnifier.registerOre("crushedCobalt", ItemCrushedOre.getCrushedOreByName("Cobalt"));
OreDictionary.registerOre("crushedDarkIron", ItemCrushedOre.getCrushedOreByName("DarkIron")); OreUnifier.registerOre("crushedDarkIron", ItemCrushedOre.getCrushedOreByName("DarkIron"));
OreDictionary.registerOre("crushedGalena", ItemCrushedOre.getCrushedOreByName("Galena")); OreUnifier.registerOre("crushedGalena", ItemCrushedOre.getCrushedOreByName("Galena"));
OreDictionary.registerOre("crushedIndium", ItemCrushedOre.getCrushedOreByName("Indium")); OreUnifier.registerOre("crushedIndium", ItemCrushedOre.getCrushedOreByName("Indium"));
OreDictionary.registerOre("crushedIridium", ItemCrushedOre.getCrushedOreByName("Iridium")); OreUnifier.registerOre("crushedIridium", ItemCrushedOre.getCrushedOreByName("Iridium"));
OreDictionary.registerOre("crushedNickel", ItemCrushedOre.getCrushedOreByName("Nickel")); OreUnifier.registerOre("crushedNickel", ItemCrushedOre.getCrushedOreByName("Nickel"));
OreDictionary.registerOre("crushedOsmium", ItemCrushedOre.getCrushedOreByName("Osmium")); OreUnifier.registerOre("crushedOsmium", ItemCrushedOre.getCrushedOreByName("Osmium"));
OreDictionary.registerOre("crushedPlatinum", ItemCrushedOre.getCrushedOreByName("Platinum")); OreUnifier.registerOre("crushedPlatinum", ItemCrushedOre.getCrushedOreByName("Platinum"));
OreDictionary.registerOre("crushedPyrite", ItemCrushedOre.getCrushedOreByName("Pyrite")); OreUnifier.registerOre("crushedPyrite", ItemCrushedOre.getCrushedOreByName("Pyrite"));
OreDictionary.registerOre("crushedSphalerite", ItemCrushedOre.getCrushedOreByName("Sphalerite")); OreUnifier.registerOre("crushedSphalerite", ItemCrushedOre.getCrushedOreByName("Sphalerite"));
OreDictionary.registerOre("crushedTetrahedrite", ItemCrushedOre.getCrushedOreByName("Tetrahedrite")); OreUnifier.registerOre("crushedTetrahedrite", ItemCrushedOre.getCrushedOreByName("Tetrahedrite"));
OreDictionary.registerOre("crushedTungsten", ItemCrushedOre.getCrushedOreByName("Tungsten")); OreUnifier.registerOre("crushedTungsten", ItemCrushedOre.getCrushedOreByName("Tungsten"));
// Purified Crushed Ore // Purified Crushed Ore
OreDictionary.registerOre("crushedPurifiedAluminum", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Aluminum")); OreUnifier.registerOre("crushedPurifiedAluminum", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Aluminum"));
OreDictionary.registerOre("crushedPurifiedAluminium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Aluminum")); OreUnifier.registerOre("crushedPurifiedAluminium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Aluminum"));
OreDictionary.registerOre("crushedPurifiedArdite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Ardite")); OreUnifier.registerOre("crushedPurifiedArdite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Ardite"));
OreDictionary.registerOre("crushedPurifiedBauxite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Bauxite")); OreUnifier.registerOre("crushedPurifiedBauxite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Bauxite"));
OreDictionary.registerOre("crushedPurifiedCadmium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cadmium")); OreUnifier.registerOre("crushedPurifiedCadmium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cadmium"));
OreDictionary.registerOre("crushedPurifiedCinnabar", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cinnabar")); OreUnifier.registerOre("crushedPurifiedCinnabar", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cinnabar"));
OreDictionary.registerOre("crushedPurifiedCobalt", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cobalt")); OreUnifier.registerOre("crushedPurifiedCobalt", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cobalt"));
OreDictionary.registerOre("crushedPurifiedDarkIron", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("DarkIron")); OreUnifier.registerOre("crushedPurifiedDarkIron", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("DarkIron"));
OreDictionary.registerOre("crushedPurifiedGalena", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Galena")); OreUnifier.registerOre("crushedPurifiedGalena", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Galena"));
OreDictionary.registerOre("crushedPurifiedIndium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Indium")); OreUnifier.registerOre("crushedPurifiedIndium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Indium"));
OreDictionary.registerOre("crushedPurifiedIridium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Iridium")); OreUnifier.registerOre("crushedPurifiedIridium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Iridium"));
OreDictionary.registerOre("crushedPurifiedNickel", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Nickel")); OreUnifier.registerOre("crushedPurifiedNickel", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Nickel"));
OreDictionary.registerOre("crushedPurifiedOsmium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Osmium")); OreUnifier.registerOre("crushedPurifiedOsmium", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Osmium"));
OreDictionary.registerOre("crushedPurifiedPlatinum", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Platinum")); OreUnifier.registerOre("crushedPurifiedPlatinum", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Platinum"));
OreDictionary.registerOre("crushedPurifiedPyrite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Pyrite")); OreUnifier.registerOre("crushedPurifiedPyrite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Pyrite"));
OreDictionary.registerOre("crushedPurifiedSphalerite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Sphalerite")); OreUnifier.registerOre("crushedPurifiedSphalerite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Sphalerite"));
OreDictionary.registerOre("crushedPurifiedTetrahedrite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tetrahedrite")); OreUnifier.registerOre("crushedPurifiedTetrahedrite", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tetrahedrite"));
OreDictionary.registerOre("crushedPurifiedTungsten", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tungsten")); OreUnifier.registerOre("crushedPurifiedTungsten", ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tungsten"));
OreDictionary.registerOre("craftingGrinder", ItemParts.getPartByName("diamondGrindingHead")); OreUnifier.registerOre("craftingGrinder", ItemParts.getPartByName("diamondGrindingHead"));
OreDictionary.registerOre("craftingGrinder", ItemParts.getPartByName("tungstenGrindingHead")); OreUnifier.registerOre("craftingGrinder", ItemParts.getPartByName("tungstenGrindingHead"));
OreDictionary.registerOre("circuitMaster", ItemParts.getPartByName("energyFlowCircuit")); OreUnifier.registerOre("circuitMaster", ItemParts.getPartByName("energyFlowCircuit"));
OreDictionary.registerOre("circuitElite", ItemParts.getPartByName("dataControlCircuit")); OreUnifier.registerOre("circuitElite", ItemParts.getPartByName("dataControlCircuit"));
OreDictionary.registerOre("circuitData", ItemParts.getPartByName("dataStorageCircuit")); OreUnifier.registerOre("circuitData", ItemParts.getPartByName("dataStorageCircuit"));
OreDictionary.registerOre("craftingSuperconductor", ItemParts.getPartByName("superconductor")); OreUnifier.registerOre("craftingSuperconductor", ItemParts.getPartByName("superconductor"));
OreDictionary.registerOre("batteryUltimate", ItemParts.getPartByName("diamondGrindingHead")); OreUnifier.registerOre("batteryUltimate", ItemParts.getPartByName("diamondGrindingHead"));
OreDictionary.registerOre("blockLapis", ItemParts.getPartByName("lazuriteChunk")); OreUnifier.registerOre("blockLapis", ItemParts.getPartByName("lazuriteChunk"));
} }

View file

@ -4,6 +4,7 @@ import net.minecraft.util.StatCollector;
public class Reference { public class Reference {
public static String alloySmelteRecipe = StatCollector.translateToLocal("techreborn.recipe.alloysmelter"); public static String alloySmelteRecipe = StatCollector.translateToLocal("techreborn.recipe.alloysmelter");
public static String ironalloySmelteRecipe = StatCollector.translateToLocal("techreborn.recipe.ironalloysmelter");
public static String assemblingMachineRecipe = StatCollector.translateToLocal("techreborn.recipe.assemblingmachine"); public static String assemblingMachineRecipe = StatCollector.translateToLocal("techreborn.recipe.assemblingmachine");
public static String blastFurnaceRecipe = StatCollector.translateToLocal("techreborn.recipe.blastfurnace"); public static String blastFurnaceRecipe = StatCollector.translateToLocal("techreborn.recipe.blastfurnace");
public static String centrifugeRecipe = StatCollector.translateToLocal("techreborn.recipe.centrifuge"); public static String centrifugeRecipe = StatCollector.translateToLocal("techreborn.recipe.centrifuge");

View file

@ -1,4 +1,4 @@
package techreborn.partSystem.parts; package techreborn.partSystem.fmp;
import codechicken.lib.packet.PacketCustom; import codechicken.lib.packet.PacketCustom;
import codechicken.lib.raytracer.RayTracer; import codechicken.lib.raytracer.RayTracer;
@ -23,10 +23,13 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import techreborn.partSystem.fmp.FMPModPart; import reborncore.RebornCore;
import reborncore.common.packets.AddDiscriminatorEvent;
import reborncore.common.packets.PacketHandler;
import techreborn.Core;
import techreborn.partSystem.parts.CablePart;
import java.util.Arrays; import java.util.Arrays;
@ -52,39 +55,36 @@ public class CableConverter implements MultiPartRegistry.IPartConverter {
return null; return null;
} }
private ThreadLocal<Object> placing = new ThreadLocal<Object>(); private final ThreadLocal<Object> placing = new ThreadLocal<Object>();
@SubscribeEvent(priority = EventPriority.LOW) @SubscribeEvent(priority = EventPriority.LOW)
public void playerInteract(PlayerInteractEvent event) { public void playerInteract(PlayerInteractEvent event) {
if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK && event.entityPlayer.worldObj.isRemote) { if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK && event.entityPlayer.worldObj.isRemote) {
if (placing.get() != null) if (placing.get() != null) return;//for mods that do dumb stuff and call this event like MFR
return;
placing.set(event); placing.set(event);
if (place(event.entityPlayer, event.entityPlayer.worldObj)) if (place(event.entityPlayer, event.entityPlayer.worldObj)) event.setCanceled(true);
event.setCanceled(true);
placing.set(null); placing.set(null);
} }
} }
public static boolean place(EntityPlayer player, World world) { public static boolean place(EntityPlayer player, World world) {
MovingObjectPosition hit = RayTracer.reTrace(world, player); MovingObjectPosition hit = RayTracer.reTrace(world, player);
if (hit == null) if (hit == null) return false;
return false;
BlockCoord pos = new BlockCoord(hit.blockX, hit.blockY, hit.blockZ).offset(hit.sideHit); BlockCoord pos = new BlockCoord(hit.blockX, hit.blockY, hit.blockZ);
ItemStack held = player.getHeldItem(); ItemStack held = player.getHeldItem();
FMPModPart part = null; FMPModPart part = null;
if (held == null) if (held == null) return false;
return false;
Item heldItem = held.getItem(); Item heldItem = held.getItem();
if (heldItem == IC2Items.getItem("copperCableItem").getItem()) {
CablePart cablePart = new CablePart();
cablePart.setType(held.getItemDamage());
part = new FMPModPart(cablePart);
}
if (part == null) return false;
if (heldItem == IC2Items.getItem("copperCableItem").getItem())
part = placeCable(world, pos, hit.sideHit, held);
if (part == null)
return false;
if (world.isRemote && !player.isSneaking())//attempt to use block activated like normal and tell the server the right stuff if (world.isRemote && !player.isSneaking())//attempt to use block activated like normal and tell the server the right stuff
{ {
@ -92,24 +92,21 @@ public class CableConverter implements MultiPartRegistry.IPartConverter {
Block block = world.getBlock(hit.blockX, hit.blockY, hit.blockZ); Block block = world.getBlock(hit.blockX, hit.blockY, hit.blockZ);
if (!ignoreActivate(block) && block.onBlockActivated(world, hit.blockX, hit.blockY, hit.blockZ, player, hit.sideHit, (float) f.x, (float) f.y, (float) f.z)) { if (!ignoreActivate(block) && block.onBlockActivated(world, hit.blockX, hit.blockY, hit.blockZ, player, hit.sideHit, (float) f.x, (float) f.y, (float) f.z)) {
player.swingItem(); player.swingItem();
PacketCustom.sendToServer(new C08PacketPlayerBlockPlacement( PacketCustom.sendToServer(new C08PacketPlayerBlockPlacement(hit.blockX, hit.blockY, hit.blockZ, hit.sideHit, player.inventory.getCurrentItem(), (float) f.x, (float) f.y, (float) f.z));
hit.blockX, hit.blockY, hit.blockZ, hit.sideHit,
player.inventory.getCurrentItem(),
(float) f.x, (float) f.y, (float) f.z));
return true; return true;
} }
} }
TileMultipart tile = TileMultipart.getOrConvertTile(world, pos); TileMultipart tile = TileMultipart.getOrConvertTile(world, pos);
if (tile == null || !tile.canAddPart(part)) if (tile == null || !tile.canAddPart(part)) {
return false; pos = pos.offset(hit.sideHit);
tile = TileMultipart.getOrConvertTile(world, pos);
if (tile == null || !tile.canAddPart(part)) return false;
}
if (!world.isRemote) { if (!world.isRemote) {
TileMultipart.addPart(world, pos, part); TileMultipart.addPart(world, pos, part);
world.playSoundEffect(pos.x + 0.5, pos.y + 0.5, pos.z + 0.5, world.playSoundEffect(pos.x + 0.5, pos.y + 0.5, pos.z + 0.5, Blocks.wool.stepSound.func_150496_b(), (Blocks.wool.stepSound.getVolume() + 1.0F) / 2.0F, Blocks.wool.stepSound.getPitch() * 0.8F);
Blocks.wool.stepSound.func_150496_b(),
(Blocks.wool.stepSound.getVolume() + 1.0F) / 2.0F,
Blocks.wool.stepSound.getPitch() * 0.8F);
if (!player.capabilities.isCreativeMode) { if (!player.capabilities.isCreativeMode) {
held.stackSize--; held.stackSize--;
if (held.stackSize == 0) { if (held.stackSize == 0) {
@ -119,28 +116,22 @@ public class CableConverter implements MultiPartRegistry.IPartConverter {
} }
} else { } else {
player.swingItem(); player.swingItem();
// new PacketCustom(McMultipartSPH.channel, 1).sendToServer(); PacketHandler.sendPacketToServer(new PacketFMPPlacePart());
} }
return true; return true;
} }
/**
* Because vanilla is weird.
*/
private static boolean ignoreActivate(Block block) { private static boolean ignoreActivate(Block block) {
if (block instanceof BlockFence) if (block instanceof BlockFence) return true;
return true;
return false; return false;
} }
public static FMPModPart placeCable(World world, BlockCoord pos, int side, ItemStack held) { @SubscribeEvent
if (side == 0) public void addDiscriminator(AddDiscriminatorEvent event) {
return null; event.getPacketHandler().addDiscriminator(event.getPacketHandler().nextDiscriminator, PacketFMPPlacePart.class);
pos = pos.copy().offset(side ^ 1);
Block block = world.getBlock(pos.x, pos.y, pos.z);
if (!block.isSideSolid(world, pos.x, pos.y, pos.z, ForgeDirection.getOrientation(side)) && (side != 1 || block.canPlaceTorchOnTop(world, pos.x, pos.y, pos.z)))
return null;
CablePart part = new CablePart();
part.setType(held.getItemDamage() * 16);
return new FMPModPart(part);
} }
} }

View file

@ -24,7 +24,6 @@ import techreborn.partSystem.IModPart;
import techreborn.partSystem.IPartProvider; import techreborn.partSystem.IPartProvider;
import techreborn.partSystem.ModPart; import techreborn.partSystem.ModPart;
import techreborn.partSystem.ModPartRegistry; import techreborn.partSystem.ModPartRegistry;
import techreborn.partSystem.parts.CableConverter;
import java.util.List; import java.util.List;
@ -76,6 +75,7 @@ public class FMPFactory implements MultiPartRegistry.IPartFactory2,
return null; return null;
} }
@Override @Override
public void init() { public void init() {
if (Loader.isModLoaded("IC2")) { if (Loader.isModLoaded("IC2")) {

View file

@ -0,0 +1,29 @@
package techreborn.partSystem.fmp;
import io.netty.buffer.ByteBuf;
import reborncore.common.packets.SimplePacket;
import java.io.IOException;
public class PacketFMPPlacePart extends SimplePacket {
public PacketFMPPlacePart() {
}
@Override
public void writeData(ByteBuf out) throws IOException {
}
@Override
public void readData(ByteBuf in) throws IOException {
}
@Override
public void execute() {
CableConverter.place(player, player.worldObj);
}
}

View file

@ -0,0 +1,11 @@
package techreborn.powerSystem.traits;
import reborncore.jtraits.JTrait;
import techreborn.powerSystem.PoweredItem;
public class RFItemPowerTrait extends JTrait<PoweredItem> {
}

View file

@ -7,7 +7,7 @@ import techreborn.client.StackToolTipEvent;
import techreborn.client.VersionCheckerClient; import techreborn.client.VersionCheckerClient;
import techreborn.client.hud.ChargeHud; import techreborn.client.hud.ChargeHud;
import techreborn.client.keybindings.KeyBindings; import techreborn.client.keybindings.KeyBindings;
import techreborn.client.render.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockRenderEvent;
public class ClientProxy extends CommonProxy { public class ClientProxy extends CommonProxy {

View file

@ -89,13 +89,11 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl
@Override @Override
public boolean canFill(ForgeDirection from, Fluid fluid) { public boolean canFill(ForgeDirection from, Fluid fluid) {
System.out.println("hi");
return FluidPowerManager.fluidPowerValues.containsKey(fluid); return FluidPowerManager.fluidPowerValues.containsKey(fluid);
} }
@Override @Override
public boolean canDrain(ForgeDirection from, Fluid fluid) { public boolean canDrain(ForgeDirection from, Fluid fluid) {
System.out.println("hi");
return tank.getFluid() == null || tank.getFluid().getFluid() == fluid; return tank.getFluid() == null || tank.getFluid().getFluid() == fluid;
} }

View file

@ -681,6 +681,80 @@ config.techreborn.connectTextures=Enable Connected textures
config.techreborn.connectTextures.tooltip= Enable Connected textures config.techreborn.connectTextures.tooltip= Enable Connected textures
config.techreborn.rainExplosions=Enable machine explosions when rain hits config.techreborn.rainExplosions=Enable machine explosions when rain hits
config.techreborn.rainExplosions.tooltip= When this is enabled machines will explode when they come in contact with rain. config.techreborn.rainExplosions.tooltip= When this is enabled machines will explode when they come in contact with rain.
config.techreborn.allowExpensiveWatermill.tooltip= Allow Expensive Watermill
config.techreborn.allowExpensiveWindmill.tooltip= Allow Expensive Watermill
config.techreborn.allowBopRecipes.tooltip= Allow BOP Recipes
config.techreborn.allowForestryRecipes.tooltip= Allow Forestry Recipes
config.techreborn.allowNaturaRecipes.tooltip= Allow Natura Recipes
config.techreborn.aesuMaxOutput.tooltip= AESU max output
config.techreborn.aesuMaxStorage.tooltip= AESU max storage
config.techreborn.baseLesuOutput.tooltip= Base LESU output
config.techreborn.cloakingDeviceEUTick.tooltip= Cloaking Device Eu/Tick
config.techreborn.cloakingDeviceMaxCharge.tooltip= Cloaking Device Max Charge
config.techreborn.cloakingDeviceTier.tooltip= Cloaking Device Tier
config.techreborn.dragoneggsiphonerPower.tooltip=Dragon Egg Siphoner Eu/Tick
config.techreborn.extraOutputPerLesuBlock.tooltip= LESU Storage Block extra output
config.techreborn.heatGeneratorOutput.tooltip= Heat Generator output
config.techreborn.lapotronicOrbMaxCharge= Lapotronic Orb Max Charge
config.techreborn.lapotronicOrbTier.tooltip= Lapatronic Orb Tier
config.techreborn.lesuStoragePerBlock.tooltip= LESU Storage Block extra output
config.techreborn.showChargehud.tooltip=Show Charge Hud
config.techreborn.allow.UUrecipesAluminumDust.tooltip= Allow UU recipes for AluminumDust
config.techreborn.allow.UUrecipesCoal.tooltip= Allow UU recipes for Coal
config.techreborn.allow.UUrecipesCopperDust.tooltip= Allow UU recipes for Copper Dust
config.techreborn.allow.UUrecipesDiamond.tooltip= Allow UU recipes for Diamond
config.techreborn.allow.UUrecipesEmerald.tooltip= Allow UU recipes for Emerald
config.techreborn.allow.UUrecipesEmeraldOre.tooltip= Allow UU recipes for Emerald Ore
config.techreborn.allow.UUrecipesGoldDust.tooltip= Allow UU recipes for Gold Dust
config.techreborn.allow.UUrecipesGoldOre.tooltip= Allow UU recipes for Gold Ore
config.techreborn.allow.UUrecipesIronDust.tooltip= Allow UU recipes for Iron Dust
config.techreborn.allow.UUrecipesIronOre.tooltip= Allow UU recipes for Iron Ore
config.techreborn.allow.UUrecipesLapis.tooltip= Allow UU recipes for Lapis
config.techreborn.allow.UUrecipesLeadDust.tooltip= Allow UU recipes for Lapis dust
config.techreborn.allow.UUrecipesPlatinumDust.tooltip= Allow UU recipes for Platinum Dust
config.techreborn.allow.UUrecipesRedStone.tooltip= Allow UU recipes for Redstone
config.techreborn.allow.UUrecipesResin.tooltip= Allow UU recipes for Sticky Resin
config.techreborn.allow.UUrecipesTinDust.tooltip= Allow UU recipes for Tin Dust
config.techreborn.allow.UUrecipesTitaniumDust.tooltip= Allow UU recipes for Titanium Dust
config.techreborn.allow.UUrecipesTungstenDust.tooltip= Allow UU recipes for Tungsten Dust
config.techreborn.allow.hiderecipes.tooltip= Hide UU recipes from NEI
config.techreborn.allow.uurecipesBone.tooltip= Allow UU recipes for Bone
config.techreborn.allow.uurecipesCactus.tooltip= Allow UU recipes for Cactus
config.techreborn.allow.uurecipesCocoa.tooltip= Allow UU recipes for Cocoa
config.techreborn.allow.uurecipesEnderPearl.tooltip= Allow UU recipes for Ender Pearl
config.techreborn.allow.uurecipesFeather.tooltip= Allow UU recipes for Feather
config.techreborn.allow.uurecipesGlass.tooltip= Allow UU recipes for Glass
config.techreborn.allow.uurecipesGlowstoneBlock.tooltip= Allow UU recipes for Glowstone Blocks
config.techreborn.allow.uurecipesGrass.tooltip= Allow UU recipes for Grass
config.techreborn.allow.uurecipesInk.tooltip= Allow UU recipes for Ink Sacks
config.techreborn.allow.uurecipesIridiamOre.tooltip= Allow UU recipes for IridiamOre
config.techreborn.allow.uurecipesLava.tooltip= Allow UU recipes for Lava
config.techreborn.allow.uurecipesLilypad.tooltip= Allow UU recipes for Lilypad
config.techreborn.allow.uurecipesObsidian.tooltip= Allow UU recipes for Obsidian
config.techreborn.allow.uurecipesSnowBall.tooltip= Allow UU recipes for Snowball
config.techreborn.allow.uurecipesSnowBlock.tooltip= Allow UU recipes for SnowBlock
config.techreborn.allow.uurecipesStone.tooltip= Allow UU recipes for Stone
config.techreborn.allow.uurecipesSugarCane.tooltip= Allow UU recipes for SugarCane
config.techreborn.allow.uurecipesVine.tooltip= Allow UU recipes for Vine
config.techreborn.allow.uurecipesWater.tooltip= Allow UU recipes for Water
config.techreborn.allow.uurecipesWood.tooltip= Allow UU recipes for Wood
config.techreborn.allow.tungstonOre.tooltip= Allow UU recipes for Tungston Ore
config.techreborn.bauxiteOre.rare.tooltip=rarity of Bauxite Ore
config.techreborn.cinnabarOre.rare.tooltip=rarity of Cinnabar Ore
config.techreborn.copperOre.rare.tooltip=rarity of Copper Ore
config.techreborn.galenaOre.rare.tooltip=rarity of Galena Ore
config.techreborn.iridiumOre.rare.tooltip=rarity of Iridium Ore
config.techreborn.leadOre.rare.tooltip=rarity of Lead Ore
config.techreborn.olivineOre.rare.tooltip=rarity of Olivine Ore
config.techreborn.pyriteOre.rare.tooltip=rarity of Pyrite Ore
config.techreborn.rubyOre.rare.tooltip=rarity of Ruby Ore
config.techreborn.sapphireOre.rare.tooltip=rarity of Sapphire Ore
config.techreborn.sheldoniteOre.rare.tooltip=rarity of Sheldonite Ore
config.techreborn.silverOre.rare.tooltip=rarity of Silver Ore
config.techreborn.sodaliteOre.rare.tooltip=rarity of Sodalite Ore
config.techreborn.sphaleriteOre.rare.tooltip=rarity of Sphalerite Ore
config.techreborn.tinOre.rare.tooltip=rarity of Tin Ore
config.techreborn.tungstenOre.rare.tooltip=rarity of Tungsten Ore
#ConfigGui #ConfigGui
config.techreborn.category.general=General Configs config.techreborn.category.general=General Configs
@ -692,6 +766,7 @@ config.techreborn.category.emc=EMC Configs
#Recipe Handlers #Recipe Handlers
techreborn.recipe.alloysmelter=Alloy Furnace Recipe techreborn.recipe.alloysmelter=Alloy Furnace Recipe
techreborn.recipe.ironalloysmelter=Iron Alloy Furnace Recipe
techreborn.recipe.assemblingmachine=Assembling Machine Recipe techreborn.recipe.assemblingmachine=Assembling Machine Recipe
techreborn.recipe.blastfurnace=Blast Furnace Recipe techreborn.recipe.blastfurnace=Blast Furnace Recipe
techreborn.recipe.centrifuge=Centrifuge Recipe techreborn.recipe.centrifuge=Centrifuge Recipe