fix bug with Botarium

terrarium-earth · Mar 25, 2024 · efa7bde · efa7bde
1 parent 608f25c
commit efa7bde
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 38 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,4 @@
-# 3.2.0
+# 3.2.1
 
-- NEW Data attachment cross platform API
+- Fix class loading error with Neo
+- Item containers are no longer serialized. Use the new DataManager api
diff --git a/fabric/src/main/java/earth/terrarium/botarium/fabric/data/FabricDataManager.java b/fabric/src/main/java/earth/terrarium/botarium/fabric/data/FabricDataManager.java
@@ -17,7 +17,7 @@ public T getData(Object dataHolder) {
         if (dataHolder instanceof AttachmentTarget target) {
             return target.getAttached(this.attachmentType);
         } else {
-            throw new IllegalArgumentException("Data holder is not an attachment target");
+            throw new IllegalArgumentException(dataHolder + " is not an attachment target");
         }
     }
 
@@ -26,7 +26,7 @@ public T setData(Object dataHolder, T data) {
         if (dataHolder instanceof AttachmentTarget target) {
             return target.setAttached(this.attachmentType, data);
         } else {
-            throw new IllegalArgumentException("Data holder is not an attachment target");
+            throw new IllegalArgumentException(dataHolder + " is not an attachment target");
         }
     }
 
@@ -35,7 +35,7 @@ public boolean hasData(Object dataHolder) {
         if (dataHolder instanceof AttachmentTarget target) {
             return target.hasAttached(this.attachmentType);
         } else {
-            throw new IllegalArgumentException("Data holder is not an attachment target");
+            throw new IllegalArgumentException(dataHolder + " is not an attachment target");
         }
     }
 }
diff --git a/fabric/src/main/java/earth/terrarium/botarium/mixin/BlockEntityMixin.java b/fabric/src/main/java/earth/terrarium/botarium/mixin/BlockEntityMixin.java
@@ -46,12 +46,6 @@ public void deserializeData(CompoundTag compoundTag, CallbackInfo ci) {
         if (this instanceof ItemContainerBlock itemContainerBlock) {
             itemContainerBlock.getContainer().deserialize(compoundTag);
         }
-        if (this instanceof BotariumItemBlock<?> botariumItemBlock) {
-            ItemContainer itemContainer = botariumItemBlock.getItemContainer(this.getLevel(), this.getBlockPos(), this.getBlockState(), (BlockEntity) (Object) this, null);
-            if (itemContainer instanceof Serializable serializable) {
-                serializable.deserialize(compoundTag);
-            }
-        }
     }
 
     @Inject(method = "saveAdditional", at = @At("TAIL"))
