This commit is contained in:
modmuss50 2016-05-06 19:49:32 +01:00
commit 595c9575b1
157 changed files with 1584 additions and 1596 deletions

View file

@ -58,3 +58,7 @@ Inactive
- joflashstudios (Recipes)
And everyone else who has helped with languages and code.
# License Infomation:
The mod is licenced under MIT. We have got permisson from Greg to use his textures, everything else has been recoded and retextured. If you have any quierys please ask on irc or in an issue.

View file

@ -38,10 +38,6 @@ public interface ISubItemRetriever {
ItemStack getPlateByName(String name, int count);
ItemStack getPurifiedCrushedOreByName(String name);
ItemStack getPurifiedCrushedOreByName(String name, int count);
ItemStack getUpgradeByName(String name);
ItemStack getUpgradeByName(String name, int count);

View file

@ -1,8 +1,5 @@
package techreborn.blocks;
import java.security.InvalidParameterException;
import java.util.List;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
@ -18,10 +15,12 @@ import reborncore.common.BaseBlock;
import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModBlocks;
import java.security.InvalidParameterException;
import java.util.List;
public class BlockMachineFrame extends BaseBlock implements ITexturedBlock
{
public static final String[] types = new String[] { "aluminum", "iron", "bronze", "brass", "steel", "titanium",
"machine", "advancedMachine", "highlyAdvancedMachine" };
public static final String[] types = new String[] { "machine", "advancedMachine", "highlyAdvancedMachine" };
public PropertyInteger METADATA;
public BlockMachineFrame(Material material)

View file

@ -1,9 +1,5 @@
package techreborn.blocks;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
@ -31,11 +27,15 @@ import techreborn.items.ItemDusts;
import techreborn.items.ItemGems;
import techreborn.world.config.IOreNameProvider;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvider
{
public static final String[] types = new String[] { "Galena", "Iridium", "Ruby", "Sapphire", "Bauxite", "Pyrite",
"Cinnabar", "Sphalerite", "Tungston", "Sheldonite", "Peridot", "Sodalite", "Tetrahedrite", "Cassiterite",
"Cinnabar", "Sphalerite", "Tungston", "Sheldonite", "Peridot", "Sodalite",
"Lead", "Silver" };
public PropertyInteger METADATA;
@ -118,7 +118,7 @@ public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvi
return set.drop(fortune, random);
}
// Sodolite
// Sodalite
if (metadata == 11)
{
OreDrop sodalite = new OreDrop(ItemDusts.getDustByName("sodalite", 6),

View file

@ -18,7 +18,6 @@ public class RecipeCategoryUids
public static final String EXTRACTOR = "TechReborn.Extractor";
public static final String COMPRESSOR = "TechReborn.Compressor";
public static final String SCRAPBOX = "TechReborn.Scrapbox";
public static final String RECYCLER = "TechReborn.Recycler";
private RecipeCategoryUids()
{
}

View file

@ -9,9 +9,9 @@ import mezz.jei.api.recipe.transfer.IRecipeTransferRegistry;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.translation.I18n;
import reborncore.api.recipe.RecipeHandler;
import techreborn.Core;
import techreborn.api.reactor.FusionReactorRecipeHelper;
import reborncore.api.recipe.RecipeHandler;
import techreborn.api.recipe.machines.AssemblingMachineRecipe;
import techreborn.api.recipe.machines.ImplosionCompressorRecipe;
import techreborn.client.container.*;
@ -42,8 +42,6 @@ import techreborn.compat.jei.industrialGrinder.IndustrialGrinderRecipeCategory;
import techreborn.compat.jei.industrialGrinder.IndustrialGrinderRecipeHandler;
import techreborn.compat.jei.industrialSawmill.IndustrialSawmillRecipeCategory;
import techreborn.compat.jei.industrialSawmill.IndustrialSawmillRecipeHandler;
import techreborn.compat.jei.recycler.RecyclerRecipeCategory;
import techreborn.compat.jei.recycler.RecyclerRecipeHandler;
import techreborn.compat.jei.rollingMachine.RollingMachineRecipeCategory;
import techreborn.compat.jei.rollingMachine.RollingMachineRecipeHandler;
import techreborn.compat.jei.rollingMachine.RollingMachineRecipeMaker;
@ -52,6 +50,7 @@ import techreborn.compat.jei.scrapbox.ScrapboxRecipeHandler;
import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeCategory;
import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeHandler;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModBlocks;
import techreborn.init.ModFluids;
import techreborn.init.ModItems;
import techreborn.items.ItemParts;
@ -60,8 +59,7 @@ import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.List;
@mezz.jei.api.JEIPlugin
public class TechRebornJeiPlugin extends BlankModPlugin
@mezz.jei.api.JEIPlugin public class TechRebornJeiPlugin extends BlankModPlugin
{
private static void addDebugRecipes(IModRegistry registry)
{
@ -85,8 +83,7 @@ public class TechRebornJeiPlugin extends BlankModPlugin
registry.addRecipes(debugRecipes);
}
@Override
public void register(@Nonnull IModRegistry registry)
@Override public void register(@Nonnull IModRegistry registry)
{
IJeiHelpers jeiHelpers = registry.getJeiHelpers();
IGuiHelper guiHelper = jeiHelpers.getGuiHelper();
@ -114,7 +111,7 @@ public class TechRebornJeiPlugin extends BlankModPlugin
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidSodiumpersulfate));
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidTritium));
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidWolframium));
registry.addRecipeCategories(new AlloySmelterRecipeCategory(guiHelper),
new AssemblingMachineRecipeCategory(guiHelper), new BlastFurnaceRecipeCategory(guiHelper),
new CentrifugeRecipeCategory(guiHelper), new ChemicalReactorRecipeCategory(guiHelper),
@ -122,8 +119,7 @@ public class TechRebornJeiPlugin extends BlankModPlugin
new ImplosionCompressorRecipeCategory(guiHelper), new IndustrialElectrolyzerRecipeCategory(guiHelper),
new IndustrialSawmillRecipeCategory(guiHelper), new RollingMachineRecipeCategory(guiHelper),
new VacuumFreezerRecipeCategory(guiHelper), new GrinderRecipeCategory(guiHelper),
new ExtractorRecipeCategory(guiHelper), new CompressorRecipeCategory(guiHelper),
new ScrapboxRecipeCategory(guiHelper), new RecyclerRecipeCategory(guiHelper));
new ExtractorRecipeCategory(guiHelper), new CompressorRecipeCategory(guiHelper), new ScrapboxRecipeCategory(guiHelper));
registry.addRecipeHandlers(new AlloySmelterRecipeHandler(jeiHelpers),
new AssemblingMachineRecipeHandler(jeiHelpers), new BlastFurnaceRecipeHandler(jeiHelpers),
@ -133,7 +129,7 @@ public class TechRebornJeiPlugin extends BlankModPlugin
new IndustrialSawmillRecipeHandler(jeiHelpers), new RollingMachineRecipeHandler(),
new VacuumFreezerRecipeHandler(jeiHelpers), new GrinderRecipeHandler(jeiHelpers),
new ExtractorRecipeHandler(jeiHelpers), new CompressorRecipeHandler(jeiHelpers),
new ScrapboxRecipeHandler(jeiHelpers), new RecyclerRecipeHandler(jeiHelpers));
new ScrapboxRecipeHandler(jeiHelpers));
registry.addRecipes(RecipeHandler.recipeList);
registry.addRecipes(FusionReactorRecipeHelper.reactorRecipes);
@ -143,8 +139,8 @@ public class TechRebornJeiPlugin extends BlankModPlugin
registry.addRecipes(RollingMachineRecipeMaker.getRecipes(jeiHelpers));
} catch (RuntimeException e)
{
Core.logHelper.error(
"Could not register rolling machine recipes. JEI may have changed its internal recipe wrapper locations.");
Core.logHelper
.error("Could not register rolling machine recipes. JEI may have changed its internal recipe wrapper locations.");
e.printStackTrace();
}
@ -189,45 +185,73 @@ public class TechRebornJeiPlugin extends BlankModPlugin
registry.addRecipeClickArea(GuiCompressor.class, 78, 36, 24, 16, RecipeCategoryUids.COMPRESSOR);
registry.addRecipeClickArea(GuiIronFurnace.class, 78, 36, 24, 16, VanillaRecipeCategoryUid.SMELTING,
VanillaRecipeCategoryUid.FUEL);
registry.addRecipeClickArea(GuiElectricFurnace.class, 78, 36, 24, 16, VanillaRecipeCategoryUid.SMELTING,
VanillaRecipeCategoryUid.FUEL);
registry.addRecipeClickArea(GuiRecycler.class, 78, 36, 24, 16, RecipeCategoryUids.RECYCLER);
registry.addRecipeClickArea(GuiElectricFurnace.class, 78, 36, 24, 16, VanillaRecipeCategoryUid.SMELTING);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.Compressor), RecipeCategoryUids.COMPRESSOR);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.AlloyFurnace), RecipeCategoryUids.ALLOY_SMELTER);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.AlloySmelter), RecipeCategoryUids.ALLOY_SMELTER);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.AssemblyMachine),
RecipeCategoryUids.ASSEMBLING_MACHINE);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.BlastFurnace), RecipeCategoryUids.BLAST_FURNACE);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.centrifuge), RecipeCategoryUids.CENTRIFUGE);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.ChemicalReactor),
RecipeCategoryUids.CHEMICAL_REACTOR);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.Extractor), RecipeCategoryUids.EXTRACTOR);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.FusionControlComputer),
RecipeCategoryUids.FUSION_REACTOR);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.Grinder), RecipeCategoryUids.GRINDER);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.ImplosionCompressor),
RecipeCategoryUids.IMPLOSION_COMPRESSOR);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.IndustrialElectrolyzer),
RecipeCategoryUids.INDUSTRIAL_ELECTROLYZER);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.IndustrialGrinder),
RecipeCategoryUids.INDUSTRIAL_GRINDER);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.industrialSawmill),
RecipeCategoryUids.INDUSTRIAL_SAWMILL);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.RollingMachine),
RecipeCategoryUids.ROLLING_MACHINE);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModItems.scrapBox), RecipeCategoryUids.SCRAPBOX);
IRecipeTransferRegistry recipeTransferRegistry = registry.getRecipeTransferRegistry();
recipeTransferRegistry.addRecipeTransferHandler(ContainerAlloyFurnace.class, RecipeCategoryUids.ALLOY_SMELTER,
0, 2, 4, 36);
recipeTransferRegistry.addRecipeTransferHandler(ContainerAlloySmelter.class, RecipeCategoryUids.ALLOY_SMELTER,
0, 2, 8, 36);
recipeTransferRegistry.addRecipeTransferHandler(ContainerAlloyFurnace.class, VanillaRecipeCategoryUid.FUEL, 3,
1, 4, 36);
recipeTransferRegistry.addRecipeTransferHandler(ContainerAssemblingMachine.class,
RecipeCategoryUids.ASSEMBLING_MACHINE, 0, 2, 8, 36);
recipeTransferRegistry.addRecipeTransferHandler(ContainerBlastFurnace.class, RecipeCategoryUids.BLAST_FURNACE,
0, 2, 4, 36);
recipeTransferRegistry.addRecipeTransferHandler(ContainerCentrifuge.class, RecipeCategoryUids.CENTRIFUGE, 0, 2,
11, 36);
recipeTransferRegistry.addRecipeTransferHandler(ContainerChemicalReactor.class,
RecipeCategoryUids.CHEMICAL_REACTOR, 0, 2, 8, 36);
recipeTransferRegistry.addRecipeTransferHandler(ContainerFusionReactor.class, RecipeCategoryUids.FUSION_REACTOR,
0, 2, 3, 36);
recipeTransferRegistry.addRecipeTransferHandler(ContainerIndustrialGrinder.class, RecipeCategoryUids.GRINDER, 0,
2, 6, 36);
recipeTransferRegistry.addRecipeTransferHandler(ContainerImplosionCompressor.class,
RecipeCategoryUids.IMPLOSION_COMPRESSOR, 0, 2, 4, 36);
recipeTransferRegistry
.addRecipeTransferHandler(ContainerAlloyFurnace.class, RecipeCategoryUids.ALLOY_SMELTER, 0, 2, 4, 36);
recipeTransferRegistry
.addRecipeTransferHandler(ContainerAlloySmelter.class, RecipeCategoryUids.ALLOY_SMELTER, 0, 2, 8, 36);
recipeTransferRegistry
.addRecipeTransferHandler(ContainerAlloyFurnace.class, VanillaRecipeCategoryUid.FUEL, 3, 1, 4, 36);
recipeTransferRegistry
.addRecipeTransferHandler(ContainerAssemblingMachine.class, RecipeCategoryUids.ASSEMBLING_MACHINE, 0, 2,
8, 36);
recipeTransferRegistry
.addRecipeTransferHandler(ContainerBlastFurnace.class, RecipeCategoryUids.BLAST_FURNACE, 0, 2, 4, 36);
recipeTransferRegistry
.addRecipeTransferHandler(ContainerCentrifuge.class, RecipeCategoryUids.CENTRIFUGE, 0, 2, 11, 36);
recipeTransferRegistry
.addRecipeTransferHandler(ContainerChemicalReactor.class, RecipeCategoryUids.CHEMICAL_REACTOR, 0, 2, 8,
36);
recipeTransferRegistry
.addRecipeTransferHandler(ContainerFusionReactor.class, RecipeCategoryUids.FUSION_REACTOR, 0, 2, 3, 36);
recipeTransferRegistry
.addRecipeTransferHandler(ContainerIndustrialGrinder.class, RecipeCategoryUids.GRINDER, 0, 2, 6, 36);
recipeTransferRegistry
.addRecipeTransferHandler(ContainerImplosionCompressor.class, RecipeCategoryUids.IMPLOSION_COMPRESSOR,
0, 2, 4, 36);
recipeTransferRegistry.addRecipeTransferHandler(ContainerIndustrialElectrolyzer.class,
RecipeCategoryUids.INDUSTRIAL_ELECTROLYZER, 0, 2, 7, 36);
recipeTransferRegistry.addRecipeTransferHandler(ContainerIndustrialSawmill.class,
RecipeCategoryUids.INDUSTRIAL_SAWMILL, 0, 2, 5, 36);
recipeTransferRegistry.addRecipeTransferHandler(ContainerRollingMachine.class,
RecipeCategoryUids.ROLLING_MACHINE, 0, 9, 11, 36);
recipeTransferRegistry.addRecipeTransferHandler(ContainerVacuumFreezer.class, RecipeCategoryUids.VACUUM_FREEZER,
0, 1, 2, 36);
recipeTransferRegistry.addRecipeTransferHandler(ContainerGrinder.class, RecipeCategoryUids.GRINDER, 0, 1, 2,
36);
recipeTransferRegistry.addRecipeTransferHandler(ContainerExtractor.class, RecipeCategoryUids.EXTRACTOR, 0, 1, 2,
36);
recipeTransferRegistry.addRecipeTransferHandler(ContainerCompressor.class, RecipeCategoryUids.COMPRESSOR, 0, 1,
2, 36);
recipeTransferRegistry
.addRecipeTransferHandler(ContainerIndustrialSawmill.class, RecipeCategoryUids.INDUSTRIAL_SAWMILL, 0, 2,
5, 36);
recipeTransferRegistry
.addRecipeTransferHandler(ContainerRollingMachine.class, RecipeCategoryUids.ROLLING_MACHINE, 0, 9, 11,
36);
recipeTransferRegistry
.addRecipeTransferHandler(ContainerVacuumFreezer.class, RecipeCategoryUids.VACUUM_FREEZER, 0, 1, 2, 36);
recipeTransferRegistry
.addRecipeTransferHandler(ContainerGrinder.class, RecipeCategoryUids.GRINDER, 0, 1, 2, 36);
recipeTransferRegistry
.addRecipeTransferHandler(ContainerExtractor.class, RecipeCategoryUids.EXTRACTOR, 0, 1, 2, 36);
recipeTransferRegistry
.addRecipeTransferHandler(ContainerCompressor.class, RecipeCategoryUids.COMPRESSOR, 0, 1, 2, 36);
}
}

