Update to latest 1.18.2 forge, sync generated code & data

tterrag1098 · Mar 30, 2022 · 3806afc · 3806afc
1 parent dfa52d1
commit 3806afc
Show file tree

Hide file tree

Showing 23 changed files with 157 additions and 50 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 mod_version=1.0.x
 minecraft_version=1.18.2
-forge_version=40.0.12
+forge_version=40.0.32
diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
@@ -1,30 +1,29 @@
 a28b0f687e669d4994b7667c92dde8394e3e6208 assets/testmod/blockstates/magic_item_model.json
 539ba580bd22c7822c059998a2479aefa78dde61 assets/testmod/blockstates/testblock.json
 209c1eedcb8fbc05ed7146cb3ed3077cb0e2172f assets/testmod/blockstates/testfluid.json
-2f94ce46a72dac1daede637b8a326f91df4154df assets/testmod/lang/en_ud.json
-0258d5485d993b470c77c71e332c2fde7b8b9e6e assets/testmod/lang/en_us.json
+3d9c3a812d0c49240f229cd37cf5c1ff92a39498 assets/testmod/lang/en_ud.json
+f4dd307f9dbcdc7b3cd20ea397dd9fce90977e69 assets/testmod/lang/en_us.json
 e252697eaaed16b403c6ccbd1d16e5a55d180753 assets/testmod/models/block/subfolder/magic_item_model.json
 f6d6714e77dedf174f7cdf2148c61979b8ff950a assets/testmod/models/block/testblock.json
 af64d14ab81f8d19774a45ad1ca41cb69c280e6e assets/testmod/models/block/testfluid.json
 63fe0b9d5aa5d58f07aa7bd9c0c76604a234c678 assets/testmod/models/item/magic_item_model.json
 1ecfe3e1394a79cacfefe33c36cfb714af953374 assets/testmod/models/item/testblock.json
 98167609bf3898587f7565736a6fc24a7966cacd assets/testmod/models/item/testentity_spawn_egg.json
-f5978560e17788b6f4fb40382e25257de00befcc assets/testmod/models/item/testfluid_bucket.json
 44a7f013ea9ed633a6eef7670db72fd6138b7d35 assets/testmod/models/item/testitem.json
 a6cdf498951379d190dc11c82b13398f792e5fb3 data/minecraft/tags/blocks/bamboo_plantable_on.json
 a6cdf498951379d190dc11c82b13398f792e5fb3 data/minecraft/tags/blocks/dragon_immune.json
 a6cdf498951379d190dc11c82b13398f792e5fb3 data/minecraft/tags/blocks/wither_immune.json
 b27f8565b143ba660c58d74121b2358a5a53c5c7 data/minecraft/tags/entity_types/raiders.json
 c9e95e928aae7b806f272f029519f7da88217864 data/minecraft/tags/fluids/water.json
 f388aaa8e3ca0f0ae20c8df06d1f2a2295cf1f51 data/minecraft/tags/items/beds.json
-ad5992997669d0b5287b648bfd0b4a03214287da data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_campfire.json
-d7f76c9f6597c2767c2edb24c2a72bcfefe2703f data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smelting.json
-6a3ff6f8d7983ab8b25dcdd345da2cdce98fe24c data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smoking.json
-1f9d4ea3ff63546bf258a2a3b7d826913b2e3060 data/testmod/advancements/recipes/testmod/testblock.json
-68ab742ba2e458e900b03f8c51c7f5b95d660d52 data/testmod/advancements/root.json
-5bcd3d963c178a6bf8d45da58e4ddc19ca1f3db0 data/testmod/loot_tables/blocks/magic_item_model.json
-584afe0097ffcd23949a055522e22a8194506ff9 data/testmod/loot_tables/blocks/testblock.json
-2e2bc9fedc2380a91b82f1161c30db25016623da data/testmod/loot_tables/entities/testentity.json
+d89129efe43bedab8879e946581f6d461c29e77b data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_campfire.json
+faea8b95ef3da2c766a9565b4e0fd100d0947abe data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smelting.json
+b402b67080821cf05df04c87ceacc603aa704985 data/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smoking.json
+387ad0982ba73f0339fd65222b89ac806b9b44f3 data/testmod/advancements/recipes/testmod/testblock.json
+bce8c5ebc3089f297396f4fc71ad2f52d9fa8be1 data/testmod/advancements/root.json
+fdce99e848f33a57df1e333e4398cbacb3a2dfa7 data/testmod/loot_tables/blocks/magic_item_model.json
+f460f7ed502ab0928c210fc93c2b41e05c4cc200 data/testmod/loot_tables/blocks/testblock.json
+0c9ede425546f487c74e0b943ebbc62d058409ff data/testmod/loot_tables/entities/testentity.json
 f0266b86d509baafb030ddb9915394ea06d372cd data/testmod/loot_tables/entities/testitem.json
 3fce860c2686d77a1d3085cc4184ee4d0431e0b1 data/testmod/recipes/diamond_block_from_testblock_campfire.json
 a5715702ab3c5d70e72667c431c89d822c50d1b4 data/testmod/recipes/diamond_block_from_testblock_smelting.json

