Finish porting refactors

Jamalam360 · Jamalam360 · commit 87f4849885fe · 2026-02-05T11:30:50.000Z
diff --git a/common/src/client/java/io/github/jamalam360/utility_belt/client/UtilityBeltClient.java b/common/src/client/java/io/github/jamalam360/utility_belt/client/UtilityBeltClient.java
@@ -1,7 +1,7 @@
 package io.github.jamalam360.utility_belt.client;
 
 import dev.architectury.event.events.client.ClientPlayerEvent;
-import dev.architectury.registry.client.gui.MenuScreenRegistry;
+import dev.architectury.registry.menu.MenuRegistry;
 import io.github.jamalam360.jamlib.config.ConfigManager;
 import io.github.jamalam360.utility_belt.UtilityBelt;
 import io.github.jamalam360.utility_belt.client.content.ClientConfig;
@@ -27,8 +27,8 @@ public static void init() {
 		ClientNetworking.init();
 		StateManager.setClientInstance(new ClientStateManager());
 		ClientPlayerEvent.CLIENT_PLAYER_RESPAWN.register(UtilityBeltClient::onPlayerRespawn);
-		ModMenus.MENU_TYPE.listen(menu -> MenuScreenRegistry.registerScreenFactory(menu, UtilityBeltScreen::new));
-		ModItems.UTILITY_BELT_ITEM.listen(belt -> AccessoriesRendererRegistry.bindItemToRenderer(belt, UtilityBelt.id("utility_belt"), BeltRenderer::new));
+		ModMenus.MENU_TYPE.listen(menu -> MenuRegistry.registerScreenFactory(menu, UtilityBeltScreen::new));
+		ModItems.UTILITY_BELT_ITEM.listen(belt -> AccessoriesRendererRegistry.registerRenderer(belt, BeltRenderer::new));
 	}
 
 	private static void onPlayerRespawn(LocalPlayer oldPlayer, LocalPlayer newPlayer) {
diff --git a/common/src/client/java/io/github/jamalam360/utility_belt/client/content/register/ModInputs.java b/common/src/client/java/io/github/jamalam360/utility_belt/client/content/register/ModInputs.java
@@ -4,7 +4,6 @@
 import dev.architectury.event.events.client.ClientRawInputEvent;
 import dev.architectury.event.events.client.ClientTickEvent;
 import dev.architectury.registry.client.keymappings.KeyMappingRegistry;
-import io.github.jamalam360.utility_belt.UtilityBelt;
 import io.github.jamalam360.utility_belt.client.UtilityBeltClient;
 import io.github.jamalam360.utility_belt.client.network.ClientNetworking;
 import io.github.jamalam360.utility_belt.content.UtilityBeltItem;
@@ -18,7 +17,7 @@
 import org.lwjgl.glfw.GLFW;
 
 public class ModInputs {
-	private static final KeyMapping.Category KEY_CATEGORY = KeyMapping.Category.register(UtilityBelt.id("utility_belt"));
+	private static final String KEY_CATEGORY = "key.category.utility_belt.utility_belt";
 	private static final KeyMapping SWAP_TOGGLE = new KeyMapping("key.utility_belt.swap_toggle", GLFW.GLFW_KEY_B, KEY_CATEGORY);
 	private static final KeyMapping SWAP_HOLD = new KeyMapping("key.utility_belt.swap_hold", GLFW.GLFW_KEY_N, KEY_CATEGORY);
 	private static final KeyMapping OPEN_SCREEN = new KeyMapping("key.utility_belt.open_screen", GLFW.GLFW_KEY_APOSTROPHE, KEY_CATEGORY);
diff --git a/common/src/generated/resources/assets/utility_belt/items/pouch.json b/common/src/generated/resources/assets/utility_belt/items/pouch.json
diff --git a/common/src/generated/resources/assets/utility_belt/items/utility_belt.json b/common/src/generated/resources/assets/utility_belt/items/utility_belt.json
diff --git a/common/src/generated/resources/data/utility_belt/recipe/pouch.json b/common/src/generated/resources/data/utility_belt/recipe/pouch.json
@@ -2,9 +2,15 @@
   "type": "minecraft:crafting_shaped",
   "category": "equipment",
   "key": {
-    "D": "minecraft:diamond",
-    "L": "minecraft:leather",
-    "S": "minecraft:string"
+    "D": {
+      "item": "minecraft:diamond"
+    },
+    "L": {
+      "item": "minecraft:leather"
+    },
+    "S": {
+      "item": "minecraft:string"
+    }
   },
   "pattern": [
     "SDS",
diff --git a/common/src/generated/resources/data/utility_belt/recipe/upgrade_utility_belt.json b/common/src/generated/resources/data/utility_belt/recipe/upgrade_utility_belt.json
@@ -1,8 +1,14 @@
 {
   "type": "minecraft:smithing_transform",
-  "addition": "utility_belt:pouch",
-  "base": "utility_belt:utility_belt",
+  "addition": {
+    "item": "utility_belt:pouch"
+  },
+  "base": {
+    "item": "utility_belt:utility_belt"
+  },
   "result": {
+    "count": 1,
     "id": "utility_belt:utility_belt"
-  }
+  },
+  "template": []
 }
diff --git a/common/src/generated/resources/data/utility_belt/recipe/utility_belt.json b/common/src/generated/resources/data/utility_belt/recipe/utility_belt.json
@@ -2,9 +2,15 @@
   "type": "minecraft:crafting_shaped",
   "category": "equipment",
   "key": {
-    "L": "minecraft:leather",
-    "P": "utility_belt:pouch",
-    "S": "minecraft:string"
+    "L": {
+      "item": "minecraft:leather"
+    },
+    "P": {
+      "item": "utility_belt:pouch"
+    },
+    "S": {
+      "item": "minecraft:string"
+    }
   },
   "pattern": [
     "LPL",
diff --git a/common/src/main/java/io/github/jamalam360/utility_belt/content/UtilityBeltItem.java b/common/src/main/java/io/github/jamalam360/utility_belt/content/UtilityBeltItem.java
@@ -35,7 +35,7 @@ public class UtilityBeltItem extends AccessoryItem {
 	private static final int BAR_COLOR = Mth.color((int) (0.4 * 255), (int) (0.4 * 255), (int) (1.0 * 255));
 
 	public UtilityBeltItem() {
-		super(new Item.Properties().stacksTo(1).component(UtilityBelt.UTILITY_BELT_INVENTORY_COMPONENT_TYPE.get(), UtilityBeltInventory.empty(UtilityBelt.COMMON_CONFIG.get().initialBeltSize)).component(UtilityBelt.UTILITY_BELT_SIZE_COMPONENT_TYPE.get(), UtilityBelt.COMMON_CONFIG.get().initialBeltSize));
+		super(new Item.Properties().stacksTo(1).component(ModComponents.UTILITY_BELT_INVENTORY.get(), UtilityBeltInventory.empty(UtilityBelt.COMMON_CONFIG.get().initialBeltSize)).component(ModComponents.UTILITY_BELT_SIZE.get(), UtilityBelt.COMMON_CONFIG.get().initialBeltSize));
 	}
 
 	@SuppressWarnings("BooleanMethodIsAlwaysInverted")
diff --git a/common/src/main/java/io/github/jamalam360/utility_belt/content/register/ModItems.java b/common/src/main/java/io/github/jamalam360/utility_belt/content/register/ModItems.java
@@ -14,7 +14,7 @@
 public class ModItems {
 	private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(UtilityBelt.MOD_ID, Registries.ITEM);
 	public static final RegistrySupplier<Item> UTILITY_BELT_ITEM = ITEMS.register("utility_belt", UtilityBeltItem::new);
-	public static final RegistrySupplier<Item> POUCH_ITEM = ITEMS.register("pouch", () -> new Item(new Item.Properties().setId(ResourceKey.create(Registries.ITEM, UtilityBelt.id("pouch")))));
+	public static final RegistrySupplier<Item> POUCH_ITEM = ITEMS.register("pouch", () -> new Item(new Item.Properties()));
 	public static final TagKey<Item> ALLOWED_IN_UTILITY_BELT = TagKey.create(Registries.ITEM, UtilityBelt.id("allowed_in_utility_belt"));
 
 	public static void init() {
diff --git a/common/src/main/java/io/github/jamalam360/utility_belt/mixin/InventoryMixin.java b/common/src/main/java/io/github/jamalam360/utility_belt/mixin/InventoryMixin.java
@@ -1,9 +1,9 @@
 package io.github.jamalam360.utility_belt.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import io.github.jamalam360.utility_belt.UtilityBeltInventory;
-import io.github.jamalam360.utility_belt.UtilityBeltItem;
+import io.github.jamalam360.utility_belt.content.UtilityBeltItem;
 import io.github.jamalam360.utility_belt.state.StateManager;
+import io.github.jamalam360.utility_belt.util.UtilityBeltInventory;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
diff --git a/common/src/main/java/io/github/jamalam360/utility_belt/mixin/SmithingMenuMixin.java b/common/src/main/java/io/github/jamalam360/utility_belt/mixin/SmithingMenuMixin.java
@@ -61,7 +61,8 @@ public SmithingMenuMixin(@Nullable MenuType<?> type, int containerId, Inventory
 			method = "createResult",
 			at = @At(
 					value = "INVOKE",
-					target = "Lnet/minecraft/world/inventory/ResultContainer;setItem(ILnet/minecraft/world/item/ItemStack;)V"
+					target = "Lnet/minecraft/world/inventory/ResultContainer;setItem(ILnet/minecraft/world/item/ItemStack;)V",
+					ordinal = 1
 			)
 	)
 	private void utilitybelt$upgradeBeltSlots(ResultContainer instance, int slot, ItemStack resultStack, Operation<Void> original, @Local(name = "list") List<RecipeHolder<SmithingRecipe>> list) {
diff --git a/datagen/src/main/java/io/github/jamalam360/utility_belt/datagen/Models.java b/datagen/src/main/java/io/github/jamalam360/utility_belt/datagen/Models.java
@@ -1,11 +1,11 @@
 package io.github.jamalam360.utility_belt.datagen;
 
 import io.github.jamalam360.utility_belt.content.register.ModItems;
-import net.fabricmc.fabric.api.client.datagen.v1.provider.FabricModelProvider;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
-import net.minecraft.client.data.models.BlockModelGenerators;
-import net.minecraft.client.data.models.ItemModelGenerators;
-import net.minecraft.client.data.models.model.ModelTemplates;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider;
+import net.minecraft.data.models.BlockModelGenerators;
+import net.minecraft.data.models.ItemModelGenerators;
+import net.minecraft.data.models.model.ModelTemplates;
 
 public class Models extends FabricModelProvider {
 	public Models(FabricDataOutput output) {
@@ -14,7 +14,6 @@ public Models(FabricDataOutput output) {
 
 	@Override
 	public void generateBlockStateModels(BlockModelGenerators gen) {
-
 	}
 
 	@Override
diff --git a/datagen/src/main/java/io/github/jamalam360/utility_belt/datagen/Recipes.java b/datagen/src/main/java/io/github/jamalam360/utility_belt/datagen/Recipes.java
@@ -4,24 +4,12 @@
 import io.github.jamalam360.utility_belt.content.register.ModItems;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
-import net.minecraft.advancements.Advancement;
-import net.minecraft.advancements.AdvancementRequirements;
-import net.minecraft.advancements.AdvancementRewards;
-import net.minecraft.advancements.critereon.RecipeUnlockedTrigger;
 import net.minecraft.core.HolderLookup;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.data.recipes.RecipeCategory;
-import net.minecraft.data.recipes.RecipeOutput;
-import net.minecraft.data.recipes.RecipeProvider;
-import net.minecraft.resources.ResourceKey;
+import net.minecraft.data.recipes.*;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraft.world.item.crafting.Recipe;
-import net.minecraft.world.item.crafting.SmithingTransformRecipe;
-import net.minecraft.world.item.crafting.TransmuteResult;
 
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
 public class Recipes extends FabricRecipeProvider {
@@ -30,44 +18,38 @@ public Recipes(FabricDataOutput output, CompletableFuture<HolderLookup.Provider>
 	}
 
 	@Override
-	protected RecipeProvider createRecipeProvider(HolderLookup.Provider provider, RecipeOutput recipeOutput) {
-		return new RecipeProvider(provider, recipeOutput) {
-			@Override
-			public void buildRecipes() {
-				shaped(RecipeCategory.TOOLS, ModItems.POUCH_ITEM.get())
+	public void buildRecipes(RecipeOutput output) {
+		ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, ModItems.POUCH_ITEM.get())
 						.pattern("SDS").pattern("L L").pattern("SLS")
 						.define('S', Items.STRING).define('L', Items.LEATHER).define('D', Items.DIAMOND)
 						.unlockedBy("has_string", has(Items.STRING))
 						.unlockedBy("has_leather", has(Items.LEATHER))
 						.unlockedBy("has_diamond", has(Items.DIAMOND))
-						.save(this.output);
+				.save(output);
 
-				shaped(RecipeCategory.TOOLS, ModItems.UTILITY_BELT_ITEM.get())
-						.pattern("LPL").pattern("S S").pattern("LPL")
-						.define('L', Items.LEATHER).define('P', ModItems.POUCH_ITEM.get()).define('S', Items.STRING)
-						.unlockedBy("has_leather", has(Items.LEATHER))
-						.unlockedBy("has_pouch", has(ModItems.POUCH_ITEM.get()))
-						.unlockedBy("has_string", has(Items.STRING))
-						.save(this.output);
+		ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, ModItems.UTILITY_BELT_ITEM.get())
+				.pattern("LPL").pattern("S S").pattern("LPL")
+				.define('L', Items.LEATHER).define('P', ModItems.POUCH_ITEM.get()).define('S', Items.STRING)
+				.unlockedBy("has_leather", has(Items.LEATHER))
+				.unlockedBy("has_pouch", has(ModItems.POUCH_ITEM.get()))
+				.unlockedBy("has_string", has(Items.STRING))
+				.save(output);
 
-				this.createSmithingRecipe();
-			}
+		this.createSmithingRecipe(output);
+	}
 
-			private void createSmithingRecipe() {
-				ResourceLocation resourceLocation = UtilityBelt.id("upgrade_utility_belt");
-				ResourceKey<Recipe<?>> resourceKey = ResourceKey.create(Registries.RECIPE, resourceLocation);
-				Advancement.Builder builder = this.output.advancement()
-						.addCriterion("has_the_recipe", RecipeUnlockedTrigger.unlocked(resourceKey))
-						.rewards(AdvancementRewards.Builder.recipe(resourceKey))
-						.requirements(AdvancementRequirements.Strategy.OR);
-				builder.addCriterion("has_utility_belt", this.has(ModItems.UTILITY_BELT_ITEM.get()));
-				builder.addCriterion("has_pouch", this.has(ModItems.POUCH_ITEM.get()));
-				SmithingTransformRecipe smithingTransformRecipe = new SmithingTransformRecipe(
-						Optional.empty(), Ingredient.of(ModItems.UTILITY_BELT_ITEM.get()), Optional.of(Ingredient.of(ModItems.POUCH_ITEM.get())), new TransmuteResult(ModItems.UTILITY_BELT_ITEM.get())
-				);
-				output.accept(resourceKey, smithingTransformRecipe, builder.build(resourceKey.location().withPrefix("recipes/" + RecipeCategory.TOOLS.getFolderName() + "/")));
-			}
-		};
+	private void createSmithingRecipe(RecipeOutput output) {
+		ResourceLocation resourceLocation = UtilityBelt.id("upgrade_utility_belt");
+
+		SmithingTransformRecipeBuilder.smithing(
+						Ingredient.EMPTY,
+						Ingredient.of(ModItems.UTILITY_BELT_ITEM.get()),
+						Ingredient.of(ModItems.POUCH_ITEM.get()),
+						RecipeCategory.TOOLS,
+						ModItems.UTILITY_BELT_ITEM.get()
+				).unlocks("has_utility_belt", has(ModItems.UTILITY_BELT_ITEM.get()))
+				.unlocks("has_pouch", has(ModItems.POUCH_ITEM.get()))
+				.save(output, resourceLocation);
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class UtilityBeltItem extends AccessoryItem {`
`35`	`35`	`private static final int BAR_COLOR = Mth.color((int) (0.4 * 255), (int) (0.4 * 255), (int) (1.0 * 255));`
`36`	`36`
`37`	`37`	`public UtilityBeltItem() {`
`38`		`- super(new Item.Properties().stacksTo(1).component(UtilityBelt.UTILITY_BELT_INVENTORY_COMPONENT_TYPE.get(), UtilityBeltInventory.empty(UtilityBelt.COMMON_CONFIG.get().initialBeltSize)).component(UtilityBelt.UTILITY_BELT_SIZE_COMPONENT_TYPE.get(), UtilityBelt.COMMON_CONFIG.get().initialBeltSize));`
	`38`	`+ super(new Item.Properties().stacksTo(1).component(ModComponents.UTILITY_BELT_INVENTORY.get(), UtilityBeltInventory.empty(UtilityBelt.COMMON_CONFIG.get().initialBeltSize)).component(ModComponents.UTILITY_BELT_SIZE.get(), UtilityBelt.COMMON_CONFIG.get().initialBeltSize));`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@SuppressWarnings("BooleanMethodIsAlwaysInverted")`