Merge remote-tracking branch 'origin/master' into fabric/master

# Conflicts:
#	gradle.properties
#	src/main/java/appeng/client/gui/Size1Slot.java
#	src/main/java/appeng/client/me/SlotFluidME.java
#	src/main/java/appeng/client/me/SlotME.java
#	src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java
#	src/main/java/appeng/client/render/cablebus/CableBusModelLoader.java
#	src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java
#	src/main/java/appeng/core/sync/packets/MEInterfaceUpdatePacket.java
#	src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java
#	src/main/java/appeng/datagen/providers/loot/BlockDropProvider.java
#	src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java
#	src/main/java/appeng/fluids/container/FluidConfigurableContainer.java
#	src/main/java/appeng/fluids/helper/FluidCellConfig.java
#	src/main/resources/META-INF/mods.toml

src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java

@@ -20,7 +20,6 @@ package appeng.client.render.cablebus;
 
 import java.util.ArrayList;
 import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -40,6 +39,11 @@ import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter;
 import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel;
 import net.fabricmc.fabric.api.renderer.v1.render.RenderContext;
 import net.fabricmc.fabric.api.rendering.data.v1.RenderAttachedBlockView;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.cache.Weigher;
+
 import net.minecraft.block.BlockState;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.BakedQuad;
@@ -63,8 +67,10 @@ public class CableBusBakedModel implements BakedModel, FabricBakedModel {
 
     private static final Renderer RENDERER = RendererAccess.INSTANCE.getRenderer();
 
-    // FIXME: This entire cache seems dumb as shit
-    private static final Map<CableBusRenderState, Mesh> CABLE_MODEL_CACHE = new HashMap<>();
+    // The number of quads overall that will be cached
+    private static final int CACHE_QUAD_COUNT = 5000;
+
+    private static final LoadingCache<CableBusRenderState, Mesh> cableModelCache = new HashMap<>();
 
     private final CableBuilder cableBuilder;
 
@@ -80,6 +86,17 @@ public class CableBusBakedModel implements BakedModel, FabricBakedModel {
         this.facadeBuilder = facadeBuilder;
         this.partModels = partModels;
         this.particleTexture = particleTexture;
+        this.cableModelCache = CacheBuilder.newBuilder()//
+                .maximumWeight(CACHE_QUAD_COUNT)//
+                .weigher((Weigher<CableBusRenderState, List<BakedQuad>>) (key, value) -> value.size())//
+                .build(new CacheLoader<CableBusRenderState, List<BakedQuad>>() {
+                    @Override
+                    public List<BakedQuad> load(CableBusRenderState renderState) {
+                        final List<BakedQuad> model = new ArrayList<>();
+                        addCableQuads(renderState, model);
+                        return model;
+                    }
+                });
     }
 
     @Override
@@ -359,10 +376,6 @@ public class CableBusBakedModel implements BakedModel, FabricBakedModel {
         return ModelOverrideList.EMPTY;
     }
 
-    public static void clearCache() {
-        CABLE_MODEL_CACHE.clear();
-    }
-
     @Override
     public boolean isVanillaAdapter() {
         return false;

src/main/java/appeng/client/render/cablebus/CableBusModelLoader.java

@@ -23,7 +23,6 @@ public class CableBusModelLoader implements ModelResourceProvider {
     public UnbakedModel loadModelResource(Identifier resourceId, ModelProviderContext context)
             throws ModelProviderException {
         if (CABLE_BUS_MODEL.equals(resourceId)) {
-            CableBusBakedModel.clearCache();
             return new CableBusModel(partModels);
         } else {
             return null;