Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Silk spawners now NBT based, lore only for display

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-19 04:50:30 -05:00
parent 0554ce8234
commit b153699691
3 changed files with 109 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0014-Villager-shops.patch
View File

@@ -1,19 +1,19 @@
From 832abc735f332df25b27e9c94013125a9e0b8b82 Mon Sep 17 00:00:00 2001
From 132991733ea1452650a9aac46b3f7477659ff4e6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 11 May 2019 01:31:50 -0500
Subject: [PATCH] Villager shops
---
.../net/minecraft/server/EntityTypes.java | 9 +
.../net/minecraft/server/EntityTypes.java | 7 +
.../server/EntityVillagerAbstract.java | 1 +
.../minecraft/server/EntityVillagerShop.java | 227 ++++++++++++++++++
.../minecraft/server/NavigationAbstract.java | 2 +
.../entity/CraftAbstractVillager.java | 2 +-
5 files changed, 240 insertions(+), 1 deletion(-)
5 files changed, 238 insertions(+), 1 deletion(-)
create mode 100644 src/main/java/net/minecraft/server/EntityVillagerShop.java
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
index 73116e48f..8c67110c8 100644
index 4979f77b7..475c3ec63 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -118,6 +118,7 @@ public class EntityTypes<T extends Entity> {
@@ -24,20 +24,18 @@ index 73116e48f..8c67110c8 100644
private final EntityTypes.b<T> aZ;
private final EnumCreatureType ba;
private final boolean bb;
@@ -137,6 +138,14 @@ public class EntityTypes<T extends Entity> {
return (EntityTypes) IRegistry.a((IRegistry) IRegistry.ENTITY_TYPE, s, (Object) entitytypes_a.a(s));
@@ -138,6 +139,12 @@ public class EntityTypes<T extends Entity> {
}
+ // Purpur start
// Purpur start
+ private static <T extends Entity> EntityTypes<T> register(String name, String extendFrom, EntityTypes.a entitytypes_a) {
+ Map<Object, Type<?>> dataTypes = (Map<Object, Type<?>>) DataConverterRegistry.a().getSchema(DataFixUtils.makeKey(SharedConstants.a().getWorldVersion())).findChoiceType(DataConverterTypes.o).types(); // entity_tree
+ dataTypes.put("minecraft:" + name, dataTypes.get("minecraft:" + extendFrom));
+ return a(name, entitytypes_a);
+ }
+ // Purpur end
+
public static MinecraftKey getName(EntityTypes<?> entitytypes) {
return IRegistry.ENTITY_TYPE.getKey(entitytypes);
public static EntityTypes getFromKey(MinecraftKey key) {
return IRegistry.ENTITY_TYPE.get(key);
}
diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
index d78528696..8c75daee2 100644