View file

@ -1,65 +0,0 @@
package techreborn.compat.jei.recycler;
import javax.annotation.Nonnull;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
import mezz.jei.api.gui.IGuiItemStackGroup;
import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.recipe.BlankRecipeCategory;
import mezz.jei.api.recipe.IRecipeWrapper;
import net.minecraft.util.text.translation.I18n;
import techreborn.client.gui.GuiRecycler;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.jei.RecipeUtil;
public class RecyclerRecipeCategory extends BlankRecipeCategory
{
private static final int[] INPUT_SLOTS = { 0 };
private static final int[] OUTPUT_SLOTS = { 1 };
private final IDrawable background;
private final String title;
public RecyclerRecipeCategory(IGuiHelper guiHelper)
{
background = guiHelper.createDrawable(GuiRecycler.texture, 55, 30, 82, 26);
title = I18n.translateToLocal("tile.techreborn.recycler.name");
}
@Nonnull
@Override
public String getUid()
{
return RecipeCategoryUids.RECYCLER;
}
@Nonnull
@Override
public String getTitle()
{
return title;
}
@Nonnull
@Override
public IDrawable getBackground()
{
return background;
}
@Override
public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper)
{
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
guiItemStacks.init(INPUT_SLOTS[0], true, 0, 3);
guiItemStacks.init(OUTPUT_SLOTS[0], false, 60, 4);
if (recipeWrapper instanceof RecyclerRecipeWrapper)
{
RecyclerRecipeWrapper recipe = (RecyclerRecipeWrapper) recipeWrapper;
RecipeUtil.setRecipeItems(recipeLayout, recipe, INPUT_SLOTS, OUTPUT_SLOTS, null, null);
}
}
}