@@ -67,11 +61,5 @@ public void serializeData(CompoundTag compoundTag, CallbackInfo ci) {
         if (this instanceof ItemContainerBlock itemContainerBlock) {
             itemContainerBlock.getContainer().serialize(compoundTag);
         }
-        if (this instanceof BotariumItemBlock<?> botariumItemBlock) {
-            ItemContainer itemContainer = botariumItemBlock.getItemContainer(this.getLevel(), this.getBlockPos(), this.getBlockState(), (BlockEntity) (Object) this, null);
-            if (itemContainer instanceof Serializable serializable) {
-                serializable.serialize(compoundTag);
-            }
-        }
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx2G
 enabledPlatforms=fabric,neoforge
-version=3.2.0
+version=3.2.1
 group=earth.terrarium.botarium
 minecraftVersion=1.20.4
 parchmentVersion=2023.12.31

diff --git a/neoforge/src/main/java/earth/terrarium/botarium/mixin/BlockEntityMixin.java b/neoforge/src/main/java/earth/terrarium/botarium/mixin/BlockEntityMixin.java
@@ -43,11 +43,6 @@ public void deserializeData(CompoundTag compoundTag, CallbackInfo ci) {
         if (energyContainer != null) {
             energyContainer.deserialize(compoundTag);
         }
-        ItemContainer itemContainer = ItemApi.SIDED.find(this.getLevel(), this.getBlockPos(), this.getBlockState(), (BlockEntity) (Object) this, null);
-        if (itemContainer instanceof Serializable container) {
-            container.deserialize(compoundTag);
-        }
-
         if (this instanceof ItemContainerBlock itemContainerBlock) {
             itemContainerBlock.getContainer().deserialize(compoundTag);
         }
@@ -63,10 +58,6 @@ public void serializeData(CompoundTag compoundTag, CallbackInfo ci) {
         if (energyContainer != null) {
             energyContainer.serialize(compoundTag);
         }
-        ItemContainer itemContainer = ItemApi.SIDED.find(this.getLevel(), this.getBlockPos(), this.getBlockState(), (BlockEntity) (Object) this, null);
-        if (itemContainer instanceof Serializable container) {
-            container.serialize(compoundTag);
-        }
         if (this instanceof ItemContainerBlock itemContainerBlock) {
             itemContainerBlock.getContainer().serialize(compoundTag);
         }

diff --git a/neoforge/src/main/java/earth/terrarium/botarium/neoforge/BotariumNeoForge.java b/neoforge/src/main/java/earth/terrarium/botarium/neoforge/BotariumNeoForge.java
@@ -7,7 +7,6 @@
 import earth.terrarium.botarium.common.fluid.FluidApi;
 import earth.terrarium.botarium.common.fluid.base.BotariumFluidBlock;
 import earth.terrarium.botarium.common.fluid.base.BotariumFluidItem;
-import earth.terrarium.botarium.common.item.ItemApi;
 import earth.terrarium.botarium.common.item.ItemContainerBlock;
 import earth.terrarium.botarium.common.item.base.BotariumItemBlock;
 import earth.terrarium.botarium.common.registry.fluid.FluidBucketItem;
@@ -16,7 +15,6 @@
 import earth.terrarium.botarium.neoforge.fluid.ForgeItemFluidContainer;
 import earth.terrarium.botarium.neoforge.generic.NeoForgeCapsHandler;
 import earth.terrarium.botarium.neoforge.item.ForgeItemContainer;
-import earth.terrarium.botarium.neoforge.item.PlatformItemContainer;
 import earth.terrarium.botarium.neoforge.item.ItemContainerWrapper;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.neoforged.bus.api.IEventBus;

diff --git a/neoforge/src/main/java/earth/terrarium/botarium/neoforge/data/NeoDataManager.java b/neoforge/src/main/java/earth/terrarium/botarium/neoforge/data/NeoDataManager.java
@@ -1,11 +1,9 @@
 package earth.terrarium.botarium.neoforge.data;
 
-import com.mojang.datafixers.util.Pair;
 import earth.terrarium.botarium.common.data.DataManager;
 import net.neoforged.neoforge.attachment.AttachmentHolder;
 import net.neoforged.neoforge.attachment.AttachmentType;
 
-import javax.naming.OperationNotSupportedException;
 import java.util.function.Supplier;
 
 public class NeoDataManager<T> implements DataManager<T> {

diff --git a/neoforge/src/main/java/earth/terrarium/botarium/neoforge/extensions/ItemApiImpl.java b/neoforge/src/main/java/earth/terrarium/botarium/neoforge/extensions/ItemApiImpl.java
@@ -3,21 +3,16 @@
 import earth.terrarium.botarium.common.generic.base.BlockContainerLookup;
 import earth.terrarium.botarium.common.generic.base.EntityContainerLookup;
 import earth.terrarium.botarium.common.generic.base.ItemContainerLookup;
+import earth.terrarium.botarium.common.item.ItemApi;
 import earth.terrarium.botarium.common.item.base.ItemContainer;
-import earth.terrarium.botarium.common.item.base.ItemSnapshot;
 import earth.terrarium.botarium.neoforge.item.ForgeItemApiBlockLookup;
 import earth.terrarium.botarium.neoforge.item.ForgeItemApiEntityAutomationLookup;
 import earth.terrarium.botarium.neoforge.item.ForgeItemApiEntityLookup;
 import earth.terrarium.botarium.neoforge.item.ForgeItemApiItemLookup;
-import earth.terrarium.botarium.util.Snapshotable;
-import earth.terrarium.botarium.util.Updatable;
 import net.minecraft.core.Direction;
 import net.msrandom.extensions.annotations.ClassExtension;
-import net.msrandom.extensions.annotations.ImplementedByExtension;
-import net.msrandom.extensions.annotations.ImplementsBaseElement;
-import org.apache.commons.lang3.NotImplementedException;
 
-@ClassExtension(ItemApiImpl.class)
+@ClassExtension(ItemApi.class)
 public class ItemApiImpl {
 
     private static ItemContainerLookup<ItemContainer, Void> getItemLookup() {