Merge pull request #447 from refinedmods/fix/GH-446/emissive-fix

Emissive fix
refinedmods · Nov 3, 2023 · adde7b8 · adde7b8
2 parents a8ef002 + d325cae
commit adde7b8
Show file tree

Hide file tree

Showing 220 changed files with 1,061 additions and 663 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 -   Network Receiver
 -   Network Card
 
+### Fixed
+
+-   Inactive Wireless Transmitter model being emissive.
+
 ## [2.0.0-milestone.3.1] - 2023-10-30
 
 ### Added

diff --git a/...-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApi.java b/...-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApi.java
@@ -28,10 +28,10 @@
 import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorExtractionStrategy;
 import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorInsertionStrategy;
 import com.refinedmods.refinedstorage2.platform.api.support.energy.EnergyItemHelper;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.NetworkBoundItemHelper;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.SlotReference;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.SlotReferenceFactory;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.SlotReferenceProvider;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemHelper;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceProvider;
 import com.refinedmods.refinedstorage2.platform.api.support.registry.PlatformRegistry;
 import com.refinedmods.refinedstorage2.platform.api.support.resource.FluidResource;
 import com.refinedmods.refinedstorage2.platform.api.support.resource.ItemResource;

diff --git a/...form-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApiProxy.java b/...form-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApiProxy.java
@@ -28,10 +28,10 @@
 import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorExtractionStrategy;
 import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorInsertionStrategy;
 import com.refinedmods.refinedstorage2.platform.api.support.energy.EnergyItemHelper;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.NetworkBoundItemHelper;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.SlotReference;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.SlotReferenceFactory;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.SlotReferenceProvider;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemHelper;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceProvider;
 import com.refinedmods.refinedstorage2.platform.api.support.registry.PlatformRegistry;
 import com.refinedmods.refinedstorage2.platform.api.support.resource.FluidResource;
 import com.refinedmods.refinedstorage2.platform.api.support.resource.ItemResource;

diff --git a/...finedmods/refinedstorage2/platform/api/support/energy/AbstractNetworkBoundEnergyItem.java b/...finedmods/refinedstorage2/platform/api/support/energy/AbstractNetworkBoundEnergyItem.java
@@ -1,9 +1,9 @@
 package com.refinedmods.refinedstorage2.platform.api.support.energy;
 
 import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.NetworkBoundItemHelper;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.NetworkBoundItemSession;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.SlotReference;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemHelper;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemSession;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference;
 
 import java.util.List;
 import java.util.Optional;

diff --git a/...tractNetworkNodeContainerBlockEntity.java → ...tractNetworkNodeContainerBlockEntity.java b/...tractNetworkNodeContainerBlockEntity.java → ...tractNetworkNodeContainerBlockEntity.java
@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.support;
+package com.refinedmods.refinedstorage2.platform.api.support.network;
 
 import com.refinedmods.refinedstorage2.api.network.node.NetworkNode;
 import com.refinedmods.refinedstorage2.platform.api.PlatformApi;

diff --git a/...support/PlatformNetworkNodeContainer.java → ...network/PlatformNetworkNodeContainer.java b/...support/PlatformNetworkNodeContainer.java → ...network/PlatformNetworkNodeContainer.java
@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.support;
+package com.refinedmods.refinedstorage2.platform.api.support.network;
 
 import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer;
 

diff --git a/...workbounditem/NetworkBoundItemHelper.java → ...ork/bounditem/NetworkBoundItemHelper.java b/...workbounditem/NetworkBoundItemHelper.java → ...ork/bounditem/NetworkBoundItemHelper.java
@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.support.networkbounditem;
+package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem;
 
 import java.util.List;
 import java.util.Optional;

diff --git a/...orkbounditem/NetworkBoundItemSession.java → ...rk/bounditem/NetworkBoundItemSession.java b/...orkbounditem/NetworkBoundItemSession.java → ...rk/bounditem/NetworkBoundItemSession.java
@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.support.networkbounditem;
+package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem;
 
 import com.refinedmods.refinedstorage2.api.network.Network;
 

