diff --git a/build.properties b/build.properties index 1e5e94c1..0bda5b7a 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.7.10 forge.version=10.13.4.1566-1.7.10 -gt.version=5.09.22.37 +gt.version=5.09.22.38 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java index 1a4fddcc..7ce01d74 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java @@ -8,6 +8,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; +import gregtech.common.blocks.GT_Item_Casings2; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -204,11 +205,79 @@ public class GT_Loader_OreDictionary //Custom Stuff GT New Horizons 1.0.9.2 GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.BloodInfusedIron, GT_ModHandler.getModItem("BloodArsenal", "blood_infused_iron", 1L, 0)); GT_OreDictUnificator.registerOre(OrePrefixes.block, Materials.BloodInfusedIron, GT_ModHandler.getModItem("BloodArsenal", "blood_infused_iron_block", 1L, 0)); - GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Mytryl, com.dreammaster.item.ItemList.MytrylIngot.getIS()); - GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.CallistoIce, com.dreammaster.item.ItemList.CallistoIceIngot.getIS()); - GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Ledox, com.dreammaster.item.ItemList.LedoxIngot.getIS()); - GT_OreDictUnificator.registerOre(OrePrefixes.ore, Materials.Adamantium, GT_ModHandler.getModItem("GalaxySpace", "oberonblocks", 1L, 3)); - GT_OreDictUnificator.registerOre(OrePrefixes.ore, Materials.Cobalt, GT_ModHandler.getModItem("GalaxySpace", "phobosblocks", 1L, 4)); + GT_OreDictUnificator.registerOre(OrePrefixes.log, Materials.Wood, GT_ModHandler.getModItem("BiomesOPlenty", "logs4", 1L, 3)); + + GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Mytryl, com.dreammaster.item.ItemList.MytrylIngot.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.dust, Materials.Mytryl, com.dreammaster.item.ItemList.MytrylDust.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Mytryl, com.dreammaster.item.ItemList.MytrylPlate.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.compressed, Materials.Mytryl, com.dreammaster.item.ItemList.MytrylCompressedPlate.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.plateDense, Materials.Mytryl, com.dreammaster.item.ItemList.MytrylDensePlate.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.block, Materials.Mytryl, GT_ModHandler.getModItem("dreamcraft", "tile.Mytryl", 1L, 0)); + GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.CallistoIce, com.dreammaster.item.ItemList.CallistoIceIngot.getIS()); + GT_OreDictUnificator.registerOre("ingotColdCallistoIce", com.dreammaster.item.ItemList.CallistoIceColdIngot.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.block, Materials.CallistoIce, GT_ModHandler.getModItem("dreamcraft", "tile.CallistoColdIce", 1L, 0)); + GT_OreDictUnificator.registerOre(OrePrefixes.dust, Materials.CallistoIce, com.dreammaster.item.ItemList.CallistoIceDust.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.CallistoIce, com.dreammaster.item.ItemList.CallistoIcePlate.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.plateDense, Materials.CallistoIce, com.dreammaster.item.ItemList.CallistoIceDensePlate.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.compressed, Materials.CallistoIce, com.dreammaster.item.ItemList.CallistoIceCompressedPlate.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Ledox, com.dreammaster.item.ItemList.LedoxIngot.getIS()); + GT_OreDictUnificator.registerOre("ingotColdLedox", com.dreammaster.item.ItemList.LedoxColdIngot.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.block, Materials.Ledox, GT_ModHandler.getModItem("dreamcraft", "tile.Ledox", 1L, 0)); + GT_OreDictUnificator.registerOre(OrePrefixes.dust, Materials.Ledox, com.dreammaster.item.ItemList.LedoxDust.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Ledox, com.dreammaster.item.ItemList.LedoxPlate.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.plateDense, Materials.Ledox, com.dreammaster.item.ItemList.LedoxDensePlate.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.compressed, Materials.Ledox, com.dreammaster.item.ItemList.LedoxCompressedPlate.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.rod, Materials.Stone, com.dreammaster.item.ItemList.CobbleStoneRod.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Stone, com.dreammaster.item.ItemList.StonePlate.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Voidmetal, com.dreammaster.item.ItemList.VoidPlate.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.rod, Materials.Voidmetal, com.dreammaster.item.ItemList.VoidRod.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.ring, Materials.Voidmetal, com.dreammaster.item.ItemList.VoidRing.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.foil, Materials.Voidmetal, com.dreammaster.item.ItemList.VoidFoil.getIS()); + GT_OreDictUnificator.registerOre("stickSandstone", com.dreammaster.item.ItemList.SandStoneRod.getIS()); + GT_OreDictUnificator.registerOre("lensReinforcedGlass", com.dreammaster.item.ItemList.ReinforcedGlassLense.getIS()); + GT_OreDictUnificator.registerOre("plateReinforcedGlass", com.dreammaster.item.ItemList.ReinforcedGlassPlate.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.block, Materials.Quantium, GT_ModHandler.getModItem("dreamcraft", "tile.Quantinum", 1L, 0)); + GT_OreDictUnificator.registerOre(OrePrefixes.compressed, Materials.Quantium, com.dreammaster.item.ItemList.QuantinumCompressedPlate.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.dust, Materials.Quantium, com.dreammaster.item.ItemList.QuantinumDust.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.plateDense, Materials.Quantium, com.dreammaster.item.ItemList.QuantinumDensePlate.getIS()); + GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Quantium, com.dreammaster.item.ItemList.QuantinumPlate.getIS()); + GT_OreDictUnificator.registerOre("ingotMyteriousCrystal", com.dreammaster.item.ItemList.MysteriousCrystalIngot.getIS()); + GT_OreDictUnificator.registerOre("ingotColdMyteriousCrystal", com.dreammaster.item.ItemList.MysteriousCrystalColdIngot.getIS()); + GT_OreDictUnificator.registerOre("blockMyteriousCrystal", GT_ModHandler.getModItem("dreamcraft", "tile.MysteriousCrystal", 1L, 0)); + GT_OreDictUnificator.registerOre("dustMyteriousCrystal", com.dreammaster.item.ItemList.MysteriousCrystalDust.getIS()); + GT_OreDictUnificator.registerOre("plateMyteriousCrystal", com.dreammaster.item.ItemList.MysteriousCrystalPlate.getIS()); + GT_OreDictUnificator.registerOre("compressedMyteriousCrystal", com.dreammaster.item.ItemList.MysteriousCrystalCompressedPlate.getIS()); + GT_OreDictUnificator.registerOre("plateDenseMyteriousCrystal", com.dreammaster.item.ItemList.MysteriousCrystalDensePlate.getIS()); + GT_OreDictUnificator.registerOre("gemMyteriousCrystal", com.dreammaster.item.ItemList.MysteriousCrystal.getIS()); + + GT_OreDictUnificator.registerOre(OrePrefixes.ore, Materials.Desh, GT_ModHandler.getModItem("GalacticraftMars", "tile.mars", 1L, 2)); + GT_OreDictUnificator.registerOre(OrePrefixes.stick, Materials.Desh, GT_ModHandler.getModItem("GalacticraftMars", "item.null", 1L, 1)); + GT_OreDictUnificator.registerOre(OrePrefixes.ore, Materials.Ilmenite, GT_ModHandler.getModItem("GalacticraftMars", "tile.asteroidsBlock", 1L, 4)); + + GT_OreDictUnificator.registerOre(OrePrefixes.ore, Materials.Adamantium, GT_ModHandler.getModItem("GalaxySpace", "oberonblocks", 1L, 3)); + GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Adamantium, GT_ModHandler.getModItem("GalaxySpace", "items.ingots", 1L, 0)); + GT_OreDictUnificator.registerOre(OrePrefixes.ore, Materials.Cobalt, GT_ModHandler.getModItem("GalaxySpace", "phobosblocks", 1L, 4)); + GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Cobalt, GT_ModHandler.getModItem("GalaxySpace", "items.ingots", 1L, 1)); + + GT_OreDictUnificator.registerOre("craftingToolShears", new ItemStack(Items.shears, 1, 32767)); + + GT_OreDictUnificator.registerOre("cropBarley", GT_ModHandler.getModItem("Natura", "barleyFood", 1L, 0)); + GT_OreDictUnificator.registerOre("cropBarley", GT_ModHandler.getModItem("Natura", "barleyFood", 1L, 0)); + + GT_OreDictUnificator.registerOre("craftingToolShears", GT_ModHandler.getModItem("ExtraUtilities", "shears", 1L, 0)); + + GT_OreDictUnificator.registerOre(OrePrefixes.log, Materials.Wood, GT_ModHandler.getModItem("ForbiddenMagic", "TaintLog", 1L, 0)); + GT_OreDictUnificator.registerOre(OrePrefixes.plank, Materials.Wood, GT_ModHandler.getModItem("ForbiddenMagic", "TaintPlank", 1L, 0)); + + GT_OreDictUnificator.registerOre("beeComb", GT_ModHandler.getModItem("gendustry", "HoneyComb", 1L)); + + GT_OreDictUnificator.registerOre("itemBeeswax", GT_ModHandler.getModItem("harvestcraft", "beeswaxItem", 1L, 0)); + GT_OreDictUnificator.registerOre("foodFlour", GT_ModHandler.getModItem("harvestcraft", "flourItem", 1L, 0)); + + GT_OreDictUnificator.registerOre("craftingToolShears", GT_ModHandler.getModItem("Railcraft", "tool.steel.shears", 1L, 0)); + GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Lead, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 4)); + + GT_OreDictUnificator.registerOre(OrePrefixes.nugget, Materials.Voidmetal, GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1L, 7)); } }