Fix waila & TOP

Author: Edivad99

src/main/java/edivad/extrastorage/autocrafting/advancedautocrafter/AdvancedAutocrafterBlockEntity.java

@@ -88,7 +88,8 @@ public class AdvancedAutocrafterBlockEntity extends AbstractBaseNetworkNodeConta
   @Getter
   private boolean visibleToTheAutocrafterManager = true;
   private int ticks;
-  private int steps = getSteps(CrafterTier.IRON, 0);
+  @Getter
+  private int steps;
   private int tickRate = getTickRate(0);
   @Nullable
   private PlatformPatternProviderExternalPatternSink sink;
@@ -109,6 +110,7 @@ public AdvancedAutocrafterBlockEntity(CrafterTier tier, BlockPos pos, BlockState
         new PatternProviderNetworkNode(Platform.INSTANCE.getConfig().getAutocrafter().getEnergyUsage(), tier.getSlots())
     );
     this.tier = tier;
+    this.steps = getSteps(tier, 0);
     this.patternContainer = new PatternInventory(this.tier.getSlots(), this::getLevel);
     this.upgradeContainer = new UpgradeContainer(UpgradeDestinations.AUTOCRAFTER, (c, upgradeEnergyUsage) -> {
       final long baseEnergyUsage = Platform.INSTANCE.getConfig().getAutocrafter().getEnergyUsage();

src/main/java/edivad/extrastorage/compat/jade/AdvancedCrafterComponent.java

@@ -18,19 +18,15 @@ public void appendTooltip(ITooltip tooltip, BlockAccessor blockAccessor,
     if (blockAccessor.getBlockEntity() instanceof AdvancedAutocrafterBlockEntity) {
       var data = blockAccessor.getServerData();
       var patterns = data.getInt("patterns");
-      var speed = data.getInt("speed");
+      //var speed = data.getInt("speed");
       var slots = data.getInt("slots");
       var tierSpeed = data.getInt("tier_speed");
-      var nodeName = data.getString("node_name");
+      //var nodeName = data.getString("node_name");
 
       tooltip.add(Component.translatable(Translations.OCCUPIED_SPACE,
           String.valueOf(patterns), String.valueOf(slots)));
 
-      if (tierSpeed != speed) {
-        tooltip.add(Component.translatable(Translations.LIMITED_SPEED, nodeName, String.valueOf(speed)));
-      } else {
-        tooltip.add(Component.translatable(Translations.CURRENT_SPEED, String.valueOf(speed)));
-      }
+      tooltip.add(Component.translatable(Translations.CURRENT_SPEED, String.valueOf(tierSpeed)));
     }
   }
 

src/main/java/edivad/extrastorage/compat/jade/AdvancedCrafterProvider.java

@@ -12,12 +12,14 @@ public class AdvancedCrafterProvider implements IServerDataProvider<BlockAccesso
   @Override
   public void appendServerData(CompoundTag tag, BlockAccessor blockAccessor) {
     if (blockAccessor.getBlockEntity() instanceof AdvancedAutocrafterBlockEntity advancedCrafter) {
-      /*var node = advancedCrafter.getNode();
-      tag.putInt("patterns", node.getPatterns().size());
-      tag.putInt("speed", node.getMaximumSuccessfulCraftingUpdates());
+      int patterns = (int) advancedCrafter.getPatternContainer().getItems().stream()
+          .filter(x -> !x.isEmpty())
+          .count();
+      tag.putInt("patterns", patterns);
+      //tag.putInt("speed", node.getMaximumSuccessfulCraftingUpdates());
       tag.putInt("slots", advancedCrafter.getTier().getSlots());
-      tag.putInt("tier_speed", node.getTierSpeed());
-      tag.putString("node_name", node.getName().getString());*/
+      tag.putInt("tier_speed", advancedCrafter.getSteps());
+      //tag.putString("node_name", node.getName().getString());
     }
   }
 

src/main/java/edivad/extrastorage/compat/jade/JadeCompatibility.java

@@ -1,7 +1,5 @@
 package edivad.extrastorage.compat.jade;
 
-import com.refinedmods.refinedstorage.common.autocrafting.autocrafter.AutocrafterBlock;
-import com.refinedmods.refinedstorage.common.autocrafting.autocrafter.AutocrafterBlockEntity;
 import edivad.extrastorage.ExtraStorage;
 import edivad.extrastorage.autocrafting.advancedautocrafter.AdvancedAutocrafterBlock;
 import edivad.extrastorage.autocrafting.advancedautocrafter.AdvancedAutocrafterBlockEntity;
@@ -16,12 +14,12 @@ public class JadeCompatibility implements IWailaPlugin {
   @Override
   public void register(IWailaCommonRegistration registration) {
     registration.registerBlockDataProvider(new AdvancedCrafterProvider(), AdvancedAutocrafterBlockEntity.class);
-    registration.registerBlockDataProvider(new CrafterProvider(), AutocrafterBlockEntity.class);
+    //registration.registerBlockDataProvider(new CrafterProvider(), AutocrafterBlockEntity.class);
   }
 
   @Override
   public void registerClient(IWailaClientRegistration registration) {
     registration.registerBlockComponent(new AdvancedCrafterComponent(), AdvancedAutocrafterBlock.class);
-    registration.registerBlockComponent(new CrafterComponent(), AutocrafterBlock.class);
+    //registration.registerBlockComponent(new CrafterComponent(), AutocrafterBlock.class);
   }
 }

src/main/java/edivad/extrastorage/compat/top/TOPIntegration.java

@@ -2,11 +2,14 @@
 
 import java.util.function.Function;
 import edivad.extrastorage.ExtraStorage;
+import edivad.extrastorage.autocrafting.advancedautocrafter.AdvancedAutocrafterBlockEntity;
+import edivad.extrastorage.tools.Translations;
 import mcjty.theoneprobe.api.IProbeHitData;
 import mcjty.theoneprobe.api.IProbeInfo;
 import mcjty.theoneprobe.api.IProbeInfoProvider;
 import mcjty.theoneprobe.api.ITheOneProbe;
 import mcjty.theoneprobe.api.ProbeMode;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
@@ -26,26 +29,21 @@ public void addProbeInfo(ProbeMode probeMode, IProbeInfo probeInfo, Player playe
     var blockEntity = level.getBlockEntity(data.getPos());
     int patterns, speed, slots;
 
-    /*if (blockEntity instanceof AdvancedAutocrafterBlockEntity advancedCrafter) {
-      var node = advancedCrafter.getNode();
-      patterns = node.getPatterns().size();
-      speed = node.getMaximumSuccessfulCraftingUpdates();
+    if (blockEntity instanceof AdvancedAutocrafterBlockEntity advancedCrafter) {
+      patterns = (int) advancedCrafter.getPatternContainer().getItems().stream()
+          .filter(x -> !x.isEmpty())
+          .count();
+      speed = advancedCrafter.getSteps();
       slots = advancedCrafter.getTier().getSlots();
       probeInfo.horizontal().text(
           Component.translatable(Translations.OCCUPIED_SPACE, String.valueOf(patterns),
               String.valueOf(slots)));
 
-      if (node.getTierSpeed() != speed) {
-        probeInfo.horizontal().text(
-            Component.translatable(Translations.LIMITED_SPEED, node.getName().getString(),
-                String.valueOf(speed)));
-      } else {
-        probeInfo.horizontal()
+      probeInfo.horizontal()
             .text(Component.translatable(Translations.CURRENT_SPEED, String.valueOf(speed)));
-      }
-    } else if (blockEntity instanceof CrafterBlockEntity crafter) {
+    }/* else if (blockEntity instanceof AutocrafterBlockEntity crafter) {
       var node = crafter.getNode();
-      patterns = node.getPatterns().size();
+      patterns = crafter.getPatternContainer().getItems().size();
       speed = node.getMaximumSuccessfulCraftingUpdates();
       slots = 9;
       probeInfo.horizontal().text(