View file

@ -1,47 +0,0 @@
package techreborn.compat.jei.recycler;
import javax.annotation.Nonnull;
import mezz.jei.api.IJeiHelpers;
import mezz.jei.api.recipe.IRecipeHandler;
import mezz.jei.api.recipe.IRecipeWrapper;
import techreborn.api.recipe.RecyclerRecipe;
import techreborn.compat.jei.RecipeCategoryUids;
public class RecyclerRecipeHandler implements IRecipeHandler<RecyclerRecipe>
{
@Nonnull
private final IJeiHelpers jeiHelpers;
public RecyclerRecipeHandler(@Nonnull IJeiHelpers jeiHelpers)
{
this.jeiHelpers = jeiHelpers;
}
@Nonnull
@Override
public Class<RecyclerRecipe> getRecipeClass()
{
return RecyclerRecipe.class;
}
@Nonnull
@Override
public String getRecipeCategoryUid()
{
return RecipeCategoryUids.RECYCLER;
}
@Nonnull
@Override
public IRecipeWrapper getRecipeWrapper(@Nonnull RecyclerRecipe recipe)
{
return new RecyclerRecipeWrapper(jeiHelpers, recipe);
}
@Override
public boolean isRecipeValid(@Nonnull RecyclerRecipe recipe)
{
return true;
}
}

