feat: update to 1.21

shockingly simple upgrade (the point releases were worse)

Author: marcus8448

build.gradle.kts

@@ -165,7 +165,7 @@ dependencies {
         "fabric-api-lookup-api-v1",
         "fabric-gametest-api-v1",
         "fabric-item-api-v1",
-        "fabric-models-v0",
+        "fabric-model-loading-api-v1",
         "fabric-renderer-api-v1",
         "fabric-rendering-data-attachment-v1",
         "fabric-rendering-fluids-v1",

gradle.properties

@@ -6,18 +6,18 @@ mod.name=MachineLib
 mod.version=0.7.0
 
 # Minecraft and Fabric Loader
-minecraft.version=1.20.6
+minecraft.version=1.21
 loader.version=0.15.11
-yarn.build=3
+yarn.build=8
 
 # Mod Dependencies
-badpackets.version=0.7.2
-energy.version=4.0.0
-fabric.version=0.100.4+1.20.6
+badpackets.version=0.8.1
+energy.version=4.1.0
+fabric.version=0.100.6+1.21
 
 # Optional Mod Dependencies
-cloth.config.version=14.0.126
-modmenu.version=10.0.0
-rei.version=15.0.728
-architectury.version=12.1.3
-wthit.version=11.4.1
+cloth.config.version=15.0.127
+modmenu.version=11.0.1
+rei.version=16.0.729
+architectury.version=13.0.3
+wthit.version=12.2.2

src/main/java/dev/galacticraft/machinelib/api/block/entity/BasicRecipeMachineBlockEntity.java

@@ -26,11 +26,11 @@
 import dev.galacticraft.machinelib.api.storage.StorageSpec;
 import dev.galacticraft.machinelib.api.storage.slot.ItemResourceSlot;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.Container;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.item.crafting.RecipeHolder;
+import net.minecraft.world.item.crafting.RecipeInput;
 import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
@@ -40,14 +40,14 @@
 /**
  * A machine block entity that processes recipes.
  *
- * @param <C> The type of inventory the recipe type uses.
+ * @param <I> The type of inventory the recipe type uses.
  * @param <R> The type of recipe the machine uses.
  */
-public abstract class BasicRecipeMachineBlockEntity<C extends Container, R extends Recipe<C>> extends RecipeMachineBlockEntity<C, R> {
+public abstract class BasicRecipeMachineBlockEntity<I extends RecipeInput, R extends Recipe<I>> extends RecipeMachineBlockEntity<I, R> {
     /**
      * An inventory for use in finding vanilla recipes for this machine.
      */
-    protected final @NotNull C craftingInv;
+    protected final @NotNull I craftingInv;
 
     protected final SlottedStorageAccess<Item, ItemResourceSlot> inputSlots;
     protected final SlottedStorageAccess<Item, ItemResourceSlot> outputSlots;
@@ -62,7 +62,7 @@ public abstract class BasicRecipeMachineBlockEntity<C extends Container, R exten
      * @param inputSlot The index of the recipe input slot.
      * @param outputSlot The index of the recipe output slot.
      */
-    protected BasicRecipeMachineBlockEntity(BlockEntityType<? extends BasicRecipeMachineBlockEntity<C, R>> type,
+    protected BasicRecipeMachineBlockEntity(BlockEntityType<? extends BasicRecipeMachineBlockEntity<I, R>> type,
                                             BlockPos pos, BlockState state, RecipeType<R> recipeType, StorageSpec spec, int inputSlot, int outputSlot) {
         this(type, pos, state, recipeType, spec, inputSlot, 1, outputSlot);
     }
@@ -78,7 +78,7 @@ protected BasicRecipeMachineBlockEntity(BlockEntityType<? extends BasicRecipeMac
      * @param inputSlotsLen The number of recipe input slots.
      * @param outputSlot The index of the recipe output slot.
      */
-    protected BasicRecipeMachineBlockEntity(BlockEntityType<? extends BasicRecipeMachineBlockEntity<C, R>> type,
+    protected BasicRecipeMachineBlockEntity(BlockEntityType<? extends BasicRecipeMachineBlockEntity<I, R>> type,
                                             BlockPos pos, BlockState state, RecipeType<R> recipeType, StorageSpec spec, int inputSlots, int inputSlotsLen, int outputSlot) {
         this(type, pos, state, recipeType, spec, inputSlots, inputSlotsLen, outputSlot, 1);
     }
@@ -95,7 +95,7 @@ protected BasicRecipeMachineBlockEntity(BlockEntityType<? extends BasicRecipeMac
      * @param outputSlots The index of the first recipe output slot.
      * @param outputSlotsLen The number of recipe output slots.
      */
-    protected BasicRecipeMachineBlockEntity(BlockEntityType<? extends BasicRecipeMachineBlockEntity<C, R>> type,
+    protected BasicRecipeMachineBlockEntity(BlockEntityType<? extends BasicRecipeMachineBlockEntity<I, R>> type,
                                             BlockPos pos, BlockState state, RecipeType<R> recipeType, StorageSpec spec, int inputSlots, int inputSlotsLen, int outputSlots, int outputSlotsLen) {
         super(type, pos, state, recipeType, spec);
 
@@ -105,7 +105,7 @@ protected BasicRecipeMachineBlockEntity(BlockEntityType<? extends BasicRecipeMac
         this.craftingInv = this.createCraftingInv();
     }
 
-    protected abstract C createCraftingInv();
+    protected abstract I createCraftingInv();
 
     /**
      * Creates an inventory for use in finding vanilla recipes for this machine.
@@ -115,7 +115,7 @@ protected BasicRecipeMachineBlockEntity(BlockEntityType<? extends BasicRecipeMac
      */
     @Override
     @Contract(pure = true)
-    protected @NotNull C craftingInv() {
+    protected @NotNull I craftingInv() {
         return this.craftingInv;
     }
 

src/main/java/dev/galacticraft/machinelib/api/block/entity/MachineBlockEntity.java

@@ -22,7 +22,6 @@
 
 package dev.galacticraft.machinelib.api.block.entity;
 
-import dev.galacticraft.machinelib.api.block.MachineBlock;
 import dev.galacticraft.machinelib.api.machine.MachineStatus;
 import dev.galacticraft.machinelib.api.menu.MachineMenu;
 import dev.galacticraft.machinelib.api.storage.MachineEnergyStorage;
@@ -34,7 +33,6 @@
 import dev.galacticraft.machinelib.api.transfer.ResourceFlow;
 import dev.galacticraft.machinelib.api.util.BlockFace;
 import dev.galacticraft.machinelib.api.util.StorageHelper;
-import dev.galacticraft.machinelib.client.api.screen.MachineScreen;
 import dev.galacticraft.machinelib.impl.Constant;
 import net.fabricmc.fabric.api.blockview.v2.RenderDataBlockEntity;
 import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage;
@@ -69,10 +67,6 @@
  * <p>
  * This class handles three different types of storage and IO configurations:
  * {@link MachineEnergyStorage energy}, {@link MachineItemStorage item} and {@link MachineFluidStorage fluid} storage.
- *
- * @see MachineBlock
- * @see MachineMenu
- * @see MachineScreen
  */
 public abstract class MachineBlockEntity extends ConfiguredBlockEntity implements RenderDataBlockEntity {
     private final @NotNull MachineItemStorage itemStorage;

src/main/java/dev/galacticraft/machinelib/api/block/entity/RecipeMachineBlockEntity.java

@@ -31,9 +31,9 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.profiling.ProfilerFiller;
-import net.minecraft.world.Container;
 import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.item.crafting.RecipeHolder;
+import net.minecraft.world.item.crafting.RecipeInput;
 import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntityType;
@@ -46,10 +46,10 @@
 /**
  * A machine block entity that processes recipes.
  *
- * @param <C> The type of inventory the recipe type uses.
+ * @param <I> The type of inventory the recipe type uses.
  * @param <R> The type of recipe the machine uses.
  */
-public abstract class RecipeMachineBlockEntity<C extends Container, R extends Recipe<C>> extends MachineBlockEntity {
+public abstract class RecipeMachineBlockEntity<I extends RecipeInput, R extends Recipe<I>> extends MachineBlockEntity {
     /**
      * The type of recipe that this machine processes.
      */
@@ -93,7 +93,7 @@ public abstract class RecipeMachineBlockEntity<C extends Container, R extends Re
      * @param state The block state of the machine.
      * @param recipeType The type of recipe to be processed.
      */
-    protected RecipeMachineBlockEntity(@NotNull BlockEntityType<? extends RecipeMachineBlockEntity<C, R>> type, @NotNull BlockPos pos, BlockState state, @NotNull RecipeType<R> recipeType,
+    protected RecipeMachineBlockEntity(@NotNull BlockEntityType<? extends RecipeMachineBlockEntity<I, R>> type, @NotNull BlockPos pos, BlockState state, @NotNull RecipeType<R> recipeType,
                                        StorageSpec spec) {
         super(type, pos, state, spec);
         this.recipeType = recipeType;
@@ -106,7 +106,7 @@ protected RecipeMachineBlockEntity(@NotNull BlockEntityType<? extends RecipeMach
      * @return The crafting inventory of the machine.
      */
     @Contract(pure = true)
-    protected abstract @NotNull C craftingInv();
+    protected abstract @NotNull I craftingInv();
 
     /**
      * Inserts the active recipe's output into the machine's inventory.

src/main/java/dev/galacticraft/machinelib/api/gametest/RecipeGameTest.java

@@ -30,9 +30,9 @@
 import net.minecraft.gametest.framework.GameTestGenerator;
 import net.minecraft.gametest.framework.GameTestHelper;
 import net.minecraft.gametest.framework.TestFunction;
-import net.minecraft.world.Container;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.crafting.Recipe;
+import net.minecraft.world.item.crafting.RecipeInput;
 import net.minecraft.world.level.block.Block;
 import org.jetbrains.annotations.MustBeInvokedByOverriders;
 import org.jetbrains.annotations.NotNull;
@@ -42,26 +42,26 @@
 /**
  * Provides a base implementation for testing recipe-based machines.
  *
- * @param <C> the type of container used by the recipe
+ * @param <I> the type of container used by the recipe
  * @param <R> the type of recipe used by the recipe
  * @param <Machine> the type of machine used in the game test
  * @see RecipeMachineBlockEntity
  */
-public abstract class RecipeGameTest<C extends Container, R extends Recipe<C>, Machine extends RecipeMachineBlockEntity<C, R>> extends MachineGameTest<Machine> {
+public abstract class RecipeGameTest<I extends RecipeInput, R extends Recipe<I>, Machine extends RecipeMachineBlockEntity<I, R>> extends MachineGameTest<Machine> {
     protected final int recipeRuntime;
     private final int outputSlotsStart;
     private final int outputSlotsLength;
-    private final List<IngredientSupplier<C, R, Machine>> conditions;
+    private final List<IngredientSupplier<I, R, Machine>> conditions;
 
-    protected RecipeGameTest(@NotNull Block block, List<IngredientSupplier<C, R, Machine>> conditions, int recipeRuntime) {
+    protected RecipeGameTest(@NotNull Block block, List<IngredientSupplier<I, R, Machine>> conditions, int recipeRuntime) {
         this(block, conditions, -1, 0, recipeRuntime);
     }
 
-    protected RecipeGameTest(@NotNull Block block, List<IngredientSupplier<C, R, Machine>> conditions, int outputSlot, int recipeRuntime) {
+    protected RecipeGameTest(@NotNull Block block, List<IngredientSupplier<I, R, Machine>> conditions, int outputSlot, int recipeRuntime) {
         this(block, conditions, outputSlot, 1, recipeRuntime);
     }
 
-    protected RecipeGameTest(@NotNull Block block, List<IngredientSupplier<C, R, Machine>> conditions, int outputSlotsStart, int outputSlotsLength, int recipeRuntime) {
+    protected RecipeGameTest(@NotNull Block block, List<IngredientSupplier<I, R, Machine>> conditions, int outputSlotsStart, int outputSlotsLength, int recipeRuntime) {
         super(block);
 
         this.outputSlotsStart = outputSlotsStart;
@@ -84,7 +84,7 @@ protected void fillOutputSlots(@NotNull MachineItemStorage storage) {
     }
 
     protected void fulfillRunConditions(Machine machine) {
-        for (IngredientSupplier<C, R, Machine> condition : this.conditions) {
+        for (IngredientSupplier<I, R, Machine> condition : this.conditions) {
             condition.supplyIngredient(machine);
         }
     }

src/main/java/dev/galacticraft/machinelib/api/gametest/recipe/IngredientSupplier.java

@@ -23,18 +23,18 @@
 package dev.galacticraft.machinelib.api.gametest.recipe;
 
 import dev.galacticraft.machinelib.api.block.entity.RecipeMachineBlockEntity;
-import net.minecraft.world.Container;
 import net.minecraft.world.item.crafting.Recipe;
+import net.minecraft.world.item.crafting.RecipeInput;
 
 /**
  * A functional interface for fulfilling the run requirements of a machine.
  *
- * @param <C> the type of container
+ * @param <I> the type of container
  * @param <R> the type of recipe
  * @param <Machine> the type of machine
  */
 @FunctionalInterface
-public interface IngredientSupplier<C extends Container, R extends Recipe<C>, Machine extends RecipeMachineBlockEntity<C, R>> {
+public interface IngredientSupplier<I extends RecipeInput, R extends Recipe<I>, Machine extends RecipeMachineBlockEntity<I, R>> {
     /**
      * Fulfills a single run requirement of a machine (energy, item, fluid, etc.).
      * It is best to split requirements to test as many edge cases as possible.

src/main/java/dev/galacticraft/machinelib/api/menu/ConfiguredMenu.java

@@ -38,7 +38,6 @@
 import dev.galacticraft.machinelib.api.transfer.ResourceType;
 import dev.galacticraft.machinelib.api.util.BlockFace;
 import dev.galacticraft.machinelib.api.util.ItemStackUtil;
-import dev.galacticraft.machinelib.client.api.screen.Tank;
 import dev.galacticraft.machinelib.impl.compat.vanilla.RecipeOutputStorageSlot;
 import dev.galacticraft.machinelib.impl.compat.vanilla.StorageSlot;
 import net.minecraft.network.RegistryFriendlyByteBuf;

src/main/java/dev/galacticraft/machinelib/api/menu/RecipeMachineMenu.java

@@ -25,22 +25,22 @@
 import dev.galacticraft.machinelib.api.block.entity.RecipeMachineBlockEntity;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.Container;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.item.crafting.RecipeHolder;
+import net.minecraft.world.item.crafting.RecipeInput;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * A simple menu that keeps track of recipe progress
  *
  * @param <Machine> The type of machine block entity
  * @param <R> The type of recipe the machine processes
- * @param <C> The type of storage the recipe uses
+ * @param <I> The type of storage the recipe uses
  * @see MachineMenu
  */
-public abstract class RecipeMachineMenu<C extends Container, R extends Recipe<C>, Machine extends RecipeMachineBlockEntity<C, R>> extends MachineMenu<Machine> {
+public abstract class RecipeMachineMenu<I extends RecipeInput, R extends Recipe<I>, Machine extends RecipeMachineBlockEntity<I, R>> extends MachineMenu<Machine> {
     /**
      * The amount of progress the machine has made in crafting a recipe.
      * Counts from zero to {@link #maxProgress}, if {@link #maxProgress} > 0.
@@ -59,7 +59,7 @@ public abstract class RecipeMachineMenu<C extends Container, R extends Recipe<C>
      * @param player The player who is interacting with this menu.
      * @param machine The machine this menu is for.
      */
-    public RecipeMachineMenu(MenuType<? extends RecipeMachineMenu<C, R, Machine>> type, int syncId, @NotNull ServerPlayer player, @NotNull Machine machine) {
+    public RecipeMachineMenu(MenuType<? extends RecipeMachineMenu<I, R, Machine>> type, int syncId, @NotNull ServerPlayer player, @NotNull Machine machine) {
         super(type, syncId, player, machine);
     }
 
@@ -71,7 +71,7 @@ public RecipeMachineMenu(MenuType<? extends RecipeMachineMenu<C, R, Machine>> ty
      * @param buf The data buffer containing the information needed to initialize the menu.
      * @param type The type of machine associated with this menu.
      */
-    protected RecipeMachineMenu(MenuType<? extends RecipeMachineMenu<C, R, Machine>> type, int syncId, @NotNull Inventory inventory, @NotNull RegistryFriendlyByteBuf buf) {
+    protected RecipeMachineMenu(MenuType<? extends RecipeMachineMenu<I, R, Machine>> type, int syncId, @NotNull Inventory inventory, @NotNull RegistryFriendlyByteBuf buf) {
         super(type, syncId, inventory, buf);
     }
 

src/main/java/dev/galacticraft/machinelib/client/api/screen/Tank.java src/main/java/dev/galacticraft/machinelib/api/menu/Tank.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package dev.galacticraft.machinelib.client.api.screen;
+package dev.galacticraft.machinelib.api.menu;
 
 import com.google.common.base.Preconditions;
 import dev.galacticraft.machinelib.api.storage.slot.ResourceSlot;

src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java

@@ -32,6 +32,7 @@
 import dev.galacticraft.machinelib.api.machine.configuration.IOFace;
 import dev.galacticraft.machinelib.api.machine.configuration.RedstoneMode;
 import dev.galacticraft.machinelib.api.menu.MachineMenu;
+import dev.galacticraft.machinelib.api.menu.Tank;
 import dev.galacticraft.machinelib.api.transfer.InputType;
 import dev.galacticraft.machinelib.api.transfer.ResourceType;
 import dev.galacticraft.machinelib.api.util.BlockFace;
@@ -92,10 +93,10 @@
 public class MachineScreen<Machine extends MachineBlockEntity, Menu extends MachineMenu<Machine>> extends AbstractContainerScreen<Menu> {
     private static final ItemStack REDSTONE = new ItemStack(Items.REDSTONE);
     private static final ItemStack GUNPOWDER = new ItemStack(Items.GUNPOWDER);
-    private static final ItemStack UNLIT_TORCH = new ItemStack(getOptionalItem(new ResourceLocation("galacticraft", "unlit_torch"), Items.TORCH));
+    private static final ItemStack UNLIT_TORCH = new ItemStack(getOptionalItem(ResourceLocation.fromNamespaceAndPath("galacticraft", "unlit_torch"), Items.TORCH));
     private static final ItemStack REDSTONE_TORCH = new ItemStack(Items.REDSTONE_TORCH);
-    private static final ItemStack WRENCH = new ItemStack(getOptionalItem(new ResourceLocation("galacticraft", "standard_wrench"), Items.HOPPER));
-    private static final ItemStack ALUMINUM_WIRE = new ItemStack(getOptionalItem(new ResourceLocation("galacticraft", "aluminum_wire"), Items.MOJANG_BANNER_PATTERN));
+    private static final ItemStack WRENCH = new ItemStack(getOptionalItem(ResourceLocation.fromNamespaceAndPath("galacticraft", "standard_wrench"), Items.HOPPER));
+    private static final ItemStack ALUMINUM_WIRE = new ItemStack(getOptionalItem(ResourceLocation.fromNamespaceAndPath("galacticraft", "aluminum_wire"), Items.MOJANG_BANNER_PATTERN));
     private static final ItemStack IRON_CHESTPLATE = new ItemStack(Items.IRON_CHESTPLATE);
 
     private static final int SPACING = 4;

src/main/java/dev/galacticraft/machinelib/client/impl/MachineLibClient.java

@@ -59,7 +59,7 @@ public void onInitializeClient() {
                             throw new RuntimeException(ex);
                         }
                         String path = entry.getKey().getPath();
-                        return new Pair<>(new ResourceLocation(entry.getKey().getNamespace(), path.substring(path.indexOf('/') + 1, path.lastIndexOf('.'))), element);
+                        return new Pair<>(ResourceLocation.fromNamespaceAndPath(entry.getKey().getNamespace(), path.substring(path.indexOf('/') + 1, path.lastIndexOf('.'))), element);
                     }, executor))
                     .map(CompletableFuture::join)
                     .filter(pair -> pair.getSecond().isJsonObject() && pair.getSecond().getAsJsonObject().has(MachineModelRegistry.MARKER))