From 79e1997d1d9efe4fc0dad720970598f5ce08c0a9 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 28 Apr 2020 23:03:14 +0200 Subject: [PATCH] fixed recipes and the book being broken in multiplayer, haha --- build.gradle | 8 +++++--- .../java/de/ellpeck/naturesaura/proxy/ClientProxy.java | 7 +++++++ .../book/en_us/entries/using/conversion_catalyst.json | 2 +- .../book/en_us/entries/using/crushing_catalyst.json | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 2241b821..05edddd2 100644 --- a/build.gradle +++ b/build.gradle @@ -103,12 +103,14 @@ dependencies { compileOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2:api") runtimeOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2") - compile fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.15.1:6.0.0.4") - compile fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.1-25.16") - compile fg.deobf("quarris.enchantability:enchantability:5.0.1") + compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-32.160:api") + runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-32.160") runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.15.2-2.0-beta2") compileOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.15.2-2.0-beta2:api") + + compile fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.15.1:6.0.0.4") + compile fg.deobf("quarris.enchantability:enchantability:5.0.1") } // Example for how to get properties into the manifest for reading by the runtime.. diff --git a/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java b/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java index c8dde9f9..ac653620 100644 --- a/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java +++ b/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java @@ -6,6 +6,7 @@ import de.ellpeck.naturesaura.gui.GuiEnderCrate; import de.ellpeck.naturesaura.gui.ModContainers; import de.ellpeck.naturesaura.particles.ParticleHandler; import de.ellpeck.naturesaura.particles.ParticleMagic; +import de.ellpeck.naturesaura.recipes.ModRecipes; import de.ellpeck.naturesaura.reg.*; import de.ellpeck.naturesaura.renderers.PlayerLayerTrinkets; import de.ellpeck.naturesaura.renderers.SupporterFancyHandler; @@ -21,6 +22,8 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.item.Item; +import net.minecraft.resources.IReloadableResourceManager; +import net.minecraft.resources.IResourceManager; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Tuple; @@ -42,6 +45,10 @@ public class ClientProxy implements IProxy { Compat.setupClient(); ScreenManager.registerFactory(ModContainers.ENDER_CRATE, GuiEnderCrate::new); ScreenManager.registerFactory(ModContainers.ENDER_ACCESS, GuiEnderCrate::new); + + IResourceManager manager = Minecraft.getInstance().getResourceManager(); + if (manager instanceof IReloadableResourceManager) + ((IReloadableResourceManager) manager).addReloadListener(new ModRecipes()); } @Override diff --git a/src/main/resources/data/naturesaura/patchouli_books/book/en_us/entries/using/conversion_catalyst.json b/src/main/resources/data/naturesaura/patchouli_books/book/en_us/entries/using/conversion_catalyst.json index 572ccf40..8178fd81 100644 --- a/src/main/resources/data/naturesaura/patchouli_books/book/en_us/entries/using/conversion_catalyst.json +++ b/src/main/resources/data/naturesaura/patchouli_books/book/en_us/entries/using/conversion_catalyst.json @@ -6,7 +6,7 @@ "pages": [ { "type": "text", - "text": "The $(l:collecting/altar)Natural Altar$() can be useful for infusing certain items with the power of $(aura), however, it can also assist in transmuting items from one type into another.$(br)This can be achieved by creating the $(item)Transmutation Catalyst$() and placing it on top of any of the four lower $(item)Golden Stone Brick$() blocks around the altar, and then placing the ingredient on the altar as usual." + "text": "The $(l:using/altar)Natural Altar$() can be useful for infusing certain items with the power of $(aura), however, it can also assist in transmuting items from one type into another.$(br)This can be achieved by creating the $(item)Transmutation Catalyst$() and placing it on top of any of the four lower $(item)Golden Stone Brick$() blocks around the altar, and then placing the ingredient on the altar as usual." }, { "type": "naturesaura:tree_ritual", diff --git a/src/main/resources/data/naturesaura/patchouli_books/book/en_us/entries/using/crushing_catalyst.json b/src/main/resources/data/naturesaura/patchouli_books/book/en_us/entries/using/crushing_catalyst.json index 5f00ecae..99f489b7 100644 --- a/src/main/resources/data/naturesaura/patchouli_books/book/en_us/entries/using/crushing_catalyst.json +++ b/src/main/resources/data/naturesaura/patchouli_books/book/en_us/entries/using/crushing_catalyst.json @@ -6,7 +6,7 @@ "pages": [ { "type": "text", - "text": "The $(l:collecting/altar)Natural Altar$() can be useful for infusing certain items with the power of $(aura), but it can also be used to $(thing)crush$() certain items into different shapes.$(br)This can be achieved by creating the $(item)Crumbling Catalyst$() and placing it on top of any of the four lower $(item)Golden Stone Brick$() blocks around the altar, and then placing the ingredient on the altar as usual." + "text": "The $(l:using/altar)Natural Altar$() can be useful for infusing certain items with the power of $(aura), but it can also be used to $(thing)crush$() certain items into different shapes.$(br)This can be achieved by creating the $(item)Crumbling Catalyst$() and placing it on top of any of the four lower $(item)Golden Stone Brick$() blocks around the altar, and then placing the ingredient on the altar as usual." }, { "type": "naturesaura:tree_ritual",