View file

@ -1,35 +0,0 @@
package techreborn.compat.jei.recycler;
import javax.annotation.Nonnull;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
import mezz.jei.api.gui.IDrawableAnimated;
import mezz.jei.api.gui.IDrawableStatic;
import net.minecraft.client.Minecraft;
import techreborn.api.recipe.RecyclerRecipe;
import techreborn.client.gui.GuiRecycler;
import techreborn.compat.jei.BaseRecipeWrapper;
public class RecyclerRecipeWrapper extends BaseRecipeWrapper<RecyclerRecipe>
{
private final IDrawableAnimated progress;
public RecyclerRecipeWrapper(@Nonnull IJeiHelpers jeiHelpers, @Nonnull RecyclerRecipe baseRecipe)
{
super(baseRecipe);
IGuiHelper guiHelper = jeiHelpers.getGuiHelper();
IDrawableStatic progressStatic = guiHelper.createDrawable(GuiRecycler.texture, 176, 14, 20, 11);
int ticksPerCycle = baseRecipe.tickTime();
this.progress = guiHelper.createAnimatedDrawable(progressStatic, ticksPerCycle,
IDrawableAnimated.StartDirection.LEFT, false);
}
@Override
public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight)
{
super.drawAnimations(minecraft, recipeWidth, recipeHeight);
progress.draw(minecraft, 25, 7);
}
}

