Add back

patches/server/0089-Optimize-villager-data-storage.patch

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/world/Container.java b/src/main/java/net/minecraft/world/Container.java
-index 2c6388d892d0b58ba1800b795418fc9541c3b94c..46e1233036b16cf593c46b9d4ccbbdab4db3a53b 100644
+index 5db5ba026462ca642dcee718af732f80fadabef5..cd380ceb40d38acc7eef289ded11259388becabd 100644
 --- a/src/main/java/net/minecraft/world/Container.java
 +++ b/src/main/java/net/minecraft/world/Container.java
-@@ -130,6 +130,20 @@ public interface Container extends Clearable {
+@@ -71,6 +71,20 @@ public interface Container extends Clearable {
          });
      }
  
@@ -210,7 +210,7 @@ index 1595568f3140a62b0f2236644ac2da11db12af05..ce8851c2cacfd3145b1e2c11443140a0
          } else {
              brain.eraseMemory(MemoryModuleType.SECONDARY_JOB_SITE);
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 64ec94ba2b2ce3884f56c95464384fbc1d29e36c..de41f5b57cb4220daf312cc8724cc32d3dd6f7a6 100644
+index ba49442ed0b7c05c50dbc2a640f5759e391902f2..71a3eadd2f1e00fa066dbfe9918d749d43435a18 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -90,6 +90,7 @@ import net.minecraft.world.item.trading.MerchantOffers;
@@ -232,7 +232,7 @@ index 64ec94ba2b2ce3884f56c95464384fbc1d29e36c..de41f5b57cb4220daf312cc8724cc32d
      private static final int MAX_GOSSIP_TOPICS = 10;
      private static final int GOSSIP_COOLDOWN = 1200;
      private static final int GOSSIP_DECAY_INTERVAL = 24000;
-@@ -908,7 +910,28 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -910,7 +912,28 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      public boolean wantsToPickUp(ItemStack stack) {
          Item item = stack.getItem();
  
@@ -263,7 +263,7 @@ index 64ec94ba2b2ce3884f56c95464384fbc1d29e36c..de41f5b57cb4220daf312cc8724cc32d
  
      public boolean hasExcessFood() {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java b/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java
-index 1316f4475802e17039800cc6128e1b065328beb7..3821c02187ad04b20cdf1e719a0deeabbf91007d 100644
+index 8734ab1bd8299bbf43906d81a349c2a13e0981a7..018b577aecf612e4a4e98cbd7d9292955d04693c 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java
 @@ -1,8 +1,6 @@
@@ -341,7 +341,7 @@ index 1316f4475802e17039800cc6128e1b065328beb7..3821c02187ad04b20cdf1e719a0deeab
      ) {
          return Registry.register(
              BuiltInRegistries.VILLAGER_PROFESSION,
-             new ResourceLocation(id),
+             ResourceLocation.withDefaultNamespace(id),
 -            new VillagerProfession(id, heldWorkstation, acquirableWorkstation, gatherableItems, secondaryJobSites, workSound)
 +            new VillagerProfession(id, heldWorkstation, acquirableWorkstation, gatherableItems != null && gatherableItems.length == 0 ? null : gatherableItems, secondaryJobSite, workSound)
          );