made everything run properly

Author: Ellpeck

Diff for: src/generated/resources/data/forge/tags/items/rods/wooden.json renamed to src/generated/resources/data/c/tags/item/rods/wooden.json

@@ -7,14 +7,16 @@
         {
           "condition": "minecraft:match_tool",
           "predicate": {
-            "enchantments": [
-              {
-                "enchantment": "minecraft:silk_touch",
-                "levels": {
-                  "min": 1
+            "predicates": {
+              "minecraft:enchantments": [
+                {
+                  "enchantments": "minecraft:silk_touch",
+                  "levels": {
+                    "min": 1
+                  }
                 }
-              }
-            ]
+              ]
+            }
           }
         }
       ],

Diff for: src/generated/resources/data/curios/tags/items/belt.json

@@ -7,14 +7,16 @@
         {
           "condition": "minecraft:match_tool",
           "predicate": {
-            "enchantments": [
-              {
-                "enchantment": "minecraft:silk_touch",
-                "levels": {
-                  "min": 1
+            "predicates": {
+              "minecraft:enchantments": [
+                {
+                  "enchantments": "minecraft:silk_touch",
+                  "levels": {
+                    "min": 1
+                  }
                 }
-              }
-            ]
+              ]
+            }
           }
         }
       ],

Diff for: src/generated/resources/data/curios/tags/items/charm.json

@@ -13,14 +13,16 @@
                 {
                   "condition": "minecraft:match_tool",
                   "predicate": {
-                    "enchantments": [
-                      {
-                        "enchantment": "minecraft:silk_touch",
-                        "levels": {
-                          "min": 1
+                    "predicates": {
+                      "minecraft:enchantments": [
+                        {
+                          "enchantments": "minecraft:silk_touch",
+                          "levels": {
+                            "min": 1
+                          }
                         }
-                      }
-                    ]
+                      ]
+                    }
                   }
                 }
               ],

Diff for: src/generated/resources/data/curios/tags/items/necklace.json

@@ -13,14 +13,16 @@
                 {
                   "condition": "minecraft:match_tool",
                   "predicate": {
-                    "enchantments": [
-                      {
-                        "enchantment": "minecraft:silk_touch",
-                        "levels": {
-                          "min": 1
+                    "predicates": {
+                      "minecraft:enchantments": [
+                        {
+                          "enchantments": "minecraft:silk_touch",
+                          "levels": {
+                            "min": 1
+                          }
                         }
-                      }
-                    ]
+                      ]
+                    }
                   }
                 }
               ],

Diff for: src/generated/resources/data/curios/tags/items/ring.json

@@ -1,6 +1,6 @@
 {
   "type": "neoforge:add_features",
-  "biomes": "#forge:is_sandy",
+  "biomes": "#c:is_sandy",
   "features": "naturesaura:aura_cactus",
   "step": "vegetal_decoration"
 }

Diff for: src/generated/resources/data/minecraft/tags/blocks/dirt.json renamed to src/generated/resources/data/minecraft/tags/block/dirt.json

@@ -1,6 +1,6 @@
 {
   "type": "neoforge:add_features",
-  "biomes": "#forge:is_mushroom",
+  "biomes": "#c:is_mushroom",
   "features": "naturesaura:aura_mushroom",
   "step": "vegetal_decoration"
 }

Diff for: src/generated/resources/data/minecraft/tags/blocks/leaves.json renamed to src/generated/resources/data/minecraft/tags/block/leaves.json

@@ -33,7 +33,7 @@ public BlockAnimalGenerator() {
     }
 
     @SubscribeEvent
