From b7aa7134b8fd5ab681a6885f97e2b36265a50161 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 26 Jun 2020 20:34:52 -0500 Subject: [PATCH] Fix recipeprovider --- .../botania/common/network/PacketBotaniaEffect.java | 2 +- .../vazkii/botania/data/recipes/RecipeProvider.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 78a5441b2..e105a38a6 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -91,7 +91,7 @@ public class PacketBotaniaEffect { int g = (hex & 0xFF00) >> 8; int b = hex & 0xFF; for (int i = 0; i < 10; i++) { - BlockPos pos = new BlockPos(message.x, message.y, message.z).offset(Direction.random(world.rand)); + BlockPos pos = new BlockPos(message.x, message.y, message.z).offset(Direction.func_239631_a_(world.rand)); SparkleParticleData data = SparkleParticleData.sparkle(0.6F + (float) Math.random() * 0.5F, r / 255F, g / 255F, b / 255F, 5); world.addParticle(data, pos.getX() + (float) Math.random(), pos.getY() + (float) Math.random(), pos.getZ() + (float) Math.random(), 0, 0, 0); } diff --git a/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java b/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java index 28f31f7c8..22a5cc59d 100644 --- a/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java @@ -817,7 +817,7 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { .addIngredient(mushrooms, 2) .addIngredient(Items.BOWL) .addCriterion("has_item", hasItem(Items.BOWL)) - .addCriterion("has_orig_recipe", new RecipeUnlockedTrigger.Instance(new ResourceLocation("mushroom_stew"))) + .addCriterion("has_orig_recipe", RecipeUnlockedTrigger.func_235675_a_(new ResourceLocation("mushroom_stew"))) .build(consumer, "botania:mushroom_stew"); ShapedRecipeBuilder.shapedRecipe(Items.COBWEB) @@ -1005,7 +1005,7 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { .addRecipe( cacophoniumBase.get().key('G', Ingredient.fromItemListStream(Stream.of( new Ingredient.TagList(Tags.Items.INGOTS_GOLD), - new Ingredient.TagList(new ItemTags.Wrapper(new ResourceLocation("forge", "ingots/brass")))) + new Ingredient.TagList(ItemTags.makeWrapperTag("forge:ingots/brass"))) ))::build ).setAdvancement(prefix("recipes/botania/cacophonium"), ConditionalAdvancement.builder() @@ -1014,7 +1014,7 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { .withParentId(new ResourceLocation("recipes/root")) .withRewards(AdvancementRewards.Builder.recipe(cacophoniumId)) .withCriterion("has_item", hasItem(Items.NOTE_BLOCK)) - .withCriterion("has_the_recipe", new RecipeUnlockedTrigger.Instance(cacophoniumId)) + .withCriterion("has_the_recipe", RecipeUnlockedTrigger.func_235675_a_(cacophoniumId)) .withRequirementsStrategy(IRequirementsStrategy.OR)) ).build(consumer, cacophoniumId); @@ -1197,7 +1197,7 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { if (pattern == CratePattern.NONE) { continue; } - Item item = Registry.ITEM.getValue(prefix(LibItemNames.CRAFT_PATTERN_PREFIX + pattern.getName().split("_", 2)[1])).get(); + Item item = Registry.ITEM.getValue(prefix(LibItemNames.CRAFT_PATTERN_PREFIX + pattern.func_176610_l().split("_", 2)[1])).get(); String s = pattern.openSlots.stream().map(bool -> bool ? "R" : "P").collect(Collectors.joining()); ShapedRecipeBuilder.shapedRecipe(item) .key('P', ModItems.placeholder) @@ -2398,7 +2398,7 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { } private void registerTerrasteelUpgradeRecipe(Consumer consumer, IItemProvider output, - IItemProvider upgradedInput, Tag runeInput) { + IItemProvider upgradedInput, ITag runeInput) { ShapedRecipeBuilder.shapedRecipe(output) .key('T', ModItems.livingwoodTwig) .key('S', ModTags.Items.INGOTS_TERRASTEEL) @@ -2442,7 +2442,7 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { .build(consumer, prefix("conversions/" + name)); } - private void deconstruct(Consumer consumer, IItemProvider output, Tag input, String name) { + private void deconstruct(Consumer consumer, IItemProvider output, ITag input, String name) { ShapelessRecipeBuilder.shapelessRecipe(output, 9) .addCriterion("has_item", hasItem(output)) .addIngredient(input)