diff --git a/...pport/networkbounditem/SlotReference.java → ...port/network/bounditem/SlotReference.java b/...pport/networkbounditem/SlotReference.java → ...port/network/bounditem/SlotReference.java
@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.support.networkbounditem;
+package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem;
 
 import java.util.Optional;
 

diff --git a/...etworkbounditem/SlotReferenceFactory.java → ...twork/bounditem/SlotReferenceFactory.java b/...etworkbounditem/SlotReferenceFactory.java → ...twork/bounditem/SlotReferenceFactory.java
@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.support.networkbounditem;
+package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem;
 
 import net.minecraft.network.FriendlyByteBuf;
 import org.apiguardian.api.API;

diff --git a/...tworkbounditem/SlotReferenceProvider.java → ...work/bounditem/SlotReferenceProvider.java b/...tworkbounditem/SlotReferenceProvider.java → ...work/bounditem/SlotReferenceProvider.java
@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.support.networkbounditem;
+package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem;
 
 import java.util.List;
 import java.util.Set;

diff --git a/...ge2/platform/forge/grid/package-info.java → ...pport/network/bounditem/package-info.java b/...ge2/platform/forge/grid/package-info.java → ...pport/network/bounditem/package-info.java
@@ -1,6 +1,6 @@
 @ParametersAreNonnullByDefault
 @FieldsAndMethodsAreNonnullByDefault
-package com.refinedmods.refinedstorage2.platform.forge.grid;
+package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem;
 
 import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault;
 

diff --git a/...upport/networkbounditem/package-info.java → ...orm/api/support/network/package-info.java b/...upport/networkbounditem/package-info.java → ...orm/api/support/network/package-info.java
@@ -1,6 +1,6 @@
 @ParametersAreNonnullByDefault
 @FieldsAndMethodsAreNonnullByDefault
-package com.refinedmods.refinedstorage2.platform.api.support.networkbounditem;
+package com.refinedmods.refinedstorage2.platform.api.support.network;
 
 import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault;
 

