Bug fix

Author: Edivad99

gradle.properties

@@ -21,11 +21,11 @@ parchment_mappings_version=2024.11.17
 mod_version=4.1.0
 edivadlib_id=5491721
 edivadlib_version_range=[3.0.0,)
-refinedstorage_version_range=[1.13.0-beta.4,)
+refinedstorage_version_range=[2.0.0-beta.1,)
 
 # Dependencies
 jei_version=19.21.0.247
 top_version=6106998
-rs_version=2.0.0-milestone.4.14
+rs_version=2.0.0-beta.1
 co_version=2.1.2.5
 jade_id=6198776

src/main/java/edivad/extrastorage/ExtraStorage.java

@@ -3,8 +3,10 @@
 import java.util.Arrays;
 import org.slf4j.Logger;
 import com.mojang.logging.LogUtils;
+import com.refinedmods.refinedstorage.common.api.RefinedStorageApi;
 import com.refinedmods.refinedstorage.common.api.RefinedStorageClientApi;
 import com.refinedmods.refinedstorage.common.api.support.network.AbstractNetworkNodeContainerBlockEntity;
+import com.refinedmods.refinedstorage.common.content.Items;
 import com.refinedmods.refinedstorage.common.support.resource.FluidResource;
 import com.refinedmods.refinedstorage.common.support.resource.ItemResource;
 import com.refinedmods.refinedstorage.neoforge.api.RefinedStorageNeoForgeApi;
@@ -32,6 +34,7 @@
 import edivad.extrastorage.storage.AdvancedItemStorageVariant;
 import edivad.extrastorage.storage.advancedstorageblock.AdvancedStorageBlockContainerMenu;
 import edivad.extrastorage.storage.advancedstorageblock.AdvancedStorageBlockScreen;
+import edivad.extrastorage.tools.UpgradeDestinations;
 import net.minecraft.client.gui.screens.MenuScreens;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
@@ -126,6 +129,7 @@ public void handleCommonSetup(FMLCommonSetupEvent event) {
       InterModComms.sendTo("inventorysorter", "containerblacklist",
           ESContainer.ADVANCED_IMPORTER::getId);
     }
+    this.registerUpgradeMappings();
   }
 
   private void handleRegisterMenuScreens(RegisterMenuScreensEvent event) {
@@ -175,4 +179,20 @@ private void registerNetworkNodeContainerProvider(RegisterCapabilitiesEvent even
         (be, side) -> be.getContainerProvider()
     );
   }
+
+  private void registerUpgradeMappings() {
+    RefinedStorageApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.ADVANCED_IMPORTER)
+        .add(Items.INSTANCE.getSpeedUpgrade(), 4)
+        .add(Items.INSTANCE.getStackUpgrade())
+        .add(Items.INSTANCE.getRegulatorUpgrade(), 4);
+
+    RefinedStorageApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.ADVANCED_EXPORTER)
+        .add(Items.INSTANCE.getSpeedUpgrade(), 4)
+        .add(Items.INSTANCE.getStackUpgrade())
+        .add(Items.INSTANCE.getRegulatorUpgrade(), 4)
+        .add(Items.INSTANCE.getAutocraftingUpgrade());
+
+    RefinedStorageApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.ADVANCED_AUTOCRAFTER)
+        .add(Items.INSTANCE.getSpeedUpgrade(), 4);
+  }
 }

src/main/java/edivad/extrastorage/advancedexporter/AdvancedExporterBlockEntity.java

@@ -30,6 +30,7 @@
 import com.refinedmods.refinedstorage.common.upgrade.UpgradeContainer;
 import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations;
 import com.refinedmods.refinedstorage.common.util.ContainerUtil;
+import com.refinedmods.refinedstorage.neoforge.support.render.ModelProperties;
 import edivad.extrastorage.setup.ESBlockEntities;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -45,6 +46,7 @@
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
+import net.neoforged.neoforge.client.model.data.ModelData;
 
 public class AdvancedExporterBlockEntity extends AbstractCableLikeBlockEntity<ExporterNetworkNode>
     implements BlockEntityWithDrops, NetworkNodeExtendedMenuProvider<ExporterData> {
@@ -219,4 +221,9 @@ protected boolean doesBlockStateChangeWarrantNetworkNodeUpdate(final BlockState
       final BlockState newBlockState) {
     return AbstractDirectionalBlock.didDirectionChange(oldBlockState, newBlockState);
   }
+
+  @Override
+  public ModelData getModelData() {
+    return ModelData.builder().with(ModelProperties.CABLE_CONNECTIONS, connections).build();
+  }
 }

