Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 06:24:06 +01:00
Code Issues Projects Releases Wiki Activity
8abed406ce
Paper/nms-patches/DispenserRegistry.patch

90 lines
7.1 KiB
Diff
Raw Normal View History

Cut fluff from patch headers.
2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/DispenserRegistry.java
+++ b/net/minecraft/server/DispenserRegistry.java
Mappings Update
2018-12-25 22:00:00 +01:00
@@ -7,6 +7,16 @@
Update to Minecraft 1.8.3
2015-02-26 23:41:06 +01:00
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+// CraftBukkit start
SPIGOT-3149: StructureGrowEvent for dispenser triggered growth
2017-03-24 11:03:44 +01:00
+import java.util.List;
+import org.bukkit.Location;
+import org.bukkit.TreeType;
Update to Minecraft 1.8.3
2015-02-26 23:41:06 +01:00
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
SPIGOT-4192: Fix cancelling dispensers removing water sources
2018-07-31 01:21:21 +02:00
+import org.bukkit.craftbukkit.util.DummyGeneratorAccess;
Update to Minecraft 1.8.3
2015-02-26 23:41:06 +01:00
+import org.bukkit.event.block.BlockDispenseEvent;
SPIGOT-3149: StructureGrowEvent for dispenser triggered growth
2017-03-24 11:03:44 +01:00
+import org.bukkit.event.world.StructureGrowEvent;
Update to Minecraft 1.8.3
2015-02-26 23:41:06 +01:00
+// CraftBukkit end
+
public class DispenserRegistry {
Update to Minecraft 1.9
2016-02-29 22:32:46 +01:00
public static final PrintStream a = System.out;
Update to Minecraft 1.16.2
2020-08-11 23:00:00 +02:00
@@ -31,6 +41,69 @@
TagStatic.b();
Update to Minecraft 1.14-pre5
2019-04-23 04:00:00 +02:00
d();
Update to Minecraft 1.8.3
2015-02-26 23:41:06 +01:00
}
Update to Minecraft 1.13-pre7
2018-07-15 02:00:00 +02:00
+ // CraftBukkit start - easier than fixing the decompile
Update to Minecraft 1.15
2019-12-10 23:00:00 +01:00
+ DataConverterFlattenData.map(1008, "{Name:'minecraft:oak_sign',Properties:{rotation:'0'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'0'}}");
+ DataConverterFlattenData.map(1009, "{Name:'minecraft:oak_sign',Properties:{rotation:'1'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'1'}}");
+ DataConverterFlattenData.map(1010, "{Name:'minecraft:oak_sign',Properties:{rotation:'2'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'2'}}");
+ DataConverterFlattenData.map(1011, "{Name:'minecraft:oak_sign',Properties:{rotation:'3'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'3'}}");
+ DataConverterFlattenData.map(1012, "{Name:'minecraft:oak_sign',Properties:{rotation:'4'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'4'}}");
+ DataConverterFlattenData.map(1013, "{Name:'minecraft:oak_sign',Properties:{rotation:'5'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'5'}}");
+ DataConverterFlattenData.map(1014, "{Name:'minecraft:oak_sign',Properties:{rotation:'6'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'6'}}");
+ DataConverterFlattenData.map(1015, "{Name:'minecraft:oak_sign',Properties:{rotation:'7'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'7'}}");
+ DataConverterFlattenData.map(1016, "{Name:'minecraft:oak_sign',Properties:{rotation:'8'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'8'}}");
+ DataConverterFlattenData.map(1017, "{Name:'minecraft:oak_sign',Properties:{rotation:'9'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'9'}}");
+ DataConverterFlattenData.map(1018, "{Name:'minecraft:oak_sign',Properties:{rotation:'10'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'10'}}");
+ DataConverterFlattenData.map(1019, "{Name:'minecraft:oak_sign',Properties:{rotation:'11'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'11'}}");
+ DataConverterFlattenData.map(1020, "{Name:'minecraft:oak_sign',Properties:{rotation:'12'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'12'}}");
+ DataConverterFlattenData.map(1021, "{Name:'minecraft:oak_sign',Properties:{rotation:'13'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'13'}}");
+ DataConverterFlattenData.map(1022, "{Name:'minecraft:oak_sign',Properties:{rotation:'14'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'14'}}");
+ DataConverterFlattenData.map(1023, "{Name:'minecraft:oak_sign',Properties:{rotation:'15'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'15'}}");
Update to Minecraft 1.14-pre5
2019-04-23 04:00:00 +02:00
+ DataConverterMaterialId.ID_MAPPING.put(323, "minecraft:oak_sign");
+
Update to Minecraft 1.15
2019-12-10 23:00:00 +01:00
+ DataConverterFlattenData.map(1440, "{Name:\'minecraft:portal\',Properties:{axis:\'x\'}}", new String[]{"{Name:\'minecraft:portal\',Properties:{axis:\'x\'}}"});
Update to Minecraft 1.13-pre7
2018-07-15 02:00:00 +02:00
+
+ DataConverterMaterialId.ID_MAPPING.put(409, "minecraft:prismarine_shard");
+ DataConverterMaterialId.ID_MAPPING.put(410, "minecraft:prismarine_crystals");
+ DataConverterMaterialId.ID_MAPPING.put(411, "minecraft:rabbit");
+ DataConverterMaterialId.ID_MAPPING.put(412, "minecraft:cooked_rabbit");
+ DataConverterMaterialId.ID_MAPPING.put(413, "minecraft:rabbit_stew");
+ DataConverterMaterialId.ID_MAPPING.put(414, "minecraft:rabbit_foot");
+ DataConverterMaterialId.ID_MAPPING.put(415, "minecraft:rabbit_hide");
+ DataConverterMaterialId.ID_MAPPING.put(416, "minecraft:armor_stand");
+
+ DataConverterMaterialId.ID_MAPPING.put(423, "minecraft:mutton");
+ DataConverterMaterialId.ID_MAPPING.put(424, "minecraft:cooked_mutton");
+ DataConverterMaterialId.ID_MAPPING.put(425, "minecraft:banner");
+ DataConverterMaterialId.ID_MAPPING.put(426, "minecraft:end_crystal");
+ DataConverterMaterialId.ID_MAPPING.put(427, "minecraft:spruce_door");
+ DataConverterMaterialId.ID_MAPPING.put(428, "minecraft:birch_door");
+ DataConverterMaterialId.ID_MAPPING.put(429, "minecraft:jungle_door");
+ DataConverterMaterialId.ID_MAPPING.put(430, "minecraft:acacia_door");
+ DataConverterMaterialId.ID_MAPPING.put(431, "minecraft:dark_oak_door");
+ DataConverterMaterialId.ID_MAPPING.put(432, "minecraft:chorus_fruit");
+ DataConverterMaterialId.ID_MAPPING.put(433, "minecraft:chorus_fruit_popped");
+ DataConverterMaterialId.ID_MAPPING.put(434, "minecraft:beetroot");
+ DataConverterMaterialId.ID_MAPPING.put(435, "minecraft:beetroot_seeds");
+ DataConverterMaterialId.ID_MAPPING.put(436, "minecraft:beetroot_soup");
+ DataConverterMaterialId.ID_MAPPING.put(437, "minecraft:dragon_breath");
+ DataConverterMaterialId.ID_MAPPING.put(438, "minecraft:splash_potion");
+ DataConverterMaterialId.ID_MAPPING.put(439, "minecraft:spectral_arrow");
+ DataConverterMaterialId.ID_MAPPING.put(440, "minecraft:tipped_arrow");
+ DataConverterMaterialId.ID_MAPPING.put(441, "minecraft:lingering_potion");
+ DataConverterMaterialId.ID_MAPPING.put(442, "minecraft:shield");
+ DataConverterMaterialId.ID_MAPPING.put(443, "minecraft:elytra");
+ DataConverterMaterialId.ID_MAPPING.put(444, "minecraft:spruce_boat");
+ DataConverterMaterialId.ID_MAPPING.put(445, "minecraft:birch_boat");
+ DataConverterMaterialId.ID_MAPPING.put(446, "minecraft:jungle_boat");
+ DataConverterMaterialId.ID_MAPPING.put(447, "minecraft:acacia_boat");
+ DataConverterMaterialId.ID_MAPPING.put(448, "minecraft:dark_oak_boat");
+ DataConverterMaterialId.ID_MAPPING.put(449, "minecraft:totem_of_undying");
+ DataConverterMaterialId.ID_MAPPING.put(450, "minecraft:shulker_shell");
+ DataConverterMaterialId.ID_MAPPING.put(452, "minecraft:iron_nugget");
+ DataConverterMaterialId.ID_MAPPING.put(453, "minecraft:knowledge_book");
+
+ DataConverterSpawnEgg.ID_MAPPING[23] = "Arrow";
+ // CraftBukkit end
}
}
}
Reference in New Issue Copy Permalink