diff --git a/...rc/generated/resources/assets/refinedstorage2/models/block/network_receiver/inactive.json b/...rc/generated/resources/assets/refinedstorage2/models/block/network_receiver/inactive.json
@@ -1,5 +1,5 @@
 {
-  "parent": "refinedstorage2:block/emissive_all_cutout",
+  "parent": "refinedstorage2:block/all_cutout",
   "textures": {
     "all": "refinedstorage2:block/network_receiver/base",
     "cutout": "refinedstorage2:block/network_receiver/cutouts/inactive",

diff --git a/...c/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/black.json b/...c/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/black.json
@@ -1,5 +1,5 @@
 {
-  "parent": "refinedstorage2:block/wireless_transmitter/inactive",
+  "parent": "refinedstorage2:block/wireless_transmitter/active",
   "textures": {
     "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/black"
   }

diff --git a/...rc/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/blue.json b/...rc/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/blue.json
@@ -1,5 +1,5 @@
 {
-  "parent": "refinedstorage2:block/wireless_transmitter/inactive",
+  "parent": "refinedstorage2:block/wireless_transmitter/active",
   "textures": {
     "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/blue"
   }

diff --git a/...c/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/brown.json b/...c/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/brown.json
@@ -1,5 +1,5 @@
 {
-  "parent": "refinedstorage2:block/wireless_transmitter/inactive",
+  "parent": "refinedstorage2:block/wireless_transmitter/active",
   "textures": {
     "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/brown"
   }

diff --git a/...rc/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/cyan.json b/...rc/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/cyan.json
@@ -1,5 +1,5 @@
 {
-  "parent": "refinedstorage2:block/wireless_transmitter/inactive",
+  "parent": "refinedstorage2:block/wireless_transmitter/active",
   "textures": {
     "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/cyan"
   }

diff --git a/...rc/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/gray.json b/...rc/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/gray.json
@@ -1,5 +1,5 @@
 {
-  "parent": "refinedstorage2:block/wireless_transmitter/inactive",
+  "parent": "refinedstorage2:block/wireless_transmitter/active",
   "textures": {
     "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/gray"
   }

diff --git a/...c/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/green.json b/...c/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/green.json
@@ -1,5 +1,5 @@
 {
-  "parent": "refinedstorage2:block/wireless_transmitter/inactive",
+  "parent": "refinedstorage2:block/wireless_transmitter/active",
   "textures": {
     "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/green"
   }

diff --git a/...erated/resources/assets/refinedstorage2/models/block/wireless_transmitter/light_blue.json b/...erated/resources/assets/refinedstorage2/models/block/wireless_transmitter/light_blue.json
@@ -1,5 +1,5 @@
 {
-  "parent": "refinedstorage2:block/wireless_transmitter/inactive",
+  "parent": "refinedstorage2:block/wireless_transmitter/active",
   "textures": {
     "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/light_blue"
   }

diff --git a/...erated/resources/assets/refinedstorage2/models/block/wireless_transmitter/light_gray.json b/...erated/resources/assets/refinedstorage2/models/block/wireless_transmitter/light_gray.json
@@ -1,5 +1,5 @@
 {
-  "parent": "refinedstorage2:block/wireless_transmitter/inactive",
+  "parent": "refinedstorage2:block/wireless_transmitter/active",
   "textures": {
     "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/light_gray"
   }

diff --git a/...rc/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/lime.json b/...rc/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/lime.json
@@ -1,5 +1,5 @@
 {
-  "parent": "refinedstorage2:block/wireless_transmitter/inactive",
+  "parent": "refinedstorage2:block/wireless_transmitter/active",
   "textures": {
     "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/lime"
   }

diff --git a/...generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/magenta.json b/...generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/magenta.json
@@ -1,5 +1,5 @@
 {
-  "parent": "refinedstorage2:block/wireless_transmitter/inactive",
+  "parent": "refinedstorage2:block/wireless_transmitter/active",
   "textures": {
     "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/magenta"
   }

diff --git a/.../generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/orange.json b/.../generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/orange.json
@@ -1,5 +1,5 @@
 {
-  "parent": "refinedstorage2:block/wireless_transmitter/inactive",
+  "parent": "refinedstorage2:block/wireless_transmitter/active",
   "textures": {
     "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/orange"
   }

diff --git a/...rc/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/pink.json b/...rc/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/pink.json
@@ -1,5 +1,5 @@
 {
-  "parent": "refinedstorage2:block/wireless_transmitter/inactive",
+  "parent": "refinedstorage2:block/wireless_transmitter/active",
   "textures": {
     "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/pink"
   }

diff --git a/.../generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/purple.json b/.../generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/purple.json
@@ -1,5 +1,5 @@
 {
-  "parent": "refinedstorage2:block/wireless_transmitter/inactive",
+  "parent": "refinedstorage2:block/wireless_transmitter/active",
   "textures": {
     "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/purple"
   }

diff --git a/...src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/red.json b/...src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/red.json
@@ -1,5 +1,5 @@
 {
-  "parent": "refinedstorage2:block/wireless_transmitter/inactive",
+  "parent": "refinedstorage2:block/wireless_transmitter/active",
   "textures": {
     "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/red"
   }

diff --git a/...c/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/white.json b/...c/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/white.json
@@ -1,5 +1,5 @@
 {
-  "parent": "refinedstorage2:block/wireless_transmitter/inactive",
+  "parent": "refinedstorage2:block/wireless_transmitter/active",
   "textures": {
     "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/white"
   }

diff --git a/.../generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/yellow.json b/.../generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/yellow.json
@@ -1,5 +1,5 @@
 {
-  "parent": "refinedstorage2:block/wireless_transmitter/inactive",
+  "parent": "refinedstorage2:block/wireless_transmitter/active",
   "textures": {
     "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/yellow"
   }

diff --git a/...src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java b/...src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java
@@ -78,11 +78,11 @@
 import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorBlock;
 import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorContainerMenu;
-import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeContainerBlockEntityImpl;
 import com.refinedmods.refinedstorage2.platform.common.support.SimpleBlock;
 import com.refinedmods.refinedstorage2.platform.common.support.SimpleBlockItem;
 import com.refinedmods.refinedstorage2.platform.common.support.SimpleItem;
 import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyLootItemFunctionSerializer;
+import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeContainerBlockEntityImpl;
 import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResourceFactory;
 import com.refinedmods.refinedstorage2.platform.common.upgrade.FortuneUpgradeItem;
 import com.refinedmods.refinedstorage2.platform.common.upgrade.RangeUpgradeItem;
@@ -155,10 +155,6 @@
 public abstract class AbstractModInitializer {
     private static final String FLUID_REGISTRY_KEY = "fluid";
 
-    protected final void initializePlatform(final Platform platform) {
-        ((PlatformProxy) Platform.INSTANCE).setPlatform(platform);
-    }
-
     protected final void initializePlatformApi() {
         ((PlatformApiProxy) PlatformApi.INSTANCE).setDelegate(new PlatformApiImpl());
         registerAdditionalStorageTypes();

diff --git a/...ommon/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractPlatform.java b/...ommon/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractPlatform.java
@@ -5,26 +5,22 @@
 import com.refinedmods.refinedstorage2.platform.common.support.ServerToClientCommunications;
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.MenuOpener;
 import com.refinedmods.refinedstorage2.platform.common.support.render.FluidRenderer;
-import com.refinedmods.refinedstorage2.platform.common.util.BucketAmountFormatting;
 
 public abstract class AbstractPlatform implements Platform {
     private final ServerToClientCommunications serverToClientCommunications;
     private final ClientToServerCommunications clientToServerCommunications;
     private final MenuOpener menuOpener;
-    private final BucketAmountFormatting bucketAmountFormatting;
     private final FluidRenderer fluidRenderer;
     private final GridInsertionStrategyFactory defaultGridInsertionStrategyFactory;
 
     protected AbstractPlatform(final ServerToClientCommunications serverToClientCommunications,
                                final ClientToServerCommunications clientToServerCommunications,
                                final MenuOpener menuOpener,
-                               final BucketAmountFormatting bucketAmountFormatting,
                                final FluidRenderer fluidRenderer,
                                final GridInsertionStrategyFactory defaultGridInsertionStrategyFactory) {
         this.serverToClientCommunications = serverToClientCommunications;
         this.clientToServerCommunications = clientToServerCommunications;
         this.menuOpener = menuOpener;
-        this.bucketAmountFormatting = bucketAmountFormatting;
         this.fluidRenderer = fluidRenderer;
         this.defaultGridInsertionStrategyFactory = defaultGridInsertionStrategyFactory;
     }
@@ -44,11 +40,6 @@ public MenuOpener getMenuOpener() {
         return menuOpener;
     }
 
-    @Override
-    public BucketAmountFormatting getBucketAmountFormatter() {
-        return bucketAmountFormatting;
-    }
-
     @Override
     public FluidRenderer getFluidRenderer() {
         return fluidRenderer;

diff --git a/...atform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/Platform.java b/...atform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/Platform.java
@@ -12,7 +12,6 @@
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.MenuOpener;
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.TransferManager;
 import com.refinedmods.refinedstorage2.platform.common.support.render.FluidRenderer;
-import com.refinedmods.refinedstorage2.platform.common.util.BucketAmountFormatting;
 
 import java.util.List;
 import java.util.Optional;
@@ -58,8 +57,6 @@ public interface Platform {
 
     TagKey<Item> getWrenchTag();
 
-    BucketAmountFormatting getBucketAmountFormatter();
-
     Config getConfig();
 
     boolean canEditBoxLoseFocus(EditBox editBox);

diff --git a/...common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformApiImpl.java b/...common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformApiImpl.java
@@ -32,10 +32,10 @@
 import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorExtractionStrategy;
 import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorInsertionStrategy;
 import com.refinedmods.refinedstorage2.platform.api.support.energy.EnergyItemHelper;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.NetworkBoundItemHelper;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.SlotReference;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.SlotReferenceFactory;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.SlotReferenceProvider;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemHelper;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceProvider;
 import com.refinedmods.refinedstorage2.platform.api.support.registry.PlatformRegistry;
 import com.refinedmods.refinedstorage2.platform.api.support.resource.FluidResource;
 import com.refinedmods.refinedstorage2.platform.api.support.resource.ItemResource;
@@ -59,13 +59,13 @@
 import com.refinedmods.refinedstorage2.platform.common.storage.channel.StorageChannelTypes;
 import com.refinedmods.refinedstorage2.platform.common.storagemonitor.CompositeStorageMonitorExtractionStrategy;
 import com.refinedmods.refinedstorage2.platform.common.storagemonitor.CompositeStorageMonitorInsertionStrategy;
-import com.refinedmods.refinedstorage2.platform.common.support.LevelConnectionProvider;
 import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyItemHelperImpl;
 import com.refinedmods.refinedstorage2.platform.common.support.energy.ItemEnergyStorage;
-import com.refinedmods.refinedstorage2.platform.common.support.networkbounditem.CompositeSlotReferenceProvider;
-import com.refinedmods.refinedstorage2.platform.common.support.networkbounditem.InventorySlotReference;
-import com.refinedmods.refinedstorage2.platform.common.support.networkbounditem.InventorySlotReferenceFactory;
-import com.refinedmods.refinedstorage2.platform.common.support.networkbounditem.NetworkBoundItemHelperImpl;
+import com.refinedmods.refinedstorage2.platform.common.support.network.LevelConnectionProvider;
+import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.CompositeSlotReferenceProvider;
+import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.InventorySlotReference;
+import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.InventorySlotReferenceFactory;
+import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.NetworkBoundItemHelperImpl;
 import com.refinedmods.refinedstorage2.platform.common.support.registry.PlatformRegistryImpl;
 import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResourceFactory;
 import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResourceFactory;

diff --git a/...m-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformProxy.java b/...m-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformProxy.java
@@ -11,7 +11,6 @@
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.MenuOpener;
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.TransferManager;
 import com.refinedmods.refinedstorage2.platform.common.support.render.FluidRenderer;
-import com.refinedmods.refinedstorage2.platform.common.util.BucketAmountFormatting;
 
 import java.util.List;
 import java.util.Optional;
@@ -48,11 +47,12 @@ public class PlatformProxy implements Platform {
     @Nullable
     private Platform platform;
 
-    public void setPlatform(final Platform platform) {
-        if (this.platform != null) {
+    public static void loadPlatform(final Platform platform) {
+        final PlatformProxy proxy = (PlatformProxy) Platform.INSTANCE;
+        if (proxy.platform != null) {
             throw new IllegalStateException("Platform already set");
         }
-        this.platform = platform;
+        proxy.platform = platform;
     }
 
     @Override
@@ -80,11 +80,6 @@ public TagKey<Item> getWrenchTag() {
         return ensureLoaded().getWrenchTag();
     }
 
-    @Override
-    public BucketAmountFormatting getBucketAmountFormatter() {
-        return ensureLoaded().getBucketAmountFormatter();
-    }
-
     @Override
     public Config getConfig() {
         return ensureLoaded().getConfig();

diff --git a/.../refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardItem.java b/.../refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardItem.java
@@ -199,7 +199,7 @@ public Optional<TooltipComponent> getTooltipImage(final ItemStack stack) {
         return Optional.of(new HelpTooltipComponent(isActive(stack) ? CONFIGURED_HELP : EMPTY_HELP));
     }
 
-    public boolean isActive(final ItemStack stack) {
+    boolean isActive(final ItemStack stack) {
         return stack.getTag() != null && stack.getTag().contains(TAG_TYPE);
     }
 }
diff --git a/...m/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorBlock.java b/...m/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorBlock.java
@@ -5,7 +5,7 @@
 import com.refinedmods.refinedstorage2.platform.common.content.Blocks;
 import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider;
 import com.refinedmods.refinedstorage2.platform.common.support.NamedBlockItem;
-import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockEntityTicker;
+import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker;
 
 import javax.annotation.Nullable;