fixed compile errors in common when compiled with the forge side

GregTech-Intergalactical · Oct 27, 2024 · a597880 · a597880
1 parent 6e14f6f
commit a597880
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 144 deletions.
diff --git a/common/src/main/java/muramasa/antimatter/capability/item/ItemStackHandler.java b/common/src/main/java/muramasa/antimatter/capability/item/ItemStackHandler.java
@@ -4,6 +4,7 @@
 import net.minecraft.core.NonNullList;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import tesseract.api.item.ContainerItemHandler;
@@ -29,6 +30,11 @@ public void setSize(int size) {
         this.stacks = NonNullList.withSize(size, ItemStack.EMPTY);
     }
 
+    @Override
+    public boolean stillValid(Player player) {
+        return ExtendedItemContainer.super.stillValid(player);
+    }
+
     @Override
     public void setItem(int slot, @NotNull ItemStack stack) {
         this.validateSlotIndex(slot);

diff --git a/common/src/main/java/muramasa/antimatter/integration/create/client/PonderIntegration.java b/common/src/main/java/muramasa/antimatter/integration/create/client/PonderIntegration.java
@@ -105,9 +105,9 @@ public static void registerMultiblock(BasicMultiMachine<?> machine, Tier t, List
                         Selection selection = util.select.fromTo(0, y, 0, pattern.getBlockInfos()[0].length - 1, y, pattern.getBlockInfos()[0][0].length - 1);
                         if (y == blocks.length){
                             controllerPositions.forEach(pos -> {
-                                scene.world.modifyTileEntity(pos, BlockEntityBasicMultiMachine.class, b -> {
+                                /*scene.world.modifyTileEntity(pos, BlockEntityBasicMultiMachine.class, b -> {
                                     b.setMachineState(MachineState.IDLE);
-                                });
+                                });*/
                             });
                         }
                         scene.world.showSection(selection, Direction.UP);

diff --git a/common/src/main/java/muramasa/antimatter/recipe/BaseRecipeSerializer.java b/common/src/main/java/muramasa/antimatter/recipe/BaseRecipeSerializer.java
@@ -0,0 +1,27 @@
+package muramasa.antimatter.recipe;
+
+import muramasa.antimatter.recipe.material.MaterialSerializer;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.crafting.Recipe;
+import net.minecraft.world.item.crafting.RecipeSerializer;
+import org.jetbrains.annotations.Nullable;
+
+public abstract class BaseRecipeSerializer<T extends Recipe<?>> implements RecipeSerializer<T> {
+    private ResourceLocation registryName = null;
+
+    public RecipeSerializer<?> setRegistryName(ResourceLocation arg) {
+        if (getRegistryName() != null)
+            throw new IllegalStateException("Attempted to set registry name with existing registry name! New: " + arg.toString() + " Old: " + getRegistryName());
+        this.registryName = arg;
+        return this;
+    }
+
+    @Nullable
+    public ResourceLocation getRegistryName() {
+        return registryName;
+    }
+
+    public Class getRegistryType() {
+        return this.getClass();
+    }
+}
diff --git a/common/src/main/java/muramasa/antimatter/recipe/container/ContainerItemShapedRecipe.java b/common/src/main/java/muramasa/antimatter/recipe/container/ContainerItemShapedRecipe.java
@@ -4,6 +4,7 @@
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.Ref;
 import muramasa.antimatter.item.IContainerItem;
+import muramasa.antimatter.recipe.BaseRecipeSerializer;
 import muramasa.antimatter.util.AntimatterPlatformUtils;
 import net.minecraft.core.NonNullList;
 import net.minecraft.network.FriendlyByteBuf;
@@ -64,7 +65,7 @@ public boolean matches(CraftingContainer inv, Level level) {
         return false;
     }
 
-    public static class Serializer implements RecipeSerializer<ContainerItemShapedRecipe> {
+    public static class Serializer extends BaseRecipeSerializer<ContainerItemShapedRecipe> {
         public Serializer() {
         }
 

diff --git a/common/src/main/java/muramasa/antimatter/recipe/container/ContainerItemShapelessRecipe.java b/common/src/main/java/muramasa/antimatter/recipe/container/ContainerItemShapelessRecipe.java
@@ -6,6 +6,7 @@
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.Ref;
 import muramasa.antimatter.item.IContainerItem;
+import muramasa.antimatter.recipe.BaseRecipeSerializer;
 import muramasa.antimatter.util.AntimatterPlatformUtils;
 import net.minecraft.core.NonNullList;
 import net.minecraft.network.FriendlyByteBuf;
@@ -50,7 +51,7 @@ public NonNullList<ItemStack> getRemainingItems(@NotNull CraftingContainer conta
         return nonnulllist;
     }
 
-    public static class Serializer implements RecipeSerializer<ContainerItemShapelessRecipe> {
+    public static class Serializer extends BaseRecipeSerializer<ContainerItemShapelessRecipe> {
         public Serializer() {
         }
 

diff --git a/common/src/main/java/muramasa/antimatter/recipe/material/MaterialSerializer.java b/common/src/main/java/muramasa/antimatter/recipe/material/MaterialSerializer.java
@@ -10,6 +10,7 @@
 import it.unimi.dsi.fastutil.objects.ObjectArraySet;
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.Ref;
+import muramasa.antimatter.recipe.BaseRecipeSerializer;
 import muramasa.antimatter.recipe.ingredient.PropertyIngredient;
 import net.minecraft.core.NonNullList;
 import net.minecraft.network.FriendlyByteBuf;
@@ -25,7 +26,7 @@
 import java.util.Set;
 
 
-public class MaterialSerializer implements RecipeSerializer<MaterialRecipe> {
+public class MaterialSerializer extends BaseRecipeSerializer<MaterialRecipe> {
 
     public static final MaterialSerializer INSTANCE = new MaterialSerializer();
 

diff --git a/common/src/main/java/muramasa/antimatter/recipe/serializer/AntimatterRecipeSerializer.java b/common/src/main/java/muramasa/antimatter/recipe/serializer/AntimatterRecipeSerializer.java
@@ -10,6 +10,7 @@
 import muramasa.antimatter.Antimatter;
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.Ref;
+import muramasa.antimatter.recipe.BaseRecipeSerializer;
 import muramasa.antimatter.recipe.Recipe;
 import muramasa.antimatter.recipe.RecipeTag;
 import muramasa.antimatter.recipe.RecipeUtil;
@@ -33,7 +34,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-public class AntimatterRecipeSerializer implements RecipeSerializer<Recipe> {
+public class AntimatterRecipeSerializer extends BaseRecipeSerializer<Recipe> {
 
     public static final AntimatterRecipeSerializer INSTANCE = new AntimatterRecipeSerializer();
 

diff --git a/common/src/main/java/muramasa/antimatter/tool/MaterialSword.java b/common/src/main/java/muramasa/antimatter/tool/MaterialSword.java
@@ -232,7 +232,7 @@ public <T extends LivingEntity> int damageItem(ItemStack stack, int amount, T en
         return (entity instanceof Player && ((Player) entity).isCreative()) ? 0 : damage(stack, amount);
     }
 
-    @Override
+    //@Override
     public int getEnchantability(ItemStack stack) {
         return getTier(stack).getEnchantmentValue();
     }

diff --git a/common/src/main/java/muramasa/antimatter/tool/MaterialTool.java b/common/src/main/java/muramasa/antimatter/tool/MaterialTool.java
@@ -282,7 +282,7 @@ public <T extends LivingEntity> int damageItem(ItemStack stack, int amount, T en
         }
         return damage(stack, amount);
     }
-    @Override
+    //@Override
     public int getEnchantability(ItemStack stack) {
         return getTier(stack).getEnchantmentValue();
     }

diff --git a/forge/src/main/java/muramasa/antimatter/mixin/forge/AntimatterRecipeSerializerMixin.java b/forge/src/main/java/muramasa/antimatter/mixin/forge/AntimatterRecipeSerializerMixin.java
diff --git a/forge/src/main/java/muramasa/antimatter/mixin/forge/ContainerShapedSerializerMixin.java b/forge/src/main/java/muramasa/antimatter/mixin/forge/ContainerShapedSerializerMixin.java
diff --git a/forge/src/main/java/muramasa/antimatter/mixin/forge/ContainerShapelessSerializerMixin.java b/forge/src/main/java/muramasa/antimatter/mixin/forge/ContainerShapelessSerializerMixin.java
diff --git a/forge/src/main/java/muramasa/antimatter/mixin/forge/MaterialSerializerMixin.java b/forge/src/main/java/muramasa/antimatter/mixin/forge/MaterialSerializerMixin.java
diff --git a/forge/src/main/resources/antimatter-forge.mixins.json b/forge/src/main/resources/antimatter-forge.mixins.json
@@ -3,12 +3,8 @@
   "package" : "muramasa.antimatter.mixin.forge",
   "compatibilityLevel" : "JAVA_17",
   "mixins" : [
-    "AntimatterRecipeSerializerMixin",
     "CapabilityManagerMixin",
-    "ContainerShapedSerializerMixin",
-    "ContainerShapelessSerializerMixin",
     "GameDataMixin",
-    "MaterialSerializerMixin",
     "PropertyIngredientMixin",
     "RecipeIngredientMixin",
     "BlockEntityFakeBlockMixin",