View file

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

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,13 @@
package techreborn.init;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import techreborn.api.recipe.IRecipeCompact;
import techreborn.blocks.BlockMachineFrame;
import techreborn.items.*;
import techreborn.parts.ItemStandaloneCables;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
@ -7,17 +15,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import techreborn.api.recipe.IRecipeCompact;
import techreborn.blocks.BlockMachineFrame;
import techreborn.items.ItemCells;
import techreborn.items.ItemIngots;
import techreborn.items.ItemParts;
import techreborn.items.ItemPlates;
import techreborn.parts.ItemStandaloneCables;
public class RecipeCompact implements IRecipeCompact
{
@ -36,7 +33,7 @@ public class RecipeCompact implements IRecipeCompact
recipes.put("bronzeIngot", ItemIngots.getIngotByName("bronze"));
recipes.put("leadIngot", ItemIngots.getIngotByName("lead"));
recipes.put("silverIngot", ItemIngots.getIngotByName("silver"));
recipes.put("iridiumOre", ItemIngots.getIngotByName("Iridium"));
recipes.put("iridiumOre", ItemIngots.getIngotByName("iridium"));
recipes.put("plateiron", ItemPlates.getPlateByName("iron"));
recipes.put("iridiumPlate", ItemPlates.getPlateByName("iridium"));
recipes.put("cell", ItemCells.getCellByName("empty"));
@ -57,9 +54,9 @@ public class RecipeCompact implements IRecipeCompact
recipes.put("solarPanel", new ItemStack(ModBlocks.solarPanel));
recipes.put("waterCell", ItemCells.getCellByName("water"));
recipes.put("lavaCell", ItemCells.getCellByName("lava"));
recipes.put("pump", ItemParts.getPartByName("pump"));
recipes.put("teleporter", ItemParts.getPartByName("teleporter"));
recipes.put("advancedAlloy", ItemParts.getPartByName("advancedAlloy"));
recipes.put("pump", new ItemStack(ModItems.missingRecipe));
recipes.put("teleporter", new ItemStack(ModItems.missingRecipe));
recipes.put("advancedAlloy", ItemIngots.getIngotByName("advancedAlloy"));
recipes.put("lvTransformer", new ItemStack(ModBlocks.lvt));
recipes.put("mvTransformer", new ItemStack(ModBlocks.mvt));
recipes.put("hvTransformer", new ItemStack(ModBlocks.hvt));

View file

@ -12,7 +12,6 @@ import techreborn.items.ItemIngots;
import techreborn.items.ItemNuggets;
import techreborn.items.ItemParts;
import techreborn.items.ItemPlates;
import techreborn.items.ItemPurifiedCrushedOre;
import techreborn.items.ItemUpgrades;
/**
@ -104,16 +103,6 @@ public class SubItemRetriever implements ISubItemRetriever {
return ItemPlates.getPlateByName(name, count);
}
@Override
public ItemStack getPurifiedCrushedOreByName(String name) {
return ItemPurifiedCrushedOre.getPurifiedCrushedOreByName(name);
}
@Override
public ItemStack getPurifiedCrushedOreByName(String name, int count) {
return ItemPurifiedCrushedOre.getPurifiedCrushedOreByName(name, count);
}
@Override
public ItemStack getUpgradeByName(String name) {
return ItemUpgrades.getUpgradeByName(name);

View file

@ -0,0 +1,45 @@
package techreborn.items;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.world.World;
import reborncore.RebornCore;
import techreborn.Core;
import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTabMisc;
public class ItemDestructopack extends ItemTextureBase implements ITexturedItem
{
public ItemDestructopack()
{
setUnlocalizedName("techreborn.destructopack");
setCreativeTab(TechRebornCreativeTabMisc.instance);
RebornCore.jsonDestroyer.registerObject(this);
}
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack itemStack, World world, EntityPlayer player,
EnumHand hand)
{
player.openGui(Core.INSTANCE, GuiHandler.destructoPackID, world, (int) player.posX, (int) player.posY,
(int) player.posY);
return new ActionResult<>(EnumActionResult.SUCCESS, itemStack);
}
@Override
public int getMaxMeta()
{
return 1;
}
@Override
public String getTextureName(int arg0)
{
return "techreborn:items/misc/destructopack";
}
}

View file

@ -1,8 +1,5 @@
package techreborn.items;
import java.security.InvalidParameterException;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
@ -11,53 +8,64 @@ import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
public class ItemDusts extends ItemTextureBase {
public static final String[] types = new String[] { "almandine", "aluminumBrass", "aluminum", "alumite",
"andradite", "antimony", "ardite", "ashes", "basalt", "bauxite", "biotite", "brass", "bronze", "cadmium",
"calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "cobalt", "copper", "cupronickel", "darkAshes",
"darkIron", "diamond", "electrum", "emerald", "enderEye", "enderPearl", "endstone", "flint", "galena",
"gold", "graphite", "grossular", "indium", "invar", "iridium", "iron", "kanthal", "lapis", "lazurite",
"lead", "limestone", "lodestone", "magnesium", "magnetite", "manganese", "manyullyn", "marble", "mithril",
"netherrack", "nichrome", "nickel", "obsidian", "osmium", "peridot", "phosphorous", "platinum",
"potassiumFeldspar", "pyrite", "pyrope", "redGarnet", "redrock", "ruby", "saltpeter", "sapphire", "sawDust",
"silicon", "silver", "sodalite", "spessartine", "sphalerite", "steel", "sulfur", "tellurium", "teslatite",
"tetrahedrite", "tin", "titanium", "tungsten", "uvarovite", "vinteum", "voidstone", "yellowGarnet", "zinc",
import java.security.InvalidParameterException;
import java.util.List;
public class ItemDusts extends ItemTextureBase
{
public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt",
"bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper",
"darkAshes", "diamond", "electrum", "emerald", "enderEye", "enderPearl", "endstone", "flint", "galena",
"gold", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack",
"nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "redGarnet", "redrock",
"ruby", "saltpeter", "sapphire", "sawDust", "silver", "sodalite", "spessartine", "sphalerite", "steel",
"sulfur", "tin", "titanium", "tungsten", "uvarovite", "vinteum", "voidstone", "yellowGarnet", "zinc",
"olivine" };
public ItemDusts() {
public ItemDusts()
{
setUnlocalizedName("techreborn.dust");
setHasSubtypes(true);
setCreativeTab(TechRebornCreativeTabMisc.instance);
}
public static ItemStack getDustByName(String name, int count) {
for (int i = 0; i < types.length; i++) {
if (types[i].equalsIgnoreCase(name)) {
public static ItemStack getDustByName(String name, int count)
{
for (int i = 0; i < types.length; i++)
{
if (types[i].equalsIgnoreCase(name))
{
return new ItemStack(ModItems.dusts, count, i);
}
}
if (name.equalsIgnoreCase("glowstone")) {
if (name.equalsIgnoreCase("glowstone"))
{
return new ItemStack(Items.glowstone_dust, count);
}
if (name.equalsIgnoreCase("redstone")) {
if (name.equalsIgnoreCase("redstone"))
{
return new ItemStack(Items.redstone, count);
}
if (name.equalsIgnoreCase("gunpowder")) {
if (name.equalsIgnoreCase("gunpowder"))
{
return new ItemStack(Items.gunpowder, count);
}
throw new InvalidParameterException("The dust " + name + " could not be found.");
}
public static ItemStack getDustByName(String name) {
public static ItemStack getDustByName(String name)
{
return getDustByName(name, 1);
}
@Override
// gets Unlocalized Name depending on meta data
public String getUnlocalizedName(ItemStack itemStack) {
public String getUnlocalizedName(ItemStack itemStack)
{
int meta = itemStack.getItemDamage();
if (meta < 0 || meta >= types.length) {
if (meta < 0 || meta >= types.length)
{
meta = 0;
}
@ -65,19 +73,21 @@ public class ItemDusts extends ItemTextureBase {
}
// Adds Dusts SubItems To Creative Tab
public void getSubItems(Item item, CreativeTabs creativeTabs, List list) {
for (int meta = 0; meta < types.length; ++meta) {
public void getSubItems(Item item, CreativeTabs creativeTabs, List list)
{
for (int meta = 0; meta < types.length; ++meta)
{
list.add(new ItemStack(item, 1, meta));
}
}
@Override
public String getTextureName(int damage) {
@Override public String getTextureName(int damage)
{
return ModInfo.MOD_ID + ":items/dust/" + types[damage] + "Dust";
}
@Override
public int getMaxMeta() {
@Override public int getMaxMeta()
{
return types.length;
}

View file

@ -1,8 +1,5 @@
package techreborn.items;
import java.security.InvalidParameterException;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -10,20 +7,20 @@ import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException;
import java.util.List;
public class ItemDustsSmall extends ItemTextureBase
{
public static final String[] types = new String[] { "Almandine", "AluminumBrass", "Aluminum", "Alumite",
"Andradite", "Antimony", "Ardite", "Ashes", "Basalt", "Bauxite", "Biotite", "Brass", "Bronze", "Cadmium",
"Calcite", "Charcoal", "Chrome", "Cinnabar", "Clay", "Coal", "Cobalt", "Copper", "Cupronickel", "DarkAshes",
"DarkIron", "Diamond", "Electrum", "Emerald", "EnderEye", "EnderPearl", "Endstone", "Flint", "Glowstone",
"Gold", "Graphite", "Grossular", "Gunpowder", "Indium", "Invar", "Iridium", "Iron", "Kanthal", "Lapis",
"Lazurite", "Lead", "Limestone", "Lodestone", "Magnesium", "Magnetite", "Manganese", "Manyullyn", "Marble",
"Mithril", "Netherrack", "Nichrome", "Nickel", "Obsidian", "Osmium", "Peridot", "Phosphorous", "Platinum",
"PotassiumFeldspar", "Pyrite", "Pyrope", "RedGarnet", "Redrock", "Redstone", "Ruby", "Saltpeter",
"Sapphire", "Silicon", "Silver", "Sodalite", "Spessartine", "Sphalerite", "Steel", "Sulfur", "Tellurium",
"Teslatite", "Tetrahedrite", "Tin", "Titanium", "Tungsten", "Uvarovite", "Vinteum", "Voidstone",
"YellowGarnet", "Zinc", "Galena", "Olivine" };
public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt",
"bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper",
"darkAshes", "diamond", "electrum", "emerald", "enderEye", "enderPearl", "endstone", "flint", "galena",
"gold", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack",
"nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "redGarnet", "redrock",
"ruby", "saltpeter", "sapphire", "sawDust", "silver", "sodalite", "spessartine", "sphalerite", "steel",
"sulfur", "tin", "titanium", "tungsten", "uvarovite", "vinteum", "voidstone", "yellowGarnet", "zinc",
"olivine", "redstone", "glowstone" };
public ItemDustsSmall()
{

View file

@ -1,8 +1,5 @@
package techreborn.items;
import java.security.InvalidParameterException;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -10,12 +7,15 @@ import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException;
import java.util.List;
public class ItemIngots extends ItemTextureBase
{
public static final String[] types = new String[] { "aluminum", "antimony", "batteryAlloy", "redAlloy", "blueAlloy",
"brass", "bronze", "cadmium", "chrome", "copper", "cupronickel", "electrum", "indium", "invar", "iridium",
"kanthal", "lead", "lodestone", "magnalium", "nichrome", "nickel", "osmium", "platinum", "silver", "steel",
"tellurium", "tin", "titanium", "tungsten", "hotTungstensteel", "tungstensteel", "zinc", "refinedIron" };
public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum",
"invar", "iridium", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium", "tungsten",
"hotTungstensteel", "tungstensteel", "zinc", "refinedIron", "advancedAlloy", "mixedMetal",
"iridiumAlloy" };
public ItemIngots()
{
@ -63,14 +63,12 @@ public class ItemIngots extends ItemTextureBase
}
}
@Override
public String getTextureName(int damage)
@Override public String getTextureName(int damage)
{
return ModInfo.MOD_ID + ":items/ingot/" + types[damage] + "Ingot";
}
@Override
public int getMaxMeta()
@Override public int getMaxMeta()
{
return types.length;
}

View file

@ -1,10 +1,25 @@
package techreborn.items;
import net.minecraft.item.Item;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import techreborn.client.TechRebornCreativeTabMisc;
/**
* Created by modmuss50 on 19/02/2016.
*/
public class ItemMissingRecipe extends Item
public class ItemMissingRecipe extends ItemTextureBase implements ITexturedItem
{
public ItemMissingRecipe()
{
setCreativeTab(TechRebornCreativeTabMisc.instance);
setUnlocalizedName("techreborn.missingrecipe");
}
@Override
public String getTextureName(int damage)
{
return "techreborn:items/misc/missing_recipe";
}
@Override
public int getMaxMeta()
{
return 1;
}
}

View file

@ -1,8 +1,5 @@
package techreborn.items;
import java.security.InvalidParameterException;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -10,12 +7,16 @@ import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException;
import java.util.List;
public class ItemNuggets extends ItemTextureBase
{
public static final String[] types = new String[] { "aluminum", "antimony", "brass", "bronze", "chrome", "copper",
"electrum", "invar", "iridium", "iron", "lead", "nickel", "osmium", "platinum", "silver", "steel", "tin",
"titanium", "tungsten", "zinc" };
public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum",
"invar", "iridium", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium", "tungsten",
"hotTungstensteel", "tungstensteel", "zinc", "refinedIron", "advancedAlloy", "mixedmetalingot",
"iridiumAlloyIngot", "iron", "diamond" };
public ItemNuggets()
{
@ -63,14 +64,12 @@ public class ItemNuggets extends ItemTextureBase
}
}
@Override
public String getTextureName(int damage)
@Override public String getTextureName(int damage)
{
return ModInfo.MOD_ID + ":items/nuggets/" + types[damage] + "Nugget";
}
@Override
public int getMaxMeta()
@Override public int getMaxMeta()
{
return types.length;
}

