diff --git a/dependencies.gradle b/dependencies.gradle index f383a2b34..614471f3d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -50,12 +50,16 @@ dependencies { devOnlyNonPublishable("com.github.GTNewHorizons:Baubles-Expanded:2.2.4-GTNH:dev") devOnlyNonPublishable("io.github.legacymoddingmc:unimixins:0.1.23:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.40-GTNH:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.105-GTNH:dev") // runtimeOnlyNonPublishable('com.github.GTNewHorizons:Angelica:2.1.42:dev') // Deobf Extra Utilities, allows hodgepodge mixins to not crash. For testing feature parity and postea only. runtimeOnlyNonPublishable("curse.maven:extrautilities-225561:2264384") + // See oredictionary entries in NEI + // runtimeOnlyNonPublishable("com.github.slprime:ChromaticTooltips:1.0.29-GTNH:dev") + // runtimeOnlyNonPublishable("com.github.slprime:ChromaticTooltipsCompat:1.0.32-GTNH:dev") {transitive = false} + // Misc testing utilities // runtimeOnlyNonPublishable("com.github.GTNewHorizons:ServerUtilities:2.2.6:dev") // (/nbtedit) // runtimeOnlyNonPublishable("com.github.GTNewHorizons:worldedit-gtnh:v0.0.8:dev") diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/CommonProxy.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/CommonProxy.java index 8ec875bd4..1dcac971a 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/CommonProxy.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/CommonProxy.java @@ -35,6 +35,7 @@ public void preInit(FMLPreInitializationEvent event) { PacketHandler.init(); ModBlocks.init(); ModItems.init(); + ModOreDictionary.init(); ModDimensions.init(); ModBiomes.init(); UnderWorldEvents.init(); diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/ModOreDictionary.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/ModOreDictionary.java new file mode 100644 index 000000000..a425e26ae --- /dev/null +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/ModOreDictionary.java @@ -0,0 +1,80 @@ +package com.fouristhenumber.utilitiesinexcess; + +import net.minecraftforge.oredict.OreDictionary; + +import com.fouristhenumber.utilitiesinexcess.config.OtherConfig; + +public class ModOreDictionary { + + public static void init() { + // Items + OreDictionary.registerOre("ingotBedrockium", ModItems.BEDROCKIUM_INGOT.get()); + OreDictionary + .registerOre("ingotUnstable", ModItems.INVERTED_INGOT.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + OreDictionary + .registerOre("ingotInverted", ModItems.INVERTED_INGOT.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + OreDictionary.registerOre("nuggetUnstable", ModItems.INVERTED_NUGGET.get()); + OreDictionary.registerOre("nuggetInverted", ModItems.INVERTED_NUGGET.get()); + OreDictionary.registerOre("craftingToolShears", ModItems.PRECISION_SHEARS.get()); + + // Blocks + OreDictionary.registerOre("burntQuartz", ModBlocks.DECORATIVE_BLOCKS.newItemStack(1, 2)); + OreDictionary.registerOre("blockIcestone", ModBlocks.DECORATIVE_BLOCKS.newItemStack(1, 4)); + OreDictionary.registerOre("bricksGravel", ModBlocks.DECORATIVE_BLOCKS.newItemStack(1, 6)); + OreDictionary.registerOre("blockGlassSandy", ModBlocks.DECORATIVE_BLOCKS.newItemStack(1, 3)); + OreDictionary.registerOre("blockMagicWood", ModBlocks.MAGIC_WOOD.get()); + OreDictionary.registerOre("blockBedrockium", ModBlocks.BEDROCKIUM_BLOCK.get()); + OreDictionary.registerOre("blockUnstable", ModBlocks.INVERTED_BLOCK.get()); + OreDictionary.registerOre("blockInverted", ModBlocks.INVERTED_BLOCK.get()); + OreDictionary.registerOre("blockEnderCore", ModBlocks.ENDSPARK.get()); + + // Only registers the non-colored decorative glass, for parity with ExU. + int[] glassMetas = { 0, 1, 2, 3, 6, 9, 12 }; + for (int meta : glassMetas) { + OreDictionary.registerOre("blockGlass", ModBlocks.DECORATIVE_GLASS.newItemStack(1, meta)); + } + for (int i = 0; i < 9; i++) { + OreDictionary.registerOre( + "compressedCobblestone" + (i + 1) + "x", + ModBlocks.COMPRESSED_COBBLESTONE.newItemStack(1, i)); + OreDictionary.registerOre("compressedDirt" + (i + 1) + "x", ModBlocks.COMPRESSED_DIRT.newItemStack(1, i)); + OreDictionary.registerOre("compressedSand" + (i + 1) + "x", ModBlocks.COMPRESSED_SAND.newItemStack(1, i)); + OreDictionary + .registerOre("compressedGravel" + (i + 1) + "x", ModBlocks.COMPRESSED_GRAVEL.newItemStack(1, i)); + } + if (OtherConfig.coloredBlockOredict) { + OreDictionary.registerOre( + "bricksStone", + ModBlocks.COLORED_STONE_BRICKS.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + OreDictionary + .registerOre("plankWood", ModBlocks.COLORED_WOOD_PLANKS.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + OreDictionary + .registerOre("glowstone", ModBlocks.COLORED_GLOWSTONE.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + OreDictionary.registerOre("stone", ModBlocks.COLORED_STONE.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + OreDictionary + .registerOre("stoneSmooth", ModBlocks.COLORED_STONE.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + OreDictionary + .registerOre("soulsand", ModBlocks.COLORED_SOUL_SAND.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + OreDictionary + .registerOre("bricksClay", ModBlocks.COLORED_BRICKS.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + OreDictionary.registerOre( + "stoneCobble", + ModBlocks.COLORED_COBBLESTONE.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + OreDictionary.registerOre( + "cobblestone", + ModBlocks.COLORED_COBBLESTONE.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + OreDictionary + .registerOre("blockLapis", ModBlocks.COLORED_LAPIS_BLOCK.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + OreDictionary + .registerOre("obsidian", ModBlocks.COLORED_OBSIDIAN.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + OreDictionary.registerOre( + "blockRedstone", + ModBlocks.COLORED_REDSTONE_BLOCK.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + OreDictionary.registerOre( + "blockAnyCarbon", + ModBlocks.COLORED_COAL_BLOCK.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + OreDictionary + .registerOre("blockCoal", ModBlocks.COLORED_COAL_BLOCK.newItemStack(1, OreDictionary.WILDCARD_VALUE)); + } + } +} diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/OtherConfig.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/OtherConfig.java index 336431e1d..bb003a497 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/OtherConfig.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/OtherConfig.java @@ -37,4 +37,8 @@ public static void registerConfig() throws ConfigException { @Config.DefaultInt(316) @Config.Comment("316 is the tinkers material ID Extra Utilities uses for magical wood and will therefore migrate tools automatically. Must change if both mods are installed!") public static int magicalWoodTinkersID; + + @Config.DefaultBoolean(false) + @Config.Comment("Register oredictionary entries for colored blocks. Will allow colored blocks to work in recipes, but will also bloat NEI for recipes that people will likely never use...") + public static boolean coloredBlockOredict; }