From 648d53ffe197d9416efcd3825d6d399dc11da1a6 Mon Sep 17 00:00:00 2001 From: cpw Date: Thu, 25 Jun 2020 18:16:38 -0400 Subject: [PATCH] Fix some patching derps from 1.15 merge Signed-off-by: cpw --- .../horse/AbstractHorseEntity.java.patch | 18 +++++---------- .../item/crafting/SmithingRecipe.java.patch | 2 +- .../util/math/RayTraceContext.java.patch | 8 +++---- .../java/net/minecraftforge/common/Tags.java | 1 + .../common/data/ForgeLootTableProvider.java | 22 +++++++++---------- 5 files changed, 22 insertions(+), 29 deletions(-) diff --git a/patches/minecraft/net/minecraft/entity/passive/horse/AbstractHorseEntity.java.patch b/patches/minecraft/net/minecraft/entity/passive/horse/AbstractHorseEntity.java.patch index 0256f57476..aa6b669d9f 100644 --- a/patches/minecraft/net/minecraft/entity/passive/horse/AbstractHorseEntity.java.patch +++ b/patches/minecraft/net/minecraft/entity/passive/horse/AbstractHorseEntity.java.patch @@ -1,22 +1,14 @@ --- a/net/minecraft/entity/passive/horse/AbstractHorseEntity.java +++ b/net/minecraft/entity/passive/horse/AbstractHorseEntity.java -@@ -263,6 +263,7 @@ - this.field_110296_bG = new Inventory(this.func_190686_di()); - if (inventory != null) { - inventory.func_110132_b(this); -+ this.itemHandler = net.minecraftforge.common.util.LazyOptional.of(() -> new net.minecraftforge.items.wrapper.InvWrapper(this.field_110296_bG)); - int i = Math.min(inventory.func_70302_i_(), this.field_110296_bG.func_70302_i_()); +@@ -275,6 +275,7 @@ - for(int j = 0; j < i; ++j) { -@@ -275,6 +276,7 @@ - this.field_110296_bG.func_110134_a(this); this.func_230275_fc_(); + this.itemHandler = net.minecraftforge.common.util.LazyOptional.of(() -> new net.minecraftforge.items.wrapper.InvWrapper(this.field_110296_bG)); } - + protected void func_230275_fc_() { -@@ -333,9 +335,9 @@ +@@ -333,9 +334,9 @@ protected void func_180429_a(BlockPos p_180429_1_, BlockState p_180429_2_) { if (!p_180429_2_.func_185904_a().func_76224_d()) { BlockState blockstate = this.field_70170_p.func_180495_p(p_180429_1_.func_177984_a()); @@ -26,9 +18,9 @@ - soundtype = blockstate.func_215695_r(); + soundtype = blockstate.getSoundType(field_70170_p, p_180429_1_, this); } - + if (this.func_184207_aI() && this.field_190688_bE) { -@@ -1010,4 +1012,22 @@ +@@ -1010,4 +1011,22 @@ this.func_230273_eI_(); return super.func_213386_a(p_213386_1_, p_213386_2_, p_213386_3_, p_213386_4_, p_213386_5_); } diff --git a/patches/minecraft/net/minecraft/item/crafting/SmithingRecipe.java.patch b/patches/minecraft/net/minecraft/item/crafting/SmithingRecipe.java.patch index ffcb245283..60b2d9096c 100644 --- a/patches/minecraft/net/minecraft/item/crafting/SmithingRecipe.java.patch +++ b/patches/minecraft/net/minecraft/item/crafting/SmithingRecipe.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/item/crafting/SmithingRecipe.java +++ b/net/minecraft/item/crafting/SmithingRecipe.java -@@ -69,7 +69,7 @@ +@@ -65,7 +65,7 @@ return IRecipeType.field_234827_g_; } diff --git a/patches/minecraft/net/minecraft/util/math/RayTraceContext.java.patch b/patches/minecraft/net/minecraft/util/math/RayTraceContext.java.patch index c4c96bbeb9..22ae097426 100644 --- a/patches/minecraft/net/minecraft/util/math/RayTraceContext.java.patch +++ b/patches/minecraft/net/minecraft/util/math/RayTraceContext.java.patch @@ -1,11 +1,11 @@ --- a/net/minecraft/util/math/RayTraceContext.java +++ b/net/minecraft/util/math/RayTraceContext.java -@@ -16,12 +16,12 @@ +@@ -18,12 +18,12 @@ private final RayTraceContext.FluidMode field_222257_d; private final ISelectionContext field_222258_e; -- public RayTraceContext(Vec3d p_i50009_1_, Vec3d p_i50009_2_, RayTraceContext.BlockMode p_i50009_3_, RayTraceContext.FluidMode p_i50009_4_, Entity p_i50009_5_) { -+ public RayTraceContext(Vec3d p_i50009_1_, Vec3d p_i50009_2_, RayTraceContext.BlockMode p_i50009_3_, RayTraceContext.FluidMode p_i50009_4_, @javax.annotation.Nullable Entity p_i50009_5_) { +- public RayTraceContext(Vector3d p_i50009_1_, Vector3d p_i50009_2_, RayTraceContext.BlockMode p_i50009_3_, RayTraceContext.FluidMode p_i50009_4_, Entity p_i50009_5_) { ++ public RayTraceContext(Vector3d p_i50009_1_, Vector3d p_i50009_2_, RayTraceContext.BlockMode p_i50009_3_, RayTraceContext.FluidMode p_i50009_4_, @javax.annotation.Nullable Entity p_i50009_5_) { this.field_222254_a = p_i50009_1_; this.field_222255_b = p_i50009_2_; this.field_222256_c = p_i50009_3_; @@ -14,4 +14,4 @@ + this.field_222258_e = p_i50009_5_ == null ? ISelectionContext.func_216377_a() : ISelectionContext.func_216374_a(p_i50009_5_); } - public Vec3d func_222250_a() { + public Vector3d func_222250_a() { diff --git a/src/main/java/net/minecraftforge/common/Tags.java b/src/main/java/net/minecraftforge/common/Tags.java index f9f388048f..add5e0bde7 100644 --- a/src/main/java/net/minecraftforge/common/Tags.java +++ b/src/main/java/net/minecraftforge/common/Tags.java @@ -251,6 +251,7 @@ public class Tags public static final ITag.INamedTag SEEDS_MELON = tag("seeds/melon"); public static final ITag.INamedTag SEEDS_PUMPKIN = tag("seeds/pumpkin"); public static final ITag.INamedTag SEEDS_WHEAT = tag("seeds/wheat"); + public static final ITag.INamedTag SHEARS = tag("shears"); public static final ITag.INamedTag SLIMEBALLS = tag("slimeballs"); public static final ITag.INamedTag STAINED_GLASS = tag("stained_glass"); public static final ITag.INamedTag STAINED_GLASS_PANES = tag("stained_glass_panes"); diff --git a/src/main/java/net/minecraftforge/common/data/ForgeLootTableProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeLootTableProvider.java index 18c0d769ef..af034b5038 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeLootTableProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeLootTableProvider.java @@ -6,13 +6,13 @@ import net.minecraft.data.DataGenerator; import net.minecraft.data.LootTableProvider; import net.minecraft.item.Item; import net.minecraft.item.Items; -import net.minecraft.tags.Tag; +import net.minecraft.tags.ITag; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.storage.loot.*; -import net.minecraft.world.storage.loot.conditions.Alternative; -import net.minecraft.world.storage.loot.conditions.ILootCondition; -import net.minecraft.world.storage.loot.conditions.Inverted; -import net.minecraft.world.storage.loot.conditions.MatchTool; +import net.minecraft.loot.*; +import net.minecraft.loot.conditions.Alternative; +import net.minecraft.loot.conditions.ILootCondition; +import net.minecraft.loot.conditions.Inverted; +import net.minecraft.loot.conditions.MatchTool; import net.minecraftforge.common.Tags; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; @@ -53,7 +53,7 @@ public class ForgeLootTableProvider extends LootTableProvider { }); } - private boolean findAndReplaceInLootTableBuilder(LootTable.Builder builder, Item from, Tag to) { + private boolean findAndReplaceInLootTableBuilder(LootTable.Builder builder, Item from, ITag.INamedTag to) { List lootPools = ObfuscationReflectionHelper.getPrivateValue(LootTable.Builder.class, builder, "field_216041_a"); boolean found = false; @@ -70,7 +70,7 @@ public class ForgeLootTableProvider extends LootTableProvider { return found; } - private boolean findAndReplaceInLootPool(LootPool lootPool, Item from, Tag to) { + private boolean findAndReplaceInLootPool(LootPool lootPool, Item from, ITag.INamedTag to) { List lootEntries = ObfuscationReflectionHelper.getPrivateValue(LootPool.class, lootPool, "field_186453_a"); List lootConditions = ObfuscationReflectionHelper.getPrivateValue(LootPool.class, lootPool, "field_186454_b"); boolean found = false; @@ -111,7 +111,7 @@ public class ForgeLootTableProvider extends LootTableProvider { return found; } - private boolean findAndReplaceInParentedLootEntry(ParentedLootEntry entry, Item from, Tag to) { + private boolean findAndReplaceInParentedLootEntry(ParentedLootEntry entry, Item from, ITag.INamedTag to) { LootEntry[] lootEntries = ObfuscationReflectionHelper.getPrivateValue(ParentedLootEntry.class, entry, "field_216147_c"); boolean found = false; @@ -128,7 +128,7 @@ public class ForgeLootTableProvider extends LootTableProvider { return found; } - private boolean findAndReplaceInLootEntry(LootEntry entry, Item from, Tag to) { + private boolean findAndReplaceInLootEntry(LootEntry entry, Item from, ITag.INamedTag to) { ILootCondition[] lootConditions = ObfuscationReflectionHelper.getPrivateValue(LootEntry.class, entry, "field_216144_d"); boolean found = false; @@ -148,7 +148,7 @@ public class ForgeLootTableProvider extends LootTableProvider { return found; } - private boolean findAndReplaceInAlternative(Alternative alternative, Item from, Tag to) { + private boolean findAndReplaceInAlternative(Alternative alternative, Item from, ITag.INamedTag to) { ILootCondition[] lootConditions = ObfuscationReflectionHelper.getPrivateValue(Alternative.class, alternative, "field_215962_a"); boolean found = false;