1.19.3, add datagen cache to gitignore

.gitignore

@@ -114,6 +114,9 @@ gradle-app.setting
 # Common working directory
 run/
 
+# datagen cache
+/src/main/generated/.cache/
+
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
 /remappedSrc/

build.gradle

@@ -34,7 +34,7 @@ dependencies {
     modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}"
     modLocalRuntime "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
 
-    modLocalRuntime "dev.architectury:architectury-fabric:${project.arch_version}"
+//    modLocalRuntime "dev.architectury:architectury-fabric:${project.arch_version}"
 
     modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
 

gradle.properties

@@ -2,24 +2,23 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_base_version=1.19
-minecraft_version=1.19.2
-yarn_mappings=1.19.2+build.28
-loader_version=0.14.10
+minecraft_base_version=1.19.3
+minecraft_version=1.19.3
+yarn_mappings=1.19.3+build.3
+loader_version=0.14.11
 # Mod Properties
 mod_version=2.0.18
 maven_group=wraith
 archives_base_name=wraith-alloy-forgery
 
 # Dependencies
-fabric_version=0.64.0+1.19.2
+fabric_version=0.69.0+1.19.3
 
 # https://maven.shedaniel.me/me/shedaniel/RoughlyEnoughItems-fabric/
-rei_version=9.0.472
-arch_version = 6.3.49
+rei_version=10.0.578
 
 # https://www.curseforge.com/minecraft/mc-mods/modmenu/files
-modmenu_version=4.1.1
+modmenu_version=5.0.2
 
 # https://maven.wispforest.io/io/wispforest/owo-lib
-owo_version=0.8.5+1.19
+owo_version=0.9.3+1.19.3

src/main/java/wraith/alloyforgery/AlloyForgeScreenHandler.java

@@ -53,7 +53,7 @@ public boolean canInsert(ItemStack stack) {
     }
 
     @Override