View file

@ -1,8 +1,5 @@
package techreborn.items;
import java.security.InvalidParameterException;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@ -14,43 +11,51 @@ import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
public class ItemParts extends ItemTextureBase {
public static final String[] types = new String[] { "advancedCircuitParts", "basicCircuitBoard",
"advancedCircuitBoard", "processorCircuitBoard", "energyFlowCircuit", "dataControlCircuit", "dataOrb",
"dataStorageCircuit", "diamondGrindingHead", "diamondSawBlade", "tungstenGrindingHead",
"heliumCoolantSimple", "HeliumCoolantTriple", "HeliumCoolantSix", "NaKCoolantSimple", "NaKCoolantTriple",
"NaKCoolantSix", "cupronickelHeatingCoil", "nichromeHeatingCoil", "kanthalHeatingCoil", "laserFocus",
"ductTape", "lazuriteChunk", "iridiumAlloyIngot", "rockCutterBlade", "superConductor", "thoriumCell",
"doubleThoriumCell", "quadThoriumCell", "plutoniumCell", "doublePlutoniumCell", "quadPlutoniumCell",
"destructoPack", "iridiumNeutronReflector", "massHoleDevice", "computerMonitor", "machineParts",
"thickNeutronReflector", "neutronReflector", "electronicCircuit", "advancedCircuit", "rubberSap", "rubber",
"scrap", "pump", "teleporter", "advancedAlloy", "mixedmetalingot", "carbonmesh", "carbonfiber", "dogecoin",
"CoolantSimple", "CoolantTriple", "CoolantSix" };
import java.security.InvalidParameterException;
import java.util.List;
public ItemParts() {
public class ItemParts extends ItemTextureBase
{
public static final String[] types = new String[] { "energyFlowCircuit", "dataControlCircuit", "dataStorageCircuit",
"dataOrb", "diamondGrindingHead", "diamondSawBlade", "wolframiumGrindingHead", "heliumCoolantSimple",
"heliumCoolantTriple", "heliumCoolantSix", "NaKCoolantSimple", "NaKCoolantTriple", "NaKCoolantSix",
"cupronickelHeatingCoil", "nichromeHeatingCoil", "kanthalHeatingCoil", "lazuriteChunk", "superConductor",
"thoriumCell", "doubleThoriumCell", "quadThoriumCell", "plutoniumCell", "doublePlutoniumCell",
"quadPlutoniumCell", "computerMonitor", "machineParts", "neutronReflector", "iridiumNeutronReflector",
"thickNeutronReflector", "electronicCircuit", "advancedCircuit", "rubberSap", "rubber", "scrap",
"carbonmesh", "carbonfiber", "coolantSimple", "coolantTriple", "coolantSix" };
public ItemParts()
{
setCreativeTab(TechRebornCreativeTab.instance);
setHasSubtypes(true);
setUnlocalizedName("techreborn.part");
}
public static ItemStack getPartByName(String name, int count) {
for (int i = 0; i < types.length; i++) {
if (types[i].equalsIgnoreCase(name)) {
public static ItemStack getPartByName(String name, int count)
{
for (int i = 0; i < types.length; i++)
{
if (types[i].equalsIgnoreCase(name))
{
return new ItemStack(ModItems.parts, count, i);
}
}
throw new InvalidParameterException("The part " + name + " could not be found.");
}
public static ItemStack getPartByName(String name) {
public static ItemStack getPartByName(String name)
{
return getPartByName(name, 1);
}
@Override
// gets Unlocalized Name depending on meta data
public String getUnlocalizedName(ItemStack itemStack) {
public String getUnlocalizedName(ItemStack itemStack)
{
int meta = itemStack.getItemDamage();
if (meta < 0 || meta >= types.length) {
if (meta < 0 || meta >= types.length)
{
meta = 0;
}
@ -58,14 +63,18 @@ public class ItemParts extends ItemTextureBase {
}
// Adds Dusts SubItems To Creative Tab
public void getSubItems(Item item, CreativeTabs creativeTabs, List list) {
for (int meta = 0; meta < types.length; ++meta) {
public void getSubItems(Item item, CreativeTabs creativeTabs, List list)
{
for (int meta = 0; meta < types.length; ++meta)
{
list.add(new ItemStack(item, 1, meta));
}
}
public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) {
switch (itemStack.getItemDamage()) {
public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player)
{
switch (itemStack.getItemDamage())
{
case 37: // Destructo pack
player.openGui(Core.INSTANCE, GuiHandler.destructoPackID, world, (int) player.posX, (int) player.posY,
(int) player.posY);
@ -74,13 +83,13 @@ public class ItemParts extends ItemTextureBase {
return itemStack;
}
@Override
public String getTextureName(int damage) {
@Override public String getTextureName(int damage)
{
return ModInfo.MOD_ID + ":items/part/" + types[damage];
}
@Override
public int getMaxMeta() {
@Override public int getMaxMeta()
{
return types.length;
}
}

View file

@ -1,8 +1,5 @@
package techreborn.items;
import java.security.InvalidParameterException;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -10,14 +7,16 @@ import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException;
import java.util.List;
public class ItemPlates extends ItemTextureBase
{
public static final String[] types = new String[] { "aluminum", "batteryAlloy", "brass", "bronze", "carbon",
"chrome", "coal", "copper", "diamond", "electrum", "emerald", "gold", "invar", "iridium", "iron", "lapis",
"lead", "magnalium", "nickel", "obsidian", "osmium", "peridot", "platinum", "redGarnet", "redstone", "ruby",
"sapphire", "silicon", "silver", "steel", "teslatite", "tin", "titanium", "tungsten", "tungstensteel",
"yellowGarnet", "zinc" };
public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum",
"invar", "iridium", "iron", "gold", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium",
"tungsten", "hotTungstensteel", "tungstensteel", "zinc", "refinedIron", "carbon", "wood", "magnalium",
"silicon", "ruby", "sapphire", "peridot", "redGarnet", "yellowGarnet", "redstone", "diamond", "emerald", "lapis", "coal", "obsidian" };
public ItemPlates()
{
@ -65,14 +64,12 @@ public class ItemPlates extends ItemTextureBase
}
}
@Override
public String getTextureName(int damage)
@Override public String getTextureName(int damage)
{
return ModInfo.MOD_ID + ":items/plate/" + types[damage] + "Plate";
}
@Override
public int getMaxMeta()
@Override public int getMaxMeta()
{
return types.length;
}

View file

@ -1,78 +0,0 @@
package techreborn.items;
import java.security.InvalidParameterException;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
public class ItemPurifiedCrushedOre extends ItemTextureBase
{
public static final String[] types = new String[] { "Aluminum", "Ardite", "Bauxite", "Cadmium", "Cinnabar",
"Cobalt", "DarkIron", "Indium", "Iridium", "Nickel", "Osmium", "Platinum", "Pyrite", "Sphalerite",
"Tetrahedrite", "Tungsten", "Galena" };
public ItemPurifiedCrushedOre()
{
setCreativeTab(TechRebornCreativeTabMisc.instance);
setHasSubtypes(true);
setUnlocalizedName("techreborn.purifiedcrushedore");
}
public static ItemStack getPurifiedCrushedOreByName(String name, int count)
{
for (int i = 0; i < types.length; i++)
{
if (types[i].equalsIgnoreCase(name))
{
return new ItemStack(ModItems.purifiedCrushedOre, count, i);
}
}
throw new InvalidParameterException("The crushed ore " + name + " could not be found.");
}
public static ItemStack getPurifiedCrushedOreByName(String name)
{
return getPurifiedCrushedOreByName(name, 1);
}
@Override
// gets Unlocalized Name depending on meta data
public String getUnlocalizedName(ItemStack itemStack)
{
int meta = itemStack.getItemDamage();
if (meta < 0 || meta >= types.length)
{
meta = 0;
}
return super.getUnlocalizedName() + "." + types[meta];
}
// Adds Dusts SubItems To Creative Tab
public void getSubItems(Item item, CreativeTabs creativeTabs, List list)
{
for (int meta = 0; meta < types.length; ++meta)
{
list.add(new ItemStack(item, 1, meta));
}
}
@Override
public String getTextureName(int damage)
{
return ModInfo.MOD_ID + ":items/purifiedCrushedOre/purifiedCrushed" + types[damage] + "Ore";
}
@Override
public int getMaxMeta()
{
return types.length;
}
}

View file

@ -1,11 +1,8 @@
package techreborn.world;
import java.io.*;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
@ -22,9 +19,11 @@ import techreborn.init.ModBlocks;
import techreborn.world.config.OreConfig;
import techreborn.world.config.WorldGenConfig;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import java.io.*;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
/**
* Created by modmuss50 on 11/03/2016.
@ -52,10 +51,6 @@ public class TechRebornWorldGen implements IWorldGenerator
defaultConfig.overworldOres.add(new OreConfig(ModBlocks.ore.getBlockStateFromName("Ruby"), 6, 3, 10, 60));
defaultConfig.overworldOres.add(new OreConfig(ModBlocks.ore.getBlockStateFromName("Sapphire"), 6, 3, 10, 60));
defaultConfig.overworldOres.add(new OreConfig(ModBlocks.ore.getBlockStateFromName("Bauxite"), 6, 10, 10, 60));
defaultConfig.overworldOres
.add(new OreConfig(ModBlocks.ore.getBlockStateFromName("Tetrahedrite"), 6, 16, 10, 60));
defaultConfig.overworldOres
.add(new OreConfig(ModBlocks.ore.getBlockStateFromName("Cassiterite"), 6, 16, 20, 60));
defaultConfig.overworldOres.add(new OreConfig(ModBlocks.ore.getBlockStateFromName("Lead"), 6, 16, 20, 60));
defaultConfig.overworldOres.add(new OreConfig(ModBlocks.ore.getBlockStateFromName("Silver"), 6, 16, 20, 60));
defaultConfig.overworldOres.add(new OreConfig(ModBlocks.ore.getBlockStateFromName("copper"), 8, 16, 20, 60));

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 241 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 241 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1,004 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1,015 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 546 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 971 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 163 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 228 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 184 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 238 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 238 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 439 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 228 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 228 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 196 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 252 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 459 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 604 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 709 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 526 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 190 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 203 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 192 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 160 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 516 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 536 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 894 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 197 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 517 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 843 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 443 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 224 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 390 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 386 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 376 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 390 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 393 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 383 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 381 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 383 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 388 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 376 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 394 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 379 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 394 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 388 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 390 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 390 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 383 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 678 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 669 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 210 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 909 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 210 B

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