Backport fixes for #4675 and #4665 to 1.15 (#4676)

* Serialize the complete NBT data to avoid mismatches (#4665)

This might increase the network traffic a bit, but the amount of mods actually using the share tag seems to be very limited.
For now it is worth the risk as it solves the problem. In case we run into actual issues, there might still be other solutions, which will be way more complex and can potentially introduce additional problems.

(cherry picked from commit e90dd2f9c6)
(cherry picked from commit ab393b0ed1)

* Fixes #4669: Take NBT into account for comparing. (#4675)

This only covers combining different items together.
Fuzzy filtering is still a bit too fuzzy for corner cases.

Co-authored-by: yueh <yueh@users.noreply.github.com>

.github/workflows/release.yml

@@ -57,7 +57,15 @@ jobs:
           KEY_STORE_ALIAS: ${{ secrets.KEY_STORE_ALIAS }}
           KEY_STORE_KEY_PASS: ${{ secrets.KEY_STORE_KEY_PASS }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew publish --no-daemon --max-workers 1
+        run: ./gradlew publishMavenPublicationToGitHubPackagesRepository --no-daemon --max-workers 1
+      - name: Publish to modmaven
+        env:
+          KEY_STORE_PASS: ${{ secrets.KEY_STORE_PASS }}
+          KEY_STORE_ALIAS: ${{ secrets.KEY_STORE_ALIAS }}
+          KEY_STORE_KEY_PASS: ${{ secrets.KEY_STORE_KEY_PASS }}
+          MODMAVEN_USER: ${{ secrets.MODMAVEN_USER }}
+          MODMAVEN_PASSWORD: ${{ secrets.MODMAVEN_PASSWORD }}
+        run: ./gradlew publishMavenPublicationToModmavenRepository --no-daemon --max-workers 1
       - name: Prepare artifact metadata
         id: prepare_artifact_metadata
         run: |

build.gradle

@@ -174,6 +174,13 @@ publishing {
             groupId = project.group
             artifactId = project.archivesBaseName
             version = project.version
+
+            // ForgeGradle will generate wild dependency definitions, see https://github.com/MinecraftForge/ForgeGradle/issues/584
+            // Since we don't actually depend on anything, just remove the entire node.
+            pom.withXml {
+                asNode().remove(asNode().dependencies)
+            }
+
             from components.java
             artifact sourcesJar
             artifact javadocJar
@@ -189,5 +196,13 @@ publishing {
             name = "GitHubPackages"
             url = "https://maven.pkg.github.com/AppliedEnergistics/Applied-Energistics-2"
         }
+        maven {
+            credentials {
+                username System.getenv("MODMAVEN_USER")
+                password System.getenv("MODMAVEN_PASSWORD")
+            }
+            name = "modmaven"
+            url = "https://modmaven.k-4u.nl/artifactory/local-releases/"
+        }
     }
 }

src/api/java/appeng/api/crafting/ICraftingHelper.java

@@ -53,6 +53,8 @@ public interface ICraftingHelper {
      * @param stack If null, a new item will be created to hold the encoded pattern.
      *              Otherwise the given item must already contains an encoded
      *              pattern that will be overwritten.
+     * @throws IllegalArgumentException If either in or out contain only empty
+     *                                  ItemStacks.
      * @return A new encoded pattern, or the given stack with the pattern encoded in
      *         it.
      */
@@ -73,6 +75,8 @@ public interface ICraftingHelper {
      *                         operation by the ME system.
      * @param allowSubstitutes Controls whether the ME system will allow the use of
      *                         equivalent items to craft this recipe.
+     * @throws IllegalArgumentException If either in or out contain only empty
+     *                                  ItemStacks.
      */
     ItemStack encodeCraftingPattern(@Nullable ItemStack stack, ICraftingRecipe recipe, ItemStack[] in, ItemStack out,
             boolean allowSubstitutes);

src/main/java/appeng/client/ClientHelper.java

@@ -22,6 +22,7 @@ import java.util.Collections;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Random;
+import java.util.function.Supplier;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.settings.KeyBinding;
@@ -29,25 +30,50 @@ import net.minecraft.client.util.InputMappings;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Hand;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.event.InputEvent;
 import net.minecraftforge.client.event.RenderLivingEvent;
+import net.minecraftforge.client.model.ModelLoaderRegistry;
+import net.minecraftforge.client.model.geometry.IModelGeometry;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 
 import appeng.api.parts.CableRenderMode;
 import appeng.block.AEBaseBlock;
+import appeng.block.paint.PaintSplotchesModel;
+import appeng.block.qnb.QnbFormedModel;
+import appeng.client.render.DummyFluidItemModel;
+import appeng.client.render.FacadeItemModel;
+import appeng.client.render.SimpleModelLoader;
+import appeng.client.render.cablebus.CableBusModelLoader;
+import appeng.client.render.cablebus.P2PTunnelFrequencyModel;
+import appeng.client.render.crafting.CraftingCubeModelLoader;
+import appeng.client.render.crafting.EncodedPatternModelLoader;
 import appeng.client.render.effects.EnergyParticleData;
 import appeng.client.render.effects.LightningArcFX;
 import appeng.client.render.effects.LightningFX;
 import appeng.client.render.effects.ParticleTypes;
+import appeng.client.render.model.BiometricCardModel;
+import appeng.client.render.model.ColorApplicatorModel;
+import appeng.client.render.model.DriveModel;
+import appeng.client.render.model.GlassModel;
+import appeng.client.render.model.MemoryCardModel;
+import appeng.client.render.model.SkyCompassModel;
+import appeng.client.render.model.UVLModelLoader;
+import appeng.client.render.spatial.SpatialPylonModel;
 import appeng.core.AEConfig;
+import appeng.core.Api;
 import appeng.core.AppEng;
+import appeng.core.features.registries.PartModels;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.helpers.IMouseWheelItem;
+import appeng.parts.automation.PlaneModelLoader;
 import appeng.server.ServerHelper;
 import appeng.util.Platform;
 
@@ -56,6 +82,45 @@ public class ClientHelper extends ServerHelper {
 
     private final EnumMap<ActionKey, KeyBinding> bindings = new EnumMap<>(ActionKey.class);
 
+    public ClientHelper() {
+        if (Minecraft.getInstance() != null) {
+            registerModelLoaders();
+        }
+    }
+
+    // In later forge versions, this runs before resource loads, in 1.15 the
+    // ModelRegistryEvent runs concurrently
+    // with resource reloading, which makes these non-deterministic
+    private void registerModelLoaders() {
+        addBuiltInModel("glass", GlassModel::new);
+        addBuiltInModel("sky_compass", SkyCompassModel::new);
+        addBuiltInModel("dummy_fluid_item", DummyFluidItemModel::new);
+        addBuiltInModel("memory_card", MemoryCardModel::new);
+        addBuiltInModel("biometric_card", BiometricCardModel::new);
+        addBuiltInModel("drive", DriveModel::new);
+        addBuiltInModel("color_applicator", ColorApplicatorModel::new);
+        addBuiltInModel("spatial_pylon", SpatialPylonModel::new);
+        addBuiltInModel("paint_splotches", PaintSplotchesModel::new);
+        addBuiltInModel("quantum_bridge_formed", QnbFormedModel::new);
+        addBuiltInModel("p2p_tunnel_frequency", P2PTunnelFrequencyModel::new);
+        addBuiltInModel("facade", FacadeItemModel::new);
+        ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "encoded_pattern"),
+                EncodedPatternModelLoader.INSTANCE);
+        ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "part_plane"),
+                PlaneModelLoader.INSTANCE);
+        ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "crafting_cube"),
+                CraftingCubeModelLoader.INSTANCE);
+        ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "uvlightmap"), UVLModelLoader.INSTANCE);
+        ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "cable_bus"),
+                new CableBusModelLoader((PartModels) Api.INSTANCE.registries().partModels()));
+    }
+
+    @OnlyIn(Dist.CLIENT)
+    private static <T extends IModelGeometry<T>> void addBuiltInModel(String id, Supplier<T> modelFactory) {
+        ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, id),
+                new SimpleModelLoader<>(modelFactory));
+    }
+
     public void clientInit() {
         MinecraftForge.EVENT_BUS.addListener(this::postPlayerRender);
         MinecraftForge.EVENT_BUS.addListener(this::wheelEvent);

src/main/java/appeng/client/gui/Size1Slot.java

@@ -8,19 +8,18 @@ import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.items.SlotItemHandler;
 
 /**
  * A proxy for a slot that will always return an itemstack with size 1, if there
  * is an item in the slot. Used to prevent the default item count from
  * rendering.
  */
-class Size1Slot extends SlotItemHandler {
+class Size1Slot extends Slot {
 
-    private final SlotItemHandler delegate;
+    private final Slot delegate;
 
-    public Size1Slot(SlotItemHandler delegate) {
-        super(delegate.getItemHandler(), delegate.getSlotIndex(), delegate.xPos, delegate.yPos);
+    public Size1Slot(Slot delegate) {
+        super(delegate.inventory, delegate.getSlotIndex(), delegate.xPos, delegate.yPos);
         this.delegate = delegate;
     }
 

src/main/java/appeng/client/me/FluidRepo.java

@@ -41,11 +41,6 @@ import appeng.fluids.util.FluidSorters;
 import appeng.util.Platform;
 import appeng.util.prioritylist.IPartitionList;
 
-/**
- * @author BrockWS
- * @version rv6 - 22/05/2018
- * @since rv6 22/05/2018
- */
 public class FluidRepo {
     private final IItemList<IAEFluidStack> list = Api.instance().storage().getStorageChannel(IFluidStorageChannel.class)
             .createList();

src/main/java/appeng/client/me/SlotFluidME.java

@@ -21,23 +21,22 @@ package appeng.client.me;
 import javax.annotation.Nonnull;
 
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.items.SlotItemHandler;
 
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.fluids.container.slots.IMEFluidSlot;
 
-/**
- * @author BrockWS
- * @version rv6 - 22/05/2018
- * @since rv6 22/05/2018
- */
-public class SlotFluidME extends SlotItemHandler implements IMEFluidSlot {
+public class SlotFluidME extends Slot implements IMEFluidSlot {
 
-    private InternalFluidSlotME slot;
+    private static final IInventory EMPTY_INVENTORY = new Inventory(0);
+
+    private final InternalFluidSlotME slot;
 
     public SlotFluidME(InternalFluidSlotME slot) {
-        super(null, 0, slot.getxPosition(), slot.getyPosition());
+        super(EMPTY_INVENTORY, 0, slot.getxPosition(), slot.getyPosition());
         this.slot = slot;
     }
 
@@ -50,7 +49,7 @@ public class SlotFluidME extends SlotItemHandler implements IMEFluidSlot {
     }
 
     @Override
-    public boolean isItemValid(final ItemStack par1ItemStack) {
+    public boolean isItemValid(final ItemStack stack) {
         return false;
     }
 
@@ -69,7 +68,7 @@ public class SlotFluidME extends SlotItemHandler implements IMEFluidSlot {
     }
 
     @Override
-    public void putStack(final ItemStack par1ItemStack) {
+    public void putStack(final ItemStack stack) {
 
     }
 
@@ -85,7 +84,7 @@ public class SlotFluidME extends SlotItemHandler implements IMEFluidSlot {
     }
 
     @Override
-    public boolean canTakeStack(final PlayerEntity par1PlayerEntity) {
+    public boolean canTakeStack(final PlayerEntity player) {
         return false;
     }
 }

src/main/java/appeng/client/me/SlotME.java

@@ -19,23 +19,27 @@
 package appeng.client.me;
 
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.items.SlotItemHandler;
 
 import appeng.api.storage.data.IAEItemStack;
 
-public class SlotME extends SlotItemHandler {
+public class SlotME extends Slot {
 
-    private final InternalSlotME mySlot;
+    private static final IInventory EMPTY_INVENTORY = new Inventory(0);
 
-    public SlotME(final InternalSlotME me) {
-        super(null, 0, me.getxPosition(), me.getyPosition());
-        this.mySlot = me;
+    private final InternalSlotME slot;
+
+    public SlotME(final InternalSlotME slot) {
+        super(EMPTY_INVENTORY, 0, slot.getxPosition(), slot.getyPosition());
+        this.slot = slot;
     }
 
     public IAEItemStack getAEStack() {
-        if (this.mySlot.hasPower()) {
-            return this.mySlot.getAEStack();
+        if (this.slot.hasPower()) {
+            return this.slot.getAEStack();
         }
         return null;
     }
@@ -47,15 +51,15 @@ public class SlotME extends SlotItemHandler {
 
     @Override
     public ItemStack getStack() {
-        if (this.mySlot.hasPower()) {
-            return this.mySlot.getStack();
+        if (this.slot.hasPower()) {
+            return this.slot.getStack();
         }
         return ItemStack.EMPTY;
     }
 
     @Override
     public boolean getHasStack() {
-        if (this.mySlot.hasPower()) {
+        if (this.slot.hasPower()) {
             return !this.getStack().isEmpty();
         }
         return false;

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

@@ -92,12 +92,14 @@ public class CableBusBakedModel implements IBakedModel {
         if (layer == RenderType.getCutout()) {
 
             // First, handle the cable at the center of the cable bus
-            final List<BakedQuad> cableModel = CABLE_MODEL_CACHE.computeIfAbsent(renderState, k -> {
-                final List<BakedQuad> model = new ArrayList<>();
-                this.addCableQuads(renderState, model);
-                return model;
-            });
-            quads.addAll(cableModel);
+            synchronized (CABLE_MODEL_CACHE) {
+                final List<BakedQuad> cableModel = CABLE_MODEL_CACHE.computeIfAbsent(renderState, k -> {
+                    final List<BakedQuad> model = new ArrayList<>();
+                    this.addCableQuads(renderState, model);
+                    return model;
+                });
+                quads.addAll(cableModel);
+            }
 
             // Then handle attachments
             for (Direction facing : Direction.values()) {
@@ -342,7 +344,9 @@ public class CableBusBakedModel implements IBakedModel {
     }
 
     public static void clearCache() {
-        CABLE_MODEL_CACHE.clear();
+        synchronized (CABLE_MODEL_CACHE) {
+            CABLE_MODEL_CACHE.clear();
+        }
     }
 
 }

src/main/java/appeng/container/implementations/PatternTermContainer.java

@@ -261,13 +261,19 @@ public class PatternTermContainer extends MEMonitorableContainer
                 return new ItemStack[] { out };
             }
         } else {
+            boolean hasValue = false;
             final ItemStack[] list = new ItemStack[3];
 
             for (int i = 0; i < this.outputSlots.length; i++) {
                 final ItemStack out = this.outputSlots[i].getStack();
                 list[i] = out;
+                if (!out.isEmpty()) {
+                    hasValue = true;
+                }
+            }
+            if (hasValue) {
+                return list;
             }
-            return list;
         }
 
         return null;

src/main/java/appeng/core/AppEng.java

@@ -19,7 +19,6 @@
 package appeng.core;
 
 import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
 
 import javax.annotation.Nonnull;
 
@@ -39,8 +38,6 @@ import net.minecraft.world.biome.Biome;
 import net.minecraft.world.gen.feature.Feature;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.client.model.ModelLoaderRegistry;
-import net.minecraftforge.client.model.geometry.IModelGeometry;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.ModDimension;
 import net.minecraftforge.eventbus.api.IEventBus;
@@ -56,29 +53,10 @@ import net.minecraftforge.fml.event.server.FMLServerStoppedEvent;
 import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
-import appeng.block.paint.PaintSplotchesModel;
-import appeng.block.qnb.QnbFormedModel;
-import appeng.bootstrap.components.IClientSetupComponent;
 import appeng.bootstrap.components.IInitComponent;
 import appeng.bootstrap.components.IPostInitComponent;
 import appeng.capabilities.Capabilities;
 import appeng.client.ClientHelper;
-import appeng.client.render.DummyFluidItemModel;
-import appeng.client.render.FacadeItemModel;
-import appeng.client.render.SimpleModelLoader;
-import appeng.client.render.cablebus.CableBusModelLoader;
-import appeng.client.render.cablebus.P2PTunnelFrequencyModel;
-import appeng.client.render.crafting.CraftingCubeModelLoader;
-import appeng.client.render.crafting.EncodedPatternModelLoader;
-import appeng.client.render.model.BiometricCardModel;
-import appeng.client.render.model.ColorApplicatorModel;
-import appeng.client.render.model.DriveModel;
-import appeng.client.render.model.GlassModel;
-import appeng.client.render.model.MemoryCardModel;
-import appeng.client.render.model.SkyCompassModel;
-import appeng.client.render.model.UVLModelLoader;
-import appeng.client.render.spatial.SpatialPylonModel;
-import appeng.core.features.registries.PartModels;
 import appeng.core.stats.AdvancementTriggers;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.worlddata.WorldData;
@@ -90,7 +68,6 @@ import appeng.entity.TinyTNTPrimedRenderer;
 import appeng.hooks.TickHandler;
 import appeng.integration.Integrations;
 import appeng.parts.PartPlacement;
-import appeng.parts.automation.PlaneModelLoader;
 import appeng.server.ServerHelper;
 
 @Mod(AppEng.MOD_ID)
@@ -177,39 +154,6 @@ public final class AppEng {
         RenderingRegistry.registerEntityRenderingHandler(ChargedQuartzEntity.TYPE,
                 m -> new ItemRenderer(m, Minecraft.getInstance().getItemRenderer()));
 
-        // TODO: Do not use the internal API
-        final ApiDefinitions definitions = Api.INSTANCE.definitions();
-        definitions.getRegistry().getBootstrapComponents(IClientSetupComponent.class)
-                .forEachRemaining(IClientSetupComponent::setup);
-
-        addBuiltInModel("glass", GlassModel::new);
-        addBuiltInModel("sky_compass", SkyCompassModel::new);
-        addBuiltInModel("dummy_fluid_item", DummyFluidItemModel::new);
-        addBuiltInModel("memory_card", MemoryCardModel::new);
-        addBuiltInModel("biometric_card", BiometricCardModel::new);
-        addBuiltInModel("drive", DriveModel::new);
-        addBuiltInModel("color_applicator", ColorApplicatorModel::new);
-        addBuiltInModel("spatial_pylon", SpatialPylonModel::new);
-        addBuiltInModel("paint_splotches", PaintSplotchesModel::new);
-        addBuiltInModel("quantum_bridge_formed", QnbFormedModel::new);
-        addBuiltInModel("p2p_tunnel_frequency", P2PTunnelFrequencyModel::new);
-        addBuiltInModel("facade", FacadeItemModel::new);
-        ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "encoded_pattern"),
-                EncodedPatternModelLoader.INSTANCE);
-        ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "part_plane"),
-                PlaneModelLoader.INSTANCE);
-        ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "crafting_cube"),
-                CraftingCubeModelLoader.INSTANCE);
-        ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "uvlightmap"), UVLModelLoader.INSTANCE);
-        ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "cable_bus"),
-                new CableBusModelLoader((PartModels) Api.INSTANCE.registries().partModels()));
-
-    }
-
-    @OnlyIn(Dist.CLIENT)
-    private static <T extends IModelGeometry<T>> void addBuiltInModel(String id, Supplier<T> modelFactory) {
-        ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, id),
-                new SimpleModelLoader<>(modelFactory));
     }
 
     @Nonnull

src/main/java/appeng/core/Registration.java

@@ -18,6 +18,8 @@
 
 package appeng.core;
 
+import java.util.function.Supplier;
+
 import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
@@ -48,6 +50,8 @@ import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.client.event.ParticleFactoryRegisterEvent;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.client.model.ModelLoaderRegistry;
+import net.minecraftforge.client.model.geometry.IModelGeometry;
 import net.minecraftforge.common.ModDimension;
 import net.minecraftforge.common.extensions.IForgeContainerType;
 import net.minecraftforge.event.RegistryEvent;
@@ -77,7 +81,10 @@ import appeng.api.networking.security.ISecurityGrid;
 import appeng.api.networking.spatial.ISpatialCache;
 import appeng.api.networking.storage.IStorageGrid;
 import appeng.api.networking.ticking.ITickManager;
+import appeng.block.paint.PaintSplotchesModel;
+import appeng.block.qnb.QnbFormedModel;
 import appeng.bootstrap.components.IBlockRegistrationComponent;
+import appeng.bootstrap.components.IClientSetupComponent;
 import appeng.bootstrap.components.IEntityRegistrationComponent;
 import appeng.bootstrap.components.IItemColorRegistrationComponent;
 import appeng.bootstrap.components.IItemRegistrationComponent;
@@ -116,6 +123,13 @@ import appeng.client.gui.implementations.UpgradeableScreen;
 import appeng.client.gui.implementations.VibrationChamberScreen;
 import appeng.client.gui.implementations.WirelessScreen;
 import appeng.client.gui.implementations.WirelessTermScreen;
+import appeng.client.render.DummyFluidItemModel;
+import appeng.client.render.FacadeItemModel;
+import appeng.client.render.SimpleModelLoader;
+import appeng.client.render.cablebus.CableBusModelLoader;
+import appeng.client.render.cablebus.P2PTunnelFrequencyModel;
+import appeng.client.render.crafting.CraftingCubeModelLoader;
+import appeng.client.render.crafting.EncodedPatternModelLoader;
 import appeng.client.render.effects.ChargedOreFX;
 import appeng.client.render.effects.CraftingFx;
 import appeng.client.render.effects.EnergyFx;
@@ -125,8 +139,13 @@ import appeng.client.render.effects.MatterCannonFX;
 import appeng.client.render.effects.ParticleTypes;
 import appeng.client.render.effects.VibrantFX;
 import appeng.client.render.model.BiometricCardModel;
+import appeng.client.render.model.ColorApplicatorModel;
+import appeng.client.render.model.DriveModel;
+import appeng.client.render.model.GlassModel;
 import appeng.client.render.model.MemoryCardModel;
 import appeng.client.render.model.SkyCompassModel;
+import appeng.client.render.model.UVLModelLoader;
+import appeng.client.render.spatial.SpatialPylonModel;
 import appeng.client.render.tesr.InscriberTESR;
 import appeng.client.render.tesr.SkyChestTESR;
 import appeng.container.AEBaseContainer;
@@ -195,11 +214,10 @@ import appeng.me.cache.PathGridCache;
 import appeng.me.cache.SecurityCache;
 import appeng.me.cache.SpatialPylonCache;
 import appeng.me.cache.TickManagerCache;
+import appeng.parts.automation.PlaneModelLoader;
 import appeng.recipes.game.DisassembleRecipe;
 import appeng.recipes.game.FacadeRecipe;
-import appeng.recipes.handlers.GrinderRecipe;
 import appeng.recipes.handlers.GrinderRecipeSerializer;
-import appeng.recipes.handlers.InscriberRecipe;
 import appeng.recipes.handlers.InscriberRecipeSerializer;
 import appeng.server.AECommand;
 import appeng.spatial.StorageCellBiome;
@@ -245,6 +263,11 @@ final class Registration {
     @OnlyIn(Dist.CLIENT)
     public void modelRegistryEvent(ModelRegistryEvent event) {
         registerSpecialModels();
+
+        // TODO: Do not use the internal API
+        final ApiDefinitions definitions = Api.INSTANCE.definitions();
+        definitions.getRegistry().getBootstrapComponents(IClientSetupComponent.class)
+                .forEachRemaining(IClientSetupComponent::setup);
     }
 
     /**

src/main/java/appeng/core/api/ApiCrafting.java

@@ -115,7 +115,12 @@ public class ApiCrafting implements ICraftingHelper {
         // We use the shared itemstack for an identity lookup.
         IAEItemStack ais = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(is);
 
-        return new CraftingPatternDetails(ais, world);
+        try {
+            return new CraftingPatternDetails(ais, world);
+        } catch (IllegalStateException e) {
+            AELog.warn("Could not decode an invalid pattern %s: %s", is, e);
+            return null;
+        }
     }
 
     private boolean attemptRecovery(EncodedPatternItem patternItem, ItemStack itemStack, World world) {

src/main/java/appeng/facade/FacadeContainer.java

@@ -37,15 +37,18 @@ public class FacadeContainer implements IFacadeContainer {
 
     private final int facades = 6;
     private final CableBusStorage storage;
+    private final Runnable changeCallback;
 
-    public FacadeContainer(final CableBusStorage cbs) {
+    public FacadeContainer(final CableBusStorage cbs, Runnable changeCallback) {
         this.storage = cbs;
+        this.changeCallback = changeCallback;
     }
 
     @Override
     public boolean addFacade(final IFacadePart a) {
         if (this.getFacade(a.getSide()) == null) {
             this.storage.setFacade(a.getSide().ordinal(), a);
+            this.notifyChange();
             return true;
         }
         return false;
@@ -56,6 +59,7 @@ public class FacadeContainer implements IFacadeContainer {
         if (side != null && side != AEPartLocation.INTERNAL) {
             if (this.storage.getFacade(side.ordinal()) != null) {
                 this.storage.setFacade(side.ordinal(), null);
+                this.notifyChange();
                 if (host != null) {
                     host.markForUpdate();
                 }
@@ -84,6 +88,7 @@ public class FacadeContainer implements IFacadeContainer {
         for (int x = 0; x < this.facades; x++) {
             this.storage.setFacade(x, newFacades[x]);
         }
+        this.notifyChange();
     }
 
     @Override
@@ -175,4 +180,9 @@ public class FacadeContainer implements IFacadeContainer {
         }
         return true;
     }
+
+    private void notifyChange() {
+        this.changeCallback.run();
+    }
+
 }

src/main/java/appeng/items/misc/EncodedPatternItem.java

@@ -309,14 +309,27 @@ public class EncodedPatternItem extends AEBaseItem {
         final ListNBT tagIn = new ListNBT();
         final ListNBT tagOut = new ListNBT();
 
+        boolean hasInput = false;
         for (final ItemStack i : in) {
             tagIn.add(createItemTag(i));
+            if (!i.isEmpty()) {
+                hasInput = true;
+            }
         }
 
+        Preconditions.checkArgument(hasInput, "cannot encode a pattern that has no inputs.");
+
+        boolean hasNonEmptyOutput = false;
         for (final ItemStack i : out) {
             tagOut.add(createItemTag(i));
+            if (!i.isEmpty()) {
+                hasNonEmptyOutput = true;
+            }
         }
 
+        // Patterns without any outputs are corrupt! Never encode such a pattern.
+        Preconditions.checkArgument(hasNonEmptyOutput, "cannot encode a pattern that has no output.");
+
         encodedValue.put(EncodedPatternItem.NBT_INGREDIENTS, tagIn);
         encodedValue.put(EncodedPatternItem.NBT_PRODUCTS, tagOut);
         return encodedValue;

src/main/java/appeng/me/cache/EnergyGridCache.java

@@ -502,7 +502,7 @@ public class EnergyGridCache implements IEnergyGrid {
     private void removeRequester(IAEPowerStorage requester) {
         Preconditions.checkState(!ongoingInjectOperation,
                 "Cannot modify energy requesters while energy is being injected.");
-        this.requesters.add(requester);
+        this.requesters.remove(requester);
     }
 
     private void addProvider(IAEPowerStorage provider) {

src/main/java/appeng/parts/CableBusContainer.java

@@ -125,7 +125,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
 
     @Override
     public IFacadeContainer getFacadeContainer() {
-        return new FacadeContainer(this);
+        return new FacadeContainer(this, this::invalidateShapes);
     }
 
     @Override

src/main/java/appeng/parts/automation/AnnihilationPlanePart.java

@@ -402,7 +402,7 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab
         ItemStack harvestTool = createHarvestTool(state);
 
         if (harvestTool == null) {
-            if (!state.getMaterial().isToolNotRequired()) {
+            if (state.getMaterial().isToolNotRequired()) {
                 harvestTool = ItemStack.EMPTY;
             } else {
                 // In case the block does NOT allow us to harvest it without a tool, or the

src/main/java/appeng/util/item/AEItemStack.java

@@ -125,7 +125,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
         buffer.writeBoolean(this.isCraftable());
         buffer.writeVarLong(this.getStackSize());
         buffer.writeVarLong(this.getCountRequestable());
-        buffer.writeItemStack(getDefinition());
+        buffer.writeItemStack(getDefinition(), false);
     }
 
     @Override

src/main/java/appeng/util/item/AESharedItemStack.java

@@ -29,6 +29,7 @@ import net.minecraft.nbt.CompoundNBT;
 import appeng.api.config.FuzzyMode;
 
 final class AESharedItemStack implements Comparable<AESharedItemStack> {
+
     private final ItemStack itemStack;
     private final int itemId;
     private final int itemDamage;
@@ -97,7 +98,8 @@ final class AESharedItemStack implements Comparable<AESharedItemStack> {
             return damageValue;
         }
 
-        return 0;
+        return System.identityHashCode(this.getDefinition().getTag())
+                - System.identityHashCode(b.getDefinition().getTag());
     }
 
     private int makeHashCode() {
@@ -183,4 +185,5 @@ final class AESharedItemStack implements Comparable<AESharedItemStack> {
         }
 
     }
+
 }

src/main/resources/data/appliedenergistics2/recipes/grinder/fluix_dust.json

@@ -1,7 +1,7 @@
 {
   "type": "appliedenergistics2:grinder",
   "input": {
-    "tag": "appliedenergistics2:crystals/fluix"
+    "item": "appliedenergistics2:fluix_crystal"
   },
   "result": {
     "primary": {