diff --git a/build.gradle b/build.gradle index 505d40ab..3c3d4aef 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ file "build.properties" withReader { } version = "${config.gt.version}" -group= "gregtech" +group = "gregtech" archivesBaseName = "gregtech" minecraft { @@ -50,25 +50,9 @@ repositories { maven { //JEI url "http://dvs1.progwml6.com/files/maven/" } - ivy { - name 'WorldControl' - artifactPattern "http://addons-origin.cursecdn.com/files/${config.worldcontrol.cf}/[module]-[revision].[ext]" - } - ivy { - name 'Railcraft' - artifactPattern "http://addons-origin.cursecdn.com/files/${config.railcraft.cf}/[module]_[revision].[ext]" - } - ivy { - name 'CoFHCore' - artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofh.cf}/[module]-[revision].[ext]" - } - ivy { - name "EnderCore" - artifactPattern "https://addons-origin.cursecdn.com/files/${config.endercore.cf}/[module]-[revision].[ext]" - } - ivy { - name "EnderIO" - artifactPattern "https://addons-origin.cursecdn.com/files/${config.enderio.cf}/[module]-[revision].[ext]" + maven { + name = "CurseForge" + url = "https://minecraft.curseforge.com/api/maven/" } } @@ -76,9 +60,9 @@ dependencies { compile "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:deobf" deobfCompile "net.industrial-craft:industrialcraft-2:${config.ic2.version}" deobfCompile "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}" - deobfCompile "mezz.jei:jei_${config.minecraft.version}:+" + deobfCompile "mezz.jei:jei_${config.minecraft.version}:${config.jei.version}" + compile files('libs/Railcraft_1.10.2-10.2.0-dev.jar') // deobfCompile name: 'worldcontrol', version: config.worldcontrol.version, ext: 'jar' - deobfCompile name: 'Railcraft', version: "${config.minecraft.version}-${config.railcraft.version}", ext: 'jar' // deobfCompile name: 'CoFHCore', version: "${config.minecraft.version}-${config.cofh.version}", ext: 'jar' // deobfCompile name: 'EnderCore', version: "${config.minecraft.version}-${config.endercore.version}", ext: 'jar' // deobfCompile name: 'EnderIO', version: "${config.minecraft.version}-${config.enderio.version}", ext: 'jar' diff --git a/build.properties b/build.properties index a2f10339..50ec5606 100644 --- a/build.properties +++ b/build.properties @@ -1,18 +1,18 @@ minecraft.version=1.10.2 -forge.version=12.18.3.2185 +forge.version=12.18.3.2422 gt.version=5.10.90 -forestry.version=5.2.7.220 -ic2.version=2.6.167-ex110 -jei.version=3.7.10.237 +forestry.version=5.2.17.388 +ic2.version=2.6.254-ex110 +jei.version=3.14.7.419 codechickenlib.version=2.4.3.162 worldcontrol.cf=2407/481 worldcontrol.version=1.0.1a railcraft.cf=2419/257 -railcraft.version=10.1.2 +railcraft.version=10.2.0 cofh.cf=2434/463 cofh.version=4.1.3.5-universal diff --git a/libs/Railcraft_1.10.2-10.2.0-dev.jar b/libs/Railcraft_1.10.2-10.2.0-dev.jar new file mode 100644 index 00000000..1511dd37 Binary files /dev/null and b/libs/Railcraft_1.10.2-10.2.0-dev.jar differ diff --git a/src/main/java/gregtech/GregTechMod.java b/src/main/java/gregtech/GregTechMod.java index 62460bff..075854fb 100644 --- a/src/main/java/gregtech/GregTechMod.java +++ b/src/main/java/gregtech/GregTechMod.java @@ -8,14 +8,16 @@ import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.type.Material; import gregtech.api.util.GTLog; import gregtech.common.CommonProxy; +import gregtech.common.items.MetaItems; import gregtech.loaders.load.FuelLoader; //import gregtech.loaders.postload.BlockResistanceLoader; //import gregtech.loaders.postload.CraftingRecipeLoader; //import gregtech.loaders.postload.DungeonLootLoader; //import gregtech.loaders.postload.MachineRecipeLoader; //import gregtech.loaders.postload.ScrapboxRecipeLoader; -import gregtech.loaders.preload.GT_Loader_Item_Block_And_Fluid; -import gregtech.loaders.preload.GT_Loader_MetaTileEntities; +import gregtech.loaders.preload.ItemBlockFluidLoader; +import gregtech.loaders.preload.MTELoader; +import gregtech.loaders.preload.OreProcessingLoader; import ic2.api.recipe.IMachineRecipeManager; import ic2.api.recipe.RecipeOutput; import net.minecraft.init.Items; @@ -58,10 +60,10 @@ public class GregTechMod { @Mod.EventHandler public void onPreInit(FMLPreInitializationEvent event) { - GTLog.logger.info("PreInit-Phase started!"); - GTLog.init(event.getModLog(), event.getModConfigurationDirectory().getParentFile()); + GTLog.logger.info("PreInit-Phase started!"); + NetworkHandler.init(); EnchantmentEnderDamage.INSTANCE.register(); @@ -79,11 +81,10 @@ public class GregTechMod { gregtechproxy.onPreLoad(); - Material.init(); OreDictUnifier.init(); - new GT_Loader_Item_Block_And_Fluid().run(); - new GT_Loader_MetaTileEntities().run(); + new ItemBlockFluidLoader().run(); + new MTELoader().run(); // if (gregtechproxy.mSortToTheEnd) { // try { @@ -112,9 +113,7 @@ public class GregTechMod { // } // } - if (RecipeMap.foundInvalidRecipe) { - throw new LoaderException("Found at least one invalid recipe. Please read the log above for more details."); - } + Material.init(); // try { // for (Runnable tRunnable : GregTechAPI.sAfterGTPreload) { @@ -135,7 +134,18 @@ public class GregTechMod { // new BeeLoader(); +// MetaItems.META_ITEM_FIRST.registerRecipes(); +// MetaItems.META_ITEM_SECOND.registerRecipes(); +// MetaItems.META_TOOL.registerRecipes(); + +// new OreProcessingLoader().run(); + gregtechproxy.onLoad(); + + if (RecipeMap.foundInvalidRecipe) { + throw new LoaderException("Found at least one invalid recipe. Please read the log above for more details."); + } + // if (gregtechproxy.mSortToTheEnd) { // gregtechproxy.registerUnificationEntries(); // new FuelLoader().run(); @@ -162,7 +172,7 @@ public class GregTechMod { // gregtechproxy.registerUnificationEntries(); // } else { // gregtechproxy.registerUnificationEntries(); - new FuelLoader().run(); +// new FuelLoader().run(); // } // new DungeonLootLoader().run(); diff --git a/src/main/java/gregtech/api/enchants/EnchantmentRadioactivity.java b/src/main/java/gregtech/api/enchants/EnchantmentRadioactivity.java index 90bc711f..2a4b07e0 100644 --- a/src/main/java/gregtech/api/enchants/EnchantmentRadioactivity.java +++ b/src/main/java/gregtech/api/enchants/EnchantmentRadioactivity.java @@ -18,7 +18,7 @@ public class EnchantmentRadioactivity extends EnchantmentDamage { } public void register() { - GameRegistry.register(this, new ResourceLocation(GTValues.MODID, "disjunction")); + GameRegistry.register(this, new ResourceLocation(GTValues.MODID, "radioactivity")); } @Override diff --git a/src/main/java/gregtech/api/items/materialitem/MaterialMetaItem.java b/src/main/java/gregtech/api/items/materialitem/MaterialMetaItem.java index ef534a4f..8029b35b 100644 --- a/src/main/java/gregtech/api/items/materialitem/MaterialMetaItem.java +++ b/src/main/java/gregtech/api/items/materialitem/MaterialMetaItem.java @@ -40,6 +40,23 @@ public class MaterialMetaItem extends StandardMetaItem { if(orePrefix != null && canGenerate(orePrefix, material)) { short metadata = (short) (j * 1000 + i); generatedItems.add(metadata); + } + } + } + } + } + + @Override + public void registerItem(String registryName) { + super.registerItem(registryName); + + for(Material material : Material.MATERIAL_REGISTRY.getObjectsWithIds()) { + if(!(material instanceof MarkerMaterial)) { + int i = Material.MATERIAL_REGISTRY.getIDForObject(material); + for(int j = 0; j < orePrefixes.length; j++) { + OrePrefix orePrefix = orePrefixes[j]; + if(orePrefix != null && canGenerate(orePrefix, material)) { + short metadata = (short) (j * 1000 + i); OreDictUnifier.registerOre(new ItemStack(this, 1, metadata), orePrefix, material); } } diff --git a/src/main/java/gregtech/api/items/metaitem/FoodStats.java b/src/main/java/gregtech/api/items/metaitem/FoodStats.java index b397f48f..b665e475 100644 --- a/src/main/java/gregtech/api/items/metaitem/FoodStats.java +++ b/src/main/java/gregtech/api/items/metaitem/FoodStats.java @@ -26,14 +26,16 @@ public class FoodStats implements IFoodStats { public final RandomPotionEffect[] potionEffects; @Nullable - public final ItemStack containerItem; + public ItemStack containerItem; public FoodStats(int foodLevel, float saturation, boolean isDrink, boolean alwaysEdible, ItemStack containerItem, RandomPotionEffect... potionEffects) { this.foodLevel = foodLevel; this.saturation = saturation; this.isDrink = isDrink; this.alwaysEdible = alwaysEdible; - this.containerItem = containerItem.copy(); + if (containerItem != null) { + this.containerItem = containerItem.copy(); + } this.potionEffects = potionEffects; } @@ -81,7 +83,7 @@ public class FoodStats implements IFoodStats { for (int i = 0; i < potionEffects.length; i++) { effects[i] = potionEffects[i].effect; } - GTUtility.addPotionTooltip(Iterables.cycle(effects), lines); +// GTUtility.addPotionTooltip(Iterables.cycle(effects), lines); } } diff --git a/src/main/java/gregtech/api/items/metaitem/MetaItem.java b/src/main/java/gregtech/api/items/metaitem/MetaItem.java index d25aa0f1..4ee33c3e 100644 --- a/src/main/java/gregtech/api/items/metaitem/MetaItem.java +++ b/src/main/java/gregtech/api/items/metaitem/MetaItem.java @@ -104,7 +104,11 @@ public abstract class MetaItem.MetaValueItem> extends Item if(metaValueItem == null) { return ElectricStats.EMPTY; } - return metaValueItem.getElectricStats(); + IElectricStats electricStats = metaValueItem.getElectricStats(); + if (electricStats == null) { + return ElectricStats.EMPTY; + } + return electricStats; } @Override @@ -121,7 +125,11 @@ public abstract class MetaItem.MetaValueItem> extends Item if(metaValueItem == null) { return FluidStats.EMPTY; } - return metaValueItem.getFluidStats(); + IFluidStats fluidStats = metaValueItem.getFluidStats(); + if (fluidStats == null) { + return FluidStats.EMPTY; + } + return fluidStats; } @Override @@ -424,29 +432,32 @@ public abstract class MetaItem.MetaValueItem> extends Item public void addInformation(ItemStack itemStack, EntityPlayer player, List lines, boolean showAdditionalInfo) { super.addInformation(itemStack, player, lines, showAdditionalInfo); - String unlocalizedTooltip = "metaitem." + getItem(itemStack).unlocalizedName + ".tooltip"; - if (I18n.hasKey(unlocalizedTooltip)) { - lines.add(I18n.format(unlocalizedTooltip)); - } + T item = getItem(itemStack); + if (item != null) { + String unlocalizedTooltip = "metaitem." + item.unlocalizedName + ".tooltip"; + if (I18n.hasKey(unlocalizedTooltip)) { + lines.add(I18n.format(unlocalizedTooltip)); + } - IElectricStats electricStats = getManager(itemStack); - if(electricStats.getMaxCharge(itemStack) > 0) { - lines.add(I18n.format("metaitem.generic.electric_item.tooltip", + IElectricStats electricStats = getManager(itemStack); + if (electricStats.getMaxCharge(itemStack) > 0) { + lines.add(I18n.format("metaitem.generic.electric_item.tooltip", (long) electricStats.getCharge(itemStack), (long) electricStats.getMaxCharge(itemStack), GTValues.V[electricStats.getTier(itemStack)])); - } - if(getCapacity(itemStack) > 0) { - FluidStack fluid = getFluid(itemStack); - if(fluid != null) { - lines.add(I18n.format("metaitem.generic.fluid_container.tooltip", + } + if (getCapacity(itemStack) > 0) { + FluidStack fluid = getFluid(itemStack); + if (fluid != null) { + lines.add(I18n.format("metaitem.generic.fluid_container.tooltip", fluid.amount, getCapacity(itemStack), fluid.getLocalizedName())); - } else lines.add(I18n.format("metaitem.generic.fluid_container.tooltip_empty")); - } - for(IItemBehaviour behaviour : getBehaviours(itemStack)) { - behaviour.addInformation(itemStack, lines); + } else lines.add(I18n.format("metaitem.generic.fluid_container.tooltip_empty")); + } + for (IItemBehaviour behaviour : getBehaviours(itemStack)) { + behaviour.addInformation(itemStack, lines); + } } } @@ -494,11 +505,16 @@ public abstract class MetaItem.MetaValueItem> extends Item //Parameters can be either localized or not protected final String[] nameParameters; + @Nullable private IElectricStats electricStats; + @Nullable private IFluidStats fluidStats; + @Nullable private INuclearStats nuclearStats; private List behaviours = new ArrayList<>(); + @Nullable private IItemUseManager useManager; + @Nullable private IItemDurabilityManager durabilityManager; private int burnValue = 0; private boolean visible = true; diff --git a/src/main/java/gregtech/api/items/toolitem/ToolMetaItem.java b/src/main/java/gregtech/api/items/toolitem/ToolMetaItem.java index 7caaa5e2..cf35d6cd 100644 --- a/src/main/java/gregtech/api/items/toolitem/ToolMetaItem.java +++ b/src/main/java/gregtech/api/items/toolitem/ToolMetaItem.java @@ -145,6 +145,9 @@ public class ToolMetaItem.MetaToolValueItem> extends M T metaValueItem = getItem(stack); if(metaValueItem != null && slot == EntityEquipmentSlot.MAINHAND) { IToolStats toolStats = metaValueItem.getToolStats(); + if (toolStats == null) { + return HashMultimap.create(); + } float attackDamage = toolStats.getBaseDamage(stack); float attackSpeed = toolStats.getAttackSpeed(stack); @@ -315,7 +318,7 @@ public class ToolMetaItem.MetaToolValueItem> extends M } public final ItemStack getStackForm(Material primaryMaterial, Material handleMaterial, int amount) { - ItemStack stack = getStackForm(amount); + ItemStack stack = new ItemStack(ToolMetaItem.this, amount, metaItemOffset + metaValue); T metaToolValueItem = getItem(stack); if (metaToolValueItem != null) { diff --git a/src/main/java/gregtech/api/metatileentity/IMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/IMetaTileEntity.java index 06f684b4..bd3f9893 100644 --- a/src/main/java/gregtech/api/metatileentity/IMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/IMetaTileEntity.java @@ -113,7 +113,7 @@ public interface IMetaTileEntity extends ITurnable, IRedstoneReceiver, IRedstone * @param player player who opens GUI * @return instance of ModularUI for this MetaTileEntity */ - ModularUI createUI(EntityPlayer player); + ModularUI createUI(EntityPlayer player); int[] getSlotsForFace(EnumFacing face); //side == null - internal inventory change diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java index 0c35a21d..ab0031a8 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java @@ -330,29 +330,11 @@ public abstract class MetaTileEntity implements IMetaTileEntity { holder.markDirty(); } - @Override - public boolean onRightClick(EntityPlayer player, EnumFacing side, float clickX, float clickY, float clickZ) { - return false; - } - @Override public void onLeftClick(EntityPlayer player) { } - @Override - public void onScrewdriverRightClick(EnumFacing side, EntityPlayer player, float clickX, float clickY, float clickZ) { - } - - @Override - public boolean onWrenchRightClick(EnumFacing side, EnumFacing wrenchingSide, EntityPlayer player, float clickX, float clickY, float clickZ) { - if(isValidFacing(wrenchingSide)) { - setFrontFacing(wrenchingSide); - return true; - } - return false; - } - @Override public void onFirstTick() { } @@ -373,31 +355,11 @@ public abstract class MetaTileEntity implements IMetaTileEntity { public void onRemoval() { } - @Override - public Container getServerGUI(int ID, InventoryPlayer playerInventory) { - return null; - } - - @Override - public GuiContainer getClientGUI(int ID, InventoryPlayer playerInventory) { - return null; - } - @Override public boolean isAccessAllowed(EntityPlayer player) { return true; //default - to be overridden } - @Override - public int getComparatorValue(EnumFacing side) { - return 0; - } - - @Override - public float getExplosionResistance(EnumFacing side) { - return 2.0f; - } - @Override public void onEntityCollidedWithBlock(Entity collider) { } @@ -467,17 +429,12 @@ public abstract class MetaTileEntity implements IMetaTileEntity { } } - @Override - public void onExplosion() { -// NO OP - } - @Override public void doExplosion(long strength) { BlockPos pos = holder.getWorldPos(); World world = holder.getWorldObj(); GTUtility.playSound(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, GregTechAPI.soundList.get(209), SoundCategory.BLOCKS, 1.0f, 1.0f); -// if (GregTechAPI.sMachineExplosions) { +// if (GregTechAPI.sMachineExplosions) { // TODO CONFIG world.createExplosion(null, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, strength, true); // } } diff --git a/src/main/java/gregtech/api/recipes/ModHandler.java b/src/main/java/gregtech/api/recipes/ModHandler.java index 718bc4b2..a4223694 100644 --- a/src/main/java/gregtech/api/recipes/ModHandler.java +++ b/src/main/java/gregtech/api/recipes/ModHandler.java @@ -46,6 +46,7 @@ import net.minecraftforge.fml.common.event.FMLInterModComms; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; import org.apache.commons.lang3.Validate; import javax.annotation.Nullable; @@ -378,7 +379,7 @@ public class ModHandler { */ public static void addShapelessRecipe(ItemStack result, Object... recipe) { result = OreDictUnifier.getUnificated(result); - Validate.notNull(result, "Result cannot be null"); + if (result == null) return; Validate.notNull(recipe, "Recipe cannot be null"); Validate.isTrue(recipe.length > 0, "Recipe cannot be empty"); Validate.noNullElements(recipe, "Recipe cannot contain null elements"); @@ -399,7 +400,7 @@ public class ModHandler { } } - GameRegistry.addRecipe(new ShapedOreRecipe(result.copy(), recipe)); + GameRegistry.addRecipe(new ShapelessOreRecipe(result.copy(), recipe)); } /////////////////////////////////////////////////// diff --git a/src/main/java/gregtech/api/recipes/RecipeBuilder.java b/src/main/java/gregtech/api/recipes/RecipeBuilder.java index c30c73a4..afd42dd4 100644 --- a/src/main/java/gregtech/api/recipes/RecipeBuilder.java +++ b/src/main/java/gregtech/api/recipes/RecipeBuilder.java @@ -128,7 +128,7 @@ public abstract class RecipeBuilder outputs) { outputs = new ArrayList<>(outputs); - if(outputs.contains(null)) outputs.remove(null); + if(outputs.contains(null)) outputs.removeIf(Objects::isNull); this.outputs.addAll(outputs); return getThis(); } @@ -153,7 +153,7 @@ public abstract class RecipeBuilder outputs) { outputs = new ArrayList<>(outputs); - if(outputs.contains(null)) outputs.remove(null); + if(outputs.contains(null)) outputs.removeIf(Objects::isNull); this.fluidOutputs.addAll(outputs); return getThis(); } @@ -239,12 +239,17 @@ public abstract class RecipeBuilder newMap = new TObjectIntHashMap<>(); - TObjectIntIterator iterator = chancedOutputs.iterator(); - while (iterator.hasNext()) { - newMap.put(OreDictUnifier.getUnificated(iterator.key()), iterator.value()); - } - chancedOutputs = newMap; + ItemStack[] keys = chancedOutputs.keys(new ItemStack[0]); + int[] values = chancedOutputs.values(); + + for (int i = 0; i < keys.length; i++) { + keys[i] = OreDictUnifier.getUnificated(keys[i]); + } + + chancedOutputs = new TObjectIntHashMap<>(); + for (int i = 0; i < keys.length; i++) { + chancedOutputs.put(keys[i], values[i]); + } } for (ItemStack stack : inputs) { @@ -297,21 +302,25 @@ public abstract class RecipeBuilder 0, "EU/t cannot be less of equal to 0"); diff --git a/src/main/java/gregtech/api/unification/OreDictUnifier.java b/src/main/java/gregtech/api/unification/OreDictUnifier.java index e2890344..cc2d6337 100644 --- a/src/main/java/gregtech/api/unification/OreDictUnifier.java +++ b/src/main/java/gregtech/api/unification/OreDictUnifier.java @@ -36,18 +36,22 @@ public class OreDictUnifier { private static final HashMap> stackUnificationItems = new HashMap<>(); public static void registerOre(ItemStack itemStack, MaterialStack component, MaterialStack... byproducts) { + if (itemStack == null) return; materialUnificationInfo.put(new SimpleItemStack(itemStack), new ItemMaterialInfo(component, byproducts)); } public static void registerOre(ItemStack itemStack, ItemMaterialInfo materialInfo) { + if (itemStack == null) return; materialUnificationInfo.put(new SimpleItemStack(itemStack), materialInfo); } public static void registerOre(ItemStack itemStack, OrePrefix orePrefix, @Nullable Material material) { + if (itemStack == null) return; OreDictionary.registerOre(orePrefix.name() + (material == null ? "" : material.toCamelCaseString()), itemStack); } public static void registerOre(ItemStack itemStack, String oreDict) { + if (itemStack == null) return; OreDictionary.registerOre(oreDict, itemStack); } diff --git a/src/main/java/gregtech/api/unification/stack/UnificationEntry.java b/src/main/java/gregtech/api/unification/stack/UnificationEntry.java index 6a8aeb26..b1ffc662 100644 --- a/src/main/java/gregtech/api/unification/stack/UnificationEntry.java +++ b/src/main/java/gregtech/api/unification/stack/UnificationEntry.java @@ -3,12 +3,15 @@ package gregtech.api.unification.stack; import gregtech.api.unification.ore.OrePrefix; import gregtech.api.unification.material.type.Material; +import javax.annotation.Nullable; + public class UnificationEntry { public final OrePrefix orePrefix; + @Nullable public final Material material; - public UnificationEntry(OrePrefix orePrefix, Material material) { + public UnificationEntry(OrePrefix orePrefix, @Nullable Material material) { this.orePrefix = orePrefix; this.material = material; } @@ -21,19 +24,19 @@ public class UnificationEntry { UnificationEntry that = (UnificationEntry) o; if (orePrefix != that.orePrefix) return false; - return material.equals(that.material); + return material != null ? material.equals(that.material) : that.material == null; } @Override public int hashCode() { int result = orePrefix.hashCode(); - result = 31 * result + material.hashCode(); + result = 31 * result + (material != null ? material.hashCode() : 0); return result; } @Override public String toString() { - return orePrefix.name() + material.toCamelCaseString(); + return orePrefix.name() + (material != null ? material.toCamelCaseString() : ""); } } diff --git a/src/main/java/gregtech/common/blocks/BlockMachine.java b/src/main/java/gregtech/common/blocks/BlockMachine.java index 476abfe4..c36b6fb8 100644 --- a/src/main/java/gregtech/common/blocks/BlockMachine.java +++ b/src/main/java/gregtech/common/blocks/BlockMachine.java @@ -12,6 +12,7 @@ import net.minecraft.block.material.EnumPushReaction; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyInteger; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -123,6 +124,11 @@ public class BlockMachine extends Block implements ITileEntityProvider { return false; } + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, HARVEST_LEVEL, HARVEST_TOOL); + } + @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState() diff --git a/src/main/java/gregtech/common/items/MetaItem1.java b/src/main/java/gregtech/common/items/MetaItem1.java index 6cafd205..4eab07d3 100644 --- a/src/main/java/gregtech/common/items/MetaItem1.java +++ b/src/main/java/gregtech/common/items/MetaItem1.java @@ -50,1464 +50,1501 @@ public class MetaItem1 extends MaterialMetaItem { OrePrefix.ingot, OrePrefix.ingotHot, OrePrefix.plate, OrePrefix.plateDense, OrePrefix.stick, OrePrefix.lens, OrePrefix.round, OrePrefix.bolt, OrePrefix.screw, OrePrefix.ring, OrePrefix.foil, OrePrefix.cell, OrePrefix.cellPlasma, null, null, null, null, null, null, null, null, null); - - CREDIT_COPPER = addItem(0, "credit.copper"); - CREDIT_CUPRONICKEL = addItem(1, "credit.cupronickel").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Cupronickel, 907200L))); - CREDIT_SILVER = addItem(2, "credit.silver"); - CREDIT_GOLD = addItem(3, "credit.gold"); - CREDIT_PLATINUM = addItem(4, "credit.platinum"); - CREDIT_OSMIUM = addItem(5, "credit.osmium"); - CREDIT_NAQUADAH = addItem(6, "credit.naquadah"); - CREDIT_DARMSTADTIUM = addItem(7, "credit.darmstadtium"); - - COIN_GOLD_ANCIENT = addItem(8, "coin.gold.ancient").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Gold, 907200L))); - COIN_DOGE = addItem(9, "coin.doge").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Brass, 907200L))); - COIN_CHOCOLATE = addItem(10, "coin.chocolate").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Gold, OrePrefix.foil.materialAmount))).addStats(new FoodStats(1, 0.1F, false, true, OreDictUnifier.get(OrePrefix.foil, Materials.Gold, 1), new RandomPotionEffect(MobEffects.SPEED, 200, 1, 10))); - - ModHandler.addShapelessRecipe(COIN_CHOCOLATE.getStackForm(), - new UnificationEntry(OrePrefix.dust, Materials.Cocoa), - new UnificationEntry(OrePrefix.dust, Materials.Milk), - new UnificationEntry(OrePrefix.dust, Materials.Sugar), - new UnificationEntry(OrePrefix.foil, Materials.Gold)); - - ModHandler.addShapelessRecipe(CREDIT_COPPER.getStackForm(8), - CREDIT_CUPRONICKEL); - - ModHandler.addShapelessRecipe(CREDIT_CUPRONICKEL.getStackForm(8), - CREDIT_SILVER); - - ModHandler.addShapelessRecipe(CREDIT_SILVER.getStackForm(8), - CREDIT_GOLD); - - ModHandler.addShapelessRecipe(CREDIT_GOLD.getStackForm(8), - CREDIT_PLATINUM); - - ModHandler.addShapelessRecipe(CREDIT_PLATINUM.getStackForm(8), - CREDIT_OSMIUM); - - ModHandler.addShapelessRecipe(CREDIT_OSMIUM.getStackForm(8), - CREDIT_NAQUADAH); - - ModHandler.addShapelessRecipe(CREDIT_NAQUADAH.getStackForm(8), - CREDIT_DARMSTADTIUM); - - - ModHandler.addShapelessRecipe(CREDIT_CUPRONICKEL.getStackForm(), - CREDIT_COPPER, - CREDIT_COPPER, - CREDIT_COPPER, - CREDIT_COPPER, - CREDIT_COPPER, - CREDIT_COPPER, - CREDIT_COPPER, - CREDIT_COPPER); - - ModHandler.addShapelessRecipe(CREDIT_SILVER.getStackForm(), - CREDIT_CUPRONICKEL, - CREDIT_CUPRONICKEL, - CREDIT_CUPRONICKEL, - CREDIT_CUPRONICKEL, - CREDIT_CUPRONICKEL, - CREDIT_CUPRONICKEL, - CREDIT_CUPRONICKEL, - CREDIT_CUPRONICKEL); - - ModHandler.addShapelessRecipe(CREDIT_GOLD.getStackForm(), - CREDIT_SILVER, - CREDIT_SILVER, - CREDIT_SILVER, - CREDIT_SILVER, - CREDIT_SILVER, - CREDIT_SILVER, - CREDIT_SILVER, - CREDIT_SILVER); - - ModHandler.addShapelessRecipe(CREDIT_PLATINUM.getStackForm(), - CREDIT_GOLD, - CREDIT_GOLD, - CREDIT_GOLD, - CREDIT_GOLD, - CREDIT_GOLD, - CREDIT_GOLD, - CREDIT_GOLD, - CREDIT_GOLD); - - ModHandler.addShapelessRecipe(CREDIT_OSMIUM.getStackForm(), - CREDIT_PLATINUM, - CREDIT_PLATINUM, - CREDIT_PLATINUM, - CREDIT_PLATINUM, - CREDIT_PLATINUM, - CREDIT_PLATINUM, - CREDIT_PLATINUM, - CREDIT_PLATINUM); - - ModHandler.addShapelessRecipe(CREDIT_NAQUADAH.getStackForm(), - CREDIT_OSMIUM, - CREDIT_OSMIUM, - CREDIT_OSMIUM, - CREDIT_OSMIUM, - CREDIT_OSMIUM, - CREDIT_OSMIUM, - CREDIT_OSMIUM, - CREDIT_OSMIUM); - - ModHandler.addShapelessRecipe(CREDIT_DARMSTADTIUM.getStackForm(), - CREDIT_NAQUADAH, - CREDIT_NAQUADAH, - CREDIT_NAQUADAH, - CREDIT_NAQUADAH, - CREDIT_NAQUADAH, - CREDIT_NAQUADAH, - CREDIT_NAQUADAH, - CREDIT_NAQUADAH); - - - MINECART_WHEELS_IRON = addItem(100, "minecart.wheels.iron"); - MINECART_WHEELS_STEEL = addItem(101, "minecart.wheels.steel"); - - ModHandler.addShapedRecipe(MINECART_WHEELS_IRON.getStackForm(), - " h ", - "RSR", - " w ", - 'R', new UnificationEntry(OrePrefix.ring, MarkerMaterials.GenericMaterial.AnyIron), - 'S', new UnificationEntry(OrePrefix.stick, MarkerMaterials.GenericMaterial.AnyIron)); - - ModHandler.addShapedRecipe(MINECART_WHEELS_STEEL.getStackForm(), - " h ", - "RSR", - " w ", - 'R', new UnificationEntry(OrePrefix.ring, Materials.Steel), - 'S', new UnificationEntry(OrePrefix.stick, Materials.Steel)); - - SHAPE_EMPTY = addItem(300, "shape.empty"); - - ModHandler.addShapedRecipe(SHAPE_EMPTY.getStackForm(),// true, - "hf", - "PP", - "PP", - 'P', new UnificationEntry(OrePrefix.plate, Materials.Steel)); - - SHAPE_MOLD_PLATE = addItem(301, "shape.mold.plate"); - SHAPE_MOLD_CASING = addItem(302, "shape.mold.casing"); - SHAPE_MOLD_GEAR = addItem(303, "shape.mold.gear"); - SHAPE_MOLD_CREDIT = addItem(304, "shape.mold.credit"); - SHAPE_MOLD_BOTTLE = addItem(305, "shape.mold.bottle"); - SHAPE_MOLD_INGOT = addItem(306, "shape.mold.ingot"); - SHAPE_MOLD_BALL = addItem(307, "shape.mold.ball"); - SHAPE_MOLD_BLOCK = addItem(308, "shape.mold.block"); - SHAPE_MOLD_NUGGET = addItem(309, "shape.mold.nugget"); - SHAPE_MOLD_BUN = addItem(310, "shape.mold.bun"); - SHAPE_MOLD_BREAD = addItem(311, "shape.mold.bread"); - SHAPE_MOLD_BAGUETTE = addItem(312, "shape.mold.baguette"); - SHAPE_MOLD_CYLINDER = addItem(313, "shape.mold.cylinder"); - SHAPE_MOLD_ANVIL = addItem(314, "shape.mold.anvil"); - SHAPE_MOLD_NAME = addItem(315, "shape.mold.name"); - SHAPE_MOLD_GEAR_SMALL = addItem(317, "shape.mold.gear.small"); - - ModHandler.removeRecipe(new ItemStack(Blocks.GLASS), null, new ItemStack(Blocks.GLASS), null, new ItemStack(Blocks.GLASS)); - - ModHandler.addShapedRecipe(SHAPE_MOLD_CREDIT.getStackForm(), - "h ", - textShape, - emptyRow, - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_MOLD_PLATE.getStackForm(), - " h ", - textShape, - emptyRow, - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_MOLD_CASING.getStackForm(), - " h", - textShape, - emptyRow, - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_MOLD_GEAR.getStackForm(), - emptyRow, - " Ph", - emptyRow, - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_MOLD_BOTTLE.getStackForm(), - emptyRow, - textShape, - " h", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_MOLD_INGOT.getStackForm(), - emptyRow, - textShape, - " h ", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_MOLD_BALL.getStackForm(), - emptyRow, - textShape, - "h ", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_MOLD_BLOCK.getStackForm(), - emptyRow, - "hP ", - emptyRow, - 'P', SHAPE_EMPTY); - - - ModHandler.addShapedRecipe(SHAPE_MOLD_NUGGET.getStackForm(), - "P h", - emptyRow, - emptyRow, - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_MOLD_BUN.getStackForm(), - "P ", - " h", - emptyRow, - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_MOLD_BREAD.getStackForm(), - "P ", - emptyRow, - " h", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_MOLD_BAGUETTE.getStackForm(), - "P ", - emptyRow, - " h ", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_MOLD_CYLINDER.getStackForm(), - " P", - emptyRow, - " h", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_MOLD_ANVIL.getStackForm(), - " P", - emptyRow, - " h ", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_MOLD_NAME.getStackForm(), - " P", - emptyRow, - "h ", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_MOLD_GEAR_SMALL.getStackForm(), - emptyRow, - emptyRow, - "h P", - 'P', SHAPE_EMPTY); - - - SHAPE_EXTRUDER_PLATE = addItem(350, "shape.extruder.plate"); - SHAPE_EXTRUDER_ROD = addItem(351, "shape.extruder.rod"); - SHAPE_EXTRUDER_BOLT = addItem(352, "shape.extruder.bolt"); - SHAPE_EXTRUDER_RING = addItem(353, "shape.extruder.ring"); - SHAPE_EXTRUDER_CELL = addItem(354, "shape.extruder.cell"); - SHAPE_EXTRUDER_INGOT = addItem(355, "shape.extruder.ingot"); - SHAPE_EXTRUDER_WIRE = addItem(356, "shape.extruder.wire"); - SHAPE_EXTRUDER_CASING = addItem(357, "shape.extruder.casing"); - SHAPE_EXTRUDER_PIPE_TINY = addItem(358, "shape.extruder.pipe.tiny"); - SHAPE_EXTRUDER_PIPE_SMALL = addItem(359, "shape.extruder.pipe.small"); - SHAPE_EXTRUDER_PIPE_MEDIUM = addItem(360, "shape.extruder.pipe.medium"); - SHAPE_EXTRUDER_PIPE_LARGE = addItem(361, "shape.extruder.pipe.large"); - SHAPE_EXTRUDER_PIPE_HUGE = addItem(362, "shape.extruder.pipe.huge"); - SHAPE_EXTRUDER_BLOCK = addItem(363, "shape.extruder.block"); - SHAPE_EXTRUDER_SWORD = addItem(364, "shape.extruder.sword"); - SHAPE_EXTRUDER_PICKAXE = addItem(365, "shape.extruder.pickaxe"); - SHAPE_EXTRUDER_SHOVEL = addItem(366, "shape.extruder.shovel"); - SHAPE_EXTRUDER_AXE = addItem(367, "shape.extruder.axe"); - SHAPE_EXTRUDER_HOE = addItem(368, "shape.extruder.hoe"); - SHAPE_EXTRUDER_HAMMER = addItem(369, "shape.extruder.hammer"); - SHAPE_EXTRUDER_FILE = addItem(370, "shape.extruder.file"); - SHAPE_EXTRUDER_SAW = addItem(371, "shape.extruder.saw"); - SHAPE_EXTRUDER_GEAR = addItem(372, "shape.extruder.gear"); - SHAPE_EXTRUDER_BOTTLE = addItem(373, "shape.extruder.bottle"); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_BOLT.getStackForm(), - "x ", - textShape, - emptyRow, - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_CELL.getStackForm(), - " x ", - textShape, - emptyRow, - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_INGOT.getStackForm(), - " x", - textShape, - emptyRow, - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_RING.getStackForm(), - emptyRow, - " Px", - emptyRow, - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_ROD.getStackForm(), - emptyRow, - textShape, - " x", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_WIRE.getStackForm(), - emptyRow, - textShape, - " x ", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_CASING.getStackForm(), - emptyRow, - textShape, - "x ", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_PLATE.getStackForm(), - emptyRow, - "xP ", - emptyRow, - 'P', SHAPE_EMPTY); - - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_BLOCK.getStackForm(), - "P x", - emptyRow, - emptyRow, - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_PIPE_SMALL.getStackForm(), - "P ", - " x", - emptyRow, - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_PIPE_LARGE.getStackForm(), - "P ", - emptyRow, - " x", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_PIPE_MEDIUM.getStackForm(), - "P ", - emptyRow, - " x ", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_SWORD.getStackForm(), - " P", - emptyRow, - " x", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_PICKAXE.getStackForm(), - " P", - emptyRow, - " x ", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_SHOVEL.getStackForm(), - " P", - emptyRow, - "x ", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_AXE.getStackForm(), - " P", - "x ", - emptyRow, - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_HOE.getStackForm(), - emptyRow, - emptyRow, - "x P", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_HAMMER.getStackForm(), - emptyRow, - "x ", - " P", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_FILE.getStackForm(), - "x ", - emptyRow, - " P", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_SAW.getStackForm(), - " x ", - emptyRow, - " P", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_GEAR.getStackForm(), - "x ", - emptyRow, - "P ", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_PIPE_TINY.getStackForm(), - " x ", - emptyRow, - "P ", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_PIPE_HUGE.getStackForm(), - " x", - emptyRow, - "P ", - 'P', SHAPE_EMPTY); - - ModHandler.addShapedRecipe(SHAPE_EXTRUDER_BOTTLE.getStackForm(), - emptyRow, - " x", - "P ", - 'P', SHAPE_EMPTY); - - - SHAPE_SLICER_FLAT = addItem(398, "shape.slicer.flat"); - SHAPE_SLICER_STRIPES = addItem(399, "shape.slicer.stripes"); - - ModHandler.addShapedRecipe(SHAPE_SLICER_FLAT.getStackForm(), - "hXS", - textShape, - "fXd", - 'P', SHAPE_EXTRUDER_BLOCK, - 'X', new UnificationEntry(OrePrefix.plate, Materials.StainlessSteel), - 'S', new UnificationEntry(OrePrefix.screw, Materials.StainlessSteel)); - - ModHandler.addShapedRecipe(SHAPE_SLICER_STRIPES.getStackForm(), - "hXS", - "XPX", - "fXd", - 'P', SHAPE_EXTRUDER_BLOCK, - 'X', new UnificationEntry(OrePrefix.plate, Materials.StainlessSteel), - 'S', new UnificationEntry(OrePrefix.screw, Materials.StainlessSteel)); - - - FUEL_CAN_PLASTIC_EMPTY = addItem(400, "fuel.can.plastic.empty").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Plastic, OrePrefix.plate.materialAmount))); - FUEL_CAN_PLASTIC_FILLED = addItem(401, "fuel.can.plastic.filled").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Plastic, OrePrefix.plate.materialAmount))); - - ModHandler.addShapedRecipe(FUEL_CAN_PLASTIC_EMPTY.getStackForm(7), - " PP", - "P P", - "PPP", - 'P', new UnificationEntry(OrePrefix.plate, Materials.Plastic)); - - SPRAY_EMPTY = addItem(402, "spray.empty").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Tin, OrePrefix.plate.materialAmount * 2L), new MaterialStack(Materials.Redstone, OrePrefix.dust.materialAmount))); - - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Redstone, 1), OreDictUnifier.get(OrePrefix.cell, null, 1)) - .outputs(SPRAY_EMPTY.getStackForm()) - .duration(800) - .EUt(1) - .buildAndRegister(); - - THERMOS_CAN_EMPTY = addItem(404, "thermos_can.empty").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Aluminium, OrePrefix.plate.materialAmount + 2L * OrePrefix.ring.materialAmount))); - - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Aluminium, 1), OreDictUnifier.get(OrePrefix.ring, Materials.Aluminium, 2)) - .outputs(THERMOS_CAN_EMPTY.getStackForm()) - .duration(800) - .EUt(1) - .buildAndRegister(); - - LARGE_FLUID_CELL_STEEL = addItem(405, "large.fluid.cell.steel").addStats(new FluidStats(16000, Integer.MAX_VALUE, Integer.MAX_VALUE)).setMaxStackSize(16).setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, OrePrefix.plate.materialAmount * 2L + 2L * OrePrefix.ring.materialAmount))); - - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Steel, 1), OreDictUnifier.get(OrePrefix.ring, Materials.Steel, 2)) - .outputs(LARGE_FLUID_CELL_STEEL.getStackForm()) - .duration(100) - .EUt(64) - .buildAndRegister(); - - LARGE_FLUID_CELL_TUNGSTENSTEEL = addItem(406, "large.fluid.cell.tungstensteel").addStats(new FluidStats(64000, Integer.MAX_VALUE, Integer.MAX_VALUE)).setMaxStackSize(16).setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.TungstenSteel, OrePrefix.plate.materialAmount * 2L + 2L * OrePrefix.ring.materialAmount))); - - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.TungstenSteel, 1), OreDictUnifier.get(OrePrefix.ring, Materials.TungstenSteel, 2)) - .outputs(LARGE_FLUID_CELL_TUNGSTENSTEEL.getStackForm()) - .duration(200) - .EUt(256) - .buildAndRegister(); - - for (byte i = 0; i < 16; i = (byte) (i + 1)) { + } + + @Override + public void registerItem(String registryName) { + super.registerItem(registryName); + + CREDIT_COPPER = addItem(0, "credit.copper"); + CREDIT_CUPRONICKEL = addItem(1, "credit.cupronickel").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Cupronickel, 907200L))); + CREDIT_SILVER = addItem(2, "credit.silver"); + CREDIT_GOLD = addItem(3, "credit.gold"); + CREDIT_PLATINUM = addItem(4, "credit.platinum"); + CREDIT_OSMIUM = addItem(5, "credit.osmium"); + CREDIT_NAQUADAH = addItem(6, "credit.naquadah"); + CREDIT_DARMSTADTIUM = addItem(7, "credit.darmstadtium"); + + COIN_GOLD_ANCIENT = addItem(8, "coin.gold.ancient"). + setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Gold, 907200L))); + COIN_DOGE = addItem(9, "coin.doge") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Brass, 907200L))); + COIN_CHOCOLATE = addItem(10, "coin.chocolate") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Gold, OrePrefix.foil.materialAmount))) + .addStats(new FoodStats(1, 0.1F, false, true, OreDictUnifier.get(OrePrefix.foil, Materials.Gold, 1), new RandomPotionEffect(MobEffects.SPEED, 200, 1, 10))); + + MINECART_WHEELS_IRON = addItem(100, "minecart.wheels.iron"); + MINECART_WHEELS_STEEL = addItem(101, "minecart.wheels.steel"); + + SHAPE_EMPTY = addItem(300, "shape.empty"); + + SHAPE_MOLD_PLATE = addItem(301, "shape.mold.plate"); + SHAPE_MOLD_CASING = addItem(302, "shape.mold.casing"); + SHAPE_MOLD_GEAR = addItem(303, "shape.mold.gear"); + SHAPE_MOLD_CREDIT = addItem(304, "shape.mold.credit"); + SHAPE_MOLD_BOTTLE = addItem(305, "shape.mold.bottle"); + SHAPE_MOLD_INGOT = addItem(306, "shape.mold.ingot"); + SHAPE_MOLD_BALL = addItem(307, "shape.mold.ball"); + SHAPE_MOLD_BLOCK = addItem(308, "shape.mold.block"); + SHAPE_MOLD_NUGGET = addItem(309, "shape.mold.nugget"); + SHAPE_MOLD_BUN = addItem(310, "shape.mold.bun"); + SHAPE_MOLD_BREAD = addItem(311, "shape.mold.bread"); + SHAPE_MOLD_BAGUETTE = addItem(312, "shape.mold.baguette"); + SHAPE_MOLD_CYLINDER = addItem(313, "shape.mold.cylinder"); + SHAPE_MOLD_ANVIL = addItem(314, "shape.mold.anvil"); + SHAPE_MOLD_NAME = addItem(315, "shape.mold.name"); + SHAPE_MOLD_GEAR_SMALL = addItem(317, "shape.mold.gear.small"); + + SHAPE_EXTRUDER_PLATE = addItem(350, "shape.extruder.plate"); + SHAPE_EXTRUDER_ROD = addItem(351, "shape.extruder.rod"); + SHAPE_EXTRUDER_BOLT = addItem(352, "shape.extruder.bolt"); + SHAPE_EXTRUDER_RING = addItem(353, "shape.extruder.ring"); + SHAPE_EXTRUDER_CELL = addItem(354, "shape.extruder.cell"); + SHAPE_EXTRUDER_INGOT = addItem(355, "shape.extruder.ingot"); + SHAPE_EXTRUDER_WIRE = addItem(356, "shape.extruder.wire"); + SHAPE_EXTRUDER_CASING = addItem(357, "shape.extruder.casing"); + SHAPE_EXTRUDER_PIPE_TINY = addItem(358, "shape.extruder.pipe.tiny"); + SHAPE_EXTRUDER_PIPE_SMALL = addItem(359, "shape.extruder.pipe.small"); + SHAPE_EXTRUDER_PIPE_MEDIUM = addItem(360, "shape.extruder.pipe.medium"); + SHAPE_EXTRUDER_PIPE_LARGE = addItem(361, "shape.extruder.pipe.large"); + SHAPE_EXTRUDER_PIPE_HUGE = addItem(362, "shape.extruder.pipe.huge"); + SHAPE_EXTRUDER_BLOCK = addItem(363, "shape.extruder.block"); + SHAPE_EXTRUDER_SWORD = addItem(364, "shape.extruder.sword"); + SHAPE_EXTRUDER_PICKAXE = addItem(365, "shape.extruder.pickaxe"); + SHAPE_EXTRUDER_SHOVEL = addItem(366, "shape.extruder.shovel"); + SHAPE_EXTRUDER_AXE = addItem(367, "shape.extruder.axe"); + SHAPE_EXTRUDER_HOE = addItem(368, "shape.extruder.hoe"); + SHAPE_EXTRUDER_HAMMER = addItem(369, "shape.extruder.hammer"); + SHAPE_EXTRUDER_FILE = addItem(370, "shape.extruder.file"); + SHAPE_EXTRUDER_SAW = addItem(371, "shape.extruder.saw"); + SHAPE_EXTRUDER_GEAR = addItem(372, "shape.extruder.gear"); + SHAPE_EXTRUDER_BOTTLE = addItem(373, "shape.extruder.bottle"); + + SHAPE_SLICER_FLAT = addItem(398, "shape.slicer.flat"); + SHAPE_SLICER_STRIPES = addItem(399, "shape.slicer.stripes"); + + FUEL_CAN_PLASTIC_EMPTY = addItem(400, "fuel.can.plastic.empty") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Plastic, OrePrefix.plate.materialAmount))); + FUEL_CAN_PLASTIC_FILLED = addItem(401, "fuel.can.plastic.filled") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Plastic, OrePrefix.plate.materialAmount))); + + SPRAY_EMPTY = addItem(402, "spray.empty") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Tin, OrePrefix.plate.materialAmount * 2L), new MaterialStack(Materials.Redstone, OrePrefix.dust.materialAmount))); + + THERMOS_CAN_EMPTY = addItem(404, "thermos_can.empty") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Aluminium, OrePrefix.plate.materialAmount + 2L * OrePrefix.ring.materialAmount))); + + LARGE_FLUID_CELL_STEEL = addItem(405, "large.fluid.cell.steel") + .addStats(new FluidStats(16000, Integer.MAX_VALUE, Integer.MAX_VALUE)) + .setMaxStackSize(16) + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, OrePrefix.plate.materialAmount * 2L + 2L * OrePrefix.ring.materialAmount))); + + LARGE_FLUID_CELL_TUNGSTENSTEEL = addItem(406, "large.fluid.cell.tungstensteel") + .addStats(new FluidStats(64000, Integer.MAX_VALUE, Integer.MAX_VALUE)) + .setMaxStackSize(16) + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.TungstenSteel, OrePrefix.plate.materialAmount * 2L + 2L * OrePrefix.ring.materialAmount))); + + for (byte i = 0; i < 16; i = (byte) (i + 1)) { // IItemBehaviour behaviour = new Behaviour_Spray_Color(SPRAY_EMPTY.getStackForm(), SPRAY_CAN_DYES_USED[i].getStackForm(), SPRAY_CAN_DYES[i].getStackForm(), 512L, i); - SPRAY_CAN_DYES[i] = addItem(430 + 2 * i, "spray.can.dyes", EnumDyeColor.byDyeDamage(i).getUnlocalizedName());//.addStats(behaviour); - SPRAY_CAN_DYES_USED[i] = addItem(431 + 2 * i, "spray.can.dyes.used", EnumDyeColor.byDyeDamage(i).getUnlocalizedName());//.addStats(behaviour); - } + SPRAY_CAN_DYES[i] = addItem(430 + 2 * i, "spray.can.dyes", EnumDyeColor.byDyeDamage(i).getUnlocalizedName());//.addStats(behaviour); + SPRAY_CAN_DYES_USED[i] = addItem(431 + 2 * i, "spray.can.dyes.used", EnumDyeColor.byDyeDamage(i).getUnlocalizedName());//.addStats(behaviour); + } // IItemBehaviour behaviour = new Behaviour_Lighter(null, TOOL_MATCHES.getStackForm(), TOOL_MATCHES.getStackForm(), 1L); - TOOL_MATCHES = addItem(471, "tool.matches");//.addStats(behaviour); + TOOL_MATCHES = addItem(471, "tool.matches");//.addStats(behaviour); // behaviour = new Behaviour_Lighter(null, TOOL_MATCHBOX_USED.getStackForm(), TOOL_MATCHBOX_FULL.getStackForm(), 16L); - TOOL_MATCHBOX_USED = addItem(472, "tool.matchbox.used");//.addStats(behaviour); - TOOL_MATCHBOX_FULL = addItem(473, "tool.matchbox.full");//.addStats(behaviour); + TOOL_MATCHBOX_USED = addItem(472, "tool.matchbox.used");//.addStats(behaviour); + TOOL_MATCHBOX_FULL = addItem(473, "tool.matchbox.full");//.addStats(behaviour); - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.bolt, Materials.Wood, 1), OreDictUnifier.get(OrePrefix.dustSmall, Materials.Phosphorus, 1)) - .outputs(TOOL_MATCHES.getStackForm()) - .duration(16) - .EUt(16) - .buildAndRegister(); - - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.bolt, Materials.Wood, 1), OreDictUnifier.get(OrePrefix.dustSmall, Materials.Phosphor, 1)) - .outputs(TOOL_MATCHES.getStackForm()) - .duration(16) - .EUt(16) - .buildAndRegister(); - - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.bolt, Materials.Wood, 4), OreDictUnifier.get(OrePrefix.dust, Materials.Phosphorus, 1)) - .outputs(TOOL_MATCHES.getStackForm(4)) - .duration(64) - .EUt(16) - .buildAndRegister(); - - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.bolt, Materials.Wood, 4), OreDictUnifier.get(OrePrefix.dust, Materials.Phosphor, 1)) - .outputs(TOOL_MATCHES.getStackForm(4)) - .duration(64) - .EUt(16) - .buildAndRegister(); - - RecipeMap.BOXINATOR_RECIPES.recipeBuilder() - .inputs(TOOL_MATCHES.getStackForm(16), OreDictUnifier.get(OrePrefix.plate, Materials.Paper, 1)) - .outputs(TOOL_MATCHBOX_FULL.getStackForm()) - .duration(64) - .EUt(16) - .buildAndRegister(); - RecipeMap.UNBOXINATOR_RECIPES.recipeBuilder() - .inputs(TOOL_MATCHBOX_FULL.getStackForm()) - .outputs(TOOL_MATCHES.getStackForm(16)) - .duration(32) - .EUt(16) - .buildAndRegister(); - - TOOL_LIGHTER_INVAR_EMPTY = addItem(474, "tool.lighter.invar.empty").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Invar, OrePrefix.plate.materialAmount * 2L))); + TOOL_LIGHTER_INVAR_EMPTY = addItem(474, "tool.lighter.invar.empty").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Invar, OrePrefix.plate.materialAmount * 2L))); // behaviour = new Behaviour_Lighter(TOOL_LIGHTER_INVAR_EMPTY.getStackForm(), TOOL_LIGHTER_INVAR_USED.getStackForm(), TOOL_LIGHTER_INVAR_FULL.getStackForm(), 100L); - TOOL_LIGHTER_INVAR_USED = addItem(475, "tool.lighter.invar.used").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Invar, OrePrefix.plate.materialAmount * 2L)));//.addStats(behaviour); - TOOL_LIGHTER_INVAR_FULL = addItem(476, "tool.lighter.invar.full").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Invar, OrePrefix.plate.materialAmount * 2L)));//.addStats(behaviour); + TOOL_LIGHTER_INVAR_USED = addItem(475, "tool.lighter.invar.used").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Invar, OrePrefix.plate.materialAmount * 2L)));//.addStats(behaviour); + TOOL_LIGHTER_INVAR_FULL = addItem(476, "tool.lighter.invar.full").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Invar, OrePrefix.plate.materialAmount * 2L)));//.addStats(behaviour); - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Invar, 2), new ItemStack(Items.FLINT, 1)) - .outputs(TOOL_LIGHTER_INVAR_EMPTY.getStackForm()) - .duration(256) - .EUt(16) - .buildAndRegister(); - - TOOL_LIGHTER_PLATINUM_EMPTY = addItem(477, "tool.lighter.platinum.empty").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Platinum, OrePrefix.plate.materialAmount * 2L))); + TOOL_LIGHTER_PLATINUM_EMPTY = addItem(477, "tool.lighter.platinum.empty").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Platinum, OrePrefix.plate.materialAmount * 2L))); // behaviour = new Behaviour_Lighter(TOOL_LIGHTER_PLATINUM_EMPTY.getStackForm(), TOOL_LIGHTER_PLATINUM_USED.getStackForm(), TOOL_LIGHTER_PLATINUM_FULL.getStackForm(), 1000L); - TOOL_LIGHTER_PLATINUM_USED = addItem(478, "tool.lighter.platinum.used").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Platinum, OrePrefix.plate.materialAmount * 2L)));//.addStats(behaviour); - TOOL_LIGHTER_PLATINUM_FULL = addItem(479, "tool.lighter.platinum.full").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Platinum, OrePrefix.plate.materialAmount * 2L)));//.addStats(behaviour); + TOOL_LIGHTER_PLATINUM_USED = addItem(478, "tool.lighter.platinum.used").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Platinum, OrePrefix.plate.materialAmount * 2L)));//.addStats(behaviour); + TOOL_LIGHTER_PLATINUM_FULL = addItem(479, "tool.lighter.platinum.full").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Platinum, OrePrefix.plate.materialAmount * 2L)));//.addStats(behaviour); - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Platinum, 2), new ItemStack(Items.FLINT, 1)) - .outputs(TOOL_LIGHTER_PLATINUM_EMPTY.getStackForm()) - .duration(256) - .EUt(256) - .buildAndRegister(); + INGOT_IRIDIUM_ALLOY = addItem(480, "ingot.iridiumalloy"); - INGOT_IRIDIUM_ALLOY = addItem(480, "ingot.iridiumalloy"); + PAPER_PRINTED_PAGES = addItem(481, "paper.printed.pages").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Paper, 10886400L)));//.addStats(new Behaviour_PrintedPages()); + PAPER_MAGIC_EMPTY = addItem(482, "paper.magic.empty").setInvisible().setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Paper, 3628800L))); + PAPER_MAGIC_PAGE = addItem(483, "paper.magic.page").setInvisible().setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Paper, 3628800L))); + PAPER_MAGIC_PAGES = addItem(484, "paper.magic.pages").setInvisible().setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Paper, 10886400L))); + PAPER_PUNCH_CARD_EMPTY = addItem(485, "paper.punch.card.empty").setInvisible().setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Paper, 7257600L))); + PAPER_PUNCH_CARD_ENCODED = addItem(486, "paper.punch.card.encoded").setInvisible().setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Paper, 7257600L))); - ModHandler.addShapedRecipe(INGOT_IRIDIUM_ALLOY.getStackForm(), - "IAI", - "ADA", - "IAI", + SCHEMATIC = addItem(490, "schematic").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.StainlessSteel, 7257600L))); + SCHEMATIC_CRAFTING = addItem(491, "schematic.crafting").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.StainlessSteel, 7257600L))); + SCHEMATIC_1X1 = addItem(495, "schematic.1by1").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.StainlessSteel, 7257600L))); + SCHEMATIC_2X2 = addItem(496, "schematic.2by2").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.StainlessSteel, 7257600L))); + SCHEMATIC_3X3 = addItem(497, "schematic.3by3").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.StainlessSteel, 7257600L))); + SCHEMATIC_DUST = addItem(498, "schematic.dust").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.StainlessSteel, 7257600L))); + + BATTERY_HULL_LV = addItem(500, "battery.hull.lv").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.BatteryAlloy, OrePrefix.plate.materialAmount))); + BATTERY_HULL_MV = addItem(501, "battery.hull.hv").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.BatteryAlloy, OrePrefix.plate.materialAmount * 3L))); + BATTERY_HULL_HV = addItem(502, "battery.hull.mv").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.BatteryAlloy, OrePrefix.plate.materialAmount * 9L))); + + BATTERY_RE_ULV_TANTALUM = addItem(499, "battery.re.ulv.tantalum").addStats(new ElectricStats(1000, 0)); + + BATTERY_SU_LV_SULFURICACID = addItem(510, "battery.su.lv.sulfuricacid").addStats(new ElectricStats(18000, 1, false)); + BATTERY_SU_LV_MERCURY = addItem(511, "battery.su.lv.mercury").addStats(new ElectricStats(32000, 1, false)); + + BATTERY_RE_LV_CADMIUM = addItem(517, "battery.re.lv.cadmium").addStats(new ElectricStats(75000, 1)); + BATTERY_RE_LV_LITHIUM = addItem(518, "battery.re.lv.lithium").addStats(new ElectricStats(100000, 1)); + BATTERY_RE_LV_SODIUM = addItem(519, "battery.re.lv.sodium").addStats(new ElectricStats(50000, 1)); + + BATTERY_SU_MV_SULFURICACID = addItem(520, "battery.su.mv.sulfuricacid").addStats(new ElectricStats(72000, 2, false)); + BATTERY_SU_MV_MERCURY = addItem(521, "battery.su.mv.mercury").addStats(new ElectricStats(128000, 2, false)); + + BATTERY_RE_MV_CADMIUM = addItem(527, "battery.re.mv.cadmium").addStats(new ElectricStats(300000, 2)); + BATTERY_RE_MV_LITHIUM = addItem(528, "battery.re.mv.lithium").addStats(new ElectricStats(400000, 2)); + BATTERY_RE_MV_SODIUM = addItem(529, "battery.re.mv.sodium").addStats(new ElectricStats(200000, 2)); + + BATTERY_SU_HV_SULFURICACID = addItem(530, "battery.su.hv.sulfuricacid").addStats(new ElectricStats(288000, 3, false)); + BATTERY_SU_HV_MERCURY = addItem(531, "battery.su.hv.mercury").addStats(new ElectricStats(512000, 3, false)); + + BATTERY_RE_HV_CADMIUM = addItem(537, "battery.re.hv.cadmium").addStats(new ElectricStats(1200000, 3)); + BATTERY_RE_HV_LITHIUM = addItem(538, "battery.re.hv.lithium").addStats(new ElectricStats(1600000, 3)); + BATTERY_RE_HV_SODIUM = addItem(539, "battery.re.hv.sodium").addStats(new ElectricStats(800000, 3)); + + ENERGY_LAPOTRONICORB = addItem(597, "energy.lapotronicorb").addStats(new ElectricStats(100000000, 5)).setUnificationData(OrePrefix.battery, MarkerMaterials.Tier.Ultimate); + ENERGY_LAPOTRONICORB2 = addItem(598, "energy.lapotronicorb2").addStats(new ElectricStats(1000000000, 6)).setUnificationData(OrePrefix.battery, MarkerMaterials.Tier.Ultimate); + + ZPM = addItem(599, "zpm").addStats(new ElectricStats(2000000000000L, 7, false)); + ZPM2 = addItem(605, "zpm2").addStats(new ElectricStats(Long.MAX_VALUE, 8)); + + ELECTRIC_MOTOR_LV = addItem(600, "electric.motor.lv"); + ELECTRIC_MOTOR_MV = addItem(601, "electric.motor.mv"); + ELECTRIC_MOTOR_HV = addItem(602, "electric.motor.hv"); + ELECTRIC_MOTOR_EV = addItem(603, "electric.motor.ev"); + ELECTRIC_MOTOR_IV = addItem(604, "electric.motor.iv"); + ELECTRIC_MOTOR_LUV = addItem(606, "electric.motor.luv"); + ELECTRIC_MOTOR_ZPM = addItem(607, "electric.motor.zpm"); + ELECTRIC_MOTOR_UV = addItem(608, "electric.motor.uv"); + + ELECTRIC_PUMP_LV = addItem(610, "electric.pump.lv"); + ELECTRIC_PUMP_MV = addItem(611, "electric.pump.mv"); + ELECTRIC_PUMP_HV = addItem(612, "electric.pump.hv"); + ELECTRIC_PUMP_EV = addItem(613, "electric.pump.ev"); + ELECTRIC_PUMP_IV = addItem(614, "electric.pump.iv"); + ELECTRIC_PUMP_LUV = addItem(620, "electric.pump.luv"); + ELECTRIC_PUMP_ZPM = addItem(621, "electric.pump.zpm"); + ELECTRIC_PUMP_UV = addItem(622, "electric.pump.uv"); + + FLUID_REGULATOR_LV = addItem(615, "fluidregulator.lv"); + FLUID_REGULATOR_MV = addItem(616, "fluidregulator.mv"); + FLUID_REGULATOR_HV = addItem(617, "fluidregulator.hv"); + FLUID_REGULATOR_EV = addItem(618, "fluidregulator.ev"); + FLUID_REGULATOR_IV = addItem(619, "fluidregulator.iv"); + + FLUID_FILTER = addItem(635, "fluidfilter"); + + ROTOR_LV = addItem(620, "rotor.lv").setUnificationData(OrePrefix.rotor, Materials.Tin); + ROTOR_MV = addItem(621, "rotor.mv").setUnificationData(OrePrefix.rotor, Materials.Bronze); + ROTOR_HV = addItem(622, "rotor.hv").setUnificationData(OrePrefix.rotor, Materials.Steel); + ROTOR_EV = addItem(623, "rotor.ev").setUnificationData(OrePrefix.rotor, Materials.StainlessSteel); + ROTOR_IV = addItem(624, "rotor.iv").setUnificationData(OrePrefix.rotor, Materials.TungstenSteel); + + CONVEYOR_MODULE_LV = addItem(630, "conveyor.module.lv"); + CONVEYOR_MODULE_MV = addItem(631, "conveyor.module.mv"); + CONVEYOR_MODULE_HV = addItem(632, "conveyor.module.hv"); + CONVEYOR_MODULE_EV = addItem(633, "conveyor.module.ev"); + CONVEYOR_MODULE_IV = addItem(634, "conveyor.module.iv"); + + ELECTRIC_PISTON_LV = addItem(640, "electric.piston.lv"); + ELECTRIC_PISTON_MV = addItem(641, "electric.piston.mv"); + ELECTRIC_PISTON_HV = addItem(642, "electric.piston.hv"); + ELECTRIC_PISTON_EV = addItem(643, "electric.piston.ev"); + ELECTRIC_PISTON_IV = addItem(644, "electric.piston.iv"); + ELECTRIC_PISTON_LUV = addItem(645, "electric.piston.luv"); + ELECTRIC_PISTON_ZPM = addItem(646, "electric.piston.zpm"); + ELECTRIC_PISTON_UV = addItem(647, "electric.piston.uv"); + + ROBOT_ARM_LV = addItem(650, "robot.arm.lv"); + ROBOT_ARM_MV = addItem(651, "robot.arm.mv"); + ROBOT_ARM_HV = addItem(652, "robot.arm.hv"); + ROBOT_ARM_EV = addItem(653, "robot.arm.ev"); + ROBOT_ARM_IV = addItem(654, "robot.arm.iv"); + ROBOT_ARM_LUV = addItem(655, "robot.arm.luv"); + ROBOT_ARM_ZPM = addItem(656, "robot.arm.zpm"); + ROBOT_ARM_UV = addItem(657, "robot.arm.uv"); + + FIELD_GENERATOR_LV = addItem(670, "field.generator.lv"); + FIELD_GENERATOR_MV = addItem(671, "field.generator.mv"); + FIELD_GENERATOR_HV = addItem(672, "field.generator.hv"); + FIELD_GENERATOR_EV = addItem(673, "field.generator.ev"); + FIELD_GENERATOR_IV = addItem(674, "field.generator.iv"); + FIELD_GENERATOR_LUV = addItem(675, "field.generator.luv"); + FIELD_GENERATOR_ZPM = addItem(676, "field.generator.zpm"); + FIELD_GENERATOR_UV = addItem(677, "field.generator.uv"); + + EMITTER_LV = addItem(680, "emitter.lv"); + EMITTER_MV = addItem(681, "emitter.mv"); + EMITTER_HV = addItem(682, "emitter.hv"); + EMITTER_EV = addItem(683, "emitter.ev"); + EMITTER_IV = addItem(684, "emitter.iv"); + EMITTER_LUV = addItem(685, "emitter.luv"); + EMITTER_ZPM = addItem(686, "emitter.zpm"); + EMITTER_UV = addItem(687, "emitter.uv"); + + SENSOR_LV = addItem(690, "sensor.lv"); + SENSOR_MV = addItem(691, "sensor.mv"); + SENSOR_HV = addItem(692, "sensor.hv"); + SENSOR_EV = addItem(693, "sensor.ev"); + SENSOR_IV = addItem(694, "sensor.iv"); + SENSOR_LUV = addItem(695, "sensor.luv"); + SENSOR_ZPM = addItem(696, "sensor.zpm"); + SENSOR_UV = addItem(697, "sensor.uv"); + + TOOL_DATASTICK = addItem(708, "tool.datastick").setUnificationData(OrePrefix.circuit, MarkerMaterials.Tier.Data);//.addStats(new Behaviour_DataStick()); + TOOL_DATAORB = addItem(707, "tool.dataorb").setUnificationData(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate);//.addStats(new Behaviour_DataOrb()); + + CIRCUIT_PRIMITIVE = addItem(700, "circuit.primitive").setUnificationData(OrePrefix.circuit, MarkerMaterials.Tier.Primitive); + CIRCUIT_BASIC = addItem(701, "circuit.basic").setUnificationData(OrePrefix.circuit, MarkerMaterials.Tier.Basic); + CIRCUIT_GOOD = addItem(702, "circuit.good").setUnificationData(OrePrefix.circuit, MarkerMaterials.Tier.Good); + CIRCUIT_ADVANCED = addItem(703, "circuit.advanced").setUnificationData(OrePrefix.circuit, MarkerMaterials.Tier.Advanced); + CIRCUIT_DATA = addItem(704, "circuit.data").setUnificationData(OrePrefix.circuit, MarkerMaterials.Tier.Data); + CIRCUIT_ELITE = addItem(705, "circuit.elite").setUnificationData(OrePrefix.circuit, MarkerMaterials.Tier.Elite); + CIRCUIT_MASTER = addItem(706, "circuit.master").setUnificationData(OrePrefix.circuit, MarkerMaterials.Tier.Master); + CIRCUIT_ULTIMATE = TOOL_DATAORB; + + CIRCUIT_BOARD_BASIC = addItem(710, "circuit.board.basic"); + CIRCUIT_BOARD_ADVANCED = addItem(711, "circuit.board.advanced"); + CIRCUIT_BOARD_ELITE = addItem(712, "circuit.board.elite"); + CIRCUIT_PARTS_CRYSTAL_CHIP_ELITE = addItem(713, "circuit.parts.crystal.chip.elite"); + CIRCUIT_PARTS_CRYSTAL_CHIP_MASTER = addItem(714, "circuit.parts.crystal.chip.master"); + CIRCUIT_PARTS_ADVANCED = addItem(715, "circuit.parts.advanced"); + CIRCUIT_PARTS_WIRING_BASIC = addItem(716, "circuit.parts.wiring.basic"); + CIRCUIT_PARTS_WIRING_ADVANCED = addItem(717, "circuit.parts.wiring.advanced"); + CIRCUIT_PARTS_WIRING_ELITE = addItem(718, "circuit.parts.wiring.elite"); + EMPTY_BOARD_BASIC = addItem(719, "empty.board.basic"); + EMPTY_BOARD_ELITE = addItem(720, "empty.board.elite"); + + + COMPONENT_SAWBLADE_DIAMOND = addItem(721, "component.sawblade.diamond").addOreDict(OreDictNames.craftingDiamondBlade); + COMPONENT_GRINDER_DIAMOND = addItem(722, "component.grinder.diamond").addOreDict(OreDictNames.craftingGrinder); + COMPONENT_GRINDER_TUNGSTEN = addItem(723, "component.grinder.tungsten").addOreDict(OreDictNames.craftingGrinder); + + QUANTUMEYE = addItem(724, "quantumeye"); + QUANTUMSTAR = addItem(725, "quantumstar"); + GRAVISTAR = addItem(726, "gravistar"); + + UPGRADE_MUFFLER = addItem(727, "upgrade.muffler"); + UPGRADE_LOCK = addItem(728, "upgrade.lock"); + + COMPONENT_FILTER = addItem(729, "component.filter").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Zinc, OrePrefix.foil.materialAmount * 16L))).addOreDict(OreDictNames.craftingFilter); + + TOOL_CHEAT = addItem(761, "tool.cheat").addStats(/*new Behaviour_Scanner(), */new ElectricStats(-2000000000, -1)); + TOOL_SCANNER = addItem(762, "tool.scanner").addStats(/*new Behaviour_Scanner(),*/ new ElectricStats(400000, 2, true, false)); + + NC_SENSORKIT = addItem(763, "nc.sensorkit");//.addStats(new Behaviour_SensorKit()); + DUCT_TAPE = addItem(764, "duct.tape").addOreDict(OreDictNames.craftingDuctTape); + MCGUFFIUM_239 = addItem(765, "mcguffium.239"); + } + + public void registerRecipes() { + + // Coin recipes + ModHandler.addShapelessRecipe(COIN_CHOCOLATE.getStackForm(), + new UnificationEntry(OrePrefix.dust, Materials.Cocoa), + new UnificationEntry(OrePrefix.dust, Materials.Milk), + new UnificationEntry(OrePrefix.dust, Materials.Sugar), + new UnificationEntry(OrePrefix.foil, Materials.Gold)); + + ModHandler.addShapelessRecipe(CREDIT_COPPER.getStackForm(8), + CREDIT_CUPRONICKEL); + + ModHandler.addShapelessRecipe(CREDIT_CUPRONICKEL.getStackForm(8), + CREDIT_SILVER); + + ModHandler.addShapelessRecipe(CREDIT_SILVER.getStackForm(8), + CREDIT_GOLD); + + ModHandler.addShapelessRecipe(CREDIT_GOLD.getStackForm(8), + CREDIT_PLATINUM); + + ModHandler.addShapelessRecipe(CREDIT_PLATINUM.getStackForm(8), + CREDIT_OSMIUM); + + ModHandler.addShapelessRecipe(CREDIT_OSMIUM.getStackForm(8), + CREDIT_NAQUADAH); + + ModHandler.addShapelessRecipe(CREDIT_NAQUADAH.getStackForm(8), + CREDIT_DARMSTADTIUM); + + + ModHandler.addShapelessRecipe(CREDIT_CUPRONICKEL.getStackForm(), + CREDIT_COPPER, + CREDIT_COPPER, + CREDIT_COPPER, + CREDIT_COPPER, + CREDIT_COPPER, + CREDIT_COPPER, + CREDIT_COPPER, + CREDIT_COPPER); + + ModHandler.addShapelessRecipe(CREDIT_SILVER.getStackForm(), + CREDIT_CUPRONICKEL, + CREDIT_CUPRONICKEL, + CREDIT_CUPRONICKEL, + CREDIT_CUPRONICKEL, + CREDIT_CUPRONICKEL, + CREDIT_CUPRONICKEL, + CREDIT_CUPRONICKEL, + CREDIT_CUPRONICKEL); + + ModHandler.addShapelessRecipe(CREDIT_GOLD.getStackForm(), + CREDIT_SILVER, + CREDIT_SILVER, + CREDIT_SILVER, + CREDIT_SILVER, + CREDIT_SILVER, + CREDIT_SILVER, + CREDIT_SILVER, + CREDIT_SILVER); + + ModHandler.addShapelessRecipe(CREDIT_PLATINUM.getStackForm(), + CREDIT_GOLD, + CREDIT_GOLD, + CREDIT_GOLD, + CREDIT_GOLD, + CREDIT_GOLD, + CREDIT_GOLD, + CREDIT_GOLD, + CREDIT_GOLD); + + ModHandler.addShapelessRecipe(CREDIT_OSMIUM.getStackForm(), + CREDIT_PLATINUM, + CREDIT_PLATINUM, + CREDIT_PLATINUM, + CREDIT_PLATINUM, + CREDIT_PLATINUM, + CREDIT_PLATINUM, + CREDIT_PLATINUM, + CREDIT_PLATINUM); + + ModHandler.addShapelessRecipe(CREDIT_NAQUADAH.getStackForm(), + CREDIT_OSMIUM, + CREDIT_OSMIUM, + CREDIT_OSMIUM, + CREDIT_OSMIUM, + CREDIT_OSMIUM, + CREDIT_OSMIUM, + CREDIT_OSMIUM, + CREDIT_OSMIUM); + + ModHandler.addShapelessRecipe(CREDIT_DARMSTADTIUM.getStackForm(), + CREDIT_NAQUADAH, + CREDIT_NAQUADAH, + CREDIT_NAQUADAH, + CREDIT_NAQUADAH, + CREDIT_NAQUADAH, + CREDIT_NAQUADAH, + CREDIT_NAQUADAH, + CREDIT_NAQUADAH); + + // Minecart wheels recipes + ModHandler.addShapedRecipe(MINECART_WHEELS_IRON.getStackForm(), + " h ", + "RSR", + " w ", + 'R', new UnificationEntry(OrePrefix.ring, MarkerMaterials.GenericMaterial.AnyIron), + 'S', new UnificationEntry(OrePrefix.stick, MarkerMaterials.GenericMaterial.AnyIron)); + + ModHandler.addShapedRecipe(MINECART_WHEELS_STEEL.getStackForm(), + " h ", + "RSR", + " w ", + 'R', new UnificationEntry(OrePrefix.ring, Materials.Steel), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Steel)); + + // Shape recipes + ModHandler.addShapedRecipe(SHAPE_EMPTY.getStackForm(),// true, + "hf", + "PP", + "PP", + 'P', new UnificationEntry(OrePrefix.plate, Materials.Steel)); + + // Shape mold recipes + ModHandler.removeRecipe(new ItemStack(Blocks.GLASS), null, new ItemStack(Blocks.GLASS), null, new ItemStack(Blocks.GLASS)); + + ModHandler.addShapedRecipe(SHAPE_MOLD_CREDIT.getStackForm(), + "h ", + textShape, + emptyRow, + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_MOLD_PLATE.getStackForm(), + " h ", + textShape, + emptyRow, + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_MOLD_CASING.getStackForm(), + " h", + textShape, + emptyRow, + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_MOLD_GEAR.getStackForm(), + emptyRow, + " Ph", + emptyRow, + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_MOLD_BOTTLE.getStackForm(), + emptyRow, + textShape, + " h", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_MOLD_INGOT.getStackForm(), + emptyRow, + textShape, + " h ", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_MOLD_BALL.getStackForm(), + emptyRow, + textShape, + "h ", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_MOLD_BLOCK.getStackForm(), + emptyRow, + "hP ", + emptyRow, + 'P', SHAPE_EMPTY); + + + ModHandler.addShapedRecipe(SHAPE_MOLD_NUGGET.getStackForm(), + "P h", + emptyRow, + emptyRow, + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_MOLD_BUN.getStackForm(), + "P ", + " h", + emptyRow, + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_MOLD_BREAD.getStackForm(), + "P ", + emptyRow, + " h", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_MOLD_BAGUETTE.getStackForm(), + "P ", + emptyRow, + " h ", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_MOLD_CYLINDER.getStackForm(), + " P", + emptyRow, + " h", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_MOLD_ANVIL.getStackForm(), + " P", + emptyRow, + " h ", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_MOLD_NAME.getStackForm(), + " P", + emptyRow, + "h ", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_MOLD_GEAR_SMALL.getStackForm(), + emptyRow, + emptyRow, + "h P", + 'P', SHAPE_EMPTY); + + // Shape extruder recipes + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_BOLT.getStackForm(), + "x ", + textShape, + emptyRow, + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_CELL.getStackForm(), + " x ", + textShape, + emptyRow, + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_INGOT.getStackForm(), + " x", + textShape, + emptyRow, + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_RING.getStackForm(), + emptyRow, + " Px", + emptyRow, + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_ROD.getStackForm(), + emptyRow, + textShape, + " x", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_WIRE.getStackForm(), + emptyRow, + textShape, + " x ", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_CASING.getStackForm(), + emptyRow, + textShape, + "x ", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_PLATE.getStackForm(), + emptyRow, + "xP ", + emptyRow, + 'P', SHAPE_EMPTY); + + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_BLOCK.getStackForm(), + "P x", + emptyRow, + emptyRow, + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_PIPE_SMALL.getStackForm(), + "P ", + " x", + emptyRow, + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_PIPE_LARGE.getStackForm(), + "P ", + emptyRow, + " x", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_PIPE_MEDIUM.getStackForm(), + "P ", + emptyRow, + " x ", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_SWORD.getStackForm(), + " P", + emptyRow, + " x", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_PICKAXE.getStackForm(), + " P", + emptyRow, + " x ", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_SHOVEL.getStackForm(), + " P", + emptyRow, + "x ", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_AXE.getStackForm(), + " P", + "x ", + emptyRow, + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_HOE.getStackForm(), + emptyRow, + emptyRow, + "x P", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_HAMMER.getStackForm(), + emptyRow, + "x ", + " P", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_FILE.getStackForm(), + "x ", + emptyRow, + " P", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_SAW.getStackForm(), + " x ", + emptyRow, + " P", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_GEAR.getStackForm(), + "x ", + emptyRow, + "P ", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_PIPE_TINY.getStackForm(), + " x ", + emptyRow, + "P ", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_PIPE_HUGE.getStackForm(), + " x", + emptyRow, + "P ", + 'P', SHAPE_EMPTY); + + ModHandler.addShapedRecipe(SHAPE_EXTRUDER_BOTTLE.getStackForm(), + emptyRow, + " x", + "P ", + 'P', SHAPE_EMPTY); + + // Shape slicer recipes + ModHandler.addShapedRecipe(SHAPE_SLICER_FLAT.getStackForm(), + "hXS", + textShape, + "fXd", + 'P', SHAPE_EXTRUDER_BLOCK, + 'X', new UnificationEntry(OrePrefix.plate, Materials.StainlessSteel), + 'S', new UnificationEntry(OrePrefix.screw, Materials.StainlessSteel)); + + ModHandler.addShapedRecipe(SHAPE_SLICER_STRIPES.getStackForm(), + "hXS", + "XPX", + "fXd", + 'P', SHAPE_EXTRUDER_BLOCK, + 'X', new UnificationEntry(OrePrefix.plate, Materials.StainlessSteel), + 'S', new UnificationEntry(OrePrefix.screw, Materials.StainlessSteel)); + + // Fluid container recipes + ModHandler.addShapedRecipe(FUEL_CAN_PLASTIC_EMPTY.getStackForm(7), + " PP", + "P P", + "PPP", + 'P', new UnificationEntry(OrePrefix.plate, Materials.Plastic)); + + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Redstone), OreDictUnifier.get(OrePrefix.cell, MarkerMaterials.Empty)) + .outputs(SPRAY_EMPTY.getStackForm()) + .duration(800) + .EUt(1) + .buildAndRegister(); + + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Aluminium, 1), OreDictUnifier.get(OrePrefix.ring, Materials.Aluminium, 2)) + .outputs(THERMOS_CAN_EMPTY.getStackForm()) + .duration(800) + .EUt(1) + .buildAndRegister(); + + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Steel, 1), OreDictUnifier.get(OrePrefix.ring, Materials.Steel, 2)) + .outputs(LARGE_FLUID_CELL_STEEL.getStackForm()) + .duration(100) + .EUt(64) + .buildAndRegister(); + + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.TungstenSteel, 1), OreDictUnifier.get(OrePrefix.ring, Materials.TungstenSteel, 2)) + .outputs(LARGE_FLUID_CELL_TUNGSTENSTEEL.getStackForm()) + .duration(200) + .EUt(256) + .buildAndRegister(); + + // Matches/lighters recipes + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.bolt, Materials.Wood, 1), OreDictUnifier.get(OrePrefix.dustSmall, Materials.Phosphorus, 1)) + .outputs(TOOL_MATCHES.getStackForm()) + .duration(16) + .EUt(16) + .buildAndRegister(); + + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.bolt, Materials.Wood, 1), OreDictUnifier.get(OrePrefix.dustSmall, Materials.Phosphor, 1)) + .outputs(TOOL_MATCHES.getStackForm()) + .duration(16) + .EUt(16) + .buildAndRegister(); + + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.bolt, Materials.Wood, 4), OreDictUnifier.get(OrePrefix.dust, Materials.Phosphorus, 1)) + .outputs(TOOL_MATCHES.getStackForm(4)) + .duration(64) + .EUt(16) + .buildAndRegister(); + + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.bolt, Materials.Wood, 4), OreDictUnifier.get(OrePrefix.dust, Materials.Phosphor, 1)) + .outputs(TOOL_MATCHES.getStackForm(4)) + .duration(64) + .EUt(16) + .buildAndRegister(); + + RecipeMap.BOXINATOR_RECIPES.recipeBuilder() + .inputs(TOOL_MATCHES.getStackForm(16), OreDictUnifier.get(OrePrefix.plate, Materials.Paper, 1)) + .outputs(TOOL_MATCHBOX_FULL.getStackForm()) + .duration(64) + .EUt(16) + .buildAndRegister(); + RecipeMap.UNBOXINATOR_RECIPES.recipeBuilder() + .inputs(TOOL_MATCHBOX_FULL.getStackForm()) + .outputs(TOOL_MATCHES.getStackForm(16)) + .duration(32) + .EUt(16) + .buildAndRegister(); + + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Invar, 2), new ItemStack(Items.FLINT, 1)) + .outputs(TOOL_LIGHTER_INVAR_EMPTY.getStackForm()) + .duration(256) + .EUt(16) + .buildAndRegister(); + + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Platinum, 2), new ItemStack(Items.FLINT, 1)) + .outputs(TOOL_LIGHTER_PLATINUM_EMPTY.getStackForm()) + .duration(256) + .EUt(256) + .buildAndRegister(); + + // Iridium alloy recipes + ModHandler.addShapedRecipe(INGOT_IRIDIUM_ALLOY.getStackForm(), + "IAI", + "ADA", + "IAI", // 'D', GregTechAPI.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "iridiumplate", true) ? OreDictNames.craftingIndustrialDiamond : new UnificationEntry(OrePrefix.dust, Materials.Diamond), - 'D', new UnificationEntry(OrePrefix.dust, Materials.Diamond), - 'A', "plateAlloyAdvanced", - 'I', new UnificationEntry(OrePrefix.plate, Materials.Iridium)); - - PAPER_PRINTED_PAGES = addItem(481, "paper.printed.pages").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Paper, 10886400L)));//.addStats(new Behaviour_PrintedPages()); - PAPER_MAGIC_EMPTY = addItem(482, "paper.magic.empty").setInvisible().setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Paper, 3628800L))); - PAPER_MAGIC_PAGE = addItem(483, "paper.magic.page").setInvisible().setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Paper, 3628800L))); - PAPER_MAGIC_PAGES = addItem(484, "paper.magic.pages").setInvisible().setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Paper, 10886400L))); - PAPER_PUNCH_CARD_EMPTY = addItem(485, "paper.punch.card.empty").setInvisible().setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Paper, 7257600L))); - PAPER_PUNCH_CARD_ENCODED = addItem(486, "paper.punch.card.encoded").setInvisible().setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Paper, 7257600L))); - - SCHEMATIC = addItem(490, "schematic").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.StainlessSteel, 7257600L))); - SCHEMATIC_CRAFTING = addItem(491, "schematic.crafting").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.StainlessSteel, 7257600L))); - SCHEMATIC_1X1 = addItem(495, "schematic.1by1").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.StainlessSteel, 7257600L))); - SCHEMATIC_2X2 = addItem(496, "schematic.2by2").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.StainlessSteel, 7257600L))); - SCHEMATIC_3X3 = addItem(497, "schematic.3by3").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.StainlessSteel, 7257600L))); - SCHEMATIC_DUST = addItem(498, "schematic.dust").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.StainlessSteel, 7257600L))); - - ModHandler.addShapedRecipe(SCHEMATIC_1X1.getStackForm(), - "d ", textShape, emptyRow, - 'P', SCHEMATIC); - - ModHandler.addShapedRecipe(SCHEMATIC_2X2.getStackForm(), - " d ", textShape, emptyRow, - 'P', SCHEMATIC); - - ModHandler.addShapedRecipe(SCHEMATIC_3X3.getStackForm(), - " d", textShape, emptyRow, - 'P', SCHEMATIC); - - ModHandler.addShapedRecipe(SCHEMATIC_DUST.getStackForm(), - emptyRow, textShape, " d", - 'P', SCHEMATIC); - - - ModHandler.addShapelessRecipe(SCHEMATIC.getStackForm(), - SCHEMATIC_CRAFTING); - - ModHandler.addShapelessRecipe(SCHEMATIC.getStackForm(), - SCHEMATIC_1X1); - - ModHandler.addShapelessRecipe(SCHEMATIC.getStackForm(), - SCHEMATIC_2X2); - - ModHandler.addShapelessRecipe(SCHEMATIC.getStackForm(), - SCHEMATIC_3X3); - - ModHandler.addShapelessRecipe(SCHEMATIC.getStackForm(), - SCHEMATIC_DUST); - - - BATTERY_HULL_LV = addItem(500, "battery.hull.lv").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.BatteryAlloy, OrePrefix.plate.materialAmount))); - BATTERY_HULL_MV = addItem(501, "battery.hull.hv").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.BatteryAlloy, OrePrefix.plate.materialAmount * 3L))); - BATTERY_HULL_HV = addItem(502, "battery.hull.mv").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.BatteryAlloy, OrePrefix.plate.materialAmount * 9L))); - - ModHandler.addShapedRecipe(BATTERY_HULL_LV.getStackForm(), - "C", - "P", - "P", - 'P', new UnificationEntry(OrePrefix.plate, Materials.BatteryAlloy), 'C', OreDictNames.craftingWireTin); - ModHandler.addShapedRecipe(BATTERY_HULL_MV.getStackForm(), - "C C", - "PPP", - "PPP", - 'P', new UnificationEntry(OrePrefix.plate, Materials.BatteryAlloy), 'C', OreDictNames.craftingWireCopper); - - BATTERY_RE_ULV_TANTALUM = addItem(499, "battery.re.ulv.tantalum").addStats(new ElectricStats(1000, 0)); - - BATTERY_SU_LV_SULFURICACID = addItem(510, "battery.su.lv.sulfuricacid").addStats(new ElectricStats(18000, 1, false)); - BATTERY_SU_LV_MERCURY = addItem(511, "battery.su.lv.mercury").addStats(new ElectricStats(32000, 1, false)); - - BATTERY_RE_LV_CADMIUM = addItem(517, "battery.re.lv.cadmium").addStats(new ElectricStats(75000, 1)); - BATTERY_RE_LV_LITHIUM = addItem(518, "battery.re.lv.lithium").addStats(new ElectricStats(100000, 1)); - BATTERY_RE_LV_SODIUM = addItem(519, "battery.re.lv.sodium").addStats(new ElectricStats(50000, 1)); - - BATTERY_SU_MV_SULFURICACID = addItem(520, "battery.su.mv.sulfuricacid").addStats(new ElectricStats(72000, 2, false)); - BATTERY_SU_MV_MERCURY = addItem(521, "battery.su.mv.mercury").addStats(new ElectricStats(128000, 2, false)); - - BATTERY_RE_MV_CADMIUM = addItem(527, "battery.re.mv.cadmium").addStats(new ElectricStats(300000, 2)); - BATTERY_RE_MV_LITHIUM = addItem(528, "battery.re.mv.lithium").addStats(new ElectricStats(400000, 2)); - BATTERY_RE_MV_SODIUM = addItem(529, "battery.re.mv.sodium").addStats(new ElectricStats(200000, 2)); - - BATTERY_SU_HV_SULFURICACID = addItem(530, "battery.su.hv.sulfuricacid").addStats(new ElectricStats(288000, 3, false)); - BATTERY_SU_HV_MERCURY = addItem(531, "battery.su.hv.mercury").addStats(new ElectricStats(512000, 3, false)); - - BATTERY_RE_HV_CADMIUM = addItem(537, "battery.re.hv.cadmium").addStats(new ElectricStats(1200000, 3)); - BATTERY_RE_HV_LITHIUM = addItem(538, "battery.re.hv.lithium").addStats(new ElectricStats(1600000, 3)); - BATTERY_RE_HV_SODIUM = addItem(539, "battery.re.hv.sodium").addStats(new ElectricStats(800000, 3)); - - RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_SU_LV_SULFURICACID.getStackForm()) - .outputs(BATTERY_HULL_LV.getStackForm()) - .buildAndRegister(); - - RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_SU_LV_MERCURY.getStackForm()) - .outputs(BATTERY_HULL_LV.getStackForm()) - .buildAndRegister(); - - RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_SU_MV_SULFURICACID.getStackForm()) - .outputs(BATTERY_HULL_MV.getStackForm()) - .buildAndRegister(); - - RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_SU_MV_MERCURY.getStackForm()) - .outputs(BATTERY_HULL_MV.getStackForm()) - .buildAndRegister(); - - RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_SU_HV_SULFURICACID.getStackForm()) - .outputs(BATTERY_HULL_HV.getStackForm()) - .buildAndRegister(); - - RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_SU_HV_MERCURY.getStackForm()) - .outputs(BATTERY_HULL_HV.getStackForm()) - .buildAndRegister(); - - RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_RE_LV_CADMIUM.getStackForm()) - .outputs(BATTERY_HULL_LV.getStackForm()) - .buildAndRegister(); - - RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_RE_LV_LITHIUM.getStackForm()) - .outputs(BATTERY_HULL_LV.getStackForm()) - .buildAndRegister(); - - RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_RE_LV_SODIUM.getStackForm()) - .outputs(BATTERY_HULL_LV.getStackForm()) - .buildAndRegister(); - - RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_RE_MV_CADMIUM.getStackForm()) - .outputs(BATTERY_HULL_MV.getStackForm()) - .buildAndRegister(); - - RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_RE_MV_LITHIUM.getStackForm()) - .outputs(BATTERY_HULL_MV.getStackForm()) - .buildAndRegister(); - - RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_RE_MV_SODIUM.getStackForm()) - .outputs(BATTERY_HULL_MV.getStackForm()) - .buildAndRegister(); - - RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_RE_HV_CADMIUM.getStackForm()) - .outputs(BATTERY_HULL_HV.getStackForm()) - .buildAndRegister(); - - RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_RE_HV_LITHIUM.getStackForm()) - .outputs(BATTERY_HULL_HV.getStackForm()) - .buildAndRegister(); - - RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_RE_HV_SODIUM.getStackForm()) - .outputs(BATTERY_HULL_HV.getStackForm()) - .buildAndRegister(); - - RecipeMap.FLUID_CANNER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Cadmium, 2), BATTERY_HULL_LV.getStackForm()) - .outputs(BATTERY_RE_LV_CADMIUM.getStackForm()) - .duration(100) - .EUt(2) - .buildAndRegister(); - RecipeMap.FLUID_CANNER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Lithium, 2), BATTERY_HULL_LV.getStackForm()) - .outputs(BATTERY_RE_LV_LITHIUM.getStackForm()) - .duration(100) - .EUt(2) - .buildAndRegister(); - RecipeMap.FLUID_CANNER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Sodium, 2), BATTERY_HULL_LV.getStackForm()) - .outputs(BATTERY_RE_LV_SODIUM.getStackForm()) - .duration(100) - .EUt(2) - .buildAndRegister(); - RecipeMap.FLUID_CANNER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Cadmium, 8), BATTERY_HULL_MV.getStackForm()) - .outputs(BATTERY_RE_MV_CADMIUM.getStackForm()) - .duration(400) - .EUt(2) - .buildAndRegister(); - RecipeMap.FLUID_CANNER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Lithium, 8), BATTERY_HULL_MV.getStackForm()) - .outputs(BATTERY_RE_MV_LITHIUM.getStackForm()) - .duration(400) - .EUt(2) - .buildAndRegister(); - RecipeMap.FLUID_CANNER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Sodium, 8), BATTERY_HULL_MV.getStackForm()) - .outputs(BATTERY_RE_MV_SODIUM.getStackForm()) - .duration(400) - .EUt(2) - .buildAndRegister(); - RecipeMap.FLUID_CANNER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Cadmium, 32), BATTERY_HULL_HV.getStackForm()) - .outputs(BATTERY_RE_HV_CADMIUM.getStackForm()) - .duration(1600) - .EUt(2) - .buildAndRegister(); - RecipeMap.FLUID_CANNER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Lithium, 32), BATTERY_HULL_HV.getStackForm()) - .outputs(BATTERY_RE_HV_LITHIUM.getStackForm()) - .duration(1600) - .EUt(2) - .buildAndRegister(); - RecipeMap.FLUID_CANNER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Sodium, 32), BATTERY_HULL_HV.getStackForm()) - .outputs(BATTERY_RE_HV_SODIUM.getStackForm()) - .duration(1600) - .EUt(2) - .buildAndRegister(); - - ENERGY_LAPOTRONICORB = addItem(597, "energy.lapotronicorb").addStats(new ElectricStats(100000000, 5)).setUnificationData(OrePrefix.battery, MarkerMaterials.Tier.Ultimate); - ENERGY_LAPOTRONICORB2 = addItem(598, "energy.lapotronicorb2").addStats(new ElectricStats(1000000000, 6)).setUnificationData(OrePrefix.battery, MarkerMaterials.Tier.Ultimate); - - ZPM = addItem(599, "zpm").addStats(new ElectricStats(2000000000000L, 7, false)); - ZPM2 = addItem(605, "zpm2").addStats(new ElectricStats(Long.MAX_VALUE, 8)); - - ELECTRIC_MOTOR_LV = addItem(600, "electric.motor.lv"); - ELECTRIC_MOTOR_MV = addItem(601, "electric.motor.mv"); - ELECTRIC_MOTOR_HV = addItem(602, "electric.motor.hv"); - ELECTRIC_MOTOR_EV = addItem(603, "electric.motor.ev"); - ELECTRIC_MOTOR_IV = addItem(604, "electric.motor.iv"); - ELECTRIC_MOTOR_LUV = addItem(606, "electric.motor.luv"); - ELECTRIC_MOTOR_ZPM = addItem(607, "electric.motor.zpm"); - ELECTRIC_MOTOR_UV = addItem(608, "electric.motor.uv"); - - ModHandler.addShapedRecipe(ELECTRIC_MOTOR_LV.getStackForm(), - "CWR", - "WIW", - "RWC", - 'I', new UnificationEntry(OrePrefix.stick, Materials.IronMagnetic), - 'R', new UnificationEntry(OrePrefix.stick, MarkerMaterials.GenericMaterial.AnyIron), - 'W', new UnificationEntry(OrePrefix.wireGt01, MarkerMaterials.GenericMaterial.AnyCopper), - 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Tin)); - - ModHandler.addShapedRecipe(ELECTRIC_MOTOR_LV.getStackForm(), - "CWR", - "WIW", - "RWC", - 'I', new UnificationEntry(OrePrefix.stick, Materials.SteelMagnetic), - 'R', new UnificationEntry(OrePrefix.stick, Materials.Steel), - 'W', new UnificationEntry(OrePrefix.wireGt01, MarkerMaterials.GenericMaterial.AnyCopper), - 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Tin)); - - ModHandler.addShapedRecipe(ELECTRIC_MOTOR_MV.getStackForm(), - "CWR", - "WIW", - "RWC", - 'I', new UnificationEntry(OrePrefix.stick, Materials.SteelMagnetic), - 'R', new UnificationEntry(OrePrefix.stick, Materials.Aluminium), - 'W', new UnificationEntry(OrePrefix.wireGt02, MarkerMaterials.GenericMaterial.AnyCopper), - 'C', new UnificationEntry(OrePrefix.cableGt01, MarkerMaterials.GenericMaterial.AnyCopper)); - - ModHandler.addShapedRecipe(ELECTRIC_MOTOR_HV.getStackForm(), - "CWR", - "WIW", - "RWC", - 'I', new UnificationEntry(OrePrefix.stick, Materials.SteelMagnetic), - 'R', new UnificationEntry(OrePrefix.stick, Materials.StainlessSteel), - 'W', new UnificationEntry(OrePrefix.wireGt04, MarkerMaterials.GenericMaterial.AnyCopper), - 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Gold)); - - ModHandler.addShapedRecipe(ELECTRIC_MOTOR_EV.getStackForm(), - "CWR", - "WIW", - "RWC", - 'I', new UnificationEntry(OrePrefix.stick, Materials.NeodymiumMagnetic), - 'R', new UnificationEntry(OrePrefix.stick, Materials.Titanium), - 'W', new UnificationEntry(OrePrefix.wireGt08, Materials.AnnealedCopper), - 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Aluminium)); - - ModHandler.addShapedRecipe(ELECTRIC_MOTOR_IV.getStackForm(), - "CWR", - "WIW", - "RWC", - 'I', new UnificationEntry(OrePrefix.stick, Materials.NeodymiumMagnetic), - 'R', new UnificationEntry(OrePrefix.stick, Materials.TungstenSteel), - 'W', new UnificationEntry(OrePrefix.wireGt16, Materials.AnnealedCopper), - 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Tungsten)); - - - ELECTRIC_PUMP_LV = addItem(610, "electric.pump.lv"); - ELECTRIC_PUMP_MV = addItem(611, "electric.pump.mv"); - ELECTRIC_PUMP_HV = addItem(612, "electric.pump.hv"); - ELECTRIC_PUMP_EV = addItem(613, "electric.pump.ev"); - ELECTRIC_PUMP_IV = addItem(614, "electric.pump.iv"); - ELECTRIC_PUMP_LUV = addItem(620, "electric.pump.luv"); - ELECTRIC_PUMP_ZPM = addItem(621, "electric.pump.zpm"); - ELECTRIC_PUMP_UV = addItem(622, "electric.pump.uv"); - - FLUID_REGULATOR_LV = addItem(615, "fluidregulator.lv"); - FLUID_REGULATOR_MV = addItem(616, "fluidregulator.mv"); - FLUID_REGULATOR_HV = addItem(617, "fluidregulator.hv"); - FLUID_REGULATOR_EV = addItem(618, "fluidregulator.ev"); - FLUID_REGULATOR_IV = addItem(619, "fluidregulator.iv"); - - FLUID_FILTER = addItem(635, "fluidfilter"); - - ROTOR_LV = addItem(620, "rotor.lv").setUnificationData(OrePrefix.rotor, Materials.Tin); - ROTOR_MV = addItem(621, "rotor.mv").setUnificationData(OrePrefix.rotor, Materials.Bronze); - ROTOR_HV = addItem(622, "rotor.hv").setUnificationData(OrePrefix.rotor, Materials.Steel); - ROTOR_EV = addItem(623, "rotor.ev").setUnificationData(OrePrefix.rotor, Materials.StainlessSteel); - ROTOR_IV = addItem(624, "rotor.iv").setUnificationData(OrePrefix.rotor, Materials.TungstenSteel); - - ModHandler.addShapedRecipe(ELECTRIC_PUMP_LV.getStackForm(), - "SXO", - "dPw", - "OMW", - 'M', ELECTRIC_MOTOR_LV, - 'O', new UnificationEntry(OrePrefix.ring, Materials.Rubber), - 'X', new UnificationEntry(OrePrefix.rotor, Materials.Tin), - 'S', new UnificationEntry(OrePrefix.screw, Materials.Tin), - 'W', new UnificationEntry(OrePrefix.cableGt01, Materials.Tin), - 'P', new UnificationEntry(OrePrefix.pipeMedium, Materials.Bronze)); - - ModHandler.addShapedRecipe(ELECTRIC_PUMP_MV.getStackForm(), - "SXO", - "dPw", - "OMW", - 'M', ELECTRIC_MOTOR_MV, - 'O', new UnificationEntry(OrePrefix.ring, Materials.Rubber), - 'X', new UnificationEntry(OrePrefix.rotor, Materials.Bronze), - 'S', new UnificationEntry(OrePrefix.screw, Materials.Bronze), - 'W', new UnificationEntry(OrePrefix.cableGt01, MarkerMaterials.GenericMaterial.AnyCopper), - 'P', new UnificationEntry(OrePrefix.pipeMedium, Materials.Steel)); - - ModHandler.addShapedRecipe(ELECTRIC_PUMP_HV.getStackForm(), - "SXO", - "dPw", - "OMW", - 'M', ELECTRIC_MOTOR_HV, - 'O', new UnificationEntry(OrePrefix.ring, Materials.Rubber), - 'X', new UnificationEntry(OrePrefix.rotor, Materials.Steel), - 'S', new UnificationEntry(OrePrefix.screw, Materials.Steel), - 'W', new UnificationEntry(OrePrefix.cableGt01, Materials.Gold), - 'P', new UnificationEntry(OrePrefix.pipeMedium, Materials.StainlessSteel)); - - ModHandler.addShapedRecipe(ELECTRIC_PUMP_EV.getStackForm(), - "SXO", - "dPw", - "OMW", - 'M', ELECTRIC_MOTOR_EV, - 'O', new UnificationEntry(OrePrefix.ring, Materials.Rubber), - 'X', new UnificationEntry(OrePrefix.rotor, Materials.StainlessSteel), - 'S', new UnificationEntry(OrePrefix.screw, Materials.StainlessSteel), - 'W', new UnificationEntry(OrePrefix.cableGt01, Materials.Aluminium), - 'P', new UnificationEntry(OrePrefix.pipeMedium, Materials.Titanium)); - - ModHandler.addShapedRecipe(ELECTRIC_PUMP_IV.getStackForm(), - "SXO", - "dPw", - "OMW", - 'M', ELECTRIC_MOTOR_IV, - 'O', new UnificationEntry(OrePrefix.ring, Materials.Rubber), - 'X', new UnificationEntry(OrePrefix.rotor, Materials.TungstenSteel), - 'S', new UnificationEntry(OrePrefix.screw, Materials.TungstenSteel), - 'W', new UnificationEntry(OrePrefix.cableGt01, Materials.Tungsten), - 'P', new UnificationEntry(OrePrefix.pipeMedium, Materials.TungstenSteel)); - - CONVEYOR_MODULE_LV = addItem(630, "conveyor.module.lv"); - CONVEYOR_MODULE_MV = addItem(631, "conveyor.module.mv"); - CONVEYOR_MODULE_HV = addItem(632, "conveyor.module.hv"); - CONVEYOR_MODULE_EV = addItem(633, "conveyor.module.ev"); - CONVEYOR_MODULE_IV = addItem(634, "conveyor.module.iv"); - - ModHandler.addShapedRecipe(CONVEYOR_MODULE_LV.getStackForm(), - "RRR", - "MCM", - "RRR", - 'M', ELECTRIC_MOTOR_LV, - 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Tin), - 'R', new UnificationEntry(OrePrefix.plate, Materials.Rubber)); - - ModHandler.addShapedRecipe(CONVEYOR_MODULE_MV.getStackForm(), - "RRR", - "MCM", - "RRR", - 'M', ELECTRIC_MOTOR_MV, - 'C', new UnificationEntry(OrePrefix.cableGt01, MarkerMaterials.GenericMaterial.AnyCopper), - 'R', new UnificationEntry(OrePrefix.plate, Materials.Rubber)); - - ModHandler.addShapedRecipe(CONVEYOR_MODULE_HV.getStackForm(), - "RRR", - "MCM", - "RRR", - 'M', ELECTRIC_MOTOR_HV, - 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Gold), - 'R', new UnificationEntry(OrePrefix.plate, Materials.Rubber)); - - ModHandler.addShapedRecipe(CONVEYOR_MODULE_EV.getStackForm(), - "RRR", - "MCM", - "RRR", - 'M', ELECTRIC_MOTOR_EV, - 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Aluminium), - 'R', new UnificationEntry(OrePrefix.plate, Materials.Rubber)); - - ModHandler.addShapedRecipe(CONVEYOR_MODULE_IV.getStackForm(), - "RRR", - "MCM", - "RRR", - 'M', ELECTRIC_MOTOR_IV, - 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Tungsten), - 'R', new UnificationEntry(OrePrefix.plate, Materials.Rubber)); - - - ELECTRIC_PISTON_LV = addItem(640, "electric.piston.lv"); - ELECTRIC_PISTON_MV = addItem(641, "electric.piston.mv"); - ELECTRIC_PISTON_HV = addItem(642, "electric.piston.hv"); - ELECTRIC_PISTON_EV = addItem(643, "electric.piston.ev"); - ELECTRIC_PISTON_IV = addItem(644, "electric.piston.iv"); - ELECTRIC_PISTON_LUV = addItem(645, "electric.piston.luv"); - ELECTRIC_PISTON_ZPM = addItem(646, "electric.piston.zpm"); - ELECTRIC_PISTON_UV = addItem(647, "electric.piston.uv"); - - ModHandler.addShapedRecipe(ELECTRIC_PISTON_LV.getStackForm(), - "PPP", - "CSS", - "CMG", - 'P', new UnificationEntry(OrePrefix.plate, Materials.Steel), - 'S', new UnificationEntry(OrePrefix.stick, Materials.Steel), - 'G', new UnificationEntry(OrePrefix.gearSmall, Materials.Steel), - 'M', ELECTRIC_MOTOR_LV, - 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Tin)); - - ModHandler.addShapedRecipe(ELECTRIC_PISTON_MV.getStackForm(), - "PPP", - "CSS", - "CMG", - 'P', new UnificationEntry(OrePrefix.plate, Materials.Aluminium), - 'S', new UnificationEntry(OrePrefix.stick, Materials.Aluminium), - 'G', new UnificationEntry(OrePrefix.gearSmall, Materials.Aluminium), - 'M', ELECTRIC_MOTOR_MV, - 'C', new UnificationEntry(OrePrefix.cableGt01, MarkerMaterials.GenericMaterial.AnyCopper)); - - ModHandler.addShapedRecipe(ELECTRIC_PISTON_HV.getStackForm(), - "PPP", - "CSS", - "CMG", - 'P', new UnificationEntry(OrePrefix.plate, Materials.StainlessSteel), - 'S', new UnificationEntry(OrePrefix.stick, Materials.StainlessSteel), - 'G', new UnificationEntry(OrePrefix.gearSmall, Materials.StainlessSteel), - 'M', ELECTRIC_MOTOR_HV, - 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Gold)); - - ModHandler.addShapedRecipe(ELECTRIC_PISTON_EV.getStackForm(), - "PPP", - "CSS", - "CMG", - 'P', new UnificationEntry(OrePrefix.plate, Materials.Titanium), - 'S', new UnificationEntry(OrePrefix.stick, Materials.Titanium), - 'G', new UnificationEntry(OrePrefix.gearSmall, Materials.Titanium), - 'M', ELECTRIC_MOTOR_EV, - 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Aluminium)); - - ModHandler.addShapedRecipe(ELECTRIC_PISTON_IV.getStackForm(), - "PPP", - "CSS", - "CMG", - 'P', new UnificationEntry(OrePrefix.plate, Materials.TungstenSteel), - 'S', new UnificationEntry(OrePrefix.stick, Materials.TungstenSteel), - 'G', new UnificationEntry(OrePrefix.gearSmall, Materials.TungstenSteel), - 'M', ELECTRIC_MOTOR_IV, - 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Tungsten)); - - - ROBOT_ARM_LV = addItem(650, "robot.arm.lv"); - ROBOT_ARM_MV = addItem(651, "robot.arm.mv"); - ROBOT_ARM_HV = addItem(652, "robot.arm.hv"); - ROBOT_ARM_EV = addItem(653, "robot.arm.ev"); - ROBOT_ARM_IV = addItem(654, "robot.arm.iv"); - ROBOT_ARM_LUV = addItem(655, "robot.arm.luv"); - ROBOT_ARM_ZPM = addItem(656, "robot.arm.zpm"); - ROBOT_ARM_UV = addItem(657, "robot.arm.uv"); - - ModHandler.addShapedRecipe(ROBOT_ARM_LV.getStackForm(), - "CCC", - "MSM", - "PES", - 'S', new UnificationEntry(OrePrefix.stick, Materials.Steel), - 'M', ELECTRIC_MOTOR_LV, - 'P', ELECTRIC_PISTON_LV, - 'E', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Basic), - 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Tin)); - - ModHandler.addShapedRecipe(ROBOT_ARM_MV.getStackForm(), - "CCC", - "MSM", - "PES", - 'S', new UnificationEntry(OrePrefix.stick, Materials.Aluminium), - 'M', ELECTRIC_MOTOR_MV, - 'P', ELECTRIC_PISTON_MV, - 'E', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Good), - 'C', new UnificationEntry(OrePrefix.cableGt01, MarkerMaterials.GenericMaterial.AnyCopper)); - - ModHandler.addShapedRecipe(ROBOT_ARM_HV.getStackForm(), - "CCC", - "MSM", - "PES", - 'S', new UnificationEntry(OrePrefix.stick, Materials.StainlessSteel), - 'M', ELECTRIC_MOTOR_HV, - 'P', ELECTRIC_PISTON_HV, - 'E', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Advanced), - 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Gold)); - - ModHandler.addShapedRecipe(ROBOT_ARM_EV.getStackForm(), - "CCC", - "MSM", - "PES", - 'S', new UnificationEntry(OrePrefix.stick, Materials.Titanium), - 'M', ELECTRIC_MOTOR_EV, - 'P', ELECTRIC_PISTON_EV, - 'E', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Elite), - 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Aluminium)); - - ModHandler.addShapedRecipe(ROBOT_ARM_IV.getStackForm(), - "CCC", - "MSM", - "PES", - 'S', new UnificationEntry(OrePrefix.stick, Materials.TungstenSteel), - 'M', ELECTRIC_MOTOR_IV, - 'P', ELECTRIC_PISTON_IV, - 'E', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Master), - 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Tungsten)); - - FIELD_GENERATOR_LV = addItem(670, "field.generator.lv"); - FIELD_GENERATOR_MV = addItem(671, "field.generator.mv"); - FIELD_GENERATOR_HV = addItem(672, "field.generator.hv"); - FIELD_GENERATOR_EV = addItem(673, "field.generator.ev"); - FIELD_GENERATOR_IV = addItem(674, "field.generator.iv"); - FIELD_GENERATOR_LUV = addItem(675, "field.generator.luv"); - FIELD_GENERATOR_ZPM = addItem(676, "field.generator.zpm"); - FIELD_GENERATOR_UV = addItem(677, "field.generator.uv"); - - ModHandler.addShapedRecipe(FIELD_GENERATOR_LV.getStackForm(), - "WCW", - "CGC", - "WCW", - 'G', new UnificationEntry(OrePrefix.gem, Materials.EnderPearl), - 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Basic), - 'W', new UnificationEntry(OrePrefix.wireGt01, Materials.Osmium)); - - ModHandler.addShapedRecipe(FIELD_GENERATOR_MV.getStackForm(), - "WCW", - "CGC", - "WCW", - 'G', new UnificationEntry(OrePrefix.gem, Materials.EnderEye), - 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Good), - 'W', new UnificationEntry(OrePrefix.wireGt02, Materials.Osmium)); - - EMITTER_LV = addItem(680, "emitter.lv"); - EMITTER_MV = addItem(681, "emitter.mv"); - EMITTER_HV = addItem(682, "emitter.hv"); - EMITTER_EV = addItem(683, "emitter.ev"); - EMITTER_IV = addItem(684, "emitter.iv"); - EMITTER_LUV = addItem(685, "emitter.luv"); - EMITTER_ZPM = addItem(686, "emitter.zpm"); - EMITTER_UV = addItem(687, "emitter.uv"); - - ModHandler.addShapedRecipe(EMITTER_LV.getStackForm(), - "SSC", - "WQS", - "CWS", - 'Q', new UnificationEntry(OrePrefix.gem, Materials.Quartzite), - 'S', new UnificationEntry(OrePrefix.stick, Materials.Brass), - 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Basic), - 'W', new UnificationEntry(OrePrefix.cableGt01, Materials.Tin)); - - ModHandler.addShapedRecipe(EMITTER_MV.getStackForm(), - "SSC", - "WQS", - "CWS", - 'Q', new UnificationEntry(OrePrefix.gem, Materials.NetherQuartz), - 'S', new UnificationEntry(OrePrefix.stick, Materials.Electrum), - 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Good), - 'W', new UnificationEntry(OrePrefix.cableGt01, MarkerMaterials.GenericMaterial.AnyCopper)); - - ModHandler.addShapedRecipe(EMITTER_HV.getStackForm(), - "SSC", - "WQS", - "CWS", - 'Q', new UnificationEntry(OrePrefix.gem, Materials.Emerald), - 'S', new UnificationEntry(OrePrefix.stick, Materials.Chrome), - 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Advanced), - 'W', new UnificationEntry(OrePrefix.cableGt01, Materials.Gold)); - - ModHandler.addShapedRecipe(EMITTER_EV.getStackForm(), - "SSC", - "WQS", - "CWS", - 'Q', new UnificationEntry(OrePrefix.gem, Materials.EnderPearl), - 'S', new UnificationEntry(OrePrefix.stick, Materials.Platinum), - 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Elite), - 'W', new UnificationEntry(OrePrefix.cableGt01, Materials.Aluminium)); - - ModHandler.addShapedRecipe(EMITTER_IV.getStackForm(), - "SSC", - "WQS", - "CWS", - 'Q', new UnificationEntry(OrePrefix.gem, Materials.EnderEye), - 'S', new UnificationEntry(OrePrefix.stick, Materials.Osmium), - 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Master), - 'W', new UnificationEntry(OrePrefix.cableGt01, Materials.Tungsten)); - - SENSOR_LV = addItem(690, "sensor.lv"); - SENSOR_MV = addItem(691, "sensor.mv"); - SENSOR_HV = addItem(692, "sensor.hv"); - SENSOR_EV = addItem(693, "sensor.ev"); - SENSOR_IV = addItem(694, "sensor.iv"); - SENSOR_LUV = addItem(695, "sensor.luv"); - SENSOR_ZPM = addItem(696, "sensor.zpm"); - SENSOR_UV = addItem(697, "sensor.uv"); - - ModHandler.addShapedRecipe(SENSOR_LV.getStackForm(), - "P Q", - "PS ", - "CPP", - 'Q', new UnificationEntry(OrePrefix.gem, Materials.Quartzite), - 'S', new UnificationEntry(OrePrefix.stick, Materials.Brass), - 'P', new UnificationEntry(OrePrefix.plate, Materials.Steel), - 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Basic)); - - ModHandler.addShapedRecipe(SENSOR_MV.getStackForm(), - "P Q", - "PS ", - "CPP", - 'Q', new UnificationEntry(OrePrefix.gem, Materials.NetherQuartz), - 'S', new UnificationEntry(OrePrefix.stick, Materials.Electrum), - 'P', new UnificationEntry(OrePrefix.plate, Materials.Aluminium), - 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Good)); - - ModHandler.addShapedRecipe(SENSOR_HV.getStackForm(), - "P Q", - "PS ", - "CPP", - 'Q', new UnificationEntry(OrePrefix.gem, Materials.Emerald), - 'S', new UnificationEntry(OrePrefix.stick, Materials.Chrome), - 'P', new UnificationEntry(OrePrefix.plate, Materials.StainlessSteel), - 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Advanced)); - - ModHandler.addShapedRecipe(SENSOR_EV.getStackForm(), - "P Q", - "PS ", - "CPP", - 'Q', new UnificationEntry(OrePrefix.gem, Materials.EnderPearl), - 'S', new UnificationEntry(OrePrefix.stick, Materials.Platinum), - 'P', new UnificationEntry(OrePrefix.plate, Materials.Titanium), - 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Elite)); - - ModHandler.addShapedRecipe(SENSOR_IV.getStackForm(), - "P Q", - "PS ", - "CPP", - 'Q', new UnificationEntry(OrePrefix.gem, Materials.EnderEye), - 'S', new UnificationEntry(OrePrefix.stick, Materials.Osmium), - 'P', new UnificationEntry(OrePrefix.plate, Materials.TungstenSteel), - 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Master)); - - TOOL_DATASTICK = addItem(708, "tool.datastick").setUnificationData(OrePrefix.circuit, MarkerMaterials.Tier.Data);//.addStats(new Behaviour_DataStick()); - TOOL_DATAORB = addItem(707, "tool.dataorb").setUnificationData(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate);//.addStats(new Behaviour_DataOrb()); - - CIRCUIT_PRIMITIVE = addItem(700, "circuit.primitive").setUnificationData(OrePrefix.circuit, MarkerMaterials.Tier.Primitive); - CIRCUIT_BASIC = addItem(701, "circuit.basic").setUnificationData(OrePrefix.circuit, MarkerMaterials.Tier.Basic); - CIRCUIT_GOOD = addItem(702, "circuit.good").setUnificationData(OrePrefix.circuit, MarkerMaterials.Tier.Good); - CIRCUIT_ADVANCED = addItem(703, "circuit.advanced").setUnificationData(OrePrefix.circuit, MarkerMaterials.Tier.Advanced); - CIRCUIT_DATA = addItem(704, "circuit.data").setUnificationData(OrePrefix.circuit, MarkerMaterials.Tier.Data); - CIRCUIT_ELITE = addItem(705, "circuit.elite").setUnificationData(OrePrefix.circuit, MarkerMaterials.Tier.Elite); - CIRCUIT_MASTER = addItem(706, "circuit.master").setUnificationData(OrePrefix.circuit, MarkerMaterials.Tier.Master); - CIRCUIT_ULTIMATE = TOOL_DATAORB; - - ModHandler.addShapelessRecipe(TOOL_DATAORB.getStackForm(), TOOL_DATAORB); - ModHandler.addShapelessRecipe(TOOL_DATASTICK.getStackForm(), TOOL_DATASTICK); - - CIRCUIT_BOARD_BASIC = addItem(710, "circuit.board.basic"); - CIRCUIT_BOARD_ADVANCED = addItem(711, "circuit.board.advanced"); - CIRCUIT_BOARD_ELITE = addItem(712, "circuit.board.elite"); - CIRCUIT_PARTS_CRYSTAL_CHIP_ELITE = addItem(713, "circuit.parts.crystal.chip.elite"); - CIRCUIT_PARTS_CRYSTAL_CHIP_MASTER = addItem(714, "circuit.parts.crystal.chip.master"); - CIRCUIT_PARTS_ADVANCED = addItem(715, "circuit.parts.advanced"); - CIRCUIT_PARTS_WIRING_BASIC = addItem(716, "circuit.parts.wiring.basic"); - CIRCUIT_PARTS_WIRING_ADVANCED = addItem(717, "circuit.parts.wiring.advanced"); - CIRCUIT_PARTS_WIRING_ELITE = addItem(718, "circuit.parts.wiring.elite"); - EMPTY_BOARD_BASIC = addItem(719, "empty.board.basic"); - EMPTY_BOARD_ELITE = addItem(720, "empty.board.elite"); - - - COMPONENT_SAWBLADE_DIAMOND = addItem(721, "component.sawblade.diamond").addOreDict(OreDictNames.craftingDiamondBlade); - COMPONENT_GRINDER_DIAMOND = addItem(722, "component.grinder.diamond").addOreDict(OreDictNames.craftingGrinder); - COMPONENT_GRINDER_TUNGSTEN = addItem(723, "component.grinder.tungsten").addOreDict(OreDictNames.craftingGrinder); - - QUANTUMEYE = addItem(724, "quantumeye"); - QUANTUMSTAR = addItem(725, "quantumstar"); - GRAVISTAR = addItem(726, "gravistar"); - - ModHandler.addShapedRecipe(FIELD_GENERATOR_HV.getStackForm(), - "WCW", - "CGC", - "WCW", - 'G', QUANTUMEYE.getStackForm(), - 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Advanced), - 'W', new UnificationEntry(OrePrefix.wireGt04, Materials.Osmium)); - - ModHandler.addShapedRecipe(FIELD_GENERATOR_EV.getStackForm(), - "WCW", - "CGC", - "WCW", - 'G', new UnificationEntry(OrePrefix.gem, Materials.NetherStar), - 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Elite), - 'W', new UnificationEntry(OrePrefix.wireGt08, Materials.Osmium)); - - ModHandler.addShapedRecipe(FIELD_GENERATOR_IV.getStackForm(), - "WCW", - "CGC", - "WCW", - 'G', QUANTUMSTAR.getStackForm(), - 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Master), - 'W', new UnificationEntry(OrePrefix.wireGt16, Materials.Osmium)); - - - ModHandler.addShapedRecipe(COMPONENT_SAWBLADE_DIAMOND.getStackForm(), - " D ", - "DGD", - " D ", - 'D', new UnificationEntry(OrePrefix.dustSmall, Materials.Diamond), - 'G', new UnificationEntry(OrePrefix.gear, Materials.CobaltBrass)); - - ModHandler.addShapedRecipe(COMPONENT_GRINDER_DIAMOND.getStackForm(), - "DSD", - "SIS", - "DSD", - 'I', OreDictNames.craftingIndustrialDiamond, - 'D', new UnificationEntry(OrePrefix.dust, Materials.Diamond), - 'S', new UnificationEntry(OrePrefix.plate, Materials.Steel)); - - ModHandler.addShapedRecipe(COMPONENT_GRINDER_TUNGSTEN.getStackForm(), - "TST", - "SIS", - "TST", - 'I', OreDictNames.craftingIndustrialDiamond, - 'T', new UnificationEntry(OrePrefix.plate, Materials.Tungsten), - 'S', new UnificationEntry(OrePrefix.plate, Materials.Steel)); - - UPGRADE_MUFFLER = addItem(727, "upgrade.muffler"); - UPGRADE_LOCK = addItem(728, "upgrade.lock"); - - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Aluminium, 1), OreDictUnifier.get(OrePrefix.dust, Materials.Plastic, 2)) - .outputs(UPGRADE_MUFFLER.getStackForm()) - .duration(1600) - .EUt(2) - .buildAndRegister(); - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Aluminium, 1), OreDictUnifier.get(OrePrefix.dust, Materials.Wood, 2)) - .outputs(UPGRADE_MUFFLER.getStackForm()) - .duration(1600) - .EUt(2) - .buildAndRegister(); - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Iron, 1), OreDictUnifier.get(OrePrefix.dust, Materials.Plastic, 2)) - .outputs(UPGRADE_MUFFLER.getStackForm()) - .duration(1600) - .EUt(2) - .buildAndRegister(); - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Iron, 1), OreDictUnifier.get(OrePrefix.dust, Materials.Wood, 2)) - .outputs(UPGRADE_MUFFLER.getStackForm()) - .duration(1600) - .EUt(2) - .buildAndRegister(); - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.WroughtIron, 1), OreDictUnifier.get(OrePrefix.dust, Materials.Plastic, 2)) - .outputs(UPGRADE_MUFFLER.getStackForm()) - .duration(1600) - .EUt(2) - .buildAndRegister(); - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.WroughtIron, 1), OreDictUnifier.get(OrePrefix.dust, Materials.Wood, 2)) - .outputs(UPGRADE_MUFFLER.getStackForm()) - .duration(1600) - .EUt(2) - .buildAndRegister(); - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Aluminium, 1), OreDictUnifier.get(OrePrefix.plate, Materials.Iridium, 1)) - .outputs(UPGRADE_LOCK.getStackForm()) - .duration(6400) - .EUt(16) - .buildAndRegister(); - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Iron, 1), OreDictUnifier.get(OrePrefix.plate, Materials.Iridium, 1)) - .outputs(UPGRADE_LOCK.getStackForm()) - .duration(6400) - .EUt(16) - .buildAndRegister(); - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.WroughtIron, 1), OreDictUnifier.get(OrePrefix.plate, Materials.Iridium, 1)) - .outputs(UPGRADE_LOCK.getStackForm()) - .duration(6400) - .EUt(16) - .buildAndRegister(); - - COMPONENT_FILTER = addItem(729, "component.filter").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Zinc, OrePrefix.foil.materialAmount * 16L))).addOreDict(OreDictNames.craftingFilter); - - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(ModHandler.IC2.getIC2Item(ItemName.crafting, CraftingItemType.carbon_mesh, 4), OreDictUnifier.get(OrePrefix.foil, Materials.Zinc, 16)) - .fluidInputs(Materials.Plastic.getFluid(144)) - .outputs(COMPONENT_FILTER.getStackForm()) - .duration(1600) - .EUt(32) - .buildAndRegister(); - - TOOL_CHEAT = addItem(761, "tool.cheat").addStats(/*new Behaviour_Scanner(), */new ElectricStats(-2000000000, -1)); - TOOL_SCANNER = addItem(762, "tool.scanner").addStats(/*new Behaviour_Scanner(),*/ new ElectricStats(400000, 2, true, false)); - - ModHandler.addShapedRecipe(TOOL_SCANNER.getStackForm(), - "EPR", - "CSC", - "PBP", - 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Advanced), - 'P', new UnificationEntry(OrePrefix.plate, Materials.Aluminium), - 'E', EMITTER_MV, - 'R', SENSOR_MV, - 'S', Items.DIAMOND, - 'B', BATTERY_RE_MV_LITHIUM); - - NC_SENSORKIT = addItem(763, "nc.sensorkit");//.addStats(new Behaviour_SensorKit()); - DUCT_TAPE = addItem(764, "duct.tape").addOreDict(OreDictNames.craftingDuctTape); - MCGUFFIUM_239 = addItem(765, "mcguffium.239"); - - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(OrePrefix.circuit, MarkerMaterials.Tier.Good, 4), OreDictUnifier.get(OrePrefix.plate, Materials.StainlessSteel, 2)) - .outputs(SCHEMATIC.getStackForm()) - .duration(3200) - .EUt(4) - .buildAndRegister(); - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(SENSOR_LV.getStackForm(), EMITTER_LV.getStackForm()) - .outputs(NC_SENSORKIT.getStackForm()) - .duration(1600) - .EUt(2) - .buildAndRegister(); - - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(ELECTRIC_PUMP_LV.getStackForm(), OreDictUnifier.get(OrePrefix.circuit, MarkerMaterials.Tier.Basic, 2)) - .outputs(FLUID_REGULATOR_LV.getStackForm()) - .duration(800) - .EUt(4) - .buildAndRegister(); - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(ELECTRIC_PUMP_MV.getStackForm(), OreDictUnifier.get(OrePrefix.circuit, MarkerMaterials.Tier.Good, 2)) - .outputs(FLUID_REGULATOR_MV.getStackForm()) - .duration(800) - .EUt(8) - .buildAndRegister(); - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(ELECTRIC_PUMP_HV.getStackForm(), OreDictUnifier.get(OrePrefix.circuit, MarkerMaterials.Tier.Advanced, 2)) - .outputs(FLUID_REGULATOR_HV.getStackForm()) - .duration(800) - .EUt(16) - .buildAndRegister(); - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(ELECTRIC_PUMP_EV.getStackForm(), OreDictUnifier.get(OrePrefix.circuit, MarkerMaterials.Tier.Elite, 2)) - .outputs(FLUID_REGULATOR_EV.getStackForm()) - .duration(800) - .EUt(32) - .buildAndRegister(); - RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(ELECTRIC_PUMP_IV.getStackForm(), OreDictUnifier.get(OrePrefix.circuit, MarkerMaterials.Tier.Master, 2)) - .outputs(FLUID_REGULATOR_IV.getStackForm()) - .duration(800) - .EUt(64) - .buildAndRegister(); - } + 'D', new UnificationEntry(OrePrefix.dust, Materials.Diamond), + 'A', "plateAlloyAdvanced", + 'I', new UnificationEntry(OrePrefix.plate, Materials.Iridium)); + + // Schematics recipes + ModHandler.addShapedRecipe(SCHEMATIC_1X1.getStackForm(), + "d ", textShape, emptyRow, + 'P', SCHEMATIC); + + ModHandler.addShapedRecipe(SCHEMATIC_2X2.getStackForm(), + " d ", textShape, emptyRow, + 'P', SCHEMATIC); + + ModHandler.addShapedRecipe(SCHEMATIC_3X3.getStackForm(), + " d", textShape, emptyRow, + 'P', SCHEMATIC); + + ModHandler.addShapedRecipe(SCHEMATIC_DUST.getStackForm(), + emptyRow, textShape, " d", + 'P', SCHEMATIC); + + + ModHandler.addShapelessRecipe(SCHEMATIC.getStackForm(), + SCHEMATIC_CRAFTING); + + ModHandler.addShapelessRecipe(SCHEMATIC.getStackForm(), + SCHEMATIC_1X1); + + ModHandler.addShapelessRecipe(SCHEMATIC.getStackForm(), + SCHEMATIC_2X2); + + ModHandler.addShapelessRecipe(SCHEMATIC.getStackForm(), + SCHEMATIC_3X3); + + ModHandler.addShapelessRecipe(SCHEMATIC.getStackForm(), + SCHEMATIC_DUST); + + // Battery recipes + ModHandler.addShapedRecipe(BATTERY_HULL_LV.getStackForm(), + "C", + "P", + "P", + 'P', new UnificationEntry(OrePrefix.plate, Materials.BatteryAlloy), 'C', OreDictNames.craftingWireTin); + ModHandler.addShapedRecipe(BATTERY_HULL_MV.getStackForm(), + "C C", + "PPP", + "PPP", + 'P', new UnificationEntry(OrePrefix.plate, Materials.BatteryAlloy), 'C', OreDictNames.craftingWireCopper); + + RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(BATTERY_SU_LV_SULFURICACID.getStackForm()) + .outputs(BATTERY_HULL_LV.getStackForm()) + .buildAndRegister(); + + RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(BATTERY_SU_LV_MERCURY.getStackForm()) + .outputs(BATTERY_HULL_LV.getStackForm()) + .buildAndRegister(); + + RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(BATTERY_SU_MV_SULFURICACID.getStackForm()) + .outputs(BATTERY_HULL_MV.getStackForm()) + .buildAndRegister(); + + RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(BATTERY_SU_MV_MERCURY.getStackForm()) + .outputs(BATTERY_HULL_MV.getStackForm()) + .buildAndRegister(); + + RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(BATTERY_SU_HV_SULFURICACID.getStackForm()) + .outputs(BATTERY_HULL_HV.getStackForm()) + .buildAndRegister(); + + RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(BATTERY_SU_HV_MERCURY.getStackForm()) + .outputs(BATTERY_HULL_HV.getStackForm()) + .buildAndRegister(); + + RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(BATTERY_RE_LV_CADMIUM.getStackForm()) + .outputs(BATTERY_HULL_LV.getStackForm()) + .buildAndRegister(); + + RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(BATTERY_RE_LV_LITHIUM.getStackForm()) + .outputs(BATTERY_HULL_LV.getStackForm()) + .buildAndRegister(); + + RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(BATTERY_RE_LV_SODIUM.getStackForm()) + .outputs(BATTERY_HULL_LV.getStackForm()) + .buildAndRegister(); + + RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(BATTERY_RE_MV_CADMIUM.getStackForm()) + .outputs(BATTERY_HULL_MV.getStackForm()) + .buildAndRegister(); + + RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(BATTERY_RE_MV_LITHIUM.getStackForm()) + .outputs(BATTERY_HULL_MV.getStackForm()) + .buildAndRegister(); + + RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(BATTERY_RE_MV_SODIUM.getStackForm()) + .outputs(BATTERY_HULL_MV.getStackForm()) + .buildAndRegister(); + + RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(BATTERY_RE_HV_CADMIUM.getStackForm()) + .outputs(BATTERY_HULL_HV.getStackForm()) + .buildAndRegister(); + + RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(BATTERY_RE_HV_LITHIUM.getStackForm()) + .outputs(BATTERY_HULL_HV.getStackForm()) + .buildAndRegister(); + + RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(BATTERY_RE_HV_SODIUM.getStackForm()) + .outputs(BATTERY_HULL_HV.getStackForm()) + .buildAndRegister(); + + RecipeMap.FLUID_CANNER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Cadmium, 2), BATTERY_HULL_LV.getStackForm()) + .outputs(BATTERY_RE_LV_CADMIUM.getStackForm()) + .duration(100) + .EUt(2) + .buildAndRegister(); + RecipeMap.FLUID_CANNER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Lithium, 2), BATTERY_HULL_LV.getStackForm()) + .outputs(BATTERY_RE_LV_LITHIUM.getStackForm()) + .duration(100) + .EUt(2) + .buildAndRegister(); + RecipeMap.FLUID_CANNER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Sodium, 2), BATTERY_HULL_LV.getStackForm()) + .outputs(BATTERY_RE_LV_SODIUM.getStackForm()) + .duration(100) + .EUt(2) + .buildAndRegister(); + RecipeMap.FLUID_CANNER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Cadmium, 8), BATTERY_HULL_MV.getStackForm()) + .outputs(BATTERY_RE_MV_CADMIUM.getStackForm()) + .duration(400) + .EUt(2) + .buildAndRegister(); + RecipeMap.FLUID_CANNER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Lithium, 8), BATTERY_HULL_MV.getStackForm()) + .outputs(BATTERY_RE_MV_LITHIUM.getStackForm()) + .duration(400) + .EUt(2) + .buildAndRegister(); + RecipeMap.FLUID_CANNER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Sodium, 8), BATTERY_HULL_MV.getStackForm()) + .outputs(BATTERY_RE_MV_SODIUM.getStackForm()) + .duration(400) + .EUt(2) + .buildAndRegister(); + RecipeMap.FLUID_CANNER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Cadmium, 32), BATTERY_HULL_HV.getStackForm()) + .outputs(BATTERY_RE_HV_CADMIUM.getStackForm()) + .duration(1600) + .EUt(2) + .buildAndRegister(); + RecipeMap.FLUID_CANNER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Lithium, 32), BATTERY_HULL_HV.getStackForm()) + .outputs(BATTERY_RE_HV_LITHIUM.getStackForm()) + .duration(1600) + .EUt(2) + .buildAndRegister(); + RecipeMap.FLUID_CANNER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.dust, Materials.Sodium, 32), BATTERY_HULL_HV.getStackForm()) + .outputs(BATTERY_RE_HV_SODIUM.getStackForm()) + .duration(1600) + .EUt(2) + .buildAndRegister(); + + // Electric motor recipes + ModHandler.addShapedRecipe(ELECTRIC_MOTOR_LV.getStackForm(), + "CWR", + "WIW", + "RWC", + 'I', new UnificationEntry(OrePrefix.stick, Materials.IronMagnetic), + 'R', new UnificationEntry(OrePrefix.stick, MarkerMaterials.GenericMaterial.AnyIron), + 'W', new UnificationEntry(OrePrefix.wireGt01, MarkerMaterials.GenericMaterial.AnyCopper), + 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Tin)); + + ModHandler.addShapedRecipe(ELECTRIC_MOTOR_LV.getStackForm(), + "CWR", + "WIW", + "RWC", + 'I', new UnificationEntry(OrePrefix.stick, Materials.SteelMagnetic), + 'R', new UnificationEntry(OrePrefix.stick, Materials.Steel), + 'W', new UnificationEntry(OrePrefix.wireGt01, MarkerMaterials.GenericMaterial.AnyCopper), + 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Tin)); + + ModHandler.addShapedRecipe(ELECTRIC_MOTOR_MV.getStackForm(), + "CWR", + "WIW", + "RWC", + 'I', new UnificationEntry(OrePrefix.stick, Materials.SteelMagnetic), + 'R', new UnificationEntry(OrePrefix.stick, Materials.Aluminium), + 'W', new UnificationEntry(OrePrefix.wireGt02, MarkerMaterials.GenericMaterial.AnyCopper), + 'C', new UnificationEntry(OrePrefix.cableGt01, MarkerMaterials.GenericMaterial.AnyCopper)); + + ModHandler.addShapedRecipe(ELECTRIC_MOTOR_HV.getStackForm(), + "CWR", + "WIW", + "RWC", + 'I', new UnificationEntry(OrePrefix.stick, Materials.SteelMagnetic), + 'R', new UnificationEntry(OrePrefix.stick, Materials.StainlessSteel), + 'W', new UnificationEntry(OrePrefix.wireGt04, MarkerMaterials.GenericMaterial.AnyCopper), + 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Gold)); + + ModHandler.addShapedRecipe(ELECTRIC_MOTOR_EV.getStackForm(), + "CWR", + "WIW", + "RWC", + 'I', new UnificationEntry(OrePrefix.stick, Materials.NeodymiumMagnetic), + 'R', new UnificationEntry(OrePrefix.stick, Materials.Titanium), + 'W', new UnificationEntry(OrePrefix.wireGt08, Materials.AnnealedCopper), + 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Aluminium)); + + ModHandler.addShapedRecipe(ELECTRIC_MOTOR_IV.getStackForm(), + "CWR", + "WIW", + "RWC", + 'I', new UnificationEntry(OrePrefix.stick, Materials.NeodymiumMagnetic), + 'R', new UnificationEntry(OrePrefix.stick, Materials.TungstenSteel), + 'W', new UnificationEntry(OrePrefix.wireGt16, Materials.AnnealedCopper), + 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Tungsten)); + + // Electric pump recipes + ModHandler.addShapedRecipe(ELECTRIC_PUMP_LV.getStackForm(), + "SXO", + "dPw", + "OMW", + 'M', ELECTRIC_MOTOR_LV, + 'O', new UnificationEntry(OrePrefix.ring, Materials.Rubber), + 'X', new UnificationEntry(OrePrefix.rotor, Materials.Tin), + 'S', new UnificationEntry(OrePrefix.screw, Materials.Tin), + 'W', new UnificationEntry(OrePrefix.cableGt01, Materials.Tin), + 'P', new UnificationEntry(OrePrefix.pipeMedium, Materials.Bronze)); + + ModHandler.addShapedRecipe(ELECTRIC_PUMP_MV.getStackForm(), + "SXO", + "dPw", + "OMW", + 'M', ELECTRIC_MOTOR_MV, + 'O', new UnificationEntry(OrePrefix.ring, Materials.Rubber), + 'X', new UnificationEntry(OrePrefix.rotor, Materials.Bronze), + 'S', new UnificationEntry(OrePrefix.screw, Materials.Bronze), + 'W', new UnificationEntry(OrePrefix.cableGt01, MarkerMaterials.GenericMaterial.AnyCopper), + 'P', new UnificationEntry(OrePrefix.pipeMedium, Materials.Steel)); + + ModHandler.addShapedRecipe(ELECTRIC_PUMP_HV.getStackForm(), + "SXO", + "dPw", + "OMW", + 'M', ELECTRIC_MOTOR_HV, + 'O', new UnificationEntry(OrePrefix.ring, Materials.Rubber), + 'X', new UnificationEntry(OrePrefix.rotor, Materials.Steel), + 'S', new UnificationEntry(OrePrefix.screw, Materials.Steel), + 'W', new UnificationEntry(OrePrefix.cableGt01, Materials.Gold), + 'P', new UnificationEntry(OrePrefix.pipeMedium, Materials.StainlessSteel)); + + ModHandler.addShapedRecipe(ELECTRIC_PUMP_EV.getStackForm(), + "SXO", + "dPw", + "OMW", + 'M', ELECTRIC_MOTOR_EV, + 'O', new UnificationEntry(OrePrefix.ring, Materials.Rubber), + 'X', new UnificationEntry(OrePrefix.rotor, Materials.StainlessSteel), + 'S', new UnificationEntry(OrePrefix.screw, Materials.StainlessSteel), + 'W', new UnificationEntry(OrePrefix.cableGt01, Materials.Aluminium), + 'P', new UnificationEntry(OrePrefix.pipeMedium, Materials.Titanium)); + + ModHandler.addShapedRecipe(ELECTRIC_PUMP_IV.getStackForm(), + "SXO", + "dPw", + "OMW", + 'M', ELECTRIC_MOTOR_IV, + 'O', new UnificationEntry(OrePrefix.ring, Materials.Rubber), + 'X', new UnificationEntry(OrePrefix.rotor, Materials.TungstenSteel), + 'S', new UnificationEntry(OrePrefix.screw, Materials.TungstenSteel), + 'W', new UnificationEntry(OrePrefix.cableGt01, Materials.Tungsten), + 'P', new UnificationEntry(OrePrefix.pipeMedium, Materials.TungstenSteel)); + + // Conveyor module recipes + ModHandler.addShapedRecipe(CONVEYOR_MODULE_LV.getStackForm(), + "RRR", + "MCM", + "RRR", + 'M', ELECTRIC_MOTOR_LV, + 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Tin), + 'R', new UnificationEntry(OrePrefix.plate, Materials.Rubber)); + + ModHandler.addShapedRecipe(CONVEYOR_MODULE_MV.getStackForm(), + "RRR", + "MCM", + "RRR", + 'M', ELECTRIC_MOTOR_MV, + 'C', new UnificationEntry(OrePrefix.cableGt01, MarkerMaterials.GenericMaterial.AnyCopper), + 'R', new UnificationEntry(OrePrefix.plate, Materials.Rubber)); + + ModHandler.addShapedRecipe(CONVEYOR_MODULE_HV.getStackForm(), + "RRR", + "MCM", + "RRR", + 'M', ELECTRIC_MOTOR_HV, + 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Gold), + 'R', new UnificationEntry(OrePrefix.plate, Materials.Rubber)); + + ModHandler.addShapedRecipe(CONVEYOR_MODULE_EV.getStackForm(), + "RRR", + "MCM", + "RRR", + 'M', ELECTRIC_MOTOR_EV, + 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Aluminium), + 'R', new UnificationEntry(OrePrefix.plate, Materials.Rubber)); + + ModHandler.addShapedRecipe(CONVEYOR_MODULE_IV.getStackForm(), + "RRR", + "MCM", + "RRR", + 'M', ELECTRIC_MOTOR_IV, + 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Tungsten), + 'R', new UnificationEntry(OrePrefix.plate, Materials.Rubber)); + + // Electric piston recipes + ModHandler.addShapedRecipe(ELECTRIC_PISTON_LV.getStackForm(), + "PPP", + "CSS", + "CMG", + 'P', new UnificationEntry(OrePrefix.plate, Materials.Steel), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Steel), + 'G', new UnificationEntry(OrePrefix.gearSmall, Materials.Steel), + 'M', ELECTRIC_MOTOR_LV, + 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Tin)); + + ModHandler.addShapedRecipe(ELECTRIC_PISTON_MV.getStackForm(), + "PPP", + "CSS", + "CMG", + 'P', new UnificationEntry(OrePrefix.plate, Materials.Aluminium), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Aluminium), + 'G', new UnificationEntry(OrePrefix.gearSmall, Materials.Aluminium), + 'M', ELECTRIC_MOTOR_MV, + 'C', new UnificationEntry(OrePrefix.cableGt01, MarkerMaterials.GenericMaterial.AnyCopper)); + + ModHandler.addShapedRecipe(ELECTRIC_PISTON_HV.getStackForm(), + "PPP", + "CSS", + "CMG", + 'P', new UnificationEntry(OrePrefix.plate, Materials.StainlessSteel), + 'S', new UnificationEntry(OrePrefix.stick, Materials.StainlessSteel), + 'G', new UnificationEntry(OrePrefix.gearSmall, Materials.StainlessSteel), + 'M', ELECTRIC_MOTOR_HV, + 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Gold)); + + ModHandler.addShapedRecipe(ELECTRIC_PISTON_EV.getStackForm(), + "PPP", + "CSS", + "CMG", + 'P', new UnificationEntry(OrePrefix.plate, Materials.Titanium), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Titanium), + 'G', new UnificationEntry(OrePrefix.gearSmall, Materials.Titanium), + 'M', ELECTRIC_MOTOR_EV, + 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Aluminium)); + + ModHandler.addShapedRecipe(ELECTRIC_PISTON_IV.getStackForm(), + "PPP", + "CSS", + "CMG", + 'P', new UnificationEntry(OrePrefix.plate, Materials.TungstenSteel), + 'S', new UnificationEntry(OrePrefix.stick, Materials.TungstenSteel), + 'G', new UnificationEntry(OrePrefix.gearSmall, Materials.TungstenSteel), + 'M', ELECTRIC_MOTOR_IV, + 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Tungsten)); + + // Robot arm recipes + ModHandler.addShapedRecipe(ROBOT_ARM_LV.getStackForm(), + "CCC", + "MSM", + "PES", + 'S', new UnificationEntry(OrePrefix.stick, Materials.Steel), + 'M', ELECTRIC_MOTOR_LV, + 'P', ELECTRIC_PISTON_LV, + 'E', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Basic), + 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Tin)); + + ModHandler.addShapedRecipe(ROBOT_ARM_MV.getStackForm(), + "CCC", + "MSM", + "PES", + 'S', new UnificationEntry(OrePrefix.stick, Materials.Aluminium), + 'M', ELECTRIC_MOTOR_MV, + 'P', ELECTRIC_PISTON_MV, + 'E', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Good), + 'C', new UnificationEntry(OrePrefix.cableGt01, MarkerMaterials.GenericMaterial.AnyCopper)); + + ModHandler.addShapedRecipe(ROBOT_ARM_HV.getStackForm(), + "CCC", + "MSM", + "PES", + 'S', new UnificationEntry(OrePrefix.stick, Materials.StainlessSteel), + 'M', ELECTRIC_MOTOR_HV, + 'P', ELECTRIC_PISTON_HV, + 'E', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Advanced), + 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Gold)); + + ModHandler.addShapedRecipe(ROBOT_ARM_EV.getStackForm(), + "CCC", + "MSM", + "PES", + 'S', new UnificationEntry(OrePrefix.stick, Materials.Titanium), + 'M', ELECTRIC_MOTOR_EV, + 'P', ELECTRIC_PISTON_EV, + 'E', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Elite), + 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Aluminium)); + + ModHandler.addShapedRecipe(ROBOT_ARM_IV.getStackForm(), + "CCC", + "MSM", + "PES", + 'S', new UnificationEntry(OrePrefix.stick, Materials.TungstenSteel), + 'M', ELECTRIC_MOTOR_IV, + 'P', ELECTRIC_PISTON_IV, + 'E', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Master), + 'C', new UnificationEntry(OrePrefix.cableGt01, Materials.Tungsten)); + + // Field generator recipes + ModHandler.addShapedRecipe(FIELD_GENERATOR_LV.getStackForm(), + "WCW", + "CGC", + "WCW", + 'G', new UnificationEntry(OrePrefix.gem, Materials.EnderPearl), + 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Basic), + 'W', new UnificationEntry(OrePrefix.wireGt01, Materials.Osmium)); + + ModHandler.addShapedRecipe(FIELD_GENERATOR_MV.getStackForm(), + "WCW", + "CGC", + "WCW", + 'G', new UnificationEntry(OrePrefix.gem, Materials.EnderEye), + 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Good), + 'W', new UnificationEntry(OrePrefix.wireGt02, Materials.Osmium)); + + // Emitter recipes + ModHandler.addShapedRecipe(EMITTER_LV.getStackForm(), + "SSC", + "WQS", + "CWS", + 'Q', new UnificationEntry(OrePrefix.gem, Materials.Quartzite), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Brass), + 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Basic), + 'W', new UnificationEntry(OrePrefix.cableGt01, Materials.Tin)); + + ModHandler.addShapedRecipe(EMITTER_MV.getStackForm(), + "SSC", + "WQS", + "CWS", + 'Q', new UnificationEntry(OrePrefix.gem, Materials.NetherQuartz), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Electrum), + 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Good), + 'W', new UnificationEntry(OrePrefix.cableGt01, MarkerMaterials.GenericMaterial.AnyCopper)); + + ModHandler.addShapedRecipe(EMITTER_HV.getStackForm(), + "SSC", + "WQS", + "CWS", + 'Q', new UnificationEntry(OrePrefix.gem, Materials.Emerald), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Chrome), + 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Advanced), + 'W', new UnificationEntry(OrePrefix.cableGt01, Materials.Gold)); + + ModHandler.addShapedRecipe(EMITTER_EV.getStackForm(), + "SSC", + "WQS", + "CWS", + 'Q', new UnificationEntry(OrePrefix.gem, Materials.EnderPearl), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Platinum), + 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Elite), + 'W', new UnificationEntry(OrePrefix.cableGt01, Materials.Aluminium)); + + ModHandler.addShapedRecipe(EMITTER_IV.getStackForm(), + "SSC", + "WQS", + "CWS", + 'Q', new UnificationEntry(OrePrefix.gem, Materials.EnderEye), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Osmium), + 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Master), + 'W', new UnificationEntry(OrePrefix.cableGt01, Materials.Tungsten)); + + // Sensor recipes + ModHandler.addShapedRecipe(SENSOR_LV.getStackForm(), + "P Q", + "PS ", + "CPP", + 'Q', new UnificationEntry(OrePrefix.gem, Materials.Quartzite), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Brass), + 'P', new UnificationEntry(OrePrefix.plate, Materials.Steel), + 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Basic)); + + ModHandler.addShapedRecipe(SENSOR_MV.getStackForm(), + "P Q", + "PS ", + "CPP", + 'Q', new UnificationEntry(OrePrefix.gem, Materials.NetherQuartz), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Electrum), + 'P', new UnificationEntry(OrePrefix.plate, Materials.Aluminium), + 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Good)); + + ModHandler.addShapedRecipe(SENSOR_HV.getStackForm(), + "P Q", + "PS ", + "CPP", + 'Q', new UnificationEntry(OrePrefix.gem, Materials.Emerald), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Chrome), + 'P', new UnificationEntry(OrePrefix.plate, Materials.StainlessSteel), + 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Advanced)); + + ModHandler.addShapedRecipe(SENSOR_EV.getStackForm(), + "P Q", + "PS ", + "CPP", + 'Q', new UnificationEntry(OrePrefix.gem, Materials.EnderPearl), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Platinum), + 'P', new UnificationEntry(OrePrefix.plate, Materials.Titanium), + 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Elite)); + + ModHandler.addShapedRecipe(SENSOR_IV.getStackForm(), + "P Q", + "PS ", + "CPP", + 'Q', new UnificationEntry(OrePrefix.gem, Materials.EnderEye), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Osmium), + 'P', new UnificationEntry(OrePrefix.plate, Materials.TungstenSteel), + 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Master)); + + // Special tools recipes + ModHandler.addShapelessRecipe(TOOL_DATAORB.getStackForm(), TOOL_DATAORB); + ModHandler.addShapelessRecipe(TOOL_DATASTICK.getStackForm(), TOOL_DATASTICK); + + ModHandler.addShapedRecipe(TOOL_SCANNER.getStackForm(), + "EPR", + "CSC", + "PBP", + 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Advanced), + 'P', new UnificationEntry(OrePrefix.plate, Materials.Aluminium), + 'E', EMITTER_MV, + 'R', SENSOR_MV, + 'S', Items.DIAMOND, + 'B', BATTERY_RE_MV_LITHIUM); + + // Field generator recipes + ModHandler.addShapedRecipe(FIELD_GENERATOR_HV.getStackForm(), + "WCW", + "CGC", + "WCW", + 'G', QUANTUMEYE.getStackForm(), + 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Advanced), + 'W', new UnificationEntry(OrePrefix.wireGt04, Materials.Osmium)); + + ModHandler.addShapedRecipe(FIELD_GENERATOR_EV.getStackForm(), + "WCW", + "CGC", + "WCW", + 'G', new UnificationEntry(OrePrefix.gem, Materials.NetherStar), + 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Elite), + 'W', new UnificationEntry(OrePrefix.wireGt08, Materials.Osmium)); + + ModHandler.addShapedRecipe(FIELD_GENERATOR_IV.getStackForm(), + "WCW", + "CGC", + "WCW", + 'G', QUANTUMSTAR.getStackForm(), + 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Master), + 'W', new UnificationEntry(OrePrefix.wireGt16, Materials.Osmium)); + + + ModHandler.addShapedRecipe(COMPONENT_SAWBLADE_DIAMOND.getStackForm(), + " D ", + "DGD", + " D ", + 'D', new UnificationEntry(OrePrefix.dustSmall, Materials.Diamond), + 'G', new UnificationEntry(OrePrefix.gear, Materials.CobaltBrass)); + + ModHandler.addShapedRecipe(COMPONENT_GRINDER_DIAMOND.getStackForm(), + "DSD", + "SIS", + "DSD", + 'I', OreDictNames.craftingIndustrialDiamond, + 'D', new UnificationEntry(OrePrefix.dust, Materials.Diamond), + 'S', new UnificationEntry(OrePrefix.plate, Materials.Steel)); + + ModHandler.addShapedRecipe(COMPONENT_GRINDER_TUNGSTEN.getStackForm(), + "TST", + "SIS", + "TST", + 'I', OreDictNames.craftingIndustrialDiamond, + 'T', new UnificationEntry(OrePrefix.plate, Materials.Tungsten), + 'S', new UnificationEntry(OrePrefix.plate, Materials.Steel)); + + // Upgrades recipes + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Aluminium, 1), OreDictUnifier.get(OrePrefix.dust, Materials.Plastic, 2)) + .outputs(UPGRADE_MUFFLER.getStackForm()) + .duration(1600) + .EUt(2) + .buildAndRegister(); + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Aluminium, 1), OreDictUnifier.get(OrePrefix.dust, Materials.Wood, 2)) + .outputs(UPGRADE_MUFFLER.getStackForm()) + .duration(1600) + .EUt(2) + .buildAndRegister(); + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Iron, 1), OreDictUnifier.get(OrePrefix.dust, Materials.Plastic, 2)) + .outputs(UPGRADE_MUFFLER.getStackForm()) + .duration(1600) + .EUt(2) + .buildAndRegister(); + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Iron, 1), OreDictUnifier.get(OrePrefix.dust, Materials.Wood, 2)) + .outputs(UPGRADE_MUFFLER.getStackForm()) + .duration(1600) + .EUt(2) + .buildAndRegister(); + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.WroughtIron, 1), OreDictUnifier.get(OrePrefix.dust, Materials.Plastic, 2)) + .outputs(UPGRADE_MUFFLER.getStackForm()) + .duration(1600) + .EUt(2) + .buildAndRegister(); + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.WroughtIron, 1), OreDictUnifier.get(OrePrefix.dust, Materials.Wood, 2)) + .outputs(UPGRADE_MUFFLER.getStackForm()) + .duration(1600) + .EUt(2) + .buildAndRegister(); + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Aluminium, 1), OreDictUnifier.get(OrePrefix.plate, Materials.Iridium, 1)) + .outputs(UPGRADE_LOCK.getStackForm()) + .duration(6400) + .EUt(16) + .buildAndRegister(); + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Iron, 1), OreDictUnifier.get(OrePrefix.plate, Materials.Iridium, 1)) + .outputs(UPGRADE_LOCK.getStackForm()) + .duration(6400) + .EUt(16) + .buildAndRegister(); + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.plate, Materials.WroughtIron, 1), OreDictUnifier.get(OrePrefix.plate, Materials.Iridium, 1)) + .outputs(UPGRADE_LOCK.getStackForm()) + .duration(6400) + .EUt(16) + .buildAndRegister(); + + // Misc + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(ModHandler.IC2.getIC2Item(ItemName.crafting, CraftingItemType.carbon_mesh, 4), OreDictUnifier.get(OrePrefix.foil, Materials.Zinc, 16)) + .fluidInputs(Materials.Plastic.getFluid(144)) + .outputs(COMPONENT_FILTER.getStackForm()) + .duration(1600) + .EUt(32) + .buildAndRegister(); + + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(OreDictUnifier.get(OrePrefix.circuit, MarkerMaterials.Tier.Good, 4), OreDictUnifier.get(OrePrefix.plate, Materials.StainlessSteel, 2)) + .outputs(SCHEMATIC.getStackForm()) + .duration(3200) + .EUt(4) + .buildAndRegister(); + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(SENSOR_LV.getStackForm(), EMITTER_LV.getStackForm()) + .outputs(NC_SENSORKIT.getStackForm()) + .duration(1600) + .EUt(2) + .buildAndRegister(); + + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(ELECTRIC_PUMP_LV.getStackForm(), OreDictUnifier.get(OrePrefix.circuit, MarkerMaterials.Tier.Basic, 2)) + .outputs(FLUID_REGULATOR_LV.getStackForm()) + .duration(800) + .EUt(4) + .buildAndRegister(); + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(ELECTRIC_PUMP_MV.getStackForm(), OreDictUnifier.get(OrePrefix.circuit, MarkerMaterials.Tier.Good, 2)) + .outputs(FLUID_REGULATOR_MV.getStackForm()) + .duration(800) + .EUt(8) + .buildAndRegister(); + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(ELECTRIC_PUMP_HV.getStackForm(), OreDictUnifier.get(OrePrefix.circuit, MarkerMaterials.Tier.Advanced, 2)) + .outputs(FLUID_REGULATOR_HV.getStackForm()) + .duration(800) + .EUt(16) + .buildAndRegister(); + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(ELECTRIC_PUMP_EV.getStackForm(), OreDictUnifier.get(OrePrefix.circuit, MarkerMaterials.Tier.Elite, 2)) + .outputs(FLUID_REGULATOR_EV.getStackForm()) + .duration(800) + .EUt(32) + .buildAndRegister(); + RecipeMap.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(ELECTRIC_PUMP_IV.getStackForm(), OreDictUnifier.get(OrePrefix.circuit, MarkerMaterials.Tier.Master, 2)) + .outputs(FLUID_REGULATOR_IV.getStackForm()) + .duration(800) + .EUt(64) + .buildAndRegister(); + } @Override public boolean onEntityItemUpdate(EntityItem itemEntity) { diff --git a/src/main/java/gregtech/common/items/MetaItem2.java b/src/main/java/gregtech/common/items/MetaItem2.java index 455eb70c..d4240b8f 100644 --- a/src/main/java/gregtech/common/items/MetaItem2.java +++ b/src/main/java/gregtech/common/items/MetaItem2.java @@ -32,9 +32,14 @@ public class MetaItem2 extends MaterialMetaItem { OrePrefix.wireFine, OrePrefix.gearSmall, OrePrefix.rotor, OrePrefix.stickLong, OrePrefix.springSmall, OrePrefix.spring, OrePrefix.gemChipped, OrePrefix.gemFlawed, OrePrefix.gemFlawless, OrePrefix.gemExquisite, OrePrefix.gear, null, null, null, null, null); + } + + @Override + public void registerItem(String registryName) { + super.registerItem(registryName); boolean drinksAlwaysDrinkable = false; - + THERMOS_CAN_DARK_COFFEE = addItem(0, "thermos_can.dark.coffee").addStats(new FoodStats(2, 0.2F, true, drinksAlwaysDrinkable, THERMOS_CAN_EMPTY.getStackForm(), new RandomPotionEffect(MobEffects.SPEED, 400, 1, 70), new RandomPotionEffect(MobEffects.HASTE, 400, 1, 70))); THERMOS_CAN_DARK_CAFE_AU_LAIT = addItem(1, "thermos_can.dark.cafe.au.lait").setInvisible().addStats(new FoodStats(2, 0.2F, true, drinksAlwaysDrinkable, THERMOS_CAN_EMPTY.getStackForm(), new RandomPotionEffect(MobEffects.SPEED, 400, 2, 90), new RandomPotionEffect(MobEffects.HASTE, 400, 2, 90))); THERMOS_CAN_COFFEE = addItem(2, "thermos_can.coffee").addStats(new FoodStats(3, 0.4F, true, drinksAlwaysDrinkable, THERMOS_CAN_EMPTY.getStackForm(), new RandomPotionEffect(MobEffects.SPEED, 400, 0, 50), new RandomPotionEffect(MobEffects.HASTE, 400, 0, 50))); @@ -49,7 +54,7 @@ public class MetaItem2 extends MaterialMetaItem { GELLED_TOLUENE = addItem(10, "gelled_toluene"); ItemStack emptyBottle = new ItemStack(Items.GLASS_BOTTLE); - + BOTTLE_PURPLE_DRINK = addItem(100, "bottle.purple.drink").addStats(new FoodStats(8, 0.2F, true, drinksAlwaysDrinkable, emptyBottle, new RandomPotionEffect(MobEffects.SLOWNESS, 400, 1, 90))); BOTTLE_GRAPE_JUICE = addItem(101, "bottle.grape.juice").addStats(new FoodStats(4, 0.2F, true, drinksAlwaysDrinkable, emptyBottle, new RandomPotionEffect(MobEffects.HUNGER, 400, 1, 60))); BOTTLE_WINE = addItem(102, "bottle.wine").addStats(new FoodStats(2, 0.2F, true, drinksAlwaysDrinkable, emptyBottle, new RandomPotionEffect(MobEffects.NAUSEA, 400, 1, 60), new RandomPotionEffect(MobEffects.INSTANT_HEALTH, 0, 0, 60), new RandomPotionEffect(MobEffects.POISON, 200, 1, 5))); @@ -146,37 +151,6 @@ public class MetaItem2 extends MaterialMetaItem { SFMIXTURE = addItem(270, "sfmixture"); MSFMIXTURE = addItem(271, "msfmixture"); - ModHandler.addShapedRecipe(PLANK_OAK.getStackForm(2), - "s ", - " P", - 'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 0)); - - ModHandler.addShapedRecipe(PLANK_SPRUCE.getStackForm(2), - "s ", - " P", - 'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 1)); - - ModHandler.addShapedRecipe(PLANK_BIRCH.getStackForm(2), - "s ", - " P", - 'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 2)); - - ModHandler.addShapedRecipe(PLANK_JUNGLE.getStackForm(2), - "s ", - " P", - 'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 3)); - - ModHandler.addShapedRecipe(PLANK_ACACIA.getStackForm(2), - "s ", - " P", - 'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 4)); - - ModHandler.addShapedRecipe(PLANK_DARKOAK.getStackForm(2), - "s ", - " P", - 'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 5)); - - CROP_DROP_PLUMBILIA = addItem(500, "crop.drop.plumbilia"); CROP_DROP_ARGENTIA = addItem(501, "crop.drop.argentia"); CROP_DROP_INDIGO = addItem(502, "crop.drop.indigo"); @@ -234,228 +208,265 @@ public class MetaItem2 extends MaterialMetaItem { FOOD_SLICED_CUCUMBER = addItem(574, "food.sliced.cucumber").addStats(new FoodStats(1, 0.05F)); FOOD_SLICED_CHEESE = addItem(576, "food.sliced.cheese").addStats(new FoodStats(1, 0.1F)); + } + + public void registerRecipes() { + + // Plank recipes + ModHandler.addShapedRecipe(PLANK_OAK.getStackForm(2), + "s ", + " P", + 'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 0)); + + ModHandler.addShapedRecipe(PLANK_SPRUCE.getStackForm(2), + "s ", + " P", + 'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 1)); + + ModHandler.addShapedRecipe(PLANK_BIRCH.getStackForm(2), + "s ", + " P", + 'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 2)); + + ModHandler.addShapedRecipe(PLANK_JUNGLE.getStackForm(2), + "s ", + " P", + 'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 3)); + + ModHandler.addShapedRecipe(PLANK_ACACIA.getStackForm(2), + "s ", + " P", + 'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 4)); + + ModHandler.addShapedRecipe(PLANK_DARKOAK.getStackForm(2), + "s ", + " P", + 'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 5)); + + // Dyes recipes + RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(new ItemStack(Blocks.RED_FLOWER, 1, 0)) + .outputs(new ItemStack(Items.DYE, 2, 1)) + .buildAndRegister(); RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.RED_FLOWER, 1, 0)) - .outputs(new ItemStack(Items.DYE, 2, 1)) - .buildAndRegister(); + .inputs(new ItemStack(Blocks.RED_FLOWER, 1, 1)) + .outputs(new ItemStack(Items.DYE, 2, 12)) + .buildAndRegister(); RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.RED_FLOWER, 1, 1)) - .outputs(new ItemStack(Items.DYE, 2, 12)) - .buildAndRegister(); + .inputs(new ItemStack(Blocks.RED_FLOWER, 1, 2)) + .outputs(new ItemStack(Items.DYE, 2, 13)) + .buildAndRegister(); RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.RED_FLOWER, 1, 2)) - .outputs(new ItemStack(Items.DYE, 2, 13)) - .buildAndRegister(); + .inputs(new ItemStack(Blocks.RED_FLOWER, 1, 3)) + .outputs(new ItemStack(Items.DYE, 2, 7)) + .buildAndRegister(); RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.RED_FLOWER, 1, 3)) - .outputs(new ItemStack(Items.DYE, 2, 7)) - .buildAndRegister(); + .inputs(new ItemStack(Blocks.RED_FLOWER, 1, 4)) + .outputs(new ItemStack(Items.DYE, 2, 1)) + .buildAndRegister(); RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.RED_FLOWER, 1, 4)) - .outputs(new ItemStack(Items.DYE, 2, 1)) - .buildAndRegister(); + .inputs(new ItemStack(Blocks.RED_FLOWER, 1, 5)) + .outputs(new ItemStack(Items.DYE, 2, 14)) + .buildAndRegister(); RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.RED_FLOWER, 1, 5)) - .outputs(new ItemStack(Items.DYE, 2, 14)) - .buildAndRegister(); + .inputs(new ItemStack(Blocks.RED_FLOWER, 1, 6)) + .outputs(new ItemStack(Items.DYE, 2, 7)) + .buildAndRegister(); RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.RED_FLOWER, 1, 6)) - .outputs(new ItemStack(Items.DYE, 2, 7)) - .buildAndRegister(); + .inputs(new ItemStack(Blocks.RED_FLOWER, 1, 7)) + .outputs(new ItemStack(Items.DYE, 2, 9)) + .buildAndRegister(); RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.RED_FLOWER, 1, 7)) - .outputs(new ItemStack(Items.DYE, 2, 9)) - .buildAndRegister(); + .inputs(new ItemStack(Blocks.RED_FLOWER, 1, 8)) + .outputs(new ItemStack(Items.DYE, 2, 7)) + .buildAndRegister(); RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.RED_FLOWER, 1, 8)) - .outputs(new ItemStack(Items.DYE, 2, 7)) - .buildAndRegister(); + .inputs(new ItemStack(Blocks.YELLOW_FLOWER, 1, 0)) + .outputs(new ItemStack(Items.DYE, 2, 11)) + .buildAndRegister(); RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.YELLOW_FLOWER, 1, 0)) - .outputs(new ItemStack(Items.DYE, 2, 11)) - .buildAndRegister(); + .inputs(new ItemStack(Blocks.DOUBLE_PLANT, 1, 0)) + .outputs(new ItemStack(Items.DYE, 3, 11)) + .buildAndRegister(); RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.DOUBLE_PLANT, 1, 0)) - .outputs(new ItemStack(Items.DYE, 3, 11)) - .buildAndRegister(); + .inputs(new ItemStack(Blocks.DOUBLE_PLANT, 1, 1)) + .outputs(new ItemStack(Items.DYE, 3, 13)) + .buildAndRegister(); RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.DOUBLE_PLANT, 1, 1)) - .outputs(new ItemStack(Items.DYE, 3, 13)) - .buildAndRegister(); + .inputs(new ItemStack(Blocks.DOUBLE_PLANT, 1, 4)) + .outputs(new ItemStack(Items.DYE, 3, 1)) + .buildAndRegister(); RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.DOUBLE_PLANT, 1, 4)) - .outputs(new ItemStack(Items.DYE, 3, 1)) - .buildAndRegister(); + .inputs(new ItemStack(Blocks.DOUBLE_PLANT, 1, 5)) + .outputs(new ItemStack(Items.DYE, 3, 9)) + .buildAndRegister(); + + // Crops recipes + RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(CROP_DROP_PLUMBILIA.getStackForm()) + .outputs(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Lead, 1)) + .buildAndRegister(); RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.DOUBLE_PLANT, 1, 5)) - .outputs(new ItemStack(Items.DYE, 3, 9)) - .buildAndRegister(); + .inputs(CROP_DROP_ARGENTIA.getStackForm()) + .outputs(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Silver, 1)) + .buildAndRegister(); RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(CROP_DROP_PLUMBILIA.getStackForm()) - .outputs(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Lead, 1)) - .buildAndRegister(); + .inputs(CROP_DROP_INDIGO.getStackForm()) + .outputs(DYE_INDIGO.getStackForm()) + .buildAndRegister(); RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(CROP_DROP_ARGENTIA.getStackForm()) - .outputs(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Silver, 1)) - .buildAndRegister(); + .inputs(CROP_DROP_MILK_WART.getStackForm()) + .outputs(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Milk)) + .buildAndRegister(); RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(CROP_DROP_INDIGO.getStackForm()) - .outputs(DYE_INDIGO.getStackForm()) - .buildAndRegister(); + .inputs(CROP_DROP_COPPON.getStackForm()) + .outputs(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Copper)) + .buildAndRegister(); RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(CROP_DROP_MILK_WART.getStackForm()) - .outputs(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Milk, 1)) - .buildAndRegister(); - - RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(CROP_DROP_COPPON.getStackForm()) - .outputs(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Copper, 1)) - .buildAndRegister(); - - RecipeMap.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(CROP_DROP_TINE.getStackForm()) - .outputs(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Tin, 1)) - .buildAndRegister(); + .inputs(CROP_DROP_TINE.getStackForm()) + .outputs(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Tin)) + .buildAndRegister(); ItemStack plantBall = ModHandler.IC2.getIC2Item(ItemName.crafting, CraftingItemType.plant_ball, 1); RecipeMap.COMPRESSOR_RECIPES.recipeBuilder() - .inputs(CROP_DROP_COPPON.getStackForm(4)) - .outputs(new ItemStack(Blocks.WOOL, 1, 1)) - .buildAndRegister(); + .inputs(CROP_DROP_COPPON.getStackForm(4)) + .outputs(new ItemStack(Blocks.WOOL, 1, 1)) + .buildAndRegister(); RecipeMap.COMPRESSOR_RECIPES.recipeBuilder() - .inputs(CROP_DROP_PLUMBILIA.getStackForm(8)) - .outputs(plantBall.copy()) - .buildAndRegister(); + .inputs(CROP_DROP_PLUMBILIA.getStackForm(8)) + .outputs(plantBall.copy()) + .buildAndRegister(); RecipeMap.COMPRESSOR_RECIPES.recipeBuilder() - .inputs(CROP_DROP_ARGENTIA.getStackForm(8)) - .outputs(plantBall.copy()) - .buildAndRegister(); + .inputs(CROP_DROP_ARGENTIA.getStackForm(8)) + .outputs(plantBall.copy()) + .buildAndRegister(); RecipeMap.COMPRESSOR_RECIPES.recipeBuilder() - .inputs(CROP_DROP_INDIGO.getStackForm(8)) - .outputs(plantBall.copy()) - .buildAndRegister(); + .inputs(CROP_DROP_INDIGO.getStackForm(8)) + .outputs(plantBall.copy()) + .buildAndRegister(); RecipeMap.COMPRESSOR_RECIPES.recipeBuilder() - .inputs(CROP_DROP_FERRU.getStackForm(8)) - .outputs(plantBall.copy()) - .buildAndRegister(); + .inputs(CROP_DROP_FERRU.getStackForm(8)) + .outputs(plantBall.copy()) + .buildAndRegister(); RecipeMap.COMPRESSOR_RECIPES.recipeBuilder() - .inputs(CROP_DROP_AURELIA.getStackForm(8)) - .outputs(plantBall.copy()) - .buildAndRegister(); + .inputs(CROP_DROP_AURELIA.getStackForm(8)) + .outputs(plantBall.copy()) + .buildAndRegister(); RecipeMap.COMPRESSOR_RECIPES.recipeBuilder() - .inputs(CROP_DROP_OIL_BERRY.getStackForm(8)) - .outputs(plantBall.copy()) - .buildAndRegister(); + .inputs(CROP_DROP_OIL_BERRY.getStackForm(8)) + .outputs(plantBall.copy()) + .buildAndRegister(); RecipeMap.COMPRESSOR_RECIPES.recipeBuilder() - .inputs(CROP_DROP_BOBS_YER_UNCLE_RANKS.getStackForm(8)) - .outputs(plantBall.copy()) - .buildAndRegister(); + .inputs(CROP_DROP_BOBS_YER_UNCLE_RANKS.getStackForm(8)) + .outputs(plantBall.copy()) + .buildAndRegister(); RecipeMap.COMPRESSOR_RECIPES.recipeBuilder() - .inputs(CROP_DROP_TINE.getStackForm(4)) - .outputs(plantBall.copy()) - .buildAndRegister(); + .inputs(CROP_DROP_TINE.getStackForm(4)) + .outputs(plantBall.copy()) + .buildAndRegister(); RecipeMap.COMPRESSOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.RED_FLOWER, 8, W)) - .outputs(plantBall.copy()) - .buildAndRegister(); + .inputs(new ItemStack(Blocks.RED_FLOWER, 8, W)) + .outputs(plantBall.copy()) + .buildAndRegister(); RecipeMap.COMPRESSOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.RED_FLOWER, 8, W)) - .outputs(plantBall.copy()) - .buildAndRegister(); + .inputs(new ItemStack(Blocks.RED_FLOWER, 8, W)) + .outputs(plantBall.copy()) + .buildAndRegister(); + + // Misc + RecipeMap.MACERATOR_RECIPES.recipeBuilder() + .inputs(FOOD_SLICED_CHEESE.getStackForm()) + .outputs(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Cheese, 1)) + .duration(400) + .EUt(2) + .buildAndRegister(); RecipeMap.MACERATOR_RECIPES.recipeBuilder() - .inputs(FOOD_SLICED_CHEESE.getStackForm()) - .outputs(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Cheese, 1)) - .duration(400) - .EUt(2) - .buildAndRegister(); - + .inputs(new ItemStack(Items.DYE, 1, EnumDyeColor.BROWN.getDyeDamage())) + .outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Cocoa, 1)) + .duration(400) + .EUt(2) + .buildAndRegister(); + RecipeMap.MACERATOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Items.DYE, 1, EnumDyeColor.BROWN.getDyeDamage())) - .outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Cocoa, 1)) - .duration(400) - .EUt(2) - .buildAndRegister(); - + .inputs(CROP_DROP_TINE.getStackForm()) + .outputs(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Wood, 2)) + .duration(400) + .EUt(2) + .buildAndRegister(); + RecipeMap.MACERATOR_RECIPES.recipeBuilder() - .inputs(CROP_DROP_TINE.getStackForm()) - .outputs(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Wood, 2)) - .duration(400) - .EUt(2) - .buildAndRegister(); - + .inputs(new ItemStack(Items.REEDS, 1)) + .outputs(new ItemStack(Items.SUGAR, 1)) + .duration(400) + .EUt(2) + .buildAndRegister(); + RecipeMap.MACERATOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Items.REEDS, 1)) - .outputs(new ItemStack(Items.SUGAR, 1)) - .duration(400) - .EUt(2) - .buildAndRegister(); - + .inputs(new ItemStack(Blocks.MELON_BLOCK, 1, 0)) + .outputs(new ItemStack(Items.MELON, 8, 0)) + .chancedOutput(new ItemStack(Items.MELON_SEEDS, 1), 8000) + .duration(400) + .EUt(2) + .buildAndRegister(); + RecipeMap.MACERATOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.MELON_BLOCK, 1, 0)) - .outputs(new ItemStack(Items.MELON, 8, 0)) - .chancedOutput(new ItemStack(Items.MELON_SEEDS, 1), 8000) - .duration(400) - .EUt(2) - .buildAndRegister(); - + .inputs(new ItemStack(Blocks.PUMPKIN, 1, 0)) + .outputs(new ItemStack(Items.PUMPKIN_SEEDS, 4, 0)) + .duration(400) + .EUt(2) + .buildAndRegister(); + RecipeMap.MACERATOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.PUMPKIN, 1, 0)) - .outputs(new ItemStack(Items.PUMPKIN_SEEDS, 4, 0)) - .duration(400) - .EUt(2) - .buildAndRegister(); - + .inputs(new ItemStack(Items.MELON, 1, 0)) + .outputs(new ItemStack(Items.MELON_SEEDS, 1, 0)) + .duration(400) + .EUt(2) + .buildAndRegister(); + RecipeMap.MACERATOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Items.MELON, 1, 0)) - .outputs(new ItemStack(Items.MELON_SEEDS, 1, 0)) - .duration(400) - .EUt(2) - .buildAndRegister(); - + .inputs(new ItemStack(Items.WHEAT, 1, 0)) + .outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Wheat, 1)) + .duration(400) + .EUt(2) + .buildAndRegister(); + RecipeMap.MACERATOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Items.WHEAT, 1, 0)) - .outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Wheat, 1)) - .duration(400) - .EUt(2) - .buildAndRegister(); - + .inputs(new ItemStack(Items.STICK, 1)) + .outputs(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Wood, 2)) + .duration(400) + .EUt(2) + .buildAndRegister(); + RecipeMap.MACERATOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Items.STICK, 1)) - .outputs(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Wood, 2)) - .duration(400) - .EUt(2) - .buildAndRegister(); - - RecipeMap.MACERATOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.WOOL, 1, W)) - .outputs(new ItemStack(Items.STRING, 2)) - .chancedOutput(new ItemStack(Items.STRING, 1), 5000) - .duration(400) - .EUt(2) - .buildAndRegister(); + .inputs(new ItemStack(Blocks.WOOL, 1, W)) + .outputs(new ItemStack(Items.STRING, 2)) + .chancedOutput(new ItemStack(Items.STRING, 1), 5000) + .duration(400) + .EUt(2) + .buildAndRegister(); } @Override diff --git a/src/main/java/gregtech/common/items/MetaTool.java b/src/main/java/gregtech/common/items/MetaTool.java index 1a82873b..eca8ae63 100644 --- a/src/main/java/gregtech/common/items/MetaTool.java +++ b/src/main/java/gregtech/common/items/MetaTool.java @@ -6,6 +6,7 @@ import gregtech.api.recipes.ModHandler; import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; +import gregtech.api.unification.stack.UnificationEntry; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -16,6 +17,11 @@ public class MetaTool extends ToolMetaItem.MetaToolValueItem> { public MetaTool() { super(); + } + + @Override + public void registerItem(String registryName) { + super.registerItem(registryName); SWORD = addItem(0, "tool.sword")/*.setToolStats(new ToolSword())*/.addOreDict(ToolDictNames.craftingToolSword); PICKAXE = addItem(1, "tool.pickaxe")/*.setToolStats(new ToolPickaxe())*/.addOreDict(ToolDictNames.craftingToolPickaxe); @@ -60,300 +66,302 @@ public class MetaTool extends ToolMetaItem.MetaToolValueItem> { TURBINE_NORMAL = addItem(37, "tool.turbine.normal")/*.setToolStats(new ToolTurbineNormal())*/; TURBINE_LARGE = addItem(38, "tool.turbine.large")/*.setToolStats(new ToolTurbineLarge())*/; TURBINE_HUGE = addItem(39, "tool.turbine.huge")/*.setToolStats(new ToolTurbineHuge())*/; + } + public void registerRecipes() { ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Flint, Materials.Stone), + " I ", + "SIS", + "SSS", + 'I', new ItemStack(Items.FLINT, 1), + 'S', OrePrefix.stone); + + ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Bronze, Materials.Stone), + " I ", + "SIS", + "SSS", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.Bronze), + 'S', OrePrefix.stone); + + ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Iron, Materials.Stone), + " I ", + "SIS", + "SSS", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.Iron), + 'S', OrePrefix.stone); + + ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Steel, Materials.Stone), + + " I ", + "SIS", + "SSS", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.Steel), + 'S', OrePrefix.stone); + + ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.WroughtIron, Materials.Stone), + " I ", + "SIS", + "SSS", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.WroughtIron), + 'S', OrePrefix.stone); + + ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.RedSteel, Materials.Stone), + " I ", + "SIS", + "SSS", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.RedSteel), + 'S', OrePrefix.stone); + + ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.BlueSteel, Materials.Stone), + " I ", + "SIS", + "SSS", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.BlueSteel), + 'S', OrePrefix.stone); + + ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.BlackSteel, Materials.Stone), + " I ", + "SIS", + "SSS", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.BlackSteel), + 'S', OrePrefix.stone); + + ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.DamascusSteel, Materials.Stone), + " I ", + "SIS", + "SSS", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.DamascusSteel), + 'S', OrePrefix.stone); + + ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.Wood, Materials.Wood), + " S", + " I ", + "S f", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.Wood), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Wood)); + + ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.Plastic, Materials.Plastic), + " S", + " I ", + "S f", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.Plastic), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Plastic)); + + ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.Aluminium, Materials.Aluminium), + " S", + " I ", + "S f", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.Aluminium), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Aluminium)); + + ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.StainlessSteel, Materials.StainlessSteel), + " S", + " I ", + "S f", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.StainlessSteel), + 'S', new UnificationEntry(OrePrefix.stick, Materials.StainlessSteel)); + + + if (false) { //TODO CONFIG !GregTechAPI.sSpecialFile.get(ConfigCategories.general, "DisableFlintTools", false) + ModHandler.addShapedRecipe(SWORD.getStackForm(Materials.Flint, Materials.Wood), + "F", + "F", + "S", + 'S', new UnificationEntry(OrePrefix.stick, Materials.Wood), + 'F', new ItemStack(Items.FLINT, 1)); + + ModHandler.addShapedRecipe(PICKAXE.getStackForm(Materials.Flint, Materials.Wood), + "FFF", + " S ", + " S ", + 'S', new UnificationEntry(OrePrefix.stick, Materials.Wood), + 'F', new ItemStack(Items.FLINT, 1)); + + ModHandler.addShapedRecipe(SHOVEL.getStackForm(Materials.Flint, Materials.Wood), + "F", + "S", + "S", + 'S', new UnificationEntry(OrePrefix.stick, Materials.Wood), + 'F', new ItemStack(Items.FLINT, 1)); + + ModHandler.addShapedRecipe(AXE.getStackForm(Materials.Flint, Materials.Wood),// true, + "FF", + "FS", + " S", + 'S', new UnificationEntry(OrePrefix.stick, Materials.Wood), + 'F', new ItemStack(Items.FLINT, 1)); + + ModHandler.addShapedRecipe(HOE.getStackForm(Materials.Flint, Materials.Wood),// true, + "FF", + " S", + " S", + 'S', new UnificationEntry(OrePrefix.stick, Materials.Wood), + 'F', new ItemStack(Items.FLINT, 1)); + + ModHandler.addShapedRecipe(KNIFE.getStackForm(Materials.Flint, Materials.Wood), + "F", + "S", + 'S', new UnificationEntry(OrePrefix.stick, Materials.Wood), + 'F', new ItemStack(Items.FLINT, 1)); + + ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Flint, Materials.Stone), " I ", "SIS", "SSS", 'I', new ItemStack(Items.FLINT, 1), 'S', OrePrefix.stone); - ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Bronze, Materials.Stone), - " I ", - "SIS", - "SSS", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Bronze), - 'S', OrePrefix.stone); - - ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Iron, Materials.Stone), - " I ", - "SIS", - "SSS", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Iron), - 'S', OrePrefix.stone); - - ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Steel, Materials.Stone), - - " I ", - "SIS", - "SSS", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Steel), - 'S', OrePrefix.stone); - - ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.WroughtIron, Materials.Stone), - " I ", - "SIS", - "SSS", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.WroughtIron), - 'S', OrePrefix.stone); - - ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.RedSteel, Materials.Stone), - " I ", - "SIS", - "SSS", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.RedSteel), - 'S', OrePrefix.stone); - - ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.BlueSteel, Materials.Stone), - " I ", - "SIS", - "SSS", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.BlueSteel), - 'S', OrePrefix.stone); - - ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.BlackSteel, Materials.Stone), - " I ", - "SIS", - "SSS", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.BlackSteel), - 'S', OrePrefix.stone); - - ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.DamascusSteel, Materials.Stone), - " I ", - "SIS", - "SSS", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.DamascusSteel), - 'S', OrePrefix.stone); - - ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.Wood, Materials.Wood), - " S", - " I ", - "S f", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Wood), - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood)); - - ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.Plastic, Materials.Plastic), - " S", - " I ", - "S f", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Plastic), - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.Plastic)); - - ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.Aluminium, Materials.Aluminium), - " S", - " I ", - "S f", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Aluminium), - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.Aluminium)); - - ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.StainlessSteel, Materials.StainlessSteel), - " S", - " I ", - "S f", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.StainlessSteel), - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.StainlessSteel)); - - - if (false) { //TODO CONFIG !GregTechAPI.sSpecialFile.get(ConfigCategories.general, "DisableFlintTools", false) - ModHandler.addShapedRecipe(SWORD.getStackForm(Materials.Flint, Materials.Wood), - "F", - "F", - "S", - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood), - 'F', new ItemStack(Items.FLINT, 1)); - - ModHandler.addShapedRecipe(PICKAXE.getStackForm(Materials.Flint, Materials.Wood), - "FFF", - " S ", - " S ", - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood), - 'F', new ItemStack(Items.FLINT, 1)); - - ModHandler.addShapedRecipe(SHOVEL.getStackForm(Materials.Flint, Materials.Wood), - "F", - "S", - "S", - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood), - 'F', new ItemStack(Items.FLINT, 1)); - - ModHandler.addShapedRecipe(AXE.getStackForm(Materials.Flint, Materials.Wood),// true, - "FF", - "FS", - " S", - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood), - 'F', new ItemStack(Items.FLINT, 1)); - - ModHandler.addShapedRecipe(HOE.getStackForm(Materials.Flint, Materials.Wood),// true, - "FF", - " S", - " S", - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood), - 'F', new ItemStack(Items.FLINT, 1)); - - ModHandler.addShapedRecipe(KNIFE.getStackForm(Materials.Flint, Materials.Wood), - "F", - "S", - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood), - 'F', new ItemStack(Items.FLINT, 1)); - - ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Flint, Materials.Stone), - " I ", - "SIS", - "SSS", - 'I', new ItemStack(Items.FLINT, 1), - 'S', OrePrefix.stone); - ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Bronze, Materials.Stone), - " I ", - "SIS", - "SSS", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Bronze), - 'S', OrePrefix.stone); + " I ", + "SIS", + "SSS", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.Bronze), + 'S', OrePrefix.stone); ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Iron, Materials.Stone), - " I ", - "SIS", - "SSS", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Iron), - 'S', OrePrefix.stone); + " I ", + "SIS", + "SSS", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.Iron), + 'S', OrePrefix.stone); ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Steel, Materials.Stone), - " I ", - "SIS", - "SSS", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Steel), - 'S', OrePrefix.stone); + " I ", + "SIS", + "SSS", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.Steel), + 'S', OrePrefix.stone); ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.WroughtIron, Materials.Stone), - " I ", - "SIS", - "SSS", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.WroughtIron), - 'S', OrePrefix.stone); + " I ", + "SIS", + "SSS", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.WroughtIron), + 'S', OrePrefix.stone); ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.RedSteel, Materials.Stone), - " I ", - "SIS", - "SSS", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.RedSteel), - 'S', OrePrefix.stone); + " I ", + "SIS", + "SSS", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.RedSteel), + 'S', OrePrefix.stone); ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.BlueSteel, Materials.Stone), - " I ", - "SIS", - "SSS", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.BlueSteel), - 'S', OrePrefix.stone); + " I ", + "SIS", + "SSS", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.BlueSteel), + 'S', OrePrefix.stone); ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.BlackSteel, Materials.Stone), - " I ", - "SIS", - "SSS", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.BlackSteel), - 'S', OrePrefix.stone); + " I ", + "SIS", + "SSS", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.BlackSteel), + 'S', OrePrefix.stone); ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.DamascusSteel, Materials.Stone), - " I ", - "SIS", - "SSS", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.DamascusSteel), - 'S', OrePrefix.stone); + " I ", + "SIS", + "SSS", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.DamascusSteel), + 'S', OrePrefix.stone); ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.Wood, Materials.Wood), - " S", - " I ", - "S f", - 'I', OreDictUnifier.get(OrePrefix.plank, Materials.Wood), - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood)); + " S", + " I ", + "S f", + 'I', new UnificationEntry(OrePrefix.plank, Materials.Wood), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Wood)); ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.Plastic, Materials.Plastic), - " S", - " I ", - "S f", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Plastic), - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.Plastic)); + " S", + " I ", + "S f", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.Plastic), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Plastic)); ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.Aluminium, Materials.Aluminium), - " S", - " I ", - "S f", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Aluminium), - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.Aluminium)); + " S", + " I ", + "S f", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.Aluminium), + 'S', new UnificationEntry(OrePrefix.stick, Materials.Aluminium)); ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.StainlessSteel, Materials.StainlessSteel), - " S", - " I ", - "S f", - 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.StainlessSteel), - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.StainlessSteel)); + " S", + " I ", + "S f", + 'I', new UnificationEntry(OrePrefix.ingot, Materials.StainlessSteel), + 'S', new UnificationEntry(OrePrefix.stick, Materials.StainlessSteel)); if (false) { // //TODO CONFIG !GregTechAPI.sSpecialFile.get(ConfigCategories.general, "DisableFlintTools", false) ModHandler.addShapedRecipe(SWORD.getStackForm(Materials.Flint, Materials.Wood), - "F", - "F", - "S", - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood), - 'F', new ItemStack(Items.FLINT, 1)); + "F", + "F", + "S", + 'S', new UnificationEntry(OrePrefix.stick, Materials.Wood), + 'F', new ItemStack(Items.FLINT, 1)); ModHandler.addShapedRecipe(PICKAXE.getStackForm(Materials.Flint, Materials.Wood), - "FFF", - " S ", - " S ", - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood), - 'F', new ItemStack(Items.FLINT, 1)); + "FFF", + " S ", + " S ", + 'S', new UnificationEntry(OrePrefix.stick, Materials.Wood), + 'F', new ItemStack(Items.FLINT, 1)); ModHandler.addShapedRecipe(SHOVEL.getStackForm(Materials.Flint, Materials.Wood), - "F", - "S", - "S", - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood), - 'F', new ItemStack(Items.FLINT, 1)); + "F", + "S", + "S", + 'S', new UnificationEntry(OrePrefix.stick, Materials.Wood), + 'F', new ItemStack(Items.FLINT, 1)); ModHandler.addShapedRecipe(AXE.getStackForm(Materials.Flint, Materials.Wood),// true, - "FF", - "FS", - " S", - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood), - 'F', new ItemStack(Items.FLINT, 1)); + "FF", + "FS", + " S", + 'S', new UnificationEntry(OrePrefix.stick, Materials.Wood), + 'F', new ItemStack(Items.FLINT, 1)); ModHandler.addShapedRecipe(HOE.getStackForm(Materials.Flint, Materials.Wood),// true, - "FF", - " S", - " S", - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood), - 'F', new ItemStack(Items.FLINT, 1)); + "FF", + " S", + " S", + 'S', new UnificationEntry(OrePrefix.stick, Materials.Wood), + 'F', new ItemStack(Items.FLINT, 1)); ModHandler.addShapedRecipe(KNIFE.getStackForm(Materials.Flint, Materials.Wood), - "F", - "S", - 'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood), - 'F', new ItemStack(Items.FLINT, 1)); + "F", + "S", + 'S', new UnificationEntry(OrePrefix.stick, Materials.Wood), + 'F', new ItemStack(Items.FLINT, 1)); } if (true) { //TODO CONFIG GregTechAPI.sRecipeFile.get(ConfigCategories.Tools.mortar, "Coal", true) ModHandler.addShapelessRecipe(OreDictUnifier.get(OrePrefix.dust, Materials.Coal, 1), - ToolDictNames.craftingToolMortar, - new ItemStack(Items.COAL, 1)); + ToolDictNames.craftingToolMortar, + new ItemStack(Items.COAL, 1)); } if (true) { //TODO CONFIG GregTechAPI.sRecipeFile.get(ConfigCategories.Tools.mortar, "Clay", true) ModHandler.addShapelessRecipe(OreDictUnifier.get(OrePrefix.dust, Materials.Clay, 1), - ToolDictNames.craftingToolMortar, - new ItemStack(Blocks.CLAY, 1)); + ToolDictNames.craftingToolMortar, + new ItemStack(Blocks.CLAY, 1)); } if (true) { // TODO CONFIG GregTechAPI.sRecipeFile.get(ConfigCategories.Tools.mortar, "Wheat", true) ModHandler.addShapelessRecipe(OreDictUnifier.get(OrePrefix.dust, Materials.Wheat, 1), - ToolDictNames.craftingToolMortar, - new ItemStack(Items.WHEAT, 1)); + ToolDictNames.craftingToolMortar, + new ItemStack(Items.WHEAT, 1)); } if (true) { //TODO CONFIG GregTechAPI.sRecipeFile.get(ConfigCategories.Tools.mortar, "Clay", true) ModHandler.addShapelessRecipe(new ItemStack(Items.FLINT, 1), - ToolDictNames.craftingToolMortar, - new ItemStack(Blocks.GRAVEL, 1)); + ToolDictNames.craftingToolMortar, + new ItemStack(Blocks.GRAVEL, 1)); } if (true) { //TODO CONFIG GregTechAPI.sRecipeFile.get(ConfigCategories.Tools.mortar, "Blaze", true) ModHandler.addShapelessRecipe(new ItemStack(Items.BLAZE_POWDER, 2), - ToolDictNames.craftingToolMortar, - new ItemStack(Items.BLAZE_ROD, 1)); + ToolDictNames.craftingToolMortar, + new ItemStack(Items.BLAZE_ROD, 1)); } } } diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/ItemBlockFluidLoader.java similarity index 99% rename from src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java rename to src/main/java/gregtech/loaders/preload/ItemBlockFluidLoader.java index 1e2c5411..b497beb7 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/ItemBlockFluidLoader.java @@ -1,26 +1,25 @@ package gregtech.loaders.preload; import gregtech.api.util.GTLog; +import gregtech.common.blocks.MetaBlocks; import gregtech.common.items.MetaItem2; import gregtech.common.items.MetaItem1; +import gregtech.common.items.MetaItems; import gregtech.common.items.MetaTool; -public class GT_Loader_Item_Block_And_Fluid - implements Runnable { +public class ItemBlockFluidLoader implements Runnable { + public void run() { // Materials.Water.mFluid = (Materials.Ice.mFluid = GT_ModHandler.getWater(1000L).getFluid()); // Materials.Lava.mFluid = GT_ModHandler.getLava(1000L).getFluid(); GTLog.logger.info("Registering Items."); -// new GT_IntegratedCircuit_Item(); - new MetaItem1(); - new MetaItem2(); - new MetaTool(); - new OreDictionaryLoader().run(); - new UnificationDataLoader().run(); - new OreProcessingLoader().run(); + new MaterialInfoLoader().run(); + + MetaItems.init(); +// MetaBlocks.init(); // ItemList.Rotor_LV.set(OreDictionaryUnifier.get(OrePrefix.rotor, Materials.Tin, 1)); // ItemList.Rotor_MV.set(OreDictionaryUnifier.get(OrePrefix.rotor, Materials.Bronze, 1)); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/MTELoader.java similarity index 99% rename from src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java rename to src/main/java/gregtech/loaders/preload/MTELoader.java index a1696140..dbcb766c 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/MTELoader.java @@ -18,7 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.common.Loader; -public class GT_Loader_MetaTileEntities implements Runnable { +public class MTELoader implements Runnable { private static final String aTextWire1 = "wire."; private static final String aTextCable1 = "cable."; private static final String aTextWire2 = " Wire"; diff --git a/src/main/java/gregtech/loaders/preload/UnificationDataLoader.java b/src/main/java/gregtech/loaders/preload/MaterialInfoLoader.java similarity index 91% rename from src/main/java/gregtech/loaders/preload/UnificationDataLoader.java rename to src/main/java/gregtech/loaders/preload/MaterialInfoLoader.java index 3a130971..2ccc2b13 100644 --- a/src/main/java/gregtech/loaders/preload/UnificationDataLoader.java +++ b/src/main/java/gregtech/loaders/preload/MaterialInfoLoader.java @@ -18,7 +18,7 @@ import net.minecraft.item.ItemStack; import static gregtech.api.GTValues.M; import static gregtech.api.GTValues.W; -public class UnificationDataLoader implements Runnable { +public class MaterialInfoLoader implements Runnable { public void run() { GTLog.logger.info("Loading Item Data Tags"); @@ -40,7 +40,7 @@ public class UnificationDataLoader implements Runnable { OreDictUnifier.registerOre(new ItemStack(Blocks.SNOW, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Snow, M))); OreDictUnifier.registerOre(new ItemStack(Blocks.GLOWSTONE, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Glowstone, 14515200L))); OreDictUnifier.registerOre(new ItemStack(Blocks.REDSTONE_LAMP, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Glowstone, 14515200L), new MaterialStack(Materials.Redstone, OrePrefix.dust.materialAmount * 4L))); - OreDictUnifier.registerOre(new ItemStack(Blocks.LIT_REDSTONE_LAMP, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Glowstone, 14515200L), new MaterialStack(Materials.Redstone, OrePrefix.dust.materialAmount * 4L))); +// OreDictUnifier.registerOre(new ItemStack(Blocks.LIT_REDSTONE_LAMP, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Glowstone, 14515200L), new MaterialStack(Materials.Redstone, OrePrefix.dust.materialAmount * 4L))); OreDictUnifier.registerOre(ModHandler.getModItem("Forestry", "craftingMaterial", 1, 5), new ItemMaterialInfo(new MaterialStack(Materials.Ice, M))); OreDictUnifier.registerOre(new ItemStack(Blocks.ICE, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Ice, M))); OreDictUnifier.registerOre(new ItemStack(Blocks.PACKED_ICE, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Ice, 7257600L))); @@ -104,22 +104,22 @@ public class UnificationDataLoader implements Runnable { OreDictUnifier.registerOre(new ItemStack(Blocks.SNOW_LAYER, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Snow, -1))); OreDictUnifier.registerOre(new ItemStack(Blocks.STONE_SLAB, 1, 0), new ItemMaterialInfo(new MaterialStack(Materials.Stone, 1814400L))); OreDictUnifier.registerOre(new ItemStack(Blocks.STONE_SLAB, 1, 8), new ItemMaterialInfo(new MaterialStack(Materials.Stone, 1814400L))); - OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 0), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M))); - OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 8), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M))); +// OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 0), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M))); +// OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 8), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M))); OreDictUnifier.registerOre(new ItemStack(Blocks.STONE_SLAB, 1, 2), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 1814400L))); OreDictUnifier.registerOre(new ItemStack(Blocks.STONE_SLAB, 1, 10), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 1814400L))); - OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 2), new ItemMaterialInfo(new MaterialStack(Materials.Wood, M))); - OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 10), new ItemMaterialInfo(new MaterialStack(Materials.Wood, M))); +// OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 2), new ItemMaterialInfo(new MaterialStack(Materials.Wood, M))); +// OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 10), new ItemMaterialInfo(new MaterialStack(Materials.Wood, M))); OreDictUnifier.registerOre(new ItemStack(Blocks.STONE_SLAB, 1, 3), new ItemMaterialInfo(new MaterialStack(Materials.Stone, 1814400L))); OreDictUnifier.registerOre(new ItemStack(Blocks.STONE_SLAB, 1, 11), new ItemMaterialInfo(new MaterialStack(Materials.Stone, 1814400L))); - OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 3), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M))); - OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 11), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M))); +// OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 3), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M))); +// OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 11), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M))); OreDictUnifier.registerOre(new ItemStack(Blocks.STONE_SLAB, 1, 5), new ItemMaterialInfo(new MaterialStack(Materials.Stone, 1814400L))); OreDictUnifier.registerOre(new ItemStack(Blocks.STONE_SLAB, 1, 13), new ItemMaterialInfo(new MaterialStack(Materials.Stone, 1814400L))); - OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 5), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M))); - OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 13), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M))); +// OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 5), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M))); +// OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 13), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M))); OreDictUnifier.registerOre(new ItemStack(Blocks.FURNACE, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Stone, 29030400L))); - OreDictUnifier.registerOre(new ItemStack(Blocks.LIT_FURNACE, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Stone, 29030400L))); +// OreDictUnifier.registerOre(new ItemStack(Blocks.LIT_FURNACE, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Stone, 29030400L))); OreDictUnifier.registerOre(new ItemStack(Blocks.STONEBRICK, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M))); OreDictUnifier.registerOre(new ItemStack(Blocks.STONE, 1, 0), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M))); @@ -144,7 +144,7 @@ public class UnificationDataLoader implements Runnable { OreDictUnifier.registerOre(new ItemStack(Blocks.CHEST, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 29030400L))); OreDictUnifier.registerOre(new ItemStack(Blocks.TRAPPED_CHEST, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 32659200L), new MaterialStack(Materials.Iron, OrePrefix.ring.materialAmount * 2L))); OreDictUnifier.registerOre(new ItemStack(Blocks.REDSTONE_TORCH, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 1814400L), new MaterialStack(Materials.Redstone, M))); - OreDictUnifier.registerOre(new ItemStack(Blocks.UNLIT_REDSTONE_TORCH, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 1814400L), new MaterialStack(Materials.Redstone, M))); +// OreDictUnifier.registerOre(new ItemStack(Blocks.UNLIT_REDSTONE_TORCH, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 1814400L), new MaterialStack(Materials.Redstone, M))); OreDictUnifier.registerOre(new ItemStack(Blocks.NOTEBLOCK, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 29030400L), new MaterialStack(Materials.Redstone, M))); OreDictUnifier.registerOre(new ItemStack(Blocks.JUKEBOX, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 29030400L), new MaterialStack(Materials.Diamond, M))); OreDictUnifier.registerOre(new ItemStack(Blocks.CRAFTING_TABLE, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 14515200L))); diff --git a/src/main/java/gregtech/loaders/preload/OreDictionaryLoader.java b/src/main/java/gregtech/loaders/preload/OreDictionaryLoader.java index 2f4cb3f8..dddf1020 100644 --- a/src/main/java/gregtech/loaders/preload/OreDictionaryLoader.java +++ b/src/main/java/gregtech/loaders/preload/OreDictionaryLoader.java @@ -45,7 +45,6 @@ public class OreDictionaryLoader implements Runnable { OreDictUnifier.registerOre(new ItemStack(Blocks.IRON_ORE, 1), OrePrefix.ore, Materials.Iron); OreDictUnifier.registerOre(new ItemStack(Blocks.LAPIS_ORE, 1), OrePrefix.ore, Materials.Lapis); OreDictUnifier.registerOre(new ItemStack(Blocks.REDSTONE_ORE, 1), OrePrefix.ore, Materials.Redstone); - OreDictUnifier.registerOre(new ItemStack(Blocks.LIT_REDSTONE_ORE, 1), OrePrefix.ore, Materials.Redstone); OreDictUnifier.registerOre(new ItemStack(Blocks.GOLD_ORE, 1), OrePrefix.ore, Materials.Gold); OreDictUnifier.registerOre(new ItemStack(Blocks.DIAMOND_ORE, 1), OrePrefix.ore, Materials.Diamond); OreDictUnifier.registerOre(new ItemStack(Blocks.EMERALD_ORE, 1), OrePrefix.ore, Materials.Emerald); @@ -120,49 +119,47 @@ public class OreDictionaryLoader implements Runnable { OreDictUnifier.registerOre(ItemCable.getCable(CableType.tin, 1), "craftingWireTin"); OreDictUnifier.registerOre(new ItemStack(Blocks.REDSTONE_TORCH, 1, W), "craftingRedstoneTorch"); - OreDictUnifier.registerOre(new ItemStack(Blocks.UNLIT_REDSTONE_TORCH, 1, W), "craftingRedstoneTorch"); - OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1), "craftingWorkBench"); - OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 16), "craftingWorkBench"); +// OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1), "craftingWorkBench"); +// OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 16), "craftingWorkBench"); OreDictUnifier.registerOre(new ItemStack(Blocks.PISTON, 1, W), "craftingPiston"); OreDictUnifier.registerOre(new ItemStack(Blocks.STICKY_PISTON, 1, W), "craftingPiston"); - OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 45), "craftingSafe"); +// OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 45), "craftingSafe"); OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.personal_chest, 1), "craftingSafe"); OreDictUnifier.registerOre(new ItemStack(Blocks.CHEST, 1, W), "craftingChest"); OreDictUnifier.registerOre(new ItemStack(Blocks.TRAPPED_CHEST, 1, W), "craftingChest"); OreDictUnifier.registerOre(new ItemStack(Blocks.FURNACE, 1, W), "craftingFurnace"); - OreDictUnifier.registerOre(new ItemStack(Blocks.LIT_FURNACE, 1, W), "craftingFurnace"); OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.pump, 1), "craftingPump"); OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.magnetizer, 1), "craftingElectromagnet"); OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.teleporter, 1), "craftingTeleporter"); OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.macerator, 1), "craftingMacerator"); - OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 50), "craftingMacerator"); +// OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 50), "craftingMacerator"); OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.extractor, 1), "craftingExtractor"); - OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 51), "craftingExtractor"); +// OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 51), "craftingExtractor"); OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.compressor, 1), "craftingCompressor"); - OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 52), "craftingCompressor"); +// OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 52), "craftingCompressor"); OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.recycler, 1), "craftingRecycler"); - OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 53), "craftingRecycler"); +// OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 53), "craftingRecycler"); OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.iron_furnace, 1), "craftingIronFurnace"); - OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 62), "craftingCentrifuge"); +// OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 62), "craftingCentrifuge"); OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.induction_furnace, 1), "craftingInductionFurnace"); OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.electric_furnace, 1), "craftingElectricFurnace"); - OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 54), "craftingElectricFurnace"); +// OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 54), "craftingElectricFurnace"); OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.generator, 1), "craftingGenerator");