post merge fixes, once again

Author: IThundxr

common/src/main/java/com/railwayteam/railways/base/data/BuilderTransformers.java

@@ -37,6 +37,7 @@
 import com.tterrag.registrate.util.nullness.NonNullUnaryOperator;
 import dev.architectury.injectables.annotations.ExpectPlatform;
 import net.minecraft.core.Direction;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.item.Item;
@@ -175,7 +176,7 @@ public static <B extends BoilerBlock, P> NonNullUnaryOperator<BlockBuilder<B, P>
             .tag(CRTags.AllBlockTags.LOCOMETAL_BOILERS.tag)
             .tag(AllTags.AllBlockTags.COPYCAT_DENY.tag)
             .transform(pickaxeOnly())
-            .onRegisterAfter(Registry.ITEM_REGISTRY, v -> ItemDescription.useKey(v, "block.railways.boiler"))
+            .onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "block.railways.boiler"))
             .blockstate(BoilerGenerator.create(color, wrapping)::generate);
     }
 

common/src/main/java/com/railwayteam/railways/content/buffer/BlockStateBlockItemGroup.java

@@ -10,7 +10,7 @@
 import com.tterrag.registrate.util.entry.BlockEntry;
 import com.tterrag.registrate.util.entry.ItemEntry;
 import com.tterrag.registrate.util.nullness.NonNullUnaryOperator;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
@@ -101,7 +101,7 @@ private void register() {
 
             items.put(v, REGISTRATE.item(v.getBlockId(context), BlockStateBlockItem.create(blockEntry::get, property, v, primary))
                 .lang(v.getLangName(context))
-                .onRegisterAfter(Registry.ITEM_REGISTRY, i -> ItemDescription.useKey(i, "block.railways.generic_radial"))
+                .onRegisterAfter(Registries.ITEM, i -> ItemDescription.useKey(i, "block.railways.generic_radial"))
                 .transform(itemTransformer)
                 .tag(cycleTag)
                 .model((c, p) -> p.withExistingParent("item/" + c.getName(), v.getModel(context)))

common/src/main/java/com/railwayteam/railways/content/palettes/boiler/BoilerBlock.java

@@ -2,7 +2,6 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.railwayteam.railways.mixin_interfaces.IForceRenderingSodium;
 import com.railwayteam.railways.mixin_interfaces.IHasCustomOutline;
 import com.railwayteam.railways.registry.CRShapes;
 import com.simibubi.create.content.equipment.wrench.IWrenchable;

common/src/main/java/com/railwayteam/railways/registry/CRBlocks.java

@@ -187,14 +187,14 @@ private static BlockEntry<SmokeStackBlock> makeSmokeStack(String variant, SmokeS
                 .tab(CRCreativeModeTabs.getBaseTabKey())
                 .model((c, p) -> p.withExistingParent(c.getName(), Railways.asResource("block/smokestack_" + variant + "_steel")))
                 .tag(cycleTag)
-            .onRegisterAfter(Registry.ITEM_REGISTRY, v -> ItemDescription.useKey(v, "block.railways.smokestack"))
+            .onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "block.railways.smokestack"))
             .build()
             .register();
 
         if (!variant.equals("caboosestyle")) {
             BlockStateBlockItemGroup<Couple<String>, SmokestackStyle> group = new BlockStateBlockItemGroup<>(Couple.create("smokestack_" + variant + "_", description), SmokeStackBlock.STYLE, SmokestackStyle.values(), BLOCK,
                 i -> i.tab(null)
-                    .onRegisterAfter(Registry.ITEM_REGISTRY, v -> ItemDescription.useKey(v, "block.railways.smokestack")),
+                    .onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "block.railways.smokestack")),
                 cycleTag, SmokestackStyle.STEEL);
             SMOKESTACK_GROUP.put(variant, group);
             group.registerDefaultEntry(SmokestackStyle.STEEL, ItemEntry.cast(REGISTRATE.get("smokestack_" + variant, Registries.ITEM)));

common/src/main/java/com/railwayteam/railways/registry/CRPalettes.java

@@ -12,6 +12,7 @@
 import com.simibubi.create.foundation.item.ItemDescription;
 import com.tterrag.registrate.util.entry.BlockEntry;
 import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.item.Item;
@@ -158,7 +159,7 @@ private static BlockEntry<?> slashedLocometal(@Nullable DyeColor color, String c
             .lang(joinSpace(colorName, "Slashed Locometal"))
             .item()
             .tag(tags)
-            .onRegisterAfter(Registry.ITEM_REGISTRY, v -> ItemDescription.useKey(v, "block.railways.generic_radial"))
+            .onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "block.railways.generic_radial"))
             .build()
             .register();
     }
@@ -171,7 +172,7 @@ private static BlockEntry<?> rivetedLocometal(@Nullable DyeColor color, String c
             .lang(joinSpace(colorName, "Riveted Locometal"))
             .item()
             .tag(tags)
-            .onRegisterAfter(Registry.ITEM_REGISTRY, v -> ItemDescription.useKey(v, "block.railways.generic_radial"))
+            .onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "block.railways.generic_radial"))
             .build()
             .register();
     }
@@ -183,7 +184,7 @@ private static BlockEntry<?> locometalPillar(@Nullable DyeColor color, String co
             .lang(joinSpace(colorName, "Locometal Pillar"))
             .item()
             .tag(tags)
-            .onRegisterAfter(Registry.ITEM_REGISTRY, v -> ItemDescription.useKey(v, "block.railways.generic_radial"))
+            .onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "block.railways.generic_radial"))
             .build()
             .register();
     }
@@ -195,7 +196,7 @@ public static BlockEntry<?> locometalSmokebox(@Nullable DyeColor color, String c
             .lang(joinSpace(colorName, "Locometal Smokebox"))
             .item()
             .tag(tags)
-            .onRegisterAfter(Registry.ITEM_REGISTRY, v -> ItemDescription.useKey(v, "block.railways.generic_radial"))
+            .onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "block.railways.generic_radial"))
             .build()
             .register();
     }
@@ -207,7 +208,7 @@ public static BlockEntry<?> platedLocometal(@Nullable DyeColor color, String col
             .lang(joinSpace("Plated", colorName, "Locometal"))
             .item()
             .tag(tags)
-            .onRegisterAfter(Registry.ITEM_REGISTRY, v -> ItemDescription.useKey(v, "block.railways.generic_radial"))
+            .onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "block.railways.generic_radial"))
             .build()
             .register();
     }
@@ -219,7 +220,7 @@ public static BlockEntry<?> flatSlashedLocometal(@Nullable DyeColor color, Strin
             .lang(joinSpace("Flat", colorName, "Slashed Locometal"))
             .item()
             .tag(tags)
-            .onRegisterAfter(Registry.ITEM_REGISTRY, v -> ItemDescription.useKey(v, "block.railways.generic_radial"))
+            .onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "block.railways.generic_radial"))
             .build()
             .register();
     }
@@ -231,7 +232,7 @@ public static BlockEntry<?> flatRivetedLocometal(@Nullable DyeColor color, Strin
             .lang(joinSpace("Flat", colorName, "Riveted Locometal"))
             .item()
             .tag(tags)
-            .onRegisterAfter(Registry.ITEM_REGISTRY, v -> ItemDescription.useKey(v, "block.railways.generic_radial"))
+            .onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "block.railways.generic_radial"))
             .build()
             .register();
     }