feat: Update Forge and NeoForge to 1.21

TwelveIterationMods · Jun 14, 2024 · 20add26 · 20add26
1 parent a1b8db4
commit 20add26
Show file tree

Hide file tree

Showing 12 changed files with 180 additions and 192 deletions.
diff --git a/common/src/main/java/net/blay09/mods/waystones/Waystones.java b/common/src/main/java/net/blay09/mods/waystones/Waystones.java
@@ -32,9 +32,9 @@ public static void initialize() {
         ModEventHandlers.initialize();
         ModNetworking.initialize(Balm.getNetworking());
         ModBlocks.initialize(Balm.getBlocks());
-        ModBlockEntities.initialize(Balm.getBlockEntities());
+        ModBlockEntities.initialize();
         ModItems.initialize(Balm.getItems());
-        ModMenus.initialize(Balm.getMenus());
+        ModMenus.initialize();
         ModWorldGen.initialize(Balm.getWorldGen());
         ModCommands.initialize(Balm.getCommands());
         ModComponents.initialize(Balm.getComponents());

diff --git a/common/src/main/java/net/blay09/mods/waystones/block/entity/ModBlockEntities.java b/common/src/main/java/net/blay09/mods/waystones/block/entity/ModBlockEntities.java
@@ -1,5 +1,6 @@
 package net.blay09.mods.waystones.block.entity;
 
+import net.blay09.mods.balm.api.Balm;
 import net.blay09.mods.balm.api.DeferredObject;
 import net.blay09.mods.balm.api.block.BalmBlockEntities;
 import net.blay09.mods.waystones.Waystones;
@@ -9,20 +10,21 @@
 import net.minecraft.world.level.block.entity.BlockEntityType;
 
 public class ModBlockEntities {
-    public static DeferredObject<BlockEntityType<WaystoneBlockEntity>> waystone;
-    public static DeferredObject<BlockEntityType<SharestoneBlockEntity>> sharestone;
-    public static DeferredObject<BlockEntityType<WarpPlateBlockEntity>> warpPlate;
-    public static DeferredObject<BlockEntityType<PortstoneBlockEntity>> portstone;
+    private static final BalmBlockEntities blockEntities = Balm.getBlockEntities();
+    public static DeferredObject<BlockEntityType<WaystoneBlockEntity>> waystone = blockEntities.registerBlockEntity(id("waystone"),
+            WaystoneBlockEntity::new,
+            () -> new Block[]{ModBlocks.waystone, ModBlocks.mossyWaystone, ModBlocks.sandyWaystone, ModBlocks.deepslateWaystone, ModBlocks.blackstoneWaystone, ModBlocks.endStoneWaystone});
+    public static DeferredObject<BlockEntityType<SharestoneBlockEntity>> sharestone = blockEntities.registerBlockEntity(id("sharestone"),
+            SharestoneBlockEntity::new,
+            () -> ModBlocks.sharestones);
+    public static DeferredObject<BlockEntityType<WarpPlateBlockEntity>> warpPlate = blockEntities.registerBlockEntity(id("warp_plate"),
+            WarpPlateBlockEntity::new,
+            () -> new Block[]{ModBlocks.warpPlate});
+    public static DeferredObject<BlockEntityType<PortstoneBlockEntity>> portstone = blockEntities.registerBlockEntity(id("portstone"),
+            PortstoneBlockEntity::new,
+            () -> ModBlocks.portstones);
 
-    public static void initialize(BalmBlockEntities blockEntities) {
-        waystone = blockEntities.registerBlockEntity(id("waystone"),
-                WaystoneBlockEntity::new,
-                () -> new Block[]{ModBlocks.waystone, ModBlocks.mossyWaystone, ModBlocks.sandyWaystone, ModBlocks.deepslateWaystone, ModBlocks.blackstoneWaystone, ModBlocks.endStoneWaystone});
-        sharestone = blockEntities.registerBlockEntity(id("sharestone"),
-                SharestoneBlockEntity::new,
-                () -> ModBlocks.sharestones);
-        warpPlate = blockEntities.registerBlockEntity(id("warp_plate"), WarpPlateBlockEntity::new, () -> new Block[]{ModBlocks.warpPlate});
-        portstone = blockEntities.registerBlockEntity(id("portstone"), PortstoneBlockEntity::new, () -> ModBlocks.portstones);
+    public static void initialize() {
     }
 
     private static ResourceLocation id(String name) {

diff --git a/common/src/main/java/net/blay09/mods/waystones/client/ModTextures.java b/common/src/main/java/net/blay09/mods/waystones/client/ModTextures.java
diff --git a/common/src/main/java/net/blay09/mods/waystones/client/WaystonesClient.java b/common/src/main/java/net/blay09/mods/waystones/client/WaystonesClient.java
@@ -1,18 +1,11 @@
 package net.blay09.mods.waystones.client;
 
-import net.blay09.mods.balm.api.Balm;
 import net.blay09.mods.balm.api.client.BalmClient;
-import net.blay09.mods.balm.api.event.client.UseItemInputEvent;
 import net.blay09.mods.waystones.InternalClientMethodsImpl;
 import net.blay09.mods.waystones.api.client.WaystonesClientAPI;
-import net.blay09.mods.waystones.block.entity.WaystoneBlockEntityBase;
 import net.blay09.mods.waystones.client.requirement.RequirementClientRegistry;
 import net.blay09.mods.waystones.compat.Compat;
-import net.blay09.mods.waystones.network.message.RequestEditWaystoneMessage;
 import net.minecraft.client.ClientBrandRetriever;
-import net.minecraft.client.Minecraft;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.HitResult;
 
 import java.util.Locale;
 
@@ -24,7 +17,6 @@ public static void initialize() {
         ModClientEventHandlers.initialize();
         ModRenderers.initialize(BalmClient.getRenderers());
         ModScreens.initialize(BalmClient.getScreens());
-        ModTextures.initialize(BalmClient.getTextures());
         ModModels.initialize(BalmClient.getModels());
 
         InventoryButtonGuiHandler.initialize();