From 6d9cb0a646dcae60a9552bf7ca9c8af8093416aa Mon Sep 17 00:00:00 2001 From: tterrag Date: Sun, 22 Sep 2019 16:47:44 -0400 Subject: [PATCH] Fix jigsaw blocks not mirroring properly --- .../net/minecraft/block/JigsawBlock.java.patch | 16 ++++++++++++++++ .../gen/feature/OreFeatureConfig.java.patch | 11 ++--------- 2 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 patches/minecraft/net/minecraft/block/JigsawBlock.java.patch diff --git a/patches/minecraft/net/minecraft/block/JigsawBlock.java.patch b/patches/minecraft/net/minecraft/block/JigsawBlock.java.patch new file mode 100644 index 000000000..986f0f1d3 --- /dev/null +++ b/patches/minecraft/net/minecraft/block/JigsawBlock.java.patch @@ -0,0 +1,16 @@ +--- a/net/minecraft/block/JigsawBlock.java ++++ b/net/minecraft/block/JigsawBlock.java +@@ -29,6 +29,13 @@ + return p_185499_1_.func_206870_a(field_176387_N, p_185499_2_.func_185831_a(p_185499_1_.func_177229_b(field_176387_N))); + } + ++ // FORGE: Fix jigsaw blocks not mirroring properly ++ @Override ++ @Deprecated ++ public BlockState func_185471_a(BlockState state, net.minecraft.util.Mirror mirrorIn) { ++ return state.func_206870_a(field_176387_N, mirrorIn.func_185803_b(state.func_177229_b(field_176387_N))); ++ } ++ + public BlockState func_196258_a(BlockItemUseContext p_196258_1_) { + return this.func_176223_P().func_206870_a(field_176387_N, p_196258_1_.func_196000_l()); + } diff --git a/patches/minecraft/net/minecraft/world/gen/feature/OreFeatureConfig.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/OreFeatureConfig.java.patch index 0a17bcdd9..633959e63 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/OreFeatureConfig.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/OreFeatureConfig.java.patch @@ -1,13 +1,6 @@ --- a/net/minecraft/world/gen/feature/OreFeatureConfig.java +++ b/net/minecraft/world/gen/feature/OreFeatureConfig.java -@@ -1,5 +1,6 @@ - package net.minecraft.world.gen.feature; - -+import com.google.common.collect.ImmutableList; - import com.google.common.collect.ImmutableMap; - import com.mojang.datafixers.Dynamic; - import com.mojang.datafixers.types.DynamicOps; -@@ -34,7 +35,7 @@ +@@ -34,7 +34,7 @@ return new OreFeatureConfig(orefeatureconfig$fillerblocktype, blockstate, i); } @@ -16,7 +9,7 @@ NATURAL_STONE("natural_stone", (p_214739_0_) -> { if (p_214739_0_ == null) { return false; -@@ -67,5 +68,15 @@ +@@ -67,5 +67,15 @@ public Predicate func_214738_b() { return this.field_214743_e; }