-    public ItemStack transferSlot(PlayerEntity player, int invSlot) {
+    public ItemStack quickMove(PlayerEntity player, int invSlot) {
         return ScreenUtils.handleSlotTransfer(this, invSlot, this.controllerInventory.size());
     }
 

src/main/java/wraith/alloyforgery/AlloyForgery.java

@@ -1,6 +1,5 @@
 package wraith.alloyforgery;
 
-import io.wispforest.owo.itemgroup.OwoItemGroup;
 import io.wispforest.owo.moddata.ModDataLoader;
 import io.wispforest.owo.particles.ClientParticles;
 import io.wispforest.owo.particles.systems.ParticleSystem;
@@ -13,12 +12,13 @@
 import net.fabricmc.fabric.api.transfer.v1.item.ItemStorage;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.particle.ParticleTypes;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
 import net.minecraft.resource.ResourceType;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.registry.Registry;
 import wraith.alloyforgery.block.ForgeControllerBlockEntity;
 import wraith.alloyforgery.data.AlloyForgeryGlobalRemaindersLoader;
 import wraith.alloyforgery.forges.ForgeRegistry;
@@ -30,8 +30,6 @@ public class AlloyForgery implements ModInitializer {
 
     public static final String MOD_ID = "alloy_forgery";
 
-    public static final OwoItemGroup ALLOY_FORGERY_GROUP = new AlloyForgeryItemGroup(id("alloy_forgery"));
-
     public static BlockEntityType<ForgeControllerBlockEntity> FORGE_CONTROLLER_BLOCK_ENTITY = ForgeControllerBlockEntity.Type.INSTANCE;
     public static ScreenHandlerType<AlloyForgeScreenHandler> ALLOY_FORGE_SCREEN_HANDLER_TYPE;
 
@@ -52,18 +50,18 @@ public class AlloyForgery implements ModInitializer {
     @SuppressWarnings("UnstableApiUsage")
     @Override
     public void onInitialize() {
-        ALLOY_FORGE_SCREEN_HANDLER_TYPE = Registry.register(Registry.SCREEN_HANDLER, id("alloy_forge"), new ScreenHandlerType<>(AlloyForgeScreenHandler::new));
+        ALLOY_FORGE_SCREEN_HANDLER_TYPE = Registry.register(Registries.SCREEN_HANDLER, id("alloy_forge"), new ScreenHandlerType<>(AlloyForgeScreenHandler::new));
 
         ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(new AlloyForgeryGlobalRemaindersLoader());
         ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(FuelDataLoader.INSTANCE);
         ModDataLoader.load(ForgeRegistry.Loader.INSTANCE);
 
-        Registry.register(Registry.BLOCK_ENTITY_TYPE, id("forge_controller"), FORGE_CONTROLLER_BLOCK_ENTITY);
+        Registry.register(Registries.BLOCK_ENTITY_TYPE, id("forge_controller"), FORGE_CONTROLLER_BLOCK_ENTITY);
 
-        Registry.register(Registry.RECIPE_TYPE, AlloyForgeRecipe.Type.ID, AlloyForgeRecipe.Type.INSTANCE);
-        Registry.register(Registry.RECIPE_SERIALIZER, AlloyForgeRecipe.Type.ID, AlloyForgeRecipeSerializer.INSTANCE);
+        Registry.register(Registries.RECIPE_TYPE, AlloyForgeRecipe.Type.ID, AlloyForgeRecipe.Type.INSTANCE);
+        Registry.register(Registries.RECIPE_SERIALIZER, AlloyForgeRecipe.Type.ID, AlloyForgeRecipeSerializer.INSTANCE);
 
-        ALLOY_FORGERY_GROUP.initialize();
+        AlloyForgeryItemGroup.GROUP.initialize();
 
         ItemStorage.SIDED.registerFallback((world, pos, state, blockEntity, context) -> {
             if (context == Direction.DOWN && world.getBlockEntity(pos.up()) instanceof ForgeControllerBlockEntity froge)

src/main/java/wraith/alloyforgery/AlloyForgeryItemGroup.java

@@ -1,51 +1,43 @@
 package wraith.alloyforgery;
 
+import io.wispforest.owo.itemgroup.Icon;
 import io.wispforest.owo.itemgroup.OwoItemGroup;
 import io.wispforest.owo.itemgroup.gui.ItemGroupButton;
+import io.wispforest.owo.itemgroup.gui.ItemGroupTab;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.collection.DefaultedList;
+import net.minecraft.text.Text;
 import wraith.alloyforgery.block.ForgeControllerBlock;
 import wraith.alloyforgery.forges.ForgeRegistry;
 
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
-public class AlloyForgeryItemGroup extends OwoItemGroup {
+public class AlloyForgeryItemGroup {
 
-    private List<ItemStack> controllerCache = null;
+    private static List<ItemStack> CONTROLLER_CACHE = null;
 
-    protected AlloyForgeryItemGroup(Identifier id) {
-        super(id);
-    }
+    public static final OwoItemGroup GROUP = OwoItemGroup.builder(AlloyForgery.id("alloy_forgery"), () -> {
+        if (CONTROLLER_CACHE == null) return null;
+        return Icon.of(CONTROLLER_CACHE.get(0));
+    }).initializer(group -> {
+        group.tabs.add(new ItemGroupTab(Icon.of(ItemStack.EMPTY), Text.empty(), (enabledFeatures, entries, hasPermissions) -> {
+            if (CONTROLLER_CACHE == null) createControllerCache();
+            CONTROLLER_CACHE.forEach(entries::add);
+        }, ItemGroupTab.DEFAULT_TEXTURE, true));
 
-    @Override
-    public ItemStack createIcon() {
-        if (this.controllerCache == null) return Items.BRICKS.getDefaultStack();
-        return this.controllerCache.isEmpty() ? Items.BRICKS.getDefaultStack() : this.controllerCache.get(0);
-    }
+        group.addButton(ItemGroupButton.github(group, "https://github.com/LordDeatHunter/Alloy-Forgery"));
+        group.addButton(ItemGroupButton.curseforge(group, "https://www.curseforge.com/minecraft/mc-mods/alloy-forgery"));
+        group.addButton(ItemGroupButton.modrinth(group, "https://modrinth.com/mod/alloy-forgery"));
+        group.addButton(ItemGroupButton.discord(group, "https://discord.gg/Pa5wDVm8Xv"));
+    }).build();
 
-    @Override
-    public void appendStacks(DefaultedList<ItemStack> stacks) {
-        if (controllerCache == null) this.createControllerCache();
-        stacks.addAll(this.controllerCache);
-    }
-
-    private void createControllerCache() {
+    private static void createControllerCache() {
         final var blockList = new ArrayList<>(ForgeRegistry.getControllerBlocks());
         blockList.sort(Comparator.comparingInt(value -> ((ForgeControllerBlock) value).forgeDefinition.forgeTier()));
 
-        this.controllerCache = new ArrayList<>(blockList.size());
-        blockList.forEach(block -> this.controllerCache.add(block.asItem().getDefaultStack()));
+        CONTROLLER_CACHE = new ArrayList<>(blockList.size());
+        blockList.forEach(block -> CONTROLLER_CACHE.add(block.asItem().getDefaultStack()));
     }
 
-    @Override
-    protected void setup() {
-        this.addButton(ItemGroupButton.github("https://github.com/LordDeatHunter/Alloy-Forgery"));
-        this.addButton(ItemGroupButton.curseforge("https://www.curseforge.com/minecraft/mc-mods/alloy-forgery"));
-        this.addButton(ItemGroupButton.modrinth("https://modrinth.com/mod/alloy-forgery"));
-        this.addButton(ItemGroupButton.discord("https://discord.gg/Pa5wDVm8Xv"));
-    }
 }

src/main/java/wraith/alloyforgery/block/ForgeControllerBlockEntity.java

@@ -254,7 +254,7 @@ private void handleForgingRemainders(DefaultedList<ItemStack> remainderList) {
             if (!remainderStack.isEmpty()) {
                 if (inputStack.isEmpty()) {
                     this.setStack(i, remainderStack);
-                } else if (ItemStack.areItemsEqualIgnoreDamage(inputStack, remainderStack) && ItemStack.areNbtEqual(inputStack, remainderStack)) {
+                } else if (inputStack.isItemEqual(remainderStack) && ItemStack.areNbtEqual(inputStack, remainderStack)) {
                     remainderStack.increment(inputStack.getCount());
 
                     if (remainderStack.getCount() > remainderStack.getMaxCount()) {

src/main/java/wraith/alloyforgery/data/AlloyForgeryData.java

@@ -8,7 +8,8 @@
 public class AlloyForgeryData implements DataGeneratorEntrypoint {
     @Override
     public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {
-        fabricDataGenerator.addProvider(new AlloyForgeryRecipeProvider(fabricDataGenerator));
-        fabricDataGenerator.addProvider(new AlloyForgeryTagProviders.Item(fabricDataGenerator));
+        var fortnitusPackus = fabricDataGenerator.createPack();
+        fortnitusPackus.addProvider(AlloyForgeryRecipeProvider::new);
+        fortnitusPackus.addProvider(AlloyForgeryTagProviders.Item::new);
     }
 }

src/main/java/wraith/alloyforgery/data/AlloyForgeryTags.java

@@ -1,9 +1,9 @@
 package wraith.alloyforgery.data;
 
 import net.minecraft.item.Item;
-import net.minecraft.tag.TagKey;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.registry.tag.TagKey;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
 import wraith.alloyforgery.AlloyForgery;
 
 public class AlloyForgeryTags {
@@ -90,15 +90,15 @@ private static TagKey<Item> registerAlloyForgery(String path) {
         }
 
         private static TagKey<Item> register(Identifier id) {
-            return TagKey.of(Registry.ITEM_KEY, id);
+            return TagKey.of(RegistryKeys.ITEM, id);
         }
     }
 
-    private static Identifier common(String path){
+    private static Identifier common(String path) {
         return new Identifier(COMMON_NAMESPACE, path);
     }
 
-    private static Identifier alloyForgery(String path){
+    private static Identifier alloyForgery(String path) {
         return AlloyForgery.id(path);
     }
 }