diff --git a/src/generated/resources/assets/testmod/lang/en_ud.json b/src/generated/resources/assets/testmod/lang/en_ud.json
@@ -8,7 +8,6 @@
   "entity.testmod.testentity": "\u028E\u0287\u0131\u0287u\u01DD\u0287s\u01DD\u27D8",
   "entity.testmod.testitem": "\u026F\u01DD\u0287\u0131\u0287s\u01DD\u27D8",
   "item.testmod.testentity_spawn_egg": "bb\u018E u\u028D\u0250dS \u028E\u0287\u0131\u0287u\u01DD\u0287s\u01DD\u27D8",
-  "item.testmod.testfluid_bucket": "\u0287\u01DD\u029E\u0254n\u15FA p\u0131n\u05DF\u025F\u0287s\u01DD\u27D8",
   "item.testmod.testitem": "\u026F\u01DD\u0287\u0131\u0287s\u01DD\u27D8",
   "item.testmod.testitem.testextra": "\u00A1\u0254\u0131b\u0250W",
   "itemGroup.testmod": "poW \u0287s\u01DD\u27D8",

diff --git a/src/generated/resources/assets/testmod/lang/en_us.json b/src/generated/resources/assets/testmod/lang/en_us.json
@@ -8,7 +8,6 @@
   "entity.testmod.testentity": "Testentity",
   "entity.testmod.testitem": "Testitem",
   "item.testmod.testentity_spawn_egg": "Testentity Spawn Egg",
-  "item.testmod.testfluid_bucket": "Testfluid Bucket",
   "item.testmod.testitem": "Testitem",
   "item.testmod.testitem.testextra": "Magic!",
   "itemGroup.testmod": "Test Mod",

diff --git a/src/generated/resources/assets/testmod/models/item/testfluid_bucket.json b/src/generated/resources/assets/testmod/models/item/testfluid_bucket.json
diff --git a/...a/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_campfire.json b/...a/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_campfire.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "testmod:testblock"
+            "items": [
+              "testmod:testblock"
+            ]
           }
         ]
       }

diff --git a/...a/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smelting.json b/...a/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smelting.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "testmod:testblock"
+            "items": [
+              "testmod:testblock"
+            ]
           }
         ]
       }

diff --git a/...ta/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smoking.json b/...ta/testmod/advancements/recipes/building_blocks/diamond_block_from_testblock_smoking.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "testmod:testblock"
+            "items": [
+              "testmod:testblock"
+            ]
           }
         ]
       }

diff --git a/src/generated/resources/data/testmod/advancements/recipes/testmod/testblock.json b/src/generated/resources/data/testmod/advancements/recipes/testmod/testblock.json
@@ -11,7 +11,9 @@
       "conditions": {
         "items": [
           {
-            "item": "minecraft:egg"
+            "items": [
+              "minecraft:egg"
+            ]
           }
         ]
       }

diff --git a/src/generated/resources/data/testmod/advancements/root.json b/src/generated/resources/data/testmod/advancements/root.json
@@ -21,7 +21,9 @@
       "conditions": {
         "items": [
           {
-            "item": "minecraft:egg"
+            "items": [
+              "minecraft:egg"
+            ]
           }
         ]
       }

diff --git a/src/generated/resources/data/testmod/loot_tables/blocks/magic_item_model.json b/src/generated/resources/data/testmod/loot_tables/blocks/magic_item_model.json
@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

diff --git a/src/generated/resources/data/testmod/loot_tables/blocks/testblock.json b/src/generated/resources/data/testmod/loot_tables/blocks/testblock.json
@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