src/main/java/edivad/extrastorage/advancedexporter/AdvancedExporterContainerMenu.java

@@ -4,7 +4,6 @@
 import com.refinedmods.refinedstorage.common.exporter.ExporterData;
 import com.refinedmods.refinedstorage.common.support.RedstoneMode;
 import com.refinedmods.refinedstorage.common.support.SchedulingModeType;
-import com.refinedmods.refinedstorage.common.support.containermenu.AbstractSimpleFilterContainerMenu;
 import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty;
 import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes;
 import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty;
@@ -15,12 +14,13 @@
 import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations;
 import com.refinedmods.refinedstorage.common.util.IdentifierUtil;
 import edivad.extrastorage.setup.ESContainer;
+import edivad.extrastorage.tools.AbstractAdvanceFilterContainerMenu;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 
-public class AdvancedExporterContainerMenu extends AbstractSimpleFilterContainerMenu<AdvancedExporterBlockEntity>
+public class AdvancedExporterContainerMenu extends AbstractAdvanceFilterContainerMenu<AdvancedExporterBlockEntity>
     implements ExportingIndicatorListener {
 
   private static final MutableComponent FILTER_HELP = IdentifierUtil.createTranslation("gui", "exporter.filter_help");

src/main/java/edivad/extrastorage/advancedexporter/AdvancedExporterScreen.java

@@ -18,6 +18,8 @@ public class AdvancedExporterScreen extends AbstractFilterScreen<AdvancedExporte
   public AdvancedExporterScreen(AdvancedExporterContainerMenu menu, Inventory inventory,
       Component title) {
     super(menu, inventory, title);
+    this.inventoryLabelY = 60;
+    this.imageHeight = 211;
   }
 
   @Override

src/main/java/edivad/extrastorage/advancedimporter/AdvancedImporterBlockEntity.java

@@ -25,6 +25,7 @@
 import com.refinedmods.refinedstorage.common.upgrade.UpgradeContainer;
 import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations;
 import com.refinedmods.refinedstorage.common.util.ContainerUtil;
+import com.refinedmods.refinedstorage.neoforge.support.render.ModelProperties;
 import edivad.extrastorage.setup.ESBlockEntities;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -40,6 +41,7 @@
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
+import net.neoforged.neoforge.client.model.data.ModelData;
 
 public class AdvancedImporterBlockEntity extends AbstractCableLikeBlockEntity<ImporterNetworkNode>
     implements NetworkNodeExtendedMenuProvider<ResourceContainerData>, BlockEntityWithDrops {
@@ -182,4 +184,9 @@ protected boolean doesBlockStateChangeWarrantNetworkNodeUpdate(final BlockState
       final BlockState newBlockState) {
     return AbstractDirectionalBlock.didDirectionChange(oldBlockState, newBlockState);
   }
+
+  @Override
+  public ModelData getModelData() {
+    return ModelData.builder().with(ModelProperties.CABLE_CONNECTIONS, connections).build();
+  }
 }

src/main/java/edivad/extrastorage/advancedimporter/AdvancedImporterContainerMenu.java

@@ -3,7 +3,6 @@
 import com.refinedmods.refinedstorage.api.resource.filter.FilterMode;
 import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer;
 import com.refinedmods.refinedstorage.common.support.RedstoneMode;
-import com.refinedmods.refinedstorage.common.support.containermenu.AbstractSimpleFilterContainerMenu;
 import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty;
 import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes;
 import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty;
@@ -12,12 +11,13 @@
 import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations;
 import com.refinedmods.refinedstorage.common.util.IdentifierUtil;
 import edivad.extrastorage.setup.ESContainer;
+import edivad.extrastorage.tools.AbstractAdvanceFilterContainerMenu;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 
 public class AdvancedImporterContainerMenu extends
-    AbstractSimpleFilterContainerMenu<AdvancedImporterBlockEntity> {
+    AbstractAdvanceFilterContainerMenu<AdvancedImporterBlockEntity> {
 
   private static final MutableComponent FILTER_HELP = IdentifierUtil.createTranslation("gui", "importer.filter_help");
 

src/main/java/edivad/extrastorage/advancedimporter/AdvancedImporterScreen.java

@@ -18,6 +18,8 @@ public class AdvancedImporterScreen extends AbstractFilterScreen<AdvancedImporte
   public AdvancedImporterScreen(AdvancedImporterContainerMenu menu, Inventory inventory,
       Component title) {
     super(menu, inventory, title);
+    this.inventoryLabelY = 60;
+    this.imageHeight = 211;
   }
 
   @Override

src/main/java/edivad/extrastorage/tools/AbstractAdvanceFilterContainerMenu.java

@@ -0,0 +1,64 @@
+package edivad.extrastorage.tools;
+
+import org.jetbrains.annotations.Nullable;
+import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer;
+import com.refinedmods.refinedstorage.common.support.containermenu.AbstractResourceContainerMenu;
+import com.refinedmods.refinedstorage.common.support.containermenu.ResourceSlot;
+import com.refinedmods.refinedstorage.common.support.containermenu.ResourceSlotType;
+import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData;
+import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl;
+import com.refinedmods.refinedstorage.common.upgrade.UpgradeContainer;
+import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations;
+import com.refinedmods.refinedstorage.common.upgrade.UpgradeSlot;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.level.block.entity.BlockEntity;
+
+public abstract class AbstractAdvanceFilterContainerMenu<T extends BlockEntity> extends AbstractResourceContainerMenu {
+  private static final int FILTER_SLOT_X = 8;
+  private final Component filterHelp;
+
+  protected AbstractAdvanceFilterContainerMenu(MenuType<?> type, int syncId, Player player, ResourceContainer resourceContainer, @Nullable UpgradeContainer upgradeContainer, T blockEntity, Component filterHelp) {
+    super(type, syncId, player);
+    this.filterHelp = filterHelp;
+    this.registerServerProperties(blockEntity);
+    this.addSlots(player, resourceContainer, upgradeContainer);
+  }
+
+  protected AbstractAdvanceFilterContainerMenu(MenuType<?> type, int syncId, Player player, ResourceContainerData resourceContainerData, @Nullable UpgradeDestinations upgradeDestination, Component filterHelp) {
+    super(type, syncId);
+    this.filterHelp = filterHelp;
+    this.registerClientProperties();
+    this.addSlots(player, ResourceContainerImpl.createForFilter(resourceContainerData), upgradeDestination == null ? null : new UpgradeContainer(upgradeDestination));
+  }
+
+  protected abstract void registerClientProperties();
+
+  protected abstract void registerServerProperties(T var1);
+
+  private void addSlots(Player player, ResourceContainer resourceContainer, @Nullable UpgradeContainer upgradeContainer) {
+    for (int i = 0; i < 2; i++) {
+      for (int j = 0; j < 9; j++) {
+        int index = (i * 9) + j;
+        int x = 8 + (18 * j);
+        int y = 20 + (18 * i);
+        this.addSlot(new ResourceSlot(resourceContainer, index, this.filterHelp, x, y,
+            ResourceSlotType.FILTER));
+      }
+    }
+
+    if (upgradeContainer != null) {
+      for(int i = 0; i < upgradeContainer.getContainerSize(); ++i) {
+        this.addSlot(new UpgradeSlot(upgradeContainer, i, 187, 6 + i * 18));
+      }
+    }
+
+    this.addPlayerInventory(player.getInventory(), FILTER_SLOT_X, 73);
+    if (upgradeContainer != null) {
+      this.transferManager.addBiTransfer(player.getInventory(), upgradeContainer);
+    }
+
+    this.transferManager.addFilterTransfer(player.getInventory());
+  }
+}

src/main/java/edivad/extrastorage/tools/UpgradeDestinations.java

@@ -0,0 +1,36 @@
+package edivad.extrastorage.tools;
+
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
+import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeDestination;
+import edivad.extrastorage.autocrafting.advancedautocrafter.CrafterTier;
+import edivad.extrastorage.setup.ESItems;
+import lombok.Getter;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.item.ItemStack;
+
+public enum UpgradeDestinations implements UpgradeDestination {
+  ADVANCED_IMPORTER(Translations.ADVANCED_IMPORTER.translateTitle(),
+      () -> new ItemStack(ESItems.ADVANCED_IMPORTER.get())),
+  ADVANCED_EXPORTER(Translations.ADVANCED_EXPORTER.translateTitle(), () -> new ItemStack(ESItems.ADVANCED_EXPORTER.get())),
+  ADVANCED_AUTOCRAFTER(Translations.IRON_CRAFTER.translateTitle(),
+      () -> new ItemStack(ESItems.CRAFTER.get(CrafterTier.IRON).get()));
+
+  @Getter
+  private final Component name;
+  private final Supplier<ItemStack> stackFactory;
+  @Nullable
+  private ItemStack cachedStack;
+
+  UpgradeDestinations(final Component name, final Supplier<ItemStack> stackFactory) {
+    this.name = name;
+    this.stackFactory = stackFactory;
+  }
+
+  public ItemStack getStackRepresentation() {
+    if (this.cachedStack == null) {
+      this.cachedStack = this.stackFactory.get();
+    }
+    return this.cachedStack;
+  }
+}