-    public void onLivingUpdate(EntityTickEvent event) {
+    public void onLivingUpdate(EntityTickEvent.Post event) {
         var entity = event.getEntity();
         if (entity.level().isClientSide || entity.level().getGameTime() % 40 != 0 || !(entity instanceof Animal) || entity instanceof Npc)
             return;

Diff for: src/generated/resources/data/minecraft/tags/blocks/logs.json renamed to src/generated/resources/data/minecraft/tags/block/logs.json

@@ -47,7 +47,7 @@ public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider
 
     public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
         if (type != SaveType.BLOCK) {
-            super.loadWithComponents(compound, registries);
+            super.loadAdditional(compound, registries);
             this.redstonePower = compound.getInt("redstone");
         }
     }

Diff for: src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json renamed to src/generated/resources/data/minecraft/tags/block/mineable/axe.json

@@ -42,7 +42,7 @@ public void render(BlockEntityAuraTimer tile, float partialTicks, PoseStack stac
         var r = (type.getColor() >> 16 & 255) / 255F;
         var g = (type.getColor() >> 8 & 255) / 255F;
         var b = (type.getColor() & 255) / 255F;
-        this.model.renderToBuffer(stack, buffer.getBuffer(this.model.renderType(RenderAuraTimer.RES)), combinedLightIn, combinedOverlayIn, FastColor.ARGB32.colorFromFloat(r, g, b, 0.75F));
+        this.model.renderToBuffer(stack, buffer.getBuffer(this.model.renderType(RenderAuraTimer.RES)), combinedLightIn, combinedOverlayIn, FastColor.ARGB32.colorFromFloat(0.75F, r, g, b));
         stack.popPose();
 
     }

Diff for: src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json renamed to src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json

@@ -47,7 +47,7 @@ public static void renderGlint(PoseStack stack, MultiBufferSource buffer, ModelL
         stack.translate(-0.002F + xOff, 1 + 0.002F + yOff, 1 + 0.002F + zOff);
         stack.mulPose(Axis.XP.rotationDegrees(180F));
         stack.scale(1.004F, 1.004F, 1.004F);
-        model.renderToBuffer(stack, buffer.getBuffer(model.renderType(texture)), brightness, combinedOverlayIn, FastColor.ARGB32.colorFromFloat(1, 1, 1, alpha * maxAlpha));
+        model.renderToBuffer(stack, buffer.getBuffer(model.renderType(texture)), brightness, combinedOverlayIn, FastColor.ARGB32.colorFromFloat(alpha * maxAlpha, 1, 1, 1));
         stack.popPose();
     }
 

Diff for: src/generated/resources/data/minecraft/tags/blocks/planks.json renamed to src/generated/resources/data/minecraft/tags/block/planks.json

@@ -187,7 +187,7 @@ public void onLevelRender(RenderLevelStageEvent event) {
         if (mc.getDebugOverlay().showDebugScreen() && (mc.player.isCreative() || mc.player.isSpectator()) && ModConfig.instance.debugLevel.get()) {
             var playerEye = mc.player.getEyePosition(event.getPartialTick().getGameTimeDeltaPartialTick(true));
             var playerView = mc.player.getViewVector(event.getPartialTick().getGameTimeDeltaPartialTick(true)).normalize();
-            var range = mc.gameMode.getDestroyStage();
+            var range = mc.player.blockInteractionRange();
             var builder = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
             IAuraChunk.getSpotsInArea(mc.level, mc.player.blockPosition(), 64, (pos, spot) -> {
                 Helper.renderWeirdBox(builder, pos.getX(), pos.getY(), pos.getZ(), 1, 1, 1, spot > 0 ? 0F : 1F, spot > 0 ? 1F : 0F, 0F, 0.35F);
@@ -202,7 +202,9 @@ public void onLevelRender(RenderLevelStageEvent event) {
                 }
 
             });
-            BufferUploader.drawWithShader(builder.build());
+            var data = builder.build();
+            if (data != null)
+                BufferUploader.drawWithShader(data);
         }
 
         // range visualizer
@@ -224,7 +226,9 @@ public void onLevelRender(RenderLevelStageEvent event) {
                     continue;
                 this.renderVisualize(builder, (IVisualizable) entity, mc.level, entity.blockPosition());
             }
-            BufferUploader.drawWithShader(builder.build());
+            var data = builder.build();
+            if (data != null)
+                BufferUploader.drawWithShader(data);
             RenderSystem.enableCull();
         }
 

Diff for: src/generated/resources/data/minecraft/tags/blocks/rails.json renamed to src/generated/resources/data/minecraft/tags/block/rails.json

@@ -6,6 +6,7 @@
 import net.minecraft.data.worldgen.features.FeatureUtils;
 import net.minecraft.data.worldgen.placement.PlacementUtils;
 import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
@@ -25,13 +26,13 @@ public final class ModFeatures {
 
     public static final class Configured {
 
-        public static final ResourceKey<ConfiguredFeature<?, ?>> ANCIENT_TREE = FeatureUtils.createKey(NaturesAura.MOD_ID + ":ancient_tree");
-        public static final ResourceKey<ConfiguredFeature<?, ?>> NETHER_WART_MUSHROOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":nether_wart_mushroom");
-        public static final ResourceKey<ConfiguredFeature<?, ?>> AURA_BLOOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":aura_bloom");
-        public static final ResourceKey<ConfiguredFeature<?, ?>> AURA_CACTUS = FeatureUtils.createKey(NaturesAura.MOD_ID + ":aura_cactus");
-        public static final ResourceKey<ConfiguredFeature<?, ?>> WARPED_AURA_MUSHROOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":warped_aura_mushroom");
-        public static final ResourceKey<ConfiguredFeature<?, ?>> CRIMSON_AURA_MUSHROOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":crimson_aura_mushroom");
-        public static final ResourceKey<ConfiguredFeature<?, ?>> AURA_MUSHROOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":aura_mushroom");
+        public static final ResourceKey<ConfiguredFeature<?, ?>> ANCIENT_TREE = ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":ancient_tree"));
+        public static final ResourceKey<ConfiguredFeature<?, ?>> NETHER_WART_MUSHROOM = ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":nether_wart_mushroom"));
+        public static final ResourceKey<ConfiguredFeature<?, ?>> AURA_BLOOM = ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":aura_bloom"));
+        public static final ResourceKey<ConfiguredFeature<?, ?>> AURA_CACTUS = ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":aura_cactus"));
+        public static final ResourceKey<ConfiguredFeature<?, ?>> WARPED_AURA_MUSHROOM = ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":warped_aura_mushroom"));
+        public static final ResourceKey<ConfiguredFeature<?, ?>> CRIMSON_AURA_MUSHROOM = ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":crimson_aura_mushroom"));
+        public static final ResourceKey<ConfiguredFeature<?, ?>> AURA_MUSHROOM = ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":aura_mushroom"));
 
         public static void bootstrap(BootstrapContext<ConfiguredFeature<?, ?>> context) {
             FeatureUtils.register(context, ModFeatures.Configured.AURA_BLOOM, ModFeatures.AURA_BLOOM, NoneFeatureConfiguration.INSTANCE);
@@ -48,11 +49,11 @@ public static void bootstrap(BootstrapContext<ConfiguredFeature<?, ?>> context)
 
     public static final class Placed {
 
-        public static final ResourceKey<PlacedFeature> AURA_BLOOM = PlacementUtils.createKey(NaturesAura.MOD_ID + ":aura_bloom");
-        public static final ResourceKey<PlacedFeature> AURA_CACTUS = PlacementUtils.createKey(NaturesAura.MOD_ID + ":aura_cactus");
-        public static final ResourceKey<PlacedFeature> WARPED_AURA_MUSHROOM = PlacementUtils.createKey(NaturesAura.MOD_ID + ":warped_aura_mushroom");
-        public static final ResourceKey<PlacedFeature> CRIMSON_AURA_MUSHROOM = PlacementUtils.createKey(NaturesAura.MOD_ID + ":crimson_aura_mushroom");
-        public static final ResourceKey<PlacedFeature> AURA_MUSHROOM = PlacementUtils.createKey(NaturesAura.MOD_ID + ":aura_mushroom");
+        public static final ResourceKey<PlacedFeature> AURA_BLOOM = ResourceKey.create(Registries.PLACED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":aura_bloom"));
+        public static final ResourceKey<PlacedFeature> AURA_CACTUS = ResourceKey.create(Registries.PLACED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":aura_cactus"));
+        public static final ResourceKey<PlacedFeature> WARPED_AURA_MUSHROOM = ResourceKey.create(Registries.PLACED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":warped_aura_mushroom"));
+        public static final ResourceKey<PlacedFeature> CRIMSON_AURA_MUSHROOM = ResourceKey.create(Registries.PLACED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":crimson_aura_mushroom"));
+        public static final ResourceKey<PlacedFeature> AURA_MUSHROOM = ResourceKey.create(Registries.PLACED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":aura_mushroom"));
 
         public static void bootstrap(BootstrapContext<PlacedFeature> context) {
             var holdergetter = context.lookup(Registries.CONFIGURED_FEATURE);

Diff for: src/generated/resources/data/minecraft/tags/blocks/slabs.json renamed to src/generated/resources/data/minecraft/tags/block/slabs.json

@@ -17,6 +17,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
+import net.minecraft.util.FastColor;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -69,7 +70,7 @@ public Component getName(ItemStack stack) {
     @Override
     @OnlyIn(Dist.CLIENT)
     public ItemColor getItemColor() {
-        return (stack, tintIndex) -> tintIndex > 0 ? ItemAuraBottle.getType(stack).getColor() : 0xFFFFFF;
+        return (stack, tintIndex) -> tintIndex > 0 ? FastColor.ARGB32.opaque(ItemAuraBottle.getType(stack).getColor()) : 0xFFFFFFFF;
     }
 
     @Override

Diff for: src/generated/resources/data/minecraft/tags/blocks/small_flowers.json renamed to src/generated/resources/data/minecraft/tags/block/small_flowers.json

@@ -13,6 +13,7 @@
 import net.minecraft.core.component.DataComponentType;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
+import net.minecraft.util.FastColor;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionResultHolder;
@@ -119,10 +120,10 @@ public ItemColor getItemColor() {
             if (tintIndex > 0) {
                 var color = ItemColorChanger.getStoredColor(stack);
                 if (color != null) {
-                    return color.getFireworkColor();
+                    return FastColor.ARGB32.opaque(color.getFireworkColor());
                 }
             }
-            return 0xFFFFFF;
+            return 0xFFFFFFFF;
         };
     }
 

Diff for: src/generated/resources/data/minecraft/tags/blocks/stairs.json renamed to src/generated/resources/data/minecraft/tags/block/stairs.json

@@ -10,6 +10,7 @@
 import net.minecraft.core.component.DataComponentType;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.FastColor;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.UseOnContext;
@@ -63,7 +64,7 @@ public Component getName(ItemStack stack) {
     @Override
     @OnlyIn(Dist.CLIENT)
     public ItemColor getItemColor() {
-        return (stack, tintIndex) -> NaturesAuraAPI.EFFECT_POWDERS.getOrDefault(ItemEffectPowder.getEffect(stack), 0xFFFFFF);
+        return (stack, tintIndex) -> FastColor.ARGB32.opaque(NaturesAuraAPI.EFFECT_POWDERS.getOrDefault(ItemEffectPowder.getEffect(stack), 0xFFFFFF));
     }
 
     public record Data(String effect) {

Diff for: src/generated/resources/data/minecraft/tags/items/axes.json renamed to src/generated/resources/data/minecraft/tags/item/axes.json

@@ -14,7 +14,7 @@ public ItemGoldFiber() {
 
     @Override
     public ItemColor getItemColor() {
-        return (stack, tintIndex) -> 0xF2FF00;
+        return (stack, tintIndex) -> 0xFFF2FF00;
     }
 
     @Override

Diff for: src/generated/resources/data/minecraft/tags/items/cluster_max_harvestables.json renamed to src/generated/resources/data/minecraft/tags/item/cluster_max_harvestables.json

@@ -39,7 +39,7 @@ public ItemPetReviver() {
     private static class Events {
 
         @SubscribeEvent
-        public void onEntityTick(EntityTickEvent event) {
+        public void onEntityTick(EntityTickEvent.Post event) {
             var entity = event.getEntity();
             if (entity.level().isClientSide || entity.level().getGameTime() % 20 != 0 || !(entity instanceof TamableAnimal tameable))
                 return;

Diff for: src/generated/resources/data/minecraft/tags/items/hoes.json renamed to src/generated/resources/data/minecraft/tags/item/hoes.json

@@ -2,7 +2,7 @@
 
 import net.minecraft.world.item.Item;
 
-@SuppressWarnings("NonConstantFieldWithUpperCaseName")
+@SuppressWarnings({"NonConstantFieldWithUpperCaseName", "FieldNamingConvention"})
 public final class ModItems {
 
     public static Item INFUSED_IRON_PICKAXE;
@@ -75,4 +75,5 @@ public final class ModItems {
     public static Item DEPTH_CHEST;
     public static Item DEPTH_PANTS;
     public static Item DEPTH_SHOES;
+
 }

Diff for: src/generated/resources/data/minecraft/tags/items/leaves.json renamed to src/generated/resources/data/minecraft/tags/item/leaves.json

@@ -80,7 +80,7 @@ public static void onAttack(LivingIncomingDamageEvent event) {
         }
 
         @SubscribeEvent
-        public static void update(PlayerTickEvent event) {
+        public static void update(PlayerTickEvent.Post event) {
             var player = event.getEntity();
             var speed = player.getAttribute(Attributes.MOVEMENT_SPEED);
             var step = player.getAttribute(Attributes.STEP_HEIGHT);

Diff for: src/generated/resources/data/minecraft/tags/items/logs.json renamed to src/generated/resources/data/minecraft/tags/item/logs.json

@@ -1,6 +1,6 @@
 {
     "name": "Effect Powder",
-    "icon": "naturesaura:effect_powder{effect:'naturesaura:plant_boost'}",
+    "icon": "naturesaura:effect_powder[naturesaura:effect_powder_data={'effect':'naturesaura:plant_boost'}]",
     "category": "naturesaura:effects",
     "advancement": "naturesaura:positive_imbalance",
     "priority": true,
@@ -14,4 +14,4 @@
             "text": "To use it, simply placing a stack of any size down on the ground will cause it to either stop its effect or create it, depending on the type of powder used. The $(thing)range$() the effect will have in blocks is equal to the size of the stack placed down. Hitting it while it is on the ground will cause it to go back into its item form.$(p)Each effect that has an $(item)Effect Powder$() attached to it will show the recipe in its chapter."
         }
     ]
-}
+}

Diff for: src/generated/resources/data/minecraft/tags/items/pickaxes.json renamed to src/generated/resources/data/minecraft/tags/item/pickaxes.json

@@ -1,6 +1,6 @@
 {
     "name": "This Book",
-    "icon": "patchouli:guide_book{'patchouli:book':'naturesaura:book'}",
+    "icon": "patchouli:guide_book[patchouli:book='naturesaura:book']",
     "category": "naturesaura:intro",
     "priority": true,
     "pages": [
@@ -13,4 +13,4 @@
             "text": "Additionally, to guide the user through the development of their research, some chapters will display $(thing)orange icons$(). These notify the reader of the next step they will have to take to advance their research further. Additionally, there is a direct link to the $(item)Advancement menu$() on the front page, which allows a greater overview of the overall progress."
         }
     ]
-}
+}