diff --git a/src/generated/resources/data/testmod/loot_tables/entities/testentity.json b/src/generated/resources/data/testmod/loot_tables/entities/testentity.json
@@ -2,22 +2,25 @@
   "type": "minecraft:entity",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",
           "functions": [
             {
               "function": "minecraft:set_count",
               "count": {
+                "type": "minecraft:uniform",
                 "min": 1.0,
-                "max": 3.0,
-                "type": "minecraft:uniform"
-              }
+                "max": 3.0
+              },
+              "add": false
             },
             {
               "function": "minecraft:looting_enchant",
               "count": {
+                "type": "minecraft:uniform",
                 "min": 0.0,
                 "max": 2.0
               }

diff --git a/src/main/java/com/tterrag/registrate/AbstractRegistrate.java b/src/main/java/com/tterrag/registrate/AbstractRegistrate.java
@@ -94,6 +94,7 @@
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.IForgeRegistry;
 import net.minecraftforge.registries.IForgeRegistryEntry;
+import net.minecraftforge.registries.NewRegistryEvent;
 import net.minecraftforge.registries.RegistryBuilder;
 import net.minecraftforge.registries.RegistryManager;
 import net.minecraftforge.registries.RegistryObject;
@@ -792,11 +793,11 @@ protected <R extends IForgeRegistryEntry<R>, T extends R> RegistryEntry<T> accep
     @Beta
     @SuppressWarnings("unchecked")
     public <R extends IForgeRegistryEntry<R>> Supplier<IForgeRegistry<R>> makeRegistry(String name, Class<? super R> superType, Supplier<RegistryBuilder<R>> builder) {
-        OneTimeEventReceiver.addModListener(RegistryEvent.NewRegistry.class, $ -> builder.get()
-                .setName(new ResourceLocation(getModid(), name))
-                .setType((Class<R>) superType)
-                .create());
-        return Suppliers.memoize(() -> RegistryManager.ACTIVE.<R>getRegistry(superType));
+        final ResourceLocation registryId = new ResourceLocation(getModid(), name);
+        OneTimeEventReceiver.addModListener(NewRegistryEvent.class, e -> e.create(builder.get()
+                .setName(registryId)
+                .setType((Class<R>) superType)));
+        return Suppliers.memoize(() -> RegistryManager.ACTIVE.<R>getRegistry(registryId));
     }
 
     /* === Builder helpers === */

diff --git a/src/main/java/com/tterrag/registrate/builders/AbstractBuilder.java b/src/main/java/com/tterrag/registrate/builders/AbstractBuilder.java
@@ -17,9 +17,7 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import net.minecraft.tags.Tag;
 import net.minecraft.tags.TagKey;
-import net.minecraft.world.item.Item;
 import net.minecraftforge.common.util.NonNullFunction;
 import net.minecraftforge.registries.IForgeRegistryEntry;
 import net.minecraftforge.registries.RegistryObject;

diff --git a/src/main/java/com/tterrag/registrate/builders/BlockBuilder.java b/src/main/java/com/tterrag/registrate/builders/BlockBuilder.java
@@ -34,7 +34,6 @@
 import net.minecraft.client.color.block.BlockColor;
 import net.minecraft.client.renderer.ItemBlockRenderTypes;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.tags.Tag;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.DyeColor;

diff --git a/src/main/java/com/tterrag/registrate/builders/EntityBuilder.java b/src/main/java/com/tterrag/registrate/builders/EntityBuilder.java
@@ -22,7 +22,6 @@
 import net.minecraft.client.renderer.entity.EntityRenderer;
 import net.minecraft.client.renderer.entity.EntityRendererProvider;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.Tag;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;

diff --git a/src/main/java/com/tterrag/registrate/builders/FluidBuilder.java b/src/main/java/com/tterrag/registrate/builders/FluidBuilder.java
@@ -25,7 +25,6 @@
 import net.minecraft.Util;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.FluidTags;
-import net.minecraft.tags.Tag;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.BucketItem;
 import net.minecraft.world.item.Item;

diff --git a/src/main/java/com/tterrag/registrate/builders/ItemBuilder.java b/src/main/java/com/tterrag/registrate/builders/ItemBuilder.java
@@ -223,7 +223,7 @@ public ItemBuilder<T, P> recipe(NonNullBiConsumer<DataGenContext<Item, T>, Regis
     }
 
     /**
-     * Assign {@link TagKey<Item>}{@code s} to this item. Multiple calls will add additional tags.
+     * Assign {@link TagKey}{@code s} to this item. Multiple calls will add additional tags.
      * 
      * @param tags
      *            The tag to assign