From 6dd8033dc77ef5b9e08b016a6721d530292d7451 Mon Sep 17 00:00:00 2001 From: David Vierra Date: Sun, 1 Oct 2017 21:14:34 -1000 Subject: [PATCH] Botania pebbles replaced by GT pebbles --- README.md | 2 +- build.gradle | 2 +- .../com/gmail/pharaun/gregtania/proxies/CommonProxy.java | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 75b51be..18db88f 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Super simple addon for Botania and Gregtech 6. Adds in a few more tiers of orech - Sand and Gravel can be turned to ores by overworld Orechids - Gravel can be turned to ores by Orechids Ignem. - Ore weights are no longer hardcoded, but instead computed from the GregTech world gen parameters. Additional ores may still be added via the JSON weights config. - +- Botania pebbles are now replaced by GregTech pebbles, which can be used to craft stone tools *With big thanks to:* diff --git a/build.gradle b/build.gradle index 627556e..8048b9e 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "6.0.0" +version = "6.0.1" group = "pharaun.Gregtania" archivesBaseName = "Gregtania" diff --git a/src/main/java/com/gmail/pharaun/gregtania/proxies/CommonProxy.java b/src/main/java/com/gmail/pharaun/gregtania/proxies/CommonProxy.java index 9563dca..a596f44 100644 --- a/src/main/java/com/gmail/pharaun/gregtania/proxies/CommonProxy.java +++ b/src/main/java/com/gmail/pharaun/gregtania/proxies/CommonProxy.java @@ -10,7 +10,9 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; public class CommonProxy { @@ -86,6 +88,12 @@ public void init(FMLInitializationEvent event) { flower = ItemBlockSpecialFlower.ofType(SUBTILE_EVOLVED_ORECHID_ENDIUM + "III"); Util.registerFunctionalRunicRecipeElven(SUBTILE_EVOLVED_ORECHID_ENDIUM + "IV", costTier4, flower, flower, flower, flower); + + // This looks like it allows Botania pebbles to be used as GT pebbles + // But it actually makes GT pebbles drop instead of Botania pebbles from right-clicking dirt + + OreDictionary.registerOre("rockGtStone", new ItemStack(ModItems.manaResource, 1, 21)); + OreDictionary.registerOre("rockGtAnyStone", new ItemStack(ModItems.manaResource, 1, 21)); } public void postInit(FMLPostInitializationEvent event) {