Bumped dependencies.

# Conflicts:
#	build.gradle

.github/workflows/branches.yml

@@ -21,7 +21,9 @@ jobs:
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-      - name: Build with Gradle
+      - name: Generate Resources
+        run: ./gradlew generateData
+      - name: Build
         run: ./gradlew build
       - uses: actions/upload-artifact@v2
         with:

.github/workflows/release.yml

@@ -23,10 +23,14 @@ jobs:
         run: chmod +x gradlew
       - name: Validate no assets
         run: test ! -d ./src/generated
+      - name: Generate resources
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew generateData
       - name: Build with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew generateData build
+        run: ./gradlew build
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -34,8 +38,19 @@ jobs:
           path: build/libs/
       - name: Publish to github packages
         env:
+          KEY_STORE_PASS: ${{ secrets.KEY_STORE_PASS }}
+          KEY_STORE_ALIAS: ${{ secrets.KEY_STORE_ALIAS }}
+          KEY_STORE_KEY_PASS: ${{ secrets.KEY_STORE_KEY_PASS }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew publish
+        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: Upload to curseforge
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -72,19 +72,41 @@ The API for Applied Energistics 2. It is open source to discuss changes, improve
 
 ### Maven
 
-We use Github Packages as maven repository now. You can use the following snippet as example on how to add a repository to your gradle build file.
+Our authoritative Maven repository is Github Packages, which you can also use in your builds. Use of Github Packages 
+[requires special setup](https://docs.github.com/en/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages#authenticating-to-github-packages) 
+to authenticate with your personal access token.
+
+AE2 is also available without authentication from Modmaven. 
+
+You can use the following snippet as example on how to add a repository to your gradle build file.
 
     repositories {
         maven {
-            name "AE2"
-            url "https://maven.pkg.github.com/AppliedEnergistics/Applied-Energistics-2"
+            name "Modmaven"
+            url "https://modmaven.k-4u.nl/"
+            // For Gradle 5.1 and above, limit it to just AE2
+            content {
+                includeGroup 'appeng'
+            }
+        }
+        
+        // Required for libblockattributes
+        maven {
+            name = "BuildCraft"
+            url = "https://mod-buildcraft.com/maven"
+            content {
+                includeGroup "alexiil.mc.lib"
+            }
         }
     }
 
 When compiling against the AE2 API you can use gradle dependencies, just add
 
     dependencies {
-        compileOnly "appeng:appliedenergistics2:VERSION:api"
+        modCompileOnly "appeng:appliedenergistics2-fabric:VERSION:api"
+        
+        // Include only if you want AE2 at runtime
+        modRuntimeOnly "appeng:appliedenergistics2-fabric:VERSION"    
     }
 
 or add the `compileOnly` line to your existing dependencies task to your build.gradle.

build.gradle

@@ -34,6 +34,9 @@ repositories {
     maven {
         name = "BuildCraft"
         url = "https://mod-buildcraft.com/maven"
+        content {
+            includeGroup "alexiil.mc.lib"
+        }
     }
     maven {
         name = "HYWLA"
@@ -42,10 +45,6 @@ repositories {
             includeGroup "mcp.mobius.waila"
         }
     }
-    maven {
-        name = 'Earthcomputer Mods'
-        url = 'https://dl.bintray.com/earthcomputer/mods'
-    }
 }
 
 sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
@@ -141,6 +140,10 @@ dependencies {
     include "alexiil.mc.lib:libblockattributes-items:${libblockattributes_version}"
     include "alexiil.mc.lib:libblockattributes-fluids:${libblockattributes_version}"
 
+    // Energy API
+    modApi "teamreborn:energy:${tr_energy_version}"
+    include "teamreborn:energy:${tr_energy_version}"
+
     modCompileOnly("me.shedaniel:RoughlyEnoughItems:5.0.2-unstable") {
         exclude group: "net.fabricmc.fabric-api"
     }
@@ -150,6 +153,9 @@ dependencies {
     modRuntime("me.shedaniel:RoughlyEnoughItems:5.0.2-unstable") {
         exclude group: "net.fabricmc.fabric-api"
     }
+    modRuntime("TechReborn:TechReborn-1.16:3.5.1+build.101") {
+        exclude group: "net.fabricmc.fabric-api"
+    }
 //    modRuntimeOnly "mcp.mobius.waila:Hwyla:1.16.1-1.9.22-75"
 
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
@@ -174,11 +180,14 @@ processResources {
 apply from: 'gradle/scripts/artifacts.gradle'
 apply from: 'gradle/scripts/curseforge.gradle'
 
-if (!version.endsWith("-SNAPSHOT")) {
-    publishing {
+// configure the maven publication
+publishing {
+    if (!version.endsWith("-SNAPSHOT")) {
         publications {
-            mavenJava(MavenPublication) {
+            maven(MavenPublication) {
+                groupId = project.group
                 artifactId = 'appliedenergistics2-fabric'
+                version = project.version
 
                 // add all the jars that should be included when publishing to maven
                 artifact(remapJar) {
@@ -187,14 +196,11 @@ if (!version.endsWith("-SNAPSHOT")) {
                 artifact(sourcesJar) {
                     builtBy remapSourcesJar
                 }
+                artifact javadocJar
+                artifact apiJar
             }
         }
     }
-}
-
-// configure the maven publication
-publishing {
-    // select the repositories you want to publish to
     repositories {
         maven {
             credentials {
@@ -204,6 +210,14 @@ 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/"
+        }
     }
 
 }

gradle.properties

@@ -11,27 +11,22 @@ org.gradle.jvmargs=-Xmx2G
 
 minecraft_version=1.16.2
 yarn_mappings=1.16.2+build.6
-loader_version=0.9.1+build.205
+loader_version=0.9.2+build.206
 
 #Fabric api
 fabric_version=0.17.2+build.396-1.16
 
 loom_version=0.4-SNAPSHOT
 
-# Mod Properties
-mod_version = 1.0.0
-maven_group = net.fabricmc
-archives_base_name = fabric-example-mod
-
 # Kotlin
 kotlin_version=1.3.61
 fabric_kotlin_version=1.3.61+build.1
 
-libblockattributes_version=0.7.1-pre.9
+# Dependencies
+libblockattributes_version=0.8.0
+tr_energy_version=0.1.0
 
 #########################################################
 # Deployment                                            #
 #########################################################
-website_version=1.16.1
-curse_versions=1.16.1
 curseforge_project=223794

gradle/scripts/dependencies.gradle

@@ -33,8 +33,8 @@ dependencies {
     compileOnly "mcjty.theoneprobe:TheOneProbe-${minecraft_release}:${minecraft_release}-${top_version}:api"
 
     // Runtime, Mods
-// FIXME 1.16.2    runtimeOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}:${jei_version}")
-// FIXME 1.16.2    runtimeOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-${minecraft_release}:${minecraft_release}-${top_version}")
+    runtimeOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}:${jei_version}")
+    runtimeOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-${minecraft_release}:${minecraft_release}-${top_version}")
     //runtimeOnly fg.deobf("team.chisel.ctm:CTM:${ctm_version}")
 
     // unit test dependencies

src/api/java/appeng/api/config/PowerUnits.java

@@ -27,21 +27,27 @@ import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 
 public enum PowerUnits {
-    AE("gui.appliedenergistics2.units.appliedenergstics"), // Native Units - AE Energy
-    EU("gui.appliedenergistics2.units.ic2"), // IndustrialCraft 2 - Energy Units
-    RF("gui.appliedenergistics2.units.rf"); // RF - Redstone Flux
+    AE("gui.appliedenergistics2.units.appliedenergstics", "AE"), // Native Units - AE Energy
+    EU("gui.appliedenergistics2.units.ic2", "EU"), // IndustrialCraft 2 - Energy Units
+    TR("gui.appliedenergistics2.units.tr", "E"); // TR - TechReborn energy
 
     /**
      * unlocalized name for the power unit.
      */
     public final String unlocalizedName;
+
+    /**
+     * unlocalized name for the power unit's symbol used to display values.
+     */
+    public final String symbolName;
     /**
      * please do not edit this value, it is set when AE loads its config files.
      */
     public double conversionRatio = 1.0;
 
-    PowerUnits(final String un) {
+    PowerUnits(final String un, String symbolName) {
         this.unlocalizedName = un;
+        this.symbolName = symbolName;
     }
 
     /**
@@ -64,4 +70,8 @@ public enum PowerUnits {
         return new TranslatableText(unlocalizedName);
     }
 
+    public String getSymbolName() {
+        return symbolName;
+    }
+
 }

src/api/java/appeng/api/config/Settings.java

@@ -36,7 +36,7 @@ public enum Settings {
 
     CONDENSER_OUTPUT(EnumSet.allOf(CondenserOutput.class)),
 
-    POWER_UNITS(EnumSet.allOf(PowerUnits.class)),
+    POWER_UNITS(EnumSet.of(PowerUnits.AE, PowerUnits.TR)),
 
     ACCESS(EnumSet.of(AccessRestriction.READ_WRITE, AccessRestriction.READ, AccessRestriction.WRITE)),
 

src/api/java/appeng/api/config/TunnelType.java

@@ -25,12 +25,8 @@ package appeng.api.config;
 
 public enum TunnelType {
     ME, // Network Tunnel
-    IC2_POWER, // EU Tunnel
-    FE_POWER, // Forge Energy tunnel
     REDSTONE, // Redstone Tunnel
     FLUID, // Fluid Tunnel
     ITEM, // Item Tunnel
     LIGHT, // Light Tunnel
-    BUNDLED_REDSTONE, // Bundled Redstone Tunnel
-    COMPUTER_MESSAGE // Computer Message Tunnel
 }

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, CraftingRecipe recipe, ItemStack[] in, ItemStack out,
             boolean allowSubstitutes);

src/api/java/appeng/api/definitions/IParts.java

@@ -71,10 +71,6 @@ public interface IParts {
 
     IItemDefinition p2PTunnelFluids();
 
-    IItemDefinition p2PTunnelEU();
-
-    IItemDefinition p2PTunnelFE();
-
     IItemDefinition p2PTunnelLight();
 
     IItemDefinition cableAnchor();

src/datagen/java/appeng/data/Entrypoint.java

@@ -4,6 +4,9 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collections;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
 import net.minecraft.Bootstrap;
 import net.minecraft.data.DataGenerator;
@@ -11,16 +14,22 @@ import net.minecraft.data.DataGenerator;
 import appeng.data.providers.loot.BlockDropProvider;
 import appeng.data.providers.recipes.SlabStairRecipes;
 import appeng.data.providers.tags.ConventionTagProvider;
+import appeng.data.providers.tags.ToolTagProviders;
 
 public class Entrypoint implements PreLaunchEntrypoint {
 
+    private static final Logger LOGGER = LogManager.getLogger();
+
     public static void dump() throws Exception {
         Path output = Paths.get("../src/generated/resources");
 
+        LOGGER.info("Writing generated resources to {}", output.toAbsolutePath());
+
         DataGenerator generator = new DataGenerator(output, Collections.emptyList());
         generator.install(new BlockDropProvider(output));
         generator.install(new SlabStairRecipes(output));
         generator.install(new ConventionTagProvider(output));
+        generator.install(new ToolTagProviders(output));
         generator.run();
     }
 

src/datagen/java/appeng/data/providers/tags/ConventionTagProvider.java

@@ -11,7 +11,7 @@ import appeng.core.AppEng;
 public class ConventionTagProvider extends TagProvider {
 
     public ConventionTagProvider(Path outputPath) {
-        super(outputPath);
+        super("c", outputPath);
     }
 
     @Override
@@ -34,6 +34,9 @@ public class ConventionTagProvider extends TagProvider {
         addItemTag("red_dyes", Items.RED_DYE);
         addItemTag("black_dyes", Items.BLACK_DYE);
 
+        addItemTag("certus_quartz_crystals", MATERIALS.certusQuartzCrystal(), MATERIALS.certusQuartzCrystalCharged());
+        addItemTag("certus_quartz_ores", BLOCKS.quartzOre(), BLOCKS.quartzOreCharged());
+
         addItemTag("iron_ingots", Items.IRON_INGOT);
         addItemTag("iron_ores", Items.IRON_ORE);
         addItemTag("gold_ingots", Items.GOLD_INGOT);
@@ -49,6 +52,7 @@ public class ConventionTagProvider extends TagProvider {
         addItemTag("wheat_crops", Items.WHEAT);
         addItemTag("redstone_dusts", Items.REDSTONE);
         addItemTag("ender_pearls", Items.ENDER_PEARL);
+        addItemTag("ender_pearl_dusts", MATERIALS.enderDust());
         addItemTag("terracotta_blocks", Items.TERRACOTTA, Items.WHITE_TERRACOTTA, Items.ORANGE_TERRACOTTA,
                 Items.MAGENTA_TERRACOTTA, Items.LIGHT_BLUE_TERRACOTTA, Items.YELLOW_TERRACOTTA, Items.LIME_TERRACOTTA,
                 Items.PINK_TERRACOTTA, Items.GRAY_TERRACOTTA, Items.LIGHT_GRAY_TERRACOTTA, Items.CYAN_TERRACOTTA,

src/datagen/java/appeng/data/providers/tags/TagProvider.java

@@ -24,15 +24,17 @@ import appeng.data.providers.IAE2DataProvider;
 public abstract class TagProvider implements IAE2DataProvider {
 
     private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
-    protected static final String CONVENTION_NAMESPACE = "c";
     protected static final String TYPE_ITEMS = "items";
     protected static final String TYPE_BLOCKS = "blocks";
 
+    private final String defaultNamespace;
+
     private final Path outputPath;
 
     private DataCache cache;
 
-    protected TagProvider(Path outputPath) {
+    protected TagProvider(String defaultNamespace, Path outputPath) {
+        this.defaultNamespace = defaultNamespace;
         this.outputPath = outputPath;
     }
 
@@ -49,15 +51,19 @@ public abstract class TagProvider implements IAE2DataProvider {
     protected abstract void generate() throws IOException;
 
     protected void addItemTag(String name, ItemConvertible... items) throws IOException {
+        Identifier id = parseId(name);
+
         List<String> itemIds = Arrays.stream(items).map(ItemConvertible::asItem).map(Registry.ITEM::getId)
                 .map(Identifier::toString).collect(Collectors.toList());
-        writeTagFile(CONVENTION_NAMESPACE, TYPE_ITEMS, name, itemIds);
+        writeTagFile(id.getNamespace(), TYPE_ITEMS, id.getPath(), itemIds);
     }
 
     protected void addBlockTag(String name, Block... blocks) throws IOException {
+        Identifier id = parseId(name);
+
         List<String> itemIds = Arrays.stream(blocks).map(Registry.BLOCK::getId).map(Identifier::toString)
                 .collect(Collectors.toList());
-        writeTagFile(CONVENTION_NAMESPACE, TYPE_BLOCKS, name, itemIds);
+        writeTagFile(id.getNamespace(), TYPE_BLOCKS, id.getPath(), itemIds);
     }
 
     protected void writeTagFile(String namespace, String tagType, String tagName, List<String> entries)
@@ -75,7 +81,15 @@ public abstract class TagProvider implements IAE2DataProvider {
 
     @Override
     public String getName() {
-        return AppEng.MOD_NAME + " Convention Tags";
+        return AppEng.MOD_NAME + " Tags (" + defaultNamespace + ")";
+    }
+
+    private Identifier parseId(String name) {
+        if (name.contains(":")) {
+            return new Identifier(name);
+        } else {
+            return new Identifier(defaultNamespace, name);
+        }
     }
 
 }

src/datagen/java/appeng/data/providers/tags/ToolTagProviders.java

@@ -0,0 +1,28 @@
+package appeng.data.providers.tags;
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+import appeng.core.AppEng;
+
+public class ToolTagProviders extends TagProvider {
+
+    public ToolTagProviders(Path outputPath) {
+        super("fabric", outputPath);
+    }
+
+    @Override
+    protected void generate() throws IOException {
+        addItemTag("axes", ITEMS.netherQuartzAxe(), ITEMS.certusQuartzAxe());
+        addItemTag("hoes", ITEMS.netherQuartzHoe(), ITEMS.certusQuartzHoe());
+        addItemTag("pickaxes", ITEMS.netherQuartzPick(), ITEMS.certusQuartzPick());
+        addItemTag("shovels", ITEMS.netherQuartzShovel(), ITEMS.certusQuartzShovel());
+        addItemTag("swords", ITEMS.netherQuartzSword(), ITEMS.certusQuartzSword());
+    }
+
+    @Override
+    public String getName() {
+        return AppEng.MOD_NAME + " Tool Tags";
+    }
+
+}

src/main/java/appeng/attributes/MEAttributes.java

@@ -48,7 +48,7 @@ public final class MEAttributes {
             return null;
         }
 
-        return attribute.getFirstOrNull(world, be.getPos().offset(side), SearchOptions.inDirection(side.getOpposite()));
+        return attribute.getFirstOrNull(world, be.getPos(), SearchOptions.inDirection(side.getOpposite()));
     }
 
     // Convenience function to get an attribute of the block that is in front of a

src/main/java/appeng/block/AEBaseTileBlock.java

@@ -232,7 +232,7 @@ public abstract class AEBaseTileBlock<T extends AEBaseBlockEntity> extends AEBas
                     Platform.spawnDrops(world, pos, itemsToDrop);
                 }
 
-                return ActionResult.FAIL;
+                return ActionResult.SUCCESS;
             }
 
             if (heldItem.getItem() instanceof IMemoryCard && !(this instanceof CableBusBlock)) {

src/main/java/appeng/block/grindstone/CrankBlock.java

@@ -161,4 +161,9 @@ public class CrankBlock extends AEBaseTileBlock<CrankBlockEntity> {
         }
 
     }
+
+    @Override
+    protected boolean hasCustomRotation() {
+        return true;
+    }
 }

src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java

@@ -76,10 +76,10 @@ class PaintSplotchesBakedModel implements BakedModel, FabricBakedModel {
 
             if (s.isLumen()) {
                 builder.setColorRGB(s.getColor().whiteVariant);
-                builder.setRenderFullBright(true);
+                builder.setEmissiveMaterial(true);
             } else {
                 builder.setColorRGB(s.getColor().mediumVariant);
-                builder.setRenderFullBright(false);
+                builder.setEmissiveMaterial(false);
             }
 
             float offset = offsetConstant;

src/main/java/appeng/block/qnb/QnbFormedBakedModel.java

@@ -144,7 +144,7 @@ class QnbFormedBakedModel implements BakedModel, FabricBakedModel {
 
                 if (formedState.isPowered()) {
                     builder.setTexture(this.lightCornerTexture);
-                    builder.setRenderFullBright(true);
+                    builder.setEmissiveMaterial(true);
                     for (Direction facing : Direction.values()) {
                         // Offset the face by a slight amount so that it is drawn over the already drawn
                         // ring texture
@@ -158,6 +158,7 @@ class QnbFormedBakedModel implements BakedModel, FabricBakedModel {
                                 DEFAULT_RENDER_MIN - zOffset, DEFAULT_RENDER_MAX + xOffset,
                                 DEFAULT_RENDER_MAX + yOffset, DEFAULT_RENDER_MAX + zOffset);
                     }
+                    builder.setEmissiveMaterial(false);
                 }
             } else {
                 builder.setTexture(this.ringTexture);
@@ -170,7 +171,7 @@ class QnbFormedBakedModel implements BakedModel, FabricBakedModel {
 
                 if (formedState.isPowered()) {
                     builder.setTexture(this.lightTexture);
-                    builder.setRenderFullBright(true);
+                    builder.setEmissiveMaterial(true);
                     for (Direction facing : Direction.values()) {
                         // Offset the face by a slight amount so that it is drawn over the already drawn
                         // ring texture

src/main/java/appeng/bootstrap/BlockEntityBuilder.java

@@ -11,7 +11,6 @@ import com.google.common.base.Preconditions;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.client.rendereregistry.v1.BlockEntityRendererRegistry;
 import net.minecraft.block.Block;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.util.Identifier;
@@ -19,6 +18,7 @@ import net.minecraft.util.registry.Registry;
 
 import appeng.api.features.AEFeature;
 import appeng.block.AEBaseTileBlock;
+import appeng.bootstrap.components.BlockEntityRendererComponent;
 import appeng.bootstrap.components.ITileEntityRegistrationComponent;
 import appeng.bootstrap.definitions.TileEntityDefinition;
 import appeng.core.AppEng;
@@ -115,7 +115,8 @@ public class BlockEntityBuilder<T extends AEBaseBlockEntity> {
     @Environment(EnvType.CLIENT)
     private void buildClient() {
         if (tileEntityRendering.tileEntityRenderer != null) {
-            BlockEntityRendererRegistry.INSTANCE.register(type, tileEntityRendering.tileEntityRenderer);
+            factory.addBootstrapComponent(
+                    new BlockEntityRendererComponent<>(type, tileEntityRendering.tileEntityRenderer));
         }
     }
 

src/main/java/appeng/bootstrap/components/BlockEntityRendererComponent.java

@@ -0,0 +1,33 @@
+package appeng.bootstrap.components;
+
+import java.util.function.Function;
+
+import net.fabricmc.fabric.api.client.rendereregistry.v1.BlockEntityRendererRegistry;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.block.entity.BlockEntityType;
+import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
+import net.minecraft.client.render.block.entity.BlockEntityRenderer;
+
+/**
+ * Registers a block entity renderer for a given block entity type. This must
+ * occur late in the client's initialization, since the constructors of our
+ * block entity renderers rely on the client being fully initialized.
+ */
+public class BlockEntityRendererComponent<T extends BlockEntity> implements IClientSetupComponent {
+
+    private final BlockEntityType<T> type;
+
+    private final Function<BlockEntityRenderDispatcher, BlockEntityRenderer<T>> renderer;
+
+    public BlockEntityRendererComponent(BlockEntityType<T> type,
+            Function<BlockEntityRenderDispatcher, BlockEntityRenderer<T>> renderer) {
+        this.type = type;
+        this.renderer = renderer;
+    }
+
+    @Override
+    public void setup() {
+        BlockEntityRendererRegistry.INSTANCE.register(type, renderer);
+    }
+
+}

src/main/java/appeng/client/AppEngClient.java

@@ -13,6 +13,7 @@ import javax.annotation.Nonnull;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry;
 import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
@@ -184,7 +185,9 @@ public final class AppEngClient extends AppEngBase {
 
         ModelsReloadCallback.EVENT.register(this::onModelsReloaded);
 
-        callDeferredBootstrapComponents(IClientSetupComponent.class, IClientSetupComponent::setup);
+        ClientLifecycleEvents.CLIENT_STARTED.register(client -> {
+            callDeferredBootstrapComponents(IClientSetupComponent.class, IClientSetupComponent::setup);
+        });
         registerModelProviders();
         registerParticleRenderers();
         registerEntityRenderers();

src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java

@@ -227,7 +227,7 @@ public class CraftConfirmScreen extends AEBaseScreen<CraftConfirmContainer> {
                         str = Long.toString(stored.getStackSize() / 1000000) + 'm';
                     }
 
-                    str = GuiText.FromStorage.text() + ": " + str;
+                    str = GuiText.FromStorage.getLocal() + ": " + str;
                     final int w = 4 + this.textRenderer.getWidth(str);
                     this.textRenderer.draw(matrices, str,
                             (int) ((x * (1 + sectionLength) + xo + sectionLength - 19 - (w * 0.5)) * 2),
@@ -250,7 +250,7 @@ public class CraftConfirmScreen extends AEBaseScreen<CraftConfirmContainer> {
                         str = Long.toString(missingStack.getStackSize() / 1000000) + 'm';
                     }
 
-                    str = GuiText.Missing.text() + ": " + str;
+                    str = GuiText.Missing.getLocal() + ": " + str;
                     final int w = 4 + this.textRenderer.getWidth(str);
                     this.textRenderer.draw(matrices, str,
                             (int) ((x * (1 + sectionLength) + xo + sectionLength - 19 - (w * 0.5)) * 2),
@@ -273,7 +273,7 @@ public class CraftConfirmScreen extends AEBaseScreen<CraftConfirmContainer> {
                         str = Long.toString(pendingStack.getStackSize() / 1000000) + 'm';
                     }
 
-                    str = GuiText.ToCraft.text() + ": " + str;
+                    str = GuiText.ToCraft.getLocal() + ": " + str;
                     final int w = 4 + this.textRenderer.getWidth(str);
                     this.textRenderer.draw(matrices, str,
                             (int) ((x * (1 + sectionLength) + xo + sectionLength - 19 - (w * 0.5)) * 2),

src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java

@@ -224,7 +224,7 @@ public class CraftingCPUScreen<T extends CraftingCPUContainer> extends AEBaseScr
                 int downY = 0;
 
                 if (stored != null && stored.getStackSize() > 0) {
-                    final String str = GuiText.Stored.text() + ": "
+                    final String str = GuiText.Stored.getLocal() + ": "
                             + converter.toWideReadableForm(stored.getStackSize());
                     final int w = 4 + this.textRenderer.getWidth(str);
                     this.textRenderer.draw(matrices, str,
@@ -240,7 +240,7 @@ public class CraftingCPUScreen<T extends CraftingCPUContainer> extends AEBaseScr
                 }
 
                 if (activeStack != null && activeStack.getStackSize() > 0) {
-                    final String str = GuiText.Crafting.text() + ": "
+                    final String str = GuiText.Crafting.getLocal() + ": "
                             + converter.toWideReadableForm(activeStack.getStackSize());
                     final int w = 4 + this.textRenderer.getWidth(str);
 
@@ -257,7 +257,7 @@ public class CraftingCPUScreen<T extends CraftingCPUContainer> extends AEBaseScr
                 }
 
                 if (pendingStack != null && pendingStack.getStackSize() > 0) {
-                    final String str = GuiText.Scheduled.text() + ": "
+                    final String str = GuiText.Scheduled.getLocal() + ": "
                             + converter.toWideReadableForm(pendingStack.getStackSize());
                     final int w = 4 + this.textRenderer.getWidth(str);
 

src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java

@@ -89,7 +89,9 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta
         this.searchField.setMaxLength(25);
         this.searchField.setEditableColor(0xFFFFFF);
         this.searchField.setVisible(true);
-        this.searchField.setFocused(true);
+        this.searchField.setChangedListener(str -> this.refreshList());
+        this.addChild(this.searchField);
+        this.changeFocus(true);
     }
 
     @Override
@@ -128,11 +130,8 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta
 
     @Override
     public boolean mouseClicked(final double xCoord, final double yCoord, final int btn) {
-        if (this.searchField.mouseClicked(xCoord, yCoord, btn)) {
-            if (btn == 1 && this.searchField.isMouseOver(xCoord, yCoord)) {
-                this.searchField.setText("");
-                this.refreshList();
-            }
+        if (btn == 1 && this.searchField.isMouseOver(xCoord, yCoord)) {
+            this.searchField.setText("");
             return true;
         }
 
@@ -170,11 +169,7 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta
         if (character == ' ' && this.searchField.getText().isEmpty()) {
             return true;
         }
-        if (this.searchField.charTyped(character, key)) {
-            this.refreshList();
-            return true;
-        }
-        return false;
+        return super.charTyped(character, key);
     }
 
     @Override

src/main/java/appeng/client/gui/widgets/SettingToggleButton.java

@@ -103,8 +103,8 @@ public class SettingToggleButton<T extends Enum<T>> extends IconButton {
                     PowerUnits.AE.textComponent());
             registerApp(16 * 10 + 1, Settings.POWER_UNITS, PowerUnits.EU, ButtonToolTips.PowerUnits,
                     PowerUnits.EU.textComponent());
-            registerApp(16 * 10 + 4, Settings.POWER_UNITS, PowerUnits.RF, ButtonToolTips.PowerUnits,
-                    PowerUnits.RF.textComponent());
+            registerApp(16 * 10 + 4, Settings.POWER_UNITS, PowerUnits.TR, ButtonToolTips.PowerUnits,
+                    PowerUnits.TR.textComponent());
 
             registerApp(3, Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE, ButtonToolTips.RedstoneMode,
                     ButtonToolTips.AlwaysActive);

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

@@ -346,7 +346,7 @@ class CableBuilder {
             this.addBigCoveredCableSizedCube(facing, cubeBuilder);
 
             // Render the channel indicators brightly lit at night
-            cubeBuilder.setRenderFullBright(true);
+            cubeBuilder.setEmissiveMaterial(true);
 
             cubeBuilder.setTexture(oddChannel);
             cubeBuilder.setColorRGB(cableColor.blackVariant);
@@ -357,14 +357,14 @@ class CableBuilder {
             this.addBigCoveredCableSizedCube(facing, cubeBuilder);
 
             // Reset back to normal rendering for the rest
-            cubeBuilder.setRenderFullBright(false);
+            cubeBuilder.setEmissiveMaterial(false);
             cubeBuilder.setTexture(texture);
         }
 
         addCoveredCableSizedCube(facing, cubeBuilder);
 
         // Render the channel indicators brightly lit at night
-        cubeBuilder.setRenderFullBright(true);
+        cubeBuilder.setEmissiveMaterial(true);
 
         cubeBuilder.setTexture(oddChannel);
         cubeBuilder.setColorRGB(cableColor.blackVariant);
@@ -373,6 +373,9 @@ class CableBuilder {
         cubeBuilder.setTexture(evenChannel);
         cubeBuilder.setColorRGB(cableColor.whiteVariant);
         addCoveredCableSizedCube(facing, cubeBuilder);
+
+        // Reset back to default
+        cubeBuilder.setEmissiveMaterial(false);
     }
 
     public void addStraightSmartConnection(Direction facing, AEColor cableColor, int channels, QuadEmitter emitter) {
@@ -389,7 +392,7 @@ class CableBuilder {
         Sprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);
 
         // Render the channel indicators brightly lit at night
-        cubeBuilder.setRenderFullBright(true);
+        cubeBuilder.setEmissiveMaterial(true);
 
         cubeBuilder.setTexture(oddChannel);
         cubeBuilder.setColorRGB(cableColor.blackVariant);
@@ -398,6 +401,9 @@ class CableBuilder {
         cubeBuilder.setTexture(evenChannel);
         cubeBuilder.setColorRGB(cableColor.whiteVariant);
         addStraightCoveredCableSizedCube(facing, cubeBuilder);
+
+        // Reset back to default
+        cubeBuilder.setEmissiveMaterial(false);
     }
 
     public void addConstrainedSmartConnection(Direction facing, AEColor cableColor, int distanceFromEdge, int channels,
@@ -420,7 +426,7 @@ class CableBuilder {
         Sprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);
 
         // Render the channel indicators brightly lit at night
-        cubeBuilder.setRenderFullBright(true);
+        cubeBuilder.setEmissiveMaterial(true);
 
         cubeBuilder.setTexture(oddChannel);
         cubeBuilder.setColorRGB(cableColor.blackVariant);
@@ -429,6 +435,9 @@ class CableBuilder {
         cubeBuilder.setTexture(evenChannel);
         cubeBuilder.setColorRGB(cableColor.whiteVariant);
         addCoveredCableSizedCube(facing, distanceFromEdge, cubeBuilder);
+
+        // Reset back to default
+        cubeBuilder.setEmissiveMaterial(false);
     }
 
     public void addDenseCoveredConnection(Direction facing, AEColor cableColor, AECableType connectionType,
@@ -452,7 +461,7 @@ class CableBuilder {
         addDenseCableSizedCube(facing, cubeBuilder);
 
         // Reset back to normal rendering for the rest
-        cubeBuilder.setRenderFullBright(false);
+        cubeBuilder.setEmissiveMaterial(false);
         cubeBuilder.setTexture(texture);
     }
 
@@ -488,7 +497,7 @@ class CableBuilder {
         Sprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);
 
         // Render the channel indicators brightly lit at night
-        cubeBuilder.setRenderFullBright(true);
+        cubeBuilder.setEmissiveMaterial(true);
 
         cubeBuilder.setTexture(oddChannel);
         cubeBuilder.setColorRGB(cableColor.blackVariant);
@@ -499,7 +508,7 @@ class CableBuilder {
         addDenseCableSizedCube(facing, cubeBuilder);
 
         // Reset back to normal rendering for the rest
-        cubeBuilder.setRenderFullBright(false);
+        cubeBuilder.setEmissiveMaterial(false);
         cubeBuilder.setTexture(texture);
     }
 
@@ -532,7 +541,7 @@ class CableBuilder {
         Sprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);
 
         // Render the channel indicators brightly lit at night
-        cubeBuilder.setRenderFullBright(true);
+        cubeBuilder.setEmissiveMaterial(true);
 
         cubeBuilder.setTexture(oddChannel);
         cubeBuilder.setColorRGB(cableColor.blackVariant);
@@ -541,6 +550,9 @@ class CableBuilder {
         cubeBuilder.setTexture(evenChannel);
         cubeBuilder.setColorRGB(cableColor.whiteVariant);
         addStraightDenseCableSizedCube(facing, cubeBuilder);
+
+        // Reset back to default
+        cubeBuilder.setEmissiveMaterial(false);
     }
 
     private static void addDenseCableSizedCube(Direction facing, CubeBuilder cubeBuilder) {

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

@@ -49,7 +49,7 @@ public class CubeBuilder {
 
     private boolean useStandardUV = false;
 
-    private boolean renderFullBright;
+    private boolean emissiveMaterial;
 
     private final QuadEmitter emitter;
 
@@ -144,7 +144,7 @@ public class CubeBuilder {
                 break;
         }
 
-        if (renderFullBright) {
+        if (emissiveMaterial) {
             // Force Brightness to 15, this is for full bright mode
             // this vertex element will only be present in that case
             int lightmap = LightmapTextureManager.pack(15, 15);
@@ -409,8 +409,8 @@ public class CubeBuilder {
         this.setColorRGB((int) (r * 255) << 16 | (int) (g * 255) << 8 | (int) (b * 255));
     }
 
-    public void setRenderFullBright(boolean renderFullBright) {
-        this.renderFullBright = renderFullBright;
+    public void setEmissiveMaterial(boolean renderFullBright) {
+        this.emissiveMaterial = renderFullBright;
     }
 
     public void setCustomUv(Direction facing, float u1, float v1, float u2, float v2) {

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

@@ -68,7 +68,7 @@ public class P2PTunnelFrequencyBakedModel implements IDynamicPartBakedModel {
 
         cb.setTexture(this.texture);
         cb.useStandardUV();
-        cb.setRenderFullBright(active);
+        cb.setEmissiveMaterial(active);
 
         for (int i = 0; i < 4; ++i) {
             final int[] offs = QUAD_OFFSETS[i];
@@ -89,6 +89,9 @@ public class P2PTunnelFrequencyBakedModel implements IDynamicPartBakedModel {
 
         }
 
+        // Reset back to default
+        cb.setEmissiveMaterial(false);
+
         return meshBuilder.build();
     }
 

src/main/java/appeng/client/render/crafting/LightBakedModel.java

@@ -50,8 +50,10 @@ class LightBakedModel extends CraftingCubeBakedModel {
         builder.addCube(x1, y1, z1, x2, y2, z2);
 
         boolean powered = state.get(AbstractCraftingUnitBlock.POWERED);
-        builder.setRenderFullBright(powered);
+        builder.setEmissiveMaterial(powered);
         builder.setTexture(this.lightTexture);
         builder.addCube(x1, y1, z1, x2, y2, z2);
+        // Reset back to default
+        builder.setEmissiveMaterial(false);
     }
 }

src/main/java/appeng/client/render/crafting/MonitorBakedModel.java

@@ -76,7 +76,7 @@ public class MonitorBakedModel extends CraftingCubeBakedModel {
         AEColor color = getColor(modelData);
         boolean powered = state.get(CraftingMonitorBlock.POWERED);
 
-        builder.setRenderFullBright(powered);
+        builder.setEmissiveMaterial(powered);
 
         builder.setColorRGB(color.whiteVariant);
         builder.setTexture(this.lightBrightTexture);
@@ -90,6 +90,8 @@ public class MonitorBakedModel extends CraftingCubeBakedModel {
         builder.setTexture(this.lightDarkTexture);
         builder.addCube(x1, y1, z1, x2, y2, z2);
 
+        // Reset back to default
+        builder.setEmissiveMaterial(false);
     }
 
     private static AEColor getColor(CraftingCubeModelData modelData) {

src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java

@@ -127,7 +127,7 @@ class SpatialPylonBakedModel implements BakedModel, FabricBakedModel {
 
             if ((flags
                     & SpatialPylonBlockEntity.DISPLAY_POWERED_ENABLED) == SpatialPylonBlockEntity.DISPLAY_POWERED_ENABLED) {
-                builder.setRenderFullBright(true);
+                builder.setEmissiveMaterial(true);
             }
 
             builder.setTextures(this.textures.get(getTextureTypeFromSideInside(flags, ori, Direction.UP)),
@@ -144,6 +144,9 @@ class SpatialPylonBakedModel implements BakedModel, FabricBakedModel {
             builder.setTexture(this.textures.get(SpatialPylonTextureType.DIM));
             builder.addCube(0, 0, 0, 16, 16, 16);
         }
+
+        // Reset back to default
+        builder.setEmissiveMaterial(false);
     }
 
     @Override

src/main/java/appeng/client/render/tesr/InscriberTESR.java

@@ -1,5 +1,7 @@
 package appeng.client.render.tesr;
 
+import java.util.Random;
+
 import com.google.common.collect.ImmutableList;
 
 import net.minecraft.client.MinecraftClient;
@@ -9,12 +11,12 @@ import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
 import net.minecraft.client.render.block.entity.BlockEntityRenderer;
 import net.minecraft.client.render.item.ItemRenderer;
+import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.json.ModelTransformation;
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.SpriteIdentifier;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Direction;
@@ -197,9 +199,12 @@ public final class InscriberTESR extends BlockEntityRenderer<InscriberBlockEntit
 
             ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer();
 
-            // heuristic to scale items down much further than blocks
-            boolean renderAsCube = (stack.getItem() instanceof BlockItem);
-            if (!renderAsCube) {
+            // heuristic to scale items down much further than blocks,
+            // the assumption here is that the generated item models will return their faces
+            // for direction=null, while a block-model will have their faces for
+            // cull-faces, but not direction=null
+            BakedModel model = itemRenderer.getModels().getModel(stack);
+            if (!model.getQuads(null, null, new Random()).isEmpty()) {
                 ms.scale(0.5f, 0.5f, 0.5f);
             }
 

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

@@ -33,6 +33,8 @@ import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
 
 import alexiil.mc.lib.attributes.item.FixedItemInv;
+import alexiil.mc.lib.attributes.item.LimitedFixedItemInv;
+import alexiil.mc.lib.attributes.item.SingleItemSlot;
 
 import appeng.api.config.SecurityPermissions;
 import appeng.api.config.Settings;
@@ -57,8 +59,6 @@ import appeng.util.Platform;
 import appeng.util.helpers.ItemHandlerUtil;
 import appeng.util.inv.AdaptorFixedInv;
 import appeng.util.inv.WrapperCursorItemHandler;
-import appeng.util.inv.WrapperFilteredItemHandler;
-import appeng.util.inv.filter.IAEItemFilter;
 
 public final class InterfaceTerminalContainer extends AEBaseContainer {
 
@@ -196,35 +196,37 @@ public final class InterfaceTerminalContainer extends AEBaseContainer {
 
             final InventoryAdaptor playerHand = new AdaptorFixedInv(new WrapperCursorItemHandler(player.inventory));
 
-            final FixedItemInv theSlot = new WrapperFilteredItemHandler(inv.server.getSubInv(slot, slot + 1),
-                    new PatternSlotFilter());
-            final InventoryAdaptor interfaceSlot = new AdaptorFixedInv(theSlot);
+            // Create a wrapper around the targetted slot that will only allow insertions of
+            // patterns
+            LimitedFixedItemInv limitedSlotInv = inv.server.createLimitedFixedInv();
+            limitedSlotInv.getAllRule().filterInserts(this::isValidPattern);
+            SingleItemSlot theSlot = limitedSlotInv.getSlot(slot);
 
             switch (action) {
                 case PICKUP_OR_SET_DOWN:
 
                     if (hasItemInHand) {
-                        ItemStack inSlot = theSlot.getInvStack(0);
+                        ItemStack inSlot = theSlot.get();
                         if (inSlot.isEmpty()) {
-                            player.inventory.setCursorStack(interfaceSlot.addItems(player.inventory.getCursorStack()));
+                            player.inventory.setCursorStack(theSlot.insert(player.inventory.getCursorStack()));
                         } else {
                             inSlot = inSlot.copy();
                             final ItemStack inHand = player.inventory.getCursorStack().copy();
 
-                            ItemHandlerUtil.setStackInSlot(theSlot, 0, ItemStack.EMPTY);
+                            theSlot.set(ItemStack.EMPTY);
                             player.inventory.setCursorStack(ItemStack.EMPTY);
 
-                            player.inventory.setCursorStack(interfaceSlot.addItems(inHand.copy()));
+                            player.inventory.setCursorStack(theSlot.insert(inHand.copy()));
 
                             if (player.inventory.getCursorStack().isEmpty()) {
                                 player.inventory.setCursorStack(inSlot);
                             } else {
                                 player.inventory.setCursorStack(inHand);
-                                ItemHandlerUtil.setStackInSlot(theSlot, 0, inSlot);
+                                theSlot.set(inSlot);
                             }
                         }
                     } else {
-                        ItemHandlerUtil.setStackInSlot(theSlot, 0, playerHand.addItems(theSlot.getInvStack(0)));
+                        theSlot.set(playerHand.addItems(theSlot.get()));
                     }
 
                     break;
@@ -233,18 +235,18 @@ public final class InterfaceTerminalContainer extends AEBaseContainer {
                     if (hasItemInHand) {
                         ItemStack extra = playerHand.removeItems(1, ItemStack.EMPTY, null);
                         if (!extra.isEmpty()) {
-                            extra = interfaceSlot.addItems(extra);
+                            extra = theSlot.insert(extra);
                         }
                         if (!extra.isEmpty()) {
                             playerHand.addItems(extra);
                         }
                     } else if (!is.isEmpty()) {
-                        ItemStack extra = interfaceSlot.removeItems((is.getCount() + 1) / 2, ItemStack.EMPTY, null);
+                        ItemStack extra = theSlot.extract((is.getCount() + 1) / 2);
                         if (!extra.isEmpty()) {
                             extra = playerHand.addItems(extra);
                         }
                         if (!extra.isEmpty()) {
-                            interfaceSlot.addItems(extra);
+                            theSlot.insert(extra);
                         }
                     }
 
@@ -252,8 +254,7 @@ public final class InterfaceTerminalContainer extends AEBaseContainer {
                 case SHIFT_CLICK:
 
                     final InventoryAdaptor playerInv = InventoryAdaptor.getAdaptor(player);
-
-                    ItemHandlerUtil.setStackInSlot(theSlot, 0, playerInv.addItems(theSlot.getInvStack(0)));
+                    theSlot.set(playerInv.addItems(theSlot.get()));
 
                     break;
                 case MOVE_REGION:
@@ -279,6 +280,10 @@ public final class InterfaceTerminalContainer extends AEBaseContainer {
         }
     }
 
+    private boolean isValidPattern(ItemStack stack) {
+        return !stack.isEmpty() && stack.getItem() instanceof EncodedPatternItem;
+    }
+
     private void regenList(final CompoundTag data) {
         this.byId.clear();
         this.diList.clear();
@@ -369,15 +374,4 @@ public final class InterfaceTerminalContainer extends AEBaseContainer {
         }
     }
 
-    private static class PatternSlotFilter implements IAEItemFilter {
-        @Override
-        public boolean allowExtract(FixedItemInv inv, int slot, int amount) {
-            return true;
-        }
-
-        @Override
-        public boolean allowInsert(FixedItemInv inv, int slot, ItemStack stack) {
-            return !stack.isEmpty() && stack.getItem() instanceof EncodedPatternItem;
-        }
-    }
 }

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

@@ -267,13 +267,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/container/slot/RestrictedInputSlot.java

@@ -165,7 +165,7 @@ public class RestrictedInputSlot extends AppEngSlot {
             case ORE:
                 return GrinderRecipes.isValidIngredient(p.player.world, stack);
             case FUEL:
-                return FuelRegistry.INSTANCE.get(stack.getItem()) > 0;
+                return FuelRegistry.INSTANCE.get(stack.getItem()) != null;
             case POWERED_TOOL:
                 return Platform.isChargeable(stack);
             case QE_SINGULARITY:

src/main/java/appeng/core/AEConfig.java

@@ -87,7 +87,7 @@ public final class AEConfig {
 
     // Default Energy Conversion Rates
     private static final double DEFAULT_IC2_EXCHANGE = 2.0;
-    private static final double DEFAULT_RF_EXCHANGE = 0.5;
+    private static final double DEFAULT_TR_EXCHANGE = 2.0;
 
     public static final String VERSION = "@version@";
     public static final String CHANNEL = "@aechannel@";
@@ -112,7 +112,6 @@ public final class AEConfig {
     private boolean useColoredCraftingStatus;
     private boolean disableColoredCableRecipesInJEI;
     private int craftingCalculationTimePerTick;
-    private PowerUnits selectedPowerUnit = PowerUnits.AE;
 
     // GUI Buttons
     private final int[] craftByStacks = new int[4];
@@ -157,9 +156,7 @@ public final class AEConfig {
         this.enableEffects = clientConfig.enableEffects.get();
         this.useLargeFonts = clientConfig.useLargeFonts.get();
         this.useColoredCraftingStatus = clientConfig.useColoredCraftingStatus.get();
-        this.selectedPowerUnit = clientConfig.selectedPowerUnit.get();
 
-        // load buttons..
         for (int btnNum = 0; btnNum < 4; btnNum++) {
             this.craftByStacks[btnNum] = clientConfig.craftByStacks.get(btnNum).get();
             this.priorityByStacks[btnNum] = clientConfig.priorityByStacks.get(btnNum).get();
@@ -169,7 +166,7 @@ public final class AEConfig {
 
     private void syncCommonConfig() {
         PowerUnits.EU.conversionRatio = commonConfig.powerRatioIc2.get();
-        PowerUnits.RF.conversionRatio = commonConfig.powerRatioForgeEnergy.get();
+        PowerUnits.TR.conversionRatio = commonConfig.powerRatioTechReborn.get();
         PowerMultiplier.CONFIG.multiplier = commonConfig.powerUsageMultiplier.get();
 
         CondenserOutput.MATTER_BALLS.requiredPower = commonConfig.condenserMatterBallsPower.get();
@@ -271,7 +268,6 @@ public final class AEConfig {
     }
 
     public void save() {
-        clientConfig.selectedPowerUnit.set(this.selectedPowerUnit);
     }
 
     /**
@@ -299,7 +295,7 @@ public final class AEConfig {
 
     @SuppressWarnings("unchecked")
     public void nextPowerUnit(final boolean backwards) {
-        PowerUnits selectedPowerUnit = EnumCycler.rotateEnum(this.selectedPowerUnit, backwards,
+        PowerUnits selectedPowerUnit = EnumCycler.rotateEnum(getSelectedPowerUnit(), backwards,
                 (EnumSet<PowerUnits>) Settings.POWER_UNITS.getPossibleValues());
         clientConfig.selectedPowerUnit.set(selectedPowerUnit);
     }
@@ -373,6 +369,10 @@ public final class AEConfig {
         return () -> this.chargedStaffBattery;
     }
 
+    public double getPowerTransactionLimitTechReborn() {
+        return commonConfig.powerTransactionLimitTechReborn.get();
+    }
+
     public float getSpawnChargedChance() {
         return (float) commonConfig.spawnChargedChance.get();
     }
@@ -494,9 +494,12 @@ public final class AEConfig {
 
         // Power Ratios
         public final DoubleOption powerRatioIc2;
-        public final DoubleOption powerRatioForgeEnergy;
+        public final DoubleOption powerRatioTechReborn;
         public final DoubleOption powerUsageMultiplier;
 
+        // How much TR energy can be transfered at most in one operation
+        public final DoubleOption powerTransactionLimitTechReborn;
+
         // Condenser Power Requirement
         public final IntegerOption condenserMatterBallsPower;
         public final IntegerOption condenserSingularityPower;
@@ -578,9 +581,13 @@ public final class AEConfig {
 
             ConfigSection PowerRatios = root.subsection("PowerRatios");
             powerRatioIc2 = PowerRatios.addDouble("IC2", DEFAULT_IC2_EXCHANGE);
-            powerRatioForgeEnergy = PowerRatios.addDouble("ForgeEnergy", DEFAULT_RF_EXCHANGE);
+            powerRatioTechReborn = PowerRatios.addDouble("TechReborn", DEFAULT_TR_EXCHANGE);
             powerUsageMultiplier = PowerRatios.addDouble("UsageMultiplier", 1.0, 0.01, Double.MAX_VALUE);
 
+            ConfigSection integration = root.subsection("Integration");
+            powerTransactionLimitTechReborn = integration.addDouble("MaxTechRebornEnergyPerTransaction", 10000.0, 0.1,
+                    1000000.0, "The maximum amount of TechReborn energy units that can be transfered per operation.");
+
             ConfigSection Condenser = root.subsection("Condenser");
             condenserMatterBallsPower = Condenser.addInt("MatterBalls", 256);
             condenserSingularityPower = Condenser.addInt("Singularity", 256000);

src/main/java/appeng/core/AppEngBase.java

@@ -35,6 +35,10 @@ import net.minecraft.util.registry.Registry;
 import net.minecraft.world.World;
 import net.minecraft.world.dimension.DimensionType;
 
+import team.reborn.energy.Energy;
+import team.reborn.energy.EnergyHandler;
+import team.reborn.energy.EnergyHolder;
+
 import appeng.api.config.Upgrades;
 import appeng.api.definitions.IBlocks;
 import appeng.api.definitions.IItems;
@@ -42,6 +46,7 @@ import appeng.api.definitions.IParts;
 import appeng.api.features.IRegistryContainer;
 import appeng.api.features.IWirelessTermHandler;
 import appeng.api.features.IWorldGen;
+import appeng.api.implementations.items.IAEItemPowerStorage;
 import appeng.api.movable.IMovableRegistry;
 import appeng.api.networking.IGridCacheRegistry;
 import appeng.api.networking.crafting.ICraftingGrid;
@@ -52,6 +57,7 @@ import appeng.api.networking.spatial.ISpatialCache;
 import appeng.api.networking.storage.IStorageGrid;
 import appeng.api.networking.ticking.ITickManager;
 import appeng.api.parts.CableRenderMode;
+import appeng.block.AEBaseBlockItemChargeable;
 import appeng.bootstrap.IBootstrapComponent;
 import appeng.bootstrap.components.ITileEntityRegistrationComponent;
 import appeng.client.render.effects.ParticleTypes;
@@ -108,6 +114,7 @@ import appeng.fluids.container.FluidStorageBusContainer;
 import appeng.fluids.container.FluidTerminalContainer;
 import appeng.fluids.registries.BasicFluidCellGuiHandler;
 import appeng.hooks.ToolItemHook;
+import appeng.integration.modules.trenergy.ItemPowerStorageAdapter;
 import appeng.items.parts.FacadeItem;
 import appeng.items.tools.NetworkToolItem;
 import appeng.me.cache.CraftingGridCache;
@@ -164,6 +171,7 @@ public abstract class AppEngBase implements AppEng {
 
         setupInternalRegistries();
 
+        ItemPowerStorageAdapter.register();
     }
 
     public static void setupInternalRegistries() {

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/core/api/definitions/ApiItems.java

@@ -55,6 +55,7 @@ import appeng.hooks.BlockToolDispenseItemBehavior;
 import appeng.hooks.MatterCannonDispenseItemBehavior;
 import appeng.items.materials.MaterialType;
 import appeng.items.misc.CrystalSeedItem;
+import appeng.items.misc.CrystalSeedRendering;
 import appeng.items.misc.EncodedPatternItem;
 import appeng.items.misc.PaintBallItem;
 import appeng.items.misc.PaintBallItemRendering;
@@ -140,12 +141,12 @@ public final class ApiItems implements IItems {
     private final AEColoredItemDefinition coloredLumenPaintBall;
 
     // unsupported dev tools
-    private IItemDefinition toolEraser;
-    private IItemDefinition toolMeteoritePlacer;
-    private IItemDefinition toolDebugCard;
-    private IItemDefinition toolReplicatorCard;
+    private final IItemDefinition toolEraser;
+    private final IItemDefinition toolMeteoritePlacer;
+    private final IItemDefinition toolDebugCard;
+    private final IItemDefinition toolReplicatorCard;
 
-    private IItemDefinition dummyFluidItem;
+    private final IItemDefinition dummyFluidItem;
 
     public ApiItems(FeatureFactory registry, ApiMaterials materials) {
         FeatureFactory certusTools = registry.features(AEFeature.CERTUS_QUARTZ_TOOLS);
@@ -305,24 +306,15 @@ public final class ApiItems implements IItems {
         this.certusCrystalSeed = registry
                 .item("certus_crystal_seed",
                         props -> new CrystalSeedItem(props, materials.purifiedCertusQuartzCrystal().item()))
-                .bootstrap(item -> new IClientSetupComponent() {
-                    @Override
-                    @Environment(EnvType.CLIENT)
-                    public void setup() {
-                        // Expose the growth of the seed to the model system
-                        FabricModelPredicateProviderRegistry.register(item, AppEng.makeId("growth"),
-                                (is, w, p) -> CrystalSeedItem.getGrowthTicks(is)
-                                        / (float) CrystalSeedItem.GROWTH_TICKS_REQUIRED);
-                    }
-                }).features(AEFeature.CRYSTAL_SEEDS).build();
+                .bootstrap(CrystalSeedRendering::new).features(AEFeature.CRYSTAL_SEEDS).build();
         this.fluixCrystalSeed = registry
                 .item("fluix_crystal_seed",
                         props -> new CrystalSeedItem(props, materials.purifiedFluixCrystal().item()))
-                .features(AEFeature.CRYSTAL_SEEDS).build();
+                .bootstrap(CrystalSeedRendering::new).features(AEFeature.CRYSTAL_SEEDS).build();
         this.netherQuartzSeed = registry
                 .item("nether_quartz_seed",
                         props -> new CrystalSeedItem(props, materials.purifiedNetherQuartzCrystal().item()))
-                .features(AEFeature.CRYSTAL_SEEDS).build();
+                .bootstrap(CrystalSeedRendering::new).features(AEFeature.CRYSTAL_SEEDS).build();
 
         GrowingCrystalEntity.TYPE = registry
                 .<GrowingCrystalEntity>entity("growing_crystal", GrowingCrystalEntity::new, SpawnGroup.MISC)

src/main/java/appeng/core/api/definitions/ApiParts.java

@@ -105,8 +105,6 @@ public final class ApiParts implements IParts {
     private final IItemDefinition p2PTunnelRedstone;
     private final IItemDefinition p2PTunnelItems;
     private final IItemDefinition p2PTunnelFluids;
-    private final IItemDefinition p2PTunnelEU;
-    private final IItemDefinition p2PTunnelFE;
     private final IItemDefinition p2PTunnelLight;
     private final IItemDefinition cableAnchor;
     private final IItemDefinition monitor;
@@ -176,17 +174,11 @@ public final class ApiParts implements IParts {
                 RedstoneP2PTunnelPart::new);
         this.p2PTunnelItems = createPart("item_p2p_tunnel", ItemP2PTunnelPart.class, ItemP2PTunnelPart::new);
         this.p2PTunnelFluids = createPart("fluid_p2p_tunnel", FluidP2PTunnelPart.class, FluidP2PTunnelPart::new);
-// FIXME FABRIC         this.p2PTunnelEU = null; // FIXME createPart( "ic2_p2p_tunnel", PartType.P2P_TUNNEL_IC2,
-// FIXME FABRIC                                  // PartP2PIC2Power.class, PartP2PIC2Power::new);
-// FIXME FABRIC         this.p2PTunnelFE = createPart("fe_p2p_tunnel", FEP2PTunnelPart.class, FEP2PTunnelPart::new);
         this.p2PTunnelLight = createPart("light_p2p_tunnel", LightP2PTunnelPart.class, LightP2PTunnelPart::new);
         this.interfaceTerminal = createPart("interface_terminal", InterfaceTerminalPart.class,
                 InterfaceTerminalPart::new);
         this.fluidTerminal = createPart("fluid_terminal", FluidTerminalPart.class, FluidTerminalPart::new);
 
-        this.p2PTunnelEU = null;
-        this.p2PTunnelFE = null;
-
         this.registry = null;
         this.partModels = null;
     }
@@ -324,16 +316,6 @@ public final class ApiParts implements IParts {
         return this.p2PTunnelFluids;
     }
 
-    @Override
-    public IItemDefinition p2PTunnelEU() {
-        return this.p2PTunnelEU;
-    }
-
-    @Override
-    public IItemDefinition p2PTunnelFE() {
-        return this.p2PTunnelFE;
-    }
-
     @Override
     public IItemDefinition p2PTunnelLight() {
         return this.p2PTunnelLight;

src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java

@@ -63,32 +63,6 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry {
         this.addNewAttunement(new ItemStack(Blocks.TORCH), TunnelType.LIGHT);
         this.addNewAttunement(new ItemStack(Blocks.GLOWSTONE), TunnelType.LIGHT);
 
-        /*
-         * Forge energy tunnel items
-         */
-
-        this.addNewAttunement(blocks.energyCellDense(), TunnelType.FE_POWER);
-        this.addNewAttunement(blocks.energyAcceptor(), TunnelType.FE_POWER);
-        this.addNewAttunement(blocks.energyCell(), TunnelType.FE_POWER);
-        this.addNewAttunement(blocks.energyCellCreative(), TunnelType.FE_POWER);
-
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 0 ), TunnelType.FE_POWER );
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 1 ), TunnelType.FE_POWER );
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 2 ), TunnelType.FE_POWER );
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 3 ), TunnelType.FE_POWER );
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 4 ), TunnelType.FE_POWER );
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 5 ), TunnelType.FE_POWER );
-
-        /**
-         * EU tunnel items
-         */
-
-// FIXME		this.addNewAttunement( this.getModItem( "ic2", "cable", 0 ), TunnelType.IC2_POWER ); // Copper cable
-// FIXME		this.addNewAttunement( this.getModItem( "ic2", "cable", 1 ), TunnelType.IC2_POWER ); // Glass fibre cable
-// FIXME		this.addNewAttunement( this.getModItem( "ic2", "cable", 2 ), TunnelType.IC2_POWER ); // Gold cable
-// FIXME		this.addNewAttunement( this.getModItem( "ic2", "cable", 3 ), TunnelType.IC2_POWER ); // HV cable
-// FIXME		this.addNewAttunement( this.getModItem( "ic2", "cable", 4 ), TunnelType.IC2_POWER ); // Tin cable
-
         /**
          * attune based on most redstone base items.
          */
@@ -114,16 +88,6 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry {
         this.addNewAttunement(new ItemStack(Blocks.HOPPER), TunnelType.ITEM);
         this.addNewAttunement(new ItemStack(Blocks.CHEST), TunnelType.ITEM);
         this.addNewAttunement(new ItemStack(Blocks.TRAPPED_CHEST), TunnelType.ITEM);
-// FIXME		this.addNewAttunement( this.getModItem( "extrautilities", "extractor_base", 0 ), TunnelType.ITEM );
-// FIXME		this.addNewAttunement( this.getModItem( "mekanism", "parttransmitter", 9 ), TunnelType.ITEM );
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 0 ), TunnelType.ITEM ); // itemduct
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 1 ), TunnelType.ITEM ); // itemduct
-// FIXME																										// (opaque)
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 2 ), TunnelType.ITEM ); // impulse
-// FIXME																										// itemduct
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 3 ), TunnelType.ITEM ); // impulse
-// FIXME																										// itemduct
-        // (opaque)
 
         /**
          * attune based on lots of random item related stuff
@@ -132,18 +96,7 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry {
         this.addNewAttunement(new ItemStack(Items.LAVA_BUCKET), TunnelType.FLUID);
         this.addNewAttunement(new ItemStack(Items.MILK_BUCKET), TunnelType.FLUID);
         this.addNewAttunement(new ItemStack(Items.WATER_BUCKET), TunnelType.FLUID);
-// FIXME		this.addNewAttunement( this.getModItem( "mekanism", "machineblock2", 11 ), TunnelType.FLUID );
-// FIXME		this.addNewAttunement( this.getModItem( "mekanism", "parttransmitter", 4 ), TunnelType.FLUID );
-// FIXME		this.addNewAttunement( this.getModItem( "extrautilities", "extractor_base", 6 ), TunnelType.FLUID );
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 0 ), TunnelType.FLUID ); // fluiduct
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 1 ), TunnelType.FLUID ); // fluiduct
-// FIXME																										// (opaque)
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 2 ), TunnelType.FLUID ); // fluiduct
-// FIXME																										// hardened
-// FIXME		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 3 ), TunnelType.FLUID ); // fluiduct
-// FIXME																										// hardened
-// FIXME																										// (opaque)
-// FIXME
+
         for (final AEColor c : AEColor.values()) {
             this.addNewAttunement(parts.cableGlass().stack(c, 1), TunnelType.ME);
             this.addNewAttunement(parts.cableCovered().stack(c, 1), TunnelType.ME);
@@ -154,30 +107,11 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry {
         /**
          * attune based caps
          */
-        // FIXME FABRIC this.addNewAttunement(Capabilities.FORGE_ENERGY,
-        // TunnelType.FE_POWER);
         this.addNewAttunement(FluidAttributes.EXTRACTABLE, TunnelType.FLUID);
         this.addNewAttunement(FluidAttributes.INSERTABLE, TunnelType.FLUID);
         this.addNewAttunement(FluidAttributes.FIXED_INV, TunnelType.FLUID);
         this.addNewAttunement(FluidAttributes.GROUPED_INV, TunnelType.FLUID);
 
-        /**
-         * attune based on the ItemStack's modId
-         */
-
-        this.addNewAttunement("thermaldynamics", TunnelType.FE_POWER);
-        this.addNewAttunement("thermalexpansion", TunnelType.FE_POWER);
-        this.addNewAttunement("thermalfoundation", TunnelType.FE_POWER);
-        // TODO: Remove when confirmed that the official 1.12 version of EnderIO will
-        // support FE.
-        this.addNewAttunement("enderio", TunnelType.FE_POWER);
-        // TODO: Remove when confirmed that the official 1.12 version of Mekanism will
-        // support FE.
-        this.addNewAttunement("mekanism", TunnelType.FE_POWER);
-        // TODO: Remove when support for RFTools' Powercells support is added
-        this.addNewAttunement("rftools", TunnelType.FE_POWER);
-        this.addNewAttunement("ic2", TunnelType.IC2_POWER);
-
     }
 
     @Override

src/main/java/appeng/entity/AEBaseItemEntity.java

@@ -44,8 +44,6 @@ public abstract class AEBaseItemEntity extends ItemEntity implements ICustomEnti
         this.yaw = this.random.nextFloat() * 360.0F;
         this.setVelocity(this.random.nextDouble() * 0.2D - 0.1D, 0.2D, this.random.nextDouble() * 0.2D - 0.1D);
         this.setStack(stack);
-        // FIXME FABRIC Needs replacement hook this.lifespan =
-        // stack.getEntityLifespan(world);
     }
 
     protected List<Entity> getCheckedEntitiesWithinAABBExcludingEntity(final Box region) {

src/main/java/appeng/entity/GrowingCrystalEntity.java

@@ -35,9 +35,10 @@ import appeng.client.EffectType;
 import appeng.core.AEConfig;
 import appeng.core.AppEng;
 import appeng.items.misc.CrystalSeedItem;
+import appeng.mixins.ItemEntityAccessor;
 import appeng.util.Platform;
 
-public final class GrowingCrystalEntity extends AEBaseItemEntity {
+public class GrowingCrystalEntity extends AEBaseItemEntity {
 
     public static EntityType<GrowingCrystalEntity> TYPE;
 
@@ -49,13 +50,16 @@ public final class GrowingCrystalEntity extends AEBaseItemEntity {
 
     public GrowingCrystalEntity(final World w, final double x, final double y, final double z, final ItemStack is) {
         super(TYPE, w, x, y, z, is);
-        this.setCovetedItem();
-        // FIXME FABRIC This does not actually fix despawning, we need to Mixin,
-        // probably.
     }
 
     @Override
     public void tick() {
+        // Prevent the entity from despawning
+        ItemEntityAccessor accessor = (ItemEntityAccessor) this;
+        if (!this.world.isClient && accessor.getAge() >= 1000) {
+            accessor.setAge(0);
+        }
+
         super.tick();
 
         if (!AEConfig.instance().isFeatureEnabled(AEFeature.IN_WORLD_PURIFICATION)) {

src/main/java/appeng/entity/TinyTNTPrimedEntity.java

@@ -134,8 +134,8 @@ public final class TinyTNTPrimedEntity extends TntEntity implements ICustomEntit
             return;
         }
 
-        final Explosion ex = new Explosion(this.world, this, this.getX(), this.getY(), this.getZ(), 0.2f, false,
-                Explosion.DestructionType.BREAK);
+        final Explosion ex = new Explosion(this.world, this, null, null, this.getX(), this.getY(), this.getZ(), 0.2f,
+                false, Explosion.DestructionType.BREAK);
 
         final Box area = new Box(this.getX() - 1.5, this.getY() - 1.5f, this.getZ() - 1.5, this.getX() + 1.5,
                 this.getY() + 1.5, this.getZ() + 1.5);

src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java

@@ -39,8 +39,8 @@ public class FluidSlotWidget extends CustomSlotWidget {
             // The tooltip area coincides with the area of the slot
             int x = getTooltipAreaX();
             int y = getTooltipAreaY();
-            int width = getTooltipAreaX();
-            int height = getTooltipAreaY();
+            int width = getTooltipAreaWidth();
+            int height = getTooltipAreaHeight();
             fs.getFluidStack().renderGuiRect(x, y, x + width, y + height);
         }
     }

src/main/java/appeng/fluids/parts/FluidExportBusPart.java

@@ -126,7 +126,7 @@ public class FluidExportBusPart extends SharedFluidBusPart {
                                 // we'll deduct 1/1000th from storage.
                                 long remainderMillibuckets = remainder.getAmount_F().asInt(1000, RoundingMode.DOWN);
 
-                                toExtract.setStackSize(remainderMillibuckets);
+                                toExtract.decStackSize(remainderMillibuckets);
                                 inv.extractItems(toExtract, Actionable.MODULATE, this.source);
 
                                 return TickRateModulation.FASTER;

src/main/java/appeng/fluids/parts/FluidImportBusPart.java

@@ -128,6 +128,10 @@ public class FluidImportBusPart extends SharedFluidBusPart {
                         aeFluidStack.decStackSize(notInserted.getStackSize());
                     }
 
+                    if (aeFluidStack.getStackSize() == 0) {
+                        return TickRateModulation.SLOWER;
+                    }
+
                     // Now we need to actually drain the fluid, and use the actual amount we just
                     // inserted
                     extractable.extract(filter, aeFluidStack.getAmount()); // FIXME: If there's a mismatch here, log?

src/main/java/appeng/hooks/HopperHooks.java

@@ -1,96 +0,0 @@
-package appeng.hooks;
-
-import net.minecraft.block.HopperBlock;
-import net.minecraft.block.entity.Hopper;
-import net.minecraft.block.entity.HopperBlockEntity;
-import net.minecraft.inventory.Inventory;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
-import net.minecraft.world.World;
-
-import alexiil.mc.lib.attributes.SearchOption;
-import alexiil.mc.lib.attributes.SearchOptions;
-import alexiil.mc.lib.attributes.item.ItemAttributes;
-import alexiil.mc.lib.attributes.item.ItemExtractable;
-import alexiil.mc.lib.attributes.item.ItemInsertable;
-import alexiil.mc.lib.attributes.item.ItemInvUtil;
-import alexiil.mc.lib.attributes.item.compat.FixedInventoryVanillaWrapper;
-
-// SEE: https://github.com/AlexIIL/LibBlockAttributes/pull/27
-public final class HopperHooks {
-
-    private HopperHooks() {
-    }
-
-    public static ActionResult tryInsert(HopperBlockEntity hopper) {
-        World world = hopper.getWorld();
-        Direction towards = hopper.getCachedState().get(HopperBlock.FACING);
-        BlockPos targetPos = hopper.getPos().offset(towards);
-
-        if (isVanillaInventoryAt(world, targetPos)) {
-            return ActionResult.PASS;
-        }
-
-        ItemInsertable insertable = ItemAttributes.INSERTABLE.getFirstOrNull(world, targetPos,
-                SearchOptions.inDirection(towards));
-        if (insertable == null) {
-            return ActionResult.PASS; // Let Vanilla handle non-LBA enabled inventories and Entities
-        }
-
-        // Get an Extractable for the Hopper's internal inventory
-        ItemExtractable extractable = new FixedInventoryVanillaWrapper(hopper).getExtractable();
-
-        // Try to move any one item from hopper->inventory
-        if (ItemInvUtil.move(extractable, insertable, 1) > 0) {
-            return ActionResult.SUCCESS;
-        } else {
-            return ActionResult.FAIL;
-        }
-    }
-
-    /**
-     * Hoppers always search UP for adjacent inventories to extract from.
-     */
-    private static final SearchOption<? super ItemExtractable> EXTRACT_SEARCH = SearchOptions.inDirection(Direction.UP);
-
-    /**
-     * Tries to extract items from an inventory above the given hopper into the
-     * hopper. Note that the given hopper can also be a hopper minecart.
-     */
-    public static ActionResult tryExtract(Hopper hopper) {
-        World world = hopper.getWorld();
-        BlockPos blockAbove = new BlockPos(hopper.getHopperX(), hopper.getHopperY() + 1, hopper.getHopperZ());
-
-        if (isVanillaInventoryAt(world, blockAbove)) {
-            return ActionResult.PASS;
-        }
-
-        // Get an Extractable for the inventory above the hopper
-        ItemExtractable extractable = ItemAttributes.EXTRACTABLE.getFirstOrNull(world, blockAbove, EXTRACT_SEARCH);
-        if (extractable == null) {
-            return ActionResult.PASS; // Let Vanilla handle non-LBA enabled inventories and Entities
-        }
-
-        // Get an Insertable for the Hopper's internal inventory
-        ItemInsertable insertable = new FixedInventoryVanillaWrapper(hopper).getInsertable();
-
-        // Try to move any one item from inventory->hopper
-        if (ItemInvUtil.move(extractable, insertable, 1) > 0) {
-            return ActionResult.SUCCESS;
-        } else {
-            return ActionResult.FAIL;
-        }
-    }
-
-    private static boolean isVanillaInventoryAt(World world, BlockPos pos) {
-        // If there's a TE at the target position that implements Inventory (such that
-        // Hopper would handle it itself)
-        // defer to Vanilla to avoid injecting ourselves inbetween Vanilla blocks
-        // needlessly.
-        // ItemAttributes.INSERTABLE would return an auto-converted Inventory in such
-        // cases.
-        return world.getBlockEntity(pos) instanceof Inventory;
-    }
-
-}

src/main/java/appeng/integration/modules/jei/ReiPlugin.java

@@ -18,13 +18,23 @@
 
 package appeng.integration.modules.jei;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import com.google.common.collect.ImmutableList;
+
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.item.ItemStack;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Identifier;
 
+import me.shedaniel.math.Rectangle;
+import me.shedaniel.rei.api.BaseBoundsHandler;
+import me.shedaniel.rei.api.DisplayHelper;
+import me.shedaniel.rei.api.EntryRegistry;
 import me.shedaniel.rei.api.EntryStack;
 import me.shedaniel.rei.api.RecipeHelper;
 import me.shedaniel.rei.api.plugins.REIPluginV0;
@@ -34,12 +44,17 @@ import appeng.api.config.CondenserOutput;
 import appeng.api.definitions.IDefinitions;
 import appeng.api.definitions.IItemDefinition;
 import appeng.api.definitions.IMaterials;
+import appeng.api.definitions.IParts;
 import appeng.api.features.AEFeature;
+import appeng.api.util.AEColor;
+import appeng.client.gui.AEBaseScreen;
 import appeng.container.implementations.CraftingTermContainer;
 import appeng.container.implementations.PatternTermContainer;
 import appeng.core.AEConfig;
 import appeng.core.Api;
 import appeng.core.AppEng;
+import appeng.core.api.definitions.ApiBlocks;
+import appeng.core.api.definitions.ApiItems;
 import appeng.core.localization.GuiText;
 import appeng.integration.abstraction.ReiFacade;
 import appeng.items.parts.FacadeItem;
@@ -47,21 +62,47 @@ import appeng.recipes.handlers.GrinderRecipe;
 import appeng.recipes.handlers.InscriberRecipe;
 
 public class ReiPlugin implements REIPluginV0 {
+
     private static final Identifier ID = new Identifier(AppEng.MOD_ID, "core");
 
+    private final ApiBlocks blocks = Api.INSTANCE.definitions().blocks();
+
+    private final ApiItems items = Api.INSTANCE.definitions().items();
+
+    // Will be hidden if developer items are disabled in the config
+    private final List<Predicate<ItemStack>> developerItems = ImmutableList.of(blocks.cubeGenerator()::isSameAs,
+            blocks.chunkLoader()::isSameAs,
+            // FIXME FABRIC blocks.energyGenerator()::isSameAs,
+            blocks.itemGen()::isSameAs, blocks.phantomNode()::isSameAs,
+
+            items.toolDebugCard()::isSameAs, items.toolEraser()::isSameAs, items.toolMeteoritePlacer()::isSameAs,
+            items.toolReplicatorCard()::isSameAs);
+
+    // Will be hidden if colored cables are hidden
+    private final List<Predicate<ItemStack>> coloredCables;
+
+    public ReiPlugin() {
+        List<Predicate<ItemStack>> predicates = new ArrayList<>();
+
+        IParts parts = Api.instance().definitions().parts();
+        for (AEColor color : AEColor.values()) {
+            if (color == AEColor.TRANSPARENT) {
+                continue; // Keep the Fluix variant
+            }
+            predicates.add(stack -> parts.cableCovered().sameAs(color, stack));
+            predicates.add(stack -> parts.cableDenseCovered().sameAs(color, stack));
+            predicates.add(stack -> parts.cableGlass().sameAs(color, stack));
+            predicates.add(stack -> parts.cableSmart().sameAs(color, stack));
+            predicates.add(stack -> parts.cableDenseSmart().sameAs(color, stack));
+        }
+        coloredCables = ImmutableList.copyOf(predicates);
+    }
+
     @Override
     public Identifier getPluginIdentifier() {
         return ID;
     }
 
-    // FIXME FABRIC @Override
-    // FIXME FABRIC public void registerItemSubtypes(ISubtypeRegistration
-    // subtypeRegistry) {
-    // FIXME FABRIC final Optional<Item> maybeFacade =
-    // AEApi.instance().definitions().items().facade().maybeItem();
-    // FIXME FABRIC maybeFacade.ifPresent(subtypeRegistry::useNbtForSubtypes);
-    // FIXME FABRIC }
-
     @Override
     public void registerPluginCategories(RecipeHelper recipeHelper) {
         recipeHelper.registerCategory(new GrinderRecipeCategory());
@@ -91,9 +132,16 @@ public class ReiPlugin implements REIPluginV0 {
 
         registerWorkingStations(recipeHelper);
 
-        IDefinitions definitions = Api.instance().definitions();
-        recipeHelper.registerLiveRecipeGenerator(new FacadeRegistryGenerator(
-                (FacadeItem) definitions.items().facade().item(), definitions.parts().cableAnchor().stack(1)));
+        if (AEConfig.instance().isFeatureEnabled(AEFeature.ENABLE_FACADE_CRAFTING)) {
+            IDefinitions definitions = Api.instance().definitions();
+            recipeHelper.registerLiveRecipeGenerator(new FacadeRegistryGenerator(
+                    (FacadeItem) definitions.items().facade().item(), definitions.parts().cableAnchor().stack(1)));
+        }
+    }
+
+    @Override
+    public void registerEntries(EntryRegistry entryRegistry) {
+        entryRegistry.removeEntryIf(this::shouldEntryBeHidden);
     }
 
     @Override
@@ -104,6 +152,17 @@ public class ReiPlugin implements REIPluginV0 {
         ReiFacade.setInstance(new ReiRuntimeAdapter());
     }
 
+    @Override
+    public void registerBounds(DisplayHelper displayHelper) {
+        BaseBoundsHandler baseBoundsHandler = BaseBoundsHandler.getInstance();
+
+        baseBoundsHandler.registerExclusionZones(AEBaseScreen.class, () -> {
+            AEBaseScreen<?> screen = (AEBaseScreen<?>) MinecraftClient.getInstance().currentScreen;
+            return ImmutableList.of(new Rectangle(screen.getX(), screen.getY(), screen.width, screen.height));
+        });
+
+    }
+
     private void registerWorkingStations(RecipeHelper registration) {
         IDefinitions definitions = Api.instance().definitions();
 
@@ -160,47 +219,36 @@ public class ReiPlugin implements REIPluginV0 {
         RecipeHelper.getInstance().registerDisplay(info);
     }
 
-// FIXME FABRIC    @Override
-// FIXME FABRIC    public void registerAdvanced(IAdvancedRegistration registration) {
-// FIXME FABRIC
-// FIXME FABRIC        IDefinitions definitions = AEApi.instance().definitions();
-// FIXME FABRIC
-// FIXME FABRIC        if (AEConfig.instance().isFeatureEnabled(AEFeature.ENABLE_FACADE_CRAFTING)) {
-// FIXME FABRIC            FacadeItem itemFacade = (FacadeItem) definitions.items().facade().item();
-// FIXME FABRIC            ItemStack cableAnchor = definitions.parts().cableAnchor().stack(1);
-// FIXME FABRIC            registration.addRecipeManagerPlugin(new FacadeRegistryPlugin(itemFacade, cableAnchor));
-// FIXME FABRIC        }
-// FIXME FABRIC    }
-// FIXME FABRIC
-// FIXME FABRIC    @Override
-// FIXME FABRIC    public void onRuntimeAvailable(IJeiRuntime jeiRuntime) {
-// FIXME FABRIC        JEIFacade.setInstance(new JeiRuntimeAdapter(jeiRuntime));
-// FIXME FABRIC        this.hideDebugTools(jeiRuntime);
-// FIXME FABRIC
-// FIXME FABRIC    }
-// FIXME FABRIC
-// FIXME FABRIC    private void hideDebugTools(IJeiRuntime jeiRuntime) {
-// FIXME FABRIC        Collection<ItemStack> toRemove = new ArrayList<>();
-// FIXME FABRIC
-// FIXME FABRIC        // We use the internal API here as exception as debug tools are not part of the
-// FIXME FABRIC        // public one by design.
-// FIXME FABRIC        toRemove.add(Api.INSTANCE.definitions().items().dummyFluidItem().maybeStack(1).orElse(null));
-// FIXME FABRIC
-// FIXME FABRIC        if (!AEConfig.instance().isFeatureEnabled(AEFeature.UNSUPPORTED_DEVELOPER_TOOLS)) {
-// FIXME FABRIC            toRemove.add(Api.INSTANCE.definitions().blocks().cubeGenerator().maybeStack(1).orElse(null));
-// FIXME FABRIC            toRemove.add(Api.INSTANCE.definitions().blocks().chunkLoader().maybeStack(1).orElse(null));
-// FIXME FABRIC            toRemove.add(Api.INSTANCE.definitions().blocks().energyGenerator().maybeStack(1).orElse(null));
-// FIXME FABRIC            toRemove.add(Api.INSTANCE.definitions().blocks().itemGen().maybeStack(1).orElse(null));
-// FIXME FABRIC            toRemove.add(Api.INSTANCE.definitions().blocks().phantomNode().maybeStack(1).orElse(null));
-// FIXME FABRIC
-// FIXME FABRIC            toRemove.add(Api.INSTANCE.definitions().items().toolDebugCard().maybeStack(1).orElse(null));
-// FIXME FABRIC            toRemove.add(Api.INSTANCE.definitions().items().toolEraser().maybeStack(1).orElse(null));
-// FIXME FABRIC            toRemove.add(Api.INSTANCE.definitions().items().toolMeteoritePlacer().maybeStack(1).orElse(null));
-// FIXME FABRIC            toRemove.add(Api.INSTANCE.definitions().items().toolReplicatorCard().maybeStack(1).orElse(null));
-// FIXME FABRIC        }
-// FIXME FABRIC
-// FIXME FABRIC        jeiRuntime.getIngredientManager().removeIngredientsAtRuntime(mezz.jei.api.constants.VanillaTypes.ITEM,
-// FIXME FABRIC                toRemove);
-// FIXME FABRIC    }
+    private boolean shouldEntryBeHidden(EntryStack entryStack) {
+        if (entryStack.getType() != EntryStack.Type.ITEM) {
+            return false;
+        }
+        ItemStack stack = entryStack.getItemStack();
+
+        if (items.dummyFluidItem().isSameAs(stack) || items.facade().isSameAs(stack) // REI will add a broken facade
+                                                                                     // with no NBT
+                || blocks.multiPart().isSameAs(stack) || blocks.matrixFrame().isSameAs(stack)
+                || blocks.paint().isSameAs(stack)) {
+            return true;
+        }
+
+        if (!AEConfig.instance().isFeatureEnabled(AEFeature.UNSUPPORTED_DEVELOPER_TOOLS)) {
+            for (Predicate<ItemStack> developerItem : developerItems) {
+                if (developerItem.test(stack)) {
+                    return true;
+                }
+            }
+        }
+
+        if (AEConfig.instance().isDisableColoredCableRecipesInJEI()) {
+            for (Predicate<ItemStack> predicate : coloredCables) {
+                if (predicate.test(stack)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
 
 }

src/main/java/appeng/integration/modules/jei/ReiRuntimeAdapter.java

@@ -18,9 +18,11 @@
 
 package appeng.integration.modules.jei;
 
+import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 
 import me.shedaniel.rei.api.REIHelper;
+import me.shedaniel.rei.gui.widget.TextFieldWidget;
 
 import appeng.integration.abstraction.IRei;
 
@@ -29,7 +31,7 @@ class ReiRuntimeAdapter implements IRei {
     private final REIHelper runtime;
 
     ReiRuntimeAdapter() {
-        this.runtime = REIHelper.getInstance();
+        this.runtime = Preconditions.checkNotNull(REIHelper.getInstance(), "REI helper was null");
     }
 
     @Override
@@ -39,11 +41,18 @@ class ReiRuntimeAdapter implements IRei {
 
     @Override
     public String getSearchText() {
-        return Strings.nullToEmpty(this.runtime.getSearchTextField().getText());
+        TextFieldWidget searchField = this.runtime.getSearchTextField();
+        if (searchField == null) {
+            return "";
+        }
+        return Strings.nullToEmpty(searchField.getText());
     }
 
     @Override
     public void setSearchText(String searchText) {
-        this.runtime.getSearchTextField().setText(Strings.nullToEmpty(searchText));
+        TextFieldWidget searchField = this.runtime.getSearchTextField();
+        if (searchField != null) {
+            searchField.setText(Strings.nullToEmpty(searchText));
+        }
     }
 }

src/main/java/appeng/integration/modules/trenergy/ItemPowerStorageAdapter.java

@@ -0,0 +1,66 @@
+package appeng.integration.modules.trenergy;
+
+import net.minecraft.item.ItemStack;
+
+import team.reborn.energy.Energy;
+import team.reborn.energy.EnergySide;
+import team.reborn.energy.EnergyStorage;
+import team.reborn.energy.EnergyTier;
+
+import appeng.api.config.Actionable;
+import appeng.api.config.PowerUnits;
+import appeng.api.implementations.items.IAEItemPowerStorage;
+
+/**
+ * Adapts an itemstack that implements
+ * {@link appeng.api.implementations.items.IAEItemPowerStorage} to the interface
+ * used by TechReborn's energy API.
+ */
+public final class ItemPowerStorageAdapter implements EnergyStorage {
+
+    private final IAEItemPowerStorage item;
+
+    private final ItemStack stack;
+
+    public ItemPowerStorageAdapter(IAEItemPowerStorage item, ItemStack stack) {
+        this.item = item;
+        this.stack = stack;
+    }
+
+    @Override
+    public double getStored(EnergySide energySide) {
+        return PowerUnits.AE.convertTo(PowerUnits.TR, this.item.getAECurrentPower(this.stack));
+    }
+
+    @Override
+    public void setStored(double v) {
+        double newPower = PowerUnits.TR.convertTo(PowerUnits.AE, v);
+        double currentPower = this.item.getAECurrentPower(this.stack);
+        double toInject = newPower - currentPower;
+        if (toInject > 0.0000001) {
+            this.item.injectAEPower(stack, toInject, Actionable.MODULATE);
+        }
+    }
+
+    @Override
+    public double getMaxStoredPower() {
+        return PowerUnits.AE.convertTo(PowerUnits.TR, this.item.getAEMaxPower(this.stack));
+    }
+
+    @Override
+    public EnergyTier getTier() {
+        return EnergyTier.INFINITE;
+    }
+
+    public static void register() {
+        // Register our charged items as TechReborn Energy compatible
+        Energy.registerHolder(
+                (Object obj) -> obj instanceof ItemStack && ((ItemStack) obj).getItem() instanceof IAEItemPowerStorage,
+                (Object obj) -> {
+                    ItemStack stack = (ItemStack) obj;
+                    IAEItemPowerStorage item = (IAEItemPowerStorage) stack.getItem();
+                    return new ItemPowerStorageAdapter(item, stack);
+                });
+    }
+
+}

src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java

@@ -20,6 +20,8 @@ package appeng.integration.modules.waila.tile;
 
 import java.util.List;
 
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.item.TooltipContext;
@@ -45,6 +47,7 @@ import appeng.tile.misc.ChargerBlockEntity;
 public final class ChargerWailaDataProvider extends BaseWailaDataProvider {
 
     @Override
+    @Environment(EnvType.CLIENT)
     public void appendBody(List<Text> tooltip, IDataAccessor accessor, IPluginConfig config) {
 
         final BlockEntity te = accessor.getBlockEntity();

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

@@ -0,0 +1,29 @@
+package appeng.items.misc;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
+import net.minecraft.item.Item;
+
+import appeng.bootstrap.components.IClientSetupComponent;
+import appeng.core.AppEng;
+
+/**
+ * Exposes a predicate "growth", which is used in the item model to
+ * differentiate the growth stages.
+ */
+public class CrystalSeedRendering implements IClientSetupComponent {
+    private final Item item;
+
+    public CrystalSeedRendering(Item item) {
+        this.item = item;
+    }
+
+    @Override
+    @Environment(EnvType.CLIENT)
+    public void setup() {
+        // Expose the growth of the seed to the model system
+        FabricModelPredicateProviderRegistry.register(item, AppEng.makeId("growth"),
+                (is, w, p) -> CrystalSeedItem.getGrowthTicks(is) / (float) CrystalSeedItem.GROWTH_TICKS_REQUIRED);
+    }
+}

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

@@ -117,39 +117,39 @@ public class EncodedPatternItem extends AEBaseItem implements AEToolItem {
                 return;
             }
 
-            stack.setCustomName(GuiText.InvalidPattern.text().copy().formatted(Formatting.RED));
+            stack.setCustomName(GuiText.InvalidPattern.text().shallowCopy().formatted(Formatting.RED));
 
             InvalidPatternHelper invalid = new InvalidPatternHelper(stack);
 
-            final Text label = (invalid.isCraftable() ? GuiText.Crafts.text() : GuiText.Creates.text()).copy()
+            final Text label = (invalid.isCraftable() ? GuiText.Crafts.text() : GuiText.Creates.text()).shallowCopy()
                     .append(": ");
-            final Text and = new LiteralText(" ").append(GuiText.And.text()).append(" ");
-            final Text with = GuiText.With.text().copy().append(": ");
+            final Text and = new LiteralText(" ").shallowCopy().append(GuiText.And.text()).shallowCopy().append(" ");
+            final Text with = GuiText.With.text().shallowCopy().append(": ");
 
             boolean first = true;
             for (final InvalidPatternHelper.PatternIngredient output : invalid.getOutputs()) {
-                lines.add((first ? label : and).copy().append(output.getFormattedToolTip()));
+                lines.add((first ? label : and).shallowCopy().append(output.getFormattedToolTip()));
                 first = false;
             }
 
             first = true;
             for (final InvalidPatternHelper.PatternIngredient input : invalid.getInputs()) {
-                lines.add((first ? with : and).copy().append(input.getFormattedToolTip()));
+                lines.add((first ? with : and).shallowCopy().append(input.getFormattedToolTip()));
                 first = false;
             }
 
             if (invalid.isCraftable()) {
-                final MutableText substitutionLabel = GuiText.Substitute.text().copy().append(" ");
+                final Text substitutionLabel = GuiText.Substitute.text().shallowCopy().append(" ");
                 final Text canSubstitute = invalid.canSubstitute() ? GuiText.Yes.text() : GuiText.No.text();
 
-                lines.add(substitutionLabel.append(canSubstitute));
+                lines.add(substitutionLabel.shallowCopy().append(canSubstitute));
             }
 
             return;
         }
 
         if (stack.hasCustomName()) {
-            stack.removeSubTag("display");
+            stack.removeCustomName();
         }
 
         final boolean isCrafting = details.isCraftable();
@@ -158,9 +158,9 @@ public class EncodedPatternItem extends AEBaseItem implements AEToolItem {
         final Collection<IAEItemStack> in = details.getInputs();
         final Collection<IAEItemStack> out = details.getOutputs();
 
-        final Text label = (isCrafting ? GuiText.Crafts.text() : GuiText.Creates.text()).copy().append(": ");
-        final Text and = new LiteralText(" ").append(GuiText.And.text()).append(" ");
-        final Text with = GuiText.With.text().copy().append(": ");
+        final Text label = (isCrafting ? GuiText.Crafts.text() : GuiText.Creates.text()).shallowCopy().append(": ");
+        final Text and = new LiteralText(" ").shallowCopy().append(GuiText.And.text()).append(" ");
+        final Text with = GuiText.With.text().shallowCopy().append(": ");
 
         boolean first = true;
         for (final IAEItemStack anOut : out) {
@@ -168,7 +168,7 @@ public class EncodedPatternItem extends AEBaseItem implements AEToolItem {
                 continue;
             }
 
-            lines.add((first ? label : and).copy().append(anOut.getStackSize() + "x ")
+            lines.add((first ? label : and).shallowCopy().append(anOut.getStackSize() + "x ")
                     .append(Platform.getItemDisplayName(anOut)));
             first = false;
         }
@@ -179,16 +179,16 @@ public class EncodedPatternItem extends AEBaseItem implements AEToolItem {
                 continue;
             }
 
-            lines.add((first ? with : and).copy().append(anIn.getStackSize() + "x ")
+            lines.add((first ? with : and).shallowCopy().append(anIn.getStackSize() + "x ")
                     .append(Platform.getItemDisplayName(anIn)));
             first = false;
         }
 
         if (isCrafting) {
-            final MutableText substitutionLabel = GuiText.Substitute.text().copy().append(" ");
+            final Text substitutionLabel = GuiText.Substitute.text().shallowCopy().append(" ");
             final Text canSubstitute = substitute ? GuiText.Yes.text() : GuiText.No.text();
 
-            lines.add(substitutionLabel.append(canSubstitute));
+            lines.add(substitutionLabel.shallowCopy().append(canSubstitute));
         }
     }
 
@@ -299,14 +299,27 @@ public class EncodedPatternItem extends AEBaseItem implements AEToolItem {
         final ListTag tagIn = new ListTag();
         final ListTag tagOut = new ListTag();
 
+        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/items/tools/NetworkToolItem.java

@@ -32,6 +32,7 @@ import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
 import appeng.api.implementations.guiobjects.IGuiItem;
@@ -53,6 +54,7 @@ import appeng.core.sync.packets.ClickPacket;
 import appeng.hooks.AEToolItem;
 import appeng.items.AEBaseItem;
 import appeng.items.contents.NetworkToolViewer;
+import appeng.util.PartHostWrenching;
 import appeng.util.Platform;
 
 public class NetworkToolItem extends AEBaseItem implements IGuiItem, IAEWrench, AEToolItem {
@@ -91,13 +93,17 @@ public class NetworkToolItem extends AEBaseItem implements IGuiItem, IAEWrench,
         final BlockEntity te = context.getWorld().getBlockEntity(context.getBlockPos());
 
         if (te instanceof IPartHost) {
-            final SelectedPart part = ((IPartHost) te).selectPart(mop.getPos());
+            Vec3d relativePosition = mop.getPos().subtract(mop.getBlockPos().getX(), mop.getBlockPos().getY(),
+                    mop.getBlockPos().getZ());
+            IPartHost host = (IPartHost) te;
+            final SelectedPart part = host.selectPart(relativePosition);
 
             if (part.part != null || part.facade != null) {
                 if (part.part instanceof INetworkToolAgent && !((INetworkToolAgent) part.part).showNetworkInfo(mop)) {
                     return ActionResult.FAIL;
                 } else if (context.getPlayer().isInSneakingPose()) {
-                    return ActionResult.PASS;
+                    PartHostWrenching.wrenchPart(context.getWorld(), context.getBlockPos(), host, part);
+                    return ActionResult.SUCCESS;
                 }
             }
         } else if (te instanceof INetworkToolAgent && !((INetworkToolAgent) te).showNetworkInfo(mop)) {
@@ -111,13 +117,6 @@ public class NetworkToolItem extends AEBaseItem implements IGuiItem, IAEWrench,
         return ActionResult.SUCCESS;
     }
 
-// FIXME FABRIC: No direct equivalent
-// FIXME FABRIC: Might already be handled by onItemUseFirst though
-// FIXME FABRIC    @Override
-// FIXME FABRIC    public boolean doesSneakBypassUse(ItemStack stack, WorldView world, BlockPos pos, PlayerEntity player) {
-// FIXME FABRIC        return true;
-// FIXME FABRIC    }
-
     public boolean serverSideToolLogic(ItemUsageContext useContext) {
         BlockPos pos = useContext.getBlockPos();
         PlayerEntity p = useContext.getPlayer();

src/main/java/appeng/items/tools/quartz/QuartzWrenchItem.java

@@ -19,18 +19,27 @@
 package appeng.items.tools.quartz;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.util.ActionResult;
+import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
 
 import appeng.api.implementations.items.IAEWrench;
+import appeng.api.parts.IPartHost;
+import appeng.api.parts.SelectedPart;
 import appeng.api.util.DimensionalCoord;
 import appeng.block.AEBaseBlock;
 import appeng.hooks.AEToolItem;
 import appeng.items.AEBaseItem;
+import appeng.parts.PartPlacement;
+import appeng.util.PartHostWrenching;
 import appeng.util.Platform;
 
 public class QuartzWrenchItem extends AEBaseItem implements IAEWrench, AEToolItem {
@@ -41,23 +50,55 @@ public class QuartzWrenchItem extends AEBaseItem implements IAEWrench, AEToolIte
 
     @Override
     public ActionResult onItemUseFirst(ItemStack stack, ItemUsageContext context) {
-        if (!context.getPlayer().isInSneakingPose() && Platform
-                .hasPermissions(new DimensionalCoord(context.getWorld(), context.getBlockPos()), context.getPlayer())) {
+        PlayerEntity player = context.getPlayer();
+        if (player == null) {
+            return ActionResult.PASS;
+        }
 
-            Block block = context.getWorld().getBlockState(context.getBlockPos()).getBlock();
-            if (block instanceof AEBaseBlock) {
-                if (Platform.isClient()) {
-                    // TODO 1.10-R - if we return FAIL on client, action will not be sent to server.
-                    // Fix that in all Block#onItemUseFirst overrides.
-                    return !context.getWorld().isClient ? ActionResult.SUCCESS : ActionResult.PASS;
+        boolean isHoldingShift = player.isInSneakingPose();
+        World world = context.getWorld();
+        BlockPos pos = context.getBlockPos();
+        if (!Platform.hasPermissions(new DimensionalCoord(world, pos), player)) {
+            return ActionResult.FAIL;
+        }
+
+        BlockState blockState = world.getBlockState(pos);
+        Block block = blockState.getBlock();
+
+        if (isHoldingShift) {
+
+            // Wrenching parts of cable buses or other part hosts
+            BlockEntity tile = world.getBlockEntity(pos);
+            IPartHost host = null;
+            if (tile instanceof IPartHost) {
+                host = (IPartHost) tile;
+            }
+
+            if (host != null) {
+                if (!world.isClient) {
+                    // Build the relative position within the part
+                    Vec3d relPos = context.getHitPos().subtract(pos.getX(), pos.getY(), pos.getZ());
+
+                    final SelectedPart sp = PartPlacement.selectPart(player, host, relPos);
+
+                    PartHostWrenching.wrenchPart(world, pos, host, sp);
                 }
+                return ActionResult.SUCCESS;
+            }
 
+            // Pass the use onto the block...
+            return block.onUse(blockState, world, pos, player, context.getHand(),
+                    new BlockHitResult(context.getHitPos(), context.getSide(), pos, context.hitsInsideBlock()));
+        }
+
+        if (block instanceof AEBaseBlock) {
+            if (!world.isClient) {
                 AEBaseBlock aeBlock = (AEBaseBlock) block;
-                if (aeBlock.rotateAroundFaceAxis(context.getWorld(), context.getBlockPos(), context.getSide())) {
-                    context.getPlayer().swingHand(context.getHand());
-                    return !context.getWorld().isClient ? ActionResult.SUCCESS : ActionResult.FAIL;
+                if (aeBlock.rotateAroundFaceAxis(world, pos, context.getSide())) {
+                    player.swingHand(context.getHand());
                 }
             }
+            return ActionResult.SUCCESS;
         }
         return ActionResult.PASS;
     }

src/main/java/appeng/me/Grid.java

@@ -176,7 +176,6 @@ public class Grid implements IGrid {
         }
 
         gridNode.getGridProxy().gridChanged();
-        // postEventTo( gridNode, networkChanged );
     }
 
     @Override

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/mixins/HopperMixin.java

@@ -1,36 +0,0 @@
-package appeng.mixins;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.minecraft.block.entity.Hopper;
-import net.minecraft.block.entity.HopperBlockEntity;
-import net.minecraft.util.ActionResult;
-
-import appeng.hooks.HopperHooks;
-
-// SEE: https://github.com/AlexIIL/LibBlockAttributes/pull/27
-@SuppressWarnings("ConstantConditions")
-@Mixin(HopperBlockEntity.class)
-public class HopperMixin {
-
-    @Inject(method = "insert", at = @At("HEAD"), cancellable = true, require = 1, allow = 1)
-    private void onInsert(CallbackInfoReturnable<Boolean> cri) {
-        HopperBlockEntity self = (HopperBlockEntity) (Object) this;
-        ActionResult result = HopperHooks.tryInsert(self);
-        if (result != ActionResult.PASS) {
-            cri.setReturnValue(result.isAccepted());
-        }
-    }
-
-    @Inject(method = "extract", at = @At("HEAD"), cancellable = true, require = 1, allow = 1)
-    private static void onExtract(Hopper hopper, CallbackInfoReturnable<Boolean> cri) {
-        ActionResult result = HopperHooks.tryExtract(hopper);
-        if (result != ActionResult.PASS) {
-            cri.setReturnValue(result.isAccepted());
-        }
-    }
-
-}

src/main/java/appeng/mixins/ItemEntityAccessor.java

@@ -0,0 +1,17 @@
+package appeng.mixins;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import net.minecraft.entity.ItemEntity;
+
+@Mixin(ItemEntity.class)
+public interface ItemEntityAccessor {
+
+    @Accessor
+    int getAge();
+
+    @Accessor
+    void setAge(int age);
+
+}

src/main/java/appeng/parts/PartPlacement.java

@@ -18,9 +18,6 @@
 
 package appeng.parts;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import net.fabricmc.fabric.api.event.player.UseBlockCallback;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
@@ -48,7 +45,6 @@ import appeng.api.definitions.IBlockDefinition;
 import appeng.api.parts.IFacadePart;
 import appeng.api.parts.IPartHost;
 import appeng.api.parts.IPartItem;
-import appeng.api.parts.PartItemStack;
 import appeng.api.parts.SelectedPart;
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.DimensionalCoord;
@@ -85,56 +81,6 @@ public class PartPlacement {
         final BlockHitResult mop = world.rayTrace(rtc);
         ItemPlacementContext useContext = new ItemPlacementContext(new ItemUsageContext(player, hand, mop));
 
-        if (!held.isEmpty() && Platform.isWrench(player, held, pos) && player.isInSneakingPose()) {
-            if (!Platform.hasPermissions(new DimensionalCoord(world, pos), player)) {
-                return ActionResult.FAIL;
-            }
-
-            final BlockEntity tile = world.getBlockEntity(pos);
-            IPartHost host = null;
-
-            if (tile instanceof IPartHost) {
-                host = (IPartHost) tile;
-            }
-
-            if (host != null) {
-                if (!world.isClient) {
-                    if (mop.getType() == HitResult.Type.BLOCK) {
-                        final List<ItemStack> is = new ArrayList<>();
-                        final SelectedPart sp = selectPart(player, host,
-                                mop.getPos().add(-mop.getPos().getX(), -mop.getPos().getY(), -mop.getPos().getZ()));
-
-                        if (sp.part != null) {
-                            is.add(sp.part.getItemStack(PartItemStack.WRENCH));
-                            sp.part.getDrops(is, true);
-                            host.removePart(sp.side, false);
-                        }
-
-                        if (sp.facade != null) {
-                            is.add(sp.facade.getItemStack());
-                            host.getFacadeContainer().removeFacade(host, sp.side);
-                            Platform.notifyBlocksOfNeighbors(world, pos);
-                        }
-
-                        if (host.isEmpty()) {
-                            host.cleanup();
-                        }
-
-                        if (!is.isEmpty()) {
-                            Platform.spawnDrops(world, pos, is);
-                        }
-                    }
-                } else {
-                    player.swingHand(hand);
-                    NetworkHandler.instance()
-                            .sendToServer(new PartPlacementPacket(pos, side, getEyeOffset(player), hand));
-                }
-                return ActionResult.SUCCESS;
-            }
-
-            return ActionResult.FAIL;
-        }
-
         BlockEntity tile = world.getBlockEntity(pos);
         IPartHost host = null;
 
@@ -178,6 +124,7 @@ public class PartPlacement {
         if (held.isEmpty()) {
             if (host != null && player.isInSneakingPose() && world.isAir(pos)) {
                 if (mop.getType() == HitResult.Type.BLOCK) {
+                    // FIXME FABRIC: This looks wrong
                     Vec3d hitVec = mop.getPos().add(-mop.getPos().getX(), -mop.getPos().getY(), -mop.getPos().getZ());
                     final SelectedPart sPart = selectPart(player, host, hitVec);
                     if (sPart != null && sPart.part != null) {
@@ -323,7 +270,7 @@ public class PartPlacement {
         return getEyeHeight();
     }
 
-    private static SelectedPart selectPart(final PlayerEntity player, final IPartHost host, final Vec3d pos) {
+    public static SelectedPart selectPart(final PlayerEntity player, final IPartHost host, final Vec3d pos) {
         AppEng.instance().setPartInteractionPlayer(player);
         try {
             return host.selectPart(pos);
@@ -401,8 +348,6 @@ public class PartPlacement {
 // FIXME FABRIC                    NetworkHandler.instance().sendToServer(new ClickPacket(event.getHand()));
 // FIXME FABRIC                }
 // FIXME FABRIC            }
-// FIXME FABRIC        } else if (event instanceof PlayerInteractEvent.RightClickBlock && !event.getPlayer().world.isClient) {
-// FIXME FABRIC
 // FIXME FABRIC        }
 // FIXME FABRIC    }
 

src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java

@@ -141,7 +141,7 @@ public class FluidP2PTunnelPart extends P2PTunnelPart<FluidP2PTunnelPart> {
                 }
 
                 if (simulation.isAction()) {
-                    FluidP2PTunnelPart.this.queueTunnelDrain(PowerUnits.RF,
+                    FluidP2PTunnelPart.this.queueTunnelDrain(PowerUnits.TR,
                             amount.sub(overflowAmount).asInexactDouble() * 1000);
                 }
             } catch (GridAccessException ignored) {

src/main/java/appeng/parts/p2p/P2PTunnelPart.java

@@ -218,18 +218,10 @@ public abstract class P2PTunnelPart<T extends P2PTunnelPart> extends BasicStateP
                     newType = parts.p2PTunnelLight().maybeStack(1).orElse(ItemStack.EMPTY);
                     break;
 
-                case FE_POWER:
-                    newType = parts.p2PTunnelFE().maybeStack(1).orElse(ItemStack.EMPTY);
-                    break;
-
                 case FLUID:
                     newType = parts.p2PTunnelFluids().maybeStack(1).orElse(ItemStack.EMPTY);
                     break;
 
-                case IC2_POWER:
-                    newType = parts.p2PTunnelEU().maybeStack(1).orElse(ItemStack.EMPTY);
-                    break;
-
                 case ITEM:
                     newType = parts.p2PTunnelItems().maybeStack(1).orElse(ItemStack.EMPTY);
                     break;
@@ -242,12 +234,6 @@ public abstract class P2PTunnelPart<T extends P2PTunnelPart> extends BasicStateP
                     newType = parts.p2PTunnelRedstone().maybeStack(1).orElse(ItemStack.EMPTY);
                     break;
 
-                /*
-                 * case COMPUTER_MESSAGE: for( ItemStack stack :
-                 * parts.p2PTunnelOpenComputers().maybeStack( 1 ).asSet() ) { newType = stack; }
-                 * break;
-                 */
-
                 default:
                     newType = ItemStack.EMPTY;
                     break;

src/main/java/appeng/tile/AEBaseBlockEntity.java

@@ -298,6 +298,7 @@ public class AEBaseBlockEntity extends BlockEntity implements IOrientable, IComm
         this.up = inUp;
         this.markForUpdate();
         Platform.notifyBlocksOfNeighbors(this.world, this.pos);
+        this.saveChanges();
     }
 
     public void onPlacement(ItemPlacementContext context) {

src/main/java/appeng/tile/AEBaseInvBlockEntity.java

@@ -59,6 +59,13 @@ public abstract class AEBaseInvBlockEntity extends AEBaseBlockEntity implements
 
     public abstract @Nonnull FixedItemInv getInternalInventory();
 
+    /**
+     * Inventory offered to other mods accessing this block externally.
+     */
+    public @Nonnull FixedItemInv getExternalInventory() {
+        return getInternalInventory();
+    }
+
     @Override
     public CompoundTag toTag(final CompoundTag data) {
         super.toTag(data);
@@ -95,7 +102,7 @@ public abstract class AEBaseInvBlockEntity extends AEBaseBlockEntity implements
             ItemStack added);
 
     protected @Nonnull FixedItemInv getItemHandlerForSide(@Nonnull Direction side) {
-        return this.getInternalInventory();
+        return this.getExternalInventory();
     }
 
     @Override
@@ -107,7 +114,7 @@ public abstract class AEBaseInvBlockEntity extends AEBaseBlockEntity implements
     private void offerItemInventory(AttributeList<?> to) {
         Direction searchDirection = to.getSearchDirection();
         if (searchDirection == null) {
-            to.offer(getInternalInventory());
+            to.offer(getExternalInventory());
         } else {
             Direction side = searchDirection.getOpposite();
             to.offer(getItemHandlerForSide(side));

src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java

@@ -23,6 +23,8 @@ import java.util.List;
 
 import javax.annotation.Nullable;
 
+import org.jetbrains.annotations.NotNull;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
@@ -38,6 +40,7 @@ import net.minecraft.world.World;
 
 import alexiil.mc.lib.attributes.Simulation;
 import alexiil.mc.lib.attributes.item.FixedItemInv;
+import alexiil.mc.lib.attributes.item.LimitedFixedItemInv;
 
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
@@ -78,8 +81,6 @@ import appeng.util.Platform;
 import appeng.util.helpers.ItemHandlerUtil;
 import appeng.util.inv.InvOperation;
 import appeng.util.inv.WrapperChainedItemHandler;
-import appeng.util.inv.WrapperFilteredItemHandler;
-import appeng.util.inv.filter.IAEItemFilter;
 import appeng.util.item.AEItemStack;
 
 public class MolecularAssemblerBlockEntity extends AENetworkInvBlockEntity
@@ -90,8 +91,8 @@ public class MolecularAssemblerBlockEntity extends AENetworkInvBlockEntity
     private final CraftingInventory craftingInv;
     private final AppEngInternalInventory gridInv = new AppEngInternalInventory(this, 9 + 1, 1);
     private final AppEngInternalInventory patternInv = new AppEngInternalInventory(this, 1, 1);
-    private final FixedItemInv gridInvExt = new WrapperFilteredItemHandler(this.gridInv, new CraftingGridFilter());
     private final FixedItemInv internalInv = new WrapperChainedItemHandler(this.gridInv, this.patternInv);
+    private final LimitedFixedItemInv gridInvExt;
     private final IConfigManager settings;
     private final UpgradeInventory upgrades;
     private boolean isPowered = false;
@@ -116,6 +117,20 @@ public class MolecularAssemblerBlockEntity extends AENetworkInvBlockEntity
         this.upgrades = new DefinitionUpgradeInventory(assembler, this, this.getUpgradeSlots());
         this.craftingInv = new CraftingInventory(new ContainerNull(), 3, 3);
 
+        gridInvExt = gridInv.createLimitedFixedInv();
+        // Limit the input slots to 1 of the respective crafting ingredient
+        for (int i = 0; i < 9; i++) {
+            int slot = i;
+            gridInvExt.getRule(slot).disallowExtraction().limitInsertionCount(1)
+                    .filterInserts(stack -> isValidIngredientForSlot(slot, stack));
+        }
+        // Output slot
+        gridInvExt.getRule(9).disallowInsertion();
+    }
+
+    private boolean isValidIngredientForSlot(int slot, ItemStack stack) {
+        return this.myPlan != null && !ItemHandlerUtil.isEmpty(this.patternInv)
+                && this.myPlan.isValidItemForSlot(slot, stack, MolecularAssemblerBlockEntity.this.getWorld());
     }
 
     private int getUpgradeSlots() {
@@ -310,8 +325,9 @@ public class MolecularAssemblerBlockEntity extends AENetworkInvBlockEntity
         return this.internalInv;
     }
 
+    @NotNull
     @Override
-    protected FixedItemInv getItemHandlerForSide(Direction side) {
+    public FixedItemInv getExternalInventory() {
         return this.gridInvExt;
     }
 
@@ -554,28 +570,4 @@ public class MolecularAssemblerBlockEntity extends AENetworkInvBlockEntity
         return this.animationStatus;
     }
 
-    private class CraftingGridFilter implements IAEItemFilter {
-        private boolean hasPattern() {
-            return MolecularAssemblerBlockEntity.this.myPlan != null
-                    && !ItemHandlerUtil.isEmpty(MolecularAssemblerBlockEntity.this.patternInv);
-        }
-
-        @Override
-        public boolean allowExtract(FixedItemInv inv, int slot, int amount) {
-            return slot == 9;
-        }
-
-        @Override
-        public boolean allowInsert(FixedItemInv inv, int slot, ItemStack stack) {
-            if (slot >= 9) {
-                return false;
-            }
-
-            if (this.hasPattern()) {
-                return MolecularAssemblerBlockEntity.this.myPlan.isValidItemForSlot(slot, stack,
-                        MolecularAssemblerBlockEntity.this.getWorld());
-            }
-            return false;
-        }
-    }
 }

src/main/java/appeng/tile/grid/AENetworkInvBlockEntity.java

@@ -80,6 +80,10 @@ public abstract class AENetworkInvBlockEntity extends AEBaseInvBlockEntity imple
     @Override
     public void markRemoved() {
         super.markRemoved();
+        // if the cached block state is not current, the following method may call
+        // markForUpdate
+        // and cause the block state to be changed back to non-air
+        resetBlock();
         this.getProxy().remove();
     }
 

src/main/java/appeng/tile/grindstone/GrinderBlockEntity.java

@@ -28,6 +28,7 @@ import net.minecraft.util.math.Direction;
 
 import alexiil.mc.lib.attributes.Simulation;
 import alexiil.mc.lib.attributes.item.FixedItemInv;
+import alexiil.mc.lib.attributes.item.LimitedFixedItemInv;
 
 import appeng.api.implementations.tiles.ICrankable;
 import appeng.recipes.handlers.GrinderOptionalResult;
@@ -39,18 +40,21 @@ import appeng.util.InventoryAdaptor;
 import appeng.util.Platform;
 import appeng.util.inv.AdaptorFixedInv;
 import appeng.util.inv.InvOperation;
-import appeng.util.inv.WrapperFilteredItemHandler;
-import appeng.util.inv.filter.IAEItemFilter;
 
 public class GrinderBlockEntity extends AEBaseInvBlockEntity implements ICrankable {
     private static final int SLOT_PROCESSING = 6;
 
     private final AppEngInternalInventory inv = new AppEngInternalInventory(this, 7);
-    private final FixedItemInv invExt = new WrapperFilteredItemHandler(this.inv, new GrinderFilter());
+    private final LimitedFixedItemInv invExt;
     private int points;
 
     public GrinderBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
         super(tileEntityTypeIn);
+
+        invExt = inv.createLimitedFixedInv();
+        invExt.getAllRule().disallowExtraction().disallowInsertion();
+        invExt.getSubRule(3, 6).allowExtraction();
+        invExt.getSubRule(0, 3).filterInserts(stack -> GrinderRecipes.isValidIngredient(world, stack)).allowInsertion();
     }
 
     @Override
@@ -161,20 +165,4 @@ public class GrinderBlockEntity extends AEBaseInvBlockEntity implements ICrankab
         return this.getUp() == directionToCrank;
     }
 
-    private class GrinderFilter implements IAEItemFilter {
-        @Override
-        public boolean allowExtract(FixedItemInv inv, int slotIndex, int amount) {
-            return slotIndex >= 3 && slotIndex <= 5;
-        }
-
-        @Override
-        public boolean allowInsert(FixedItemInv inv, int slotIndex, ItemStack stack) {
-            if (!GrinderRecipes.isValidIngredient(world, stack)) {
-                return false;
-            }
-
-            return slotIndex >= 0 && slotIndex <= 2;
-        }
-    }
-
 }

src/main/java/appeng/tile/misc/ChargerBlockEntity.java

@@ -23,6 +23,8 @@ import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 
+import org.jetbrains.annotations.NotNull;
+
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -137,6 +139,12 @@ public class ChargerBlockEntity extends AENetworkPowerBlockEntity implements ICr
 
     @Override
     public FixedItemInv getInternalInventory() {
+        return inv;
+    }
+
+    @NotNull
+    @Override
+    public FixedItemInv getExternalInventory() {
         return externalInv;
     }
 
@@ -255,7 +263,7 @@ public class ChargerBlockEntity extends AENetworkPowerBlockEntity implements ICr
         return true;
     }
 
-    private class ChargerInvFilter implements IAEItemFilter {
+    private static class ChargerInvFilter implements IAEItemFilter {
         @Override
         public boolean allowInsert(FixedItemInv inv, final int i, final ItemStack itemstack) {
             final IItemDefinition cert = Api.instance().definitions().materials().certusQuartzCrystal();

src/main/java/appeng/tile/misc/CondenserBlockEntity.java

@@ -73,7 +73,6 @@ public class CondenserBlockEntity extends AEBaseInvBlockEntity implements IConfi
     private final AppEngInternalInventory storageSlot = new AppEngInternalInventory(this, 1);
     // This is a FixedItemInv implementation to satisfy the UI, which is slot based
     private final CondenseItemHandler internalInputSlot = new CondenseItemHandler();
-    private final CondenseItemInsertable externalItemInput = new CondenseItemInsertable();
     private final FluidInsertable externalFluidInput = new FluidHandler();
     private final MEHandler meHandler = new MEHandler();
 
@@ -139,7 +138,7 @@ public class CondenserBlockEntity extends AEBaseInvBlockEntity implements IConfi
     }
 
     private boolean canAddOutput(final ItemStack output) {
-        return this.outputSlot.getInsertable().attemptInsertion(output, Simulation.SIMULATE).isEmpty();
+        return this.outputSlot.getInsertable().wouldAccept(output);
     }
 
     /**
@@ -148,7 +147,7 @@ public class CondenserBlockEntity extends AEBaseInvBlockEntity implements IConfi
      * @param output to be added output
      */
     private void addOutput(final ItemStack output) {
-        this.outputSlot.getInsertable().attemptInsertion(output, Simulation.ACTION);
+        this.outputSlot.getInsertable().insert(output);
     }
 
     FixedItemInv getOutputSlot() {
@@ -215,16 +214,6 @@ public class CondenserBlockEntity extends AEBaseInvBlockEntity implements IConfi
         to.offer(meHandler);
     }
 
-    private class CondenseItemInsertable implements ItemInsertable {
-        @Override
-        public ItemStack attemptInsertion(ItemStack itemStack, Simulation simulation) {
-            if (simulation == Simulation.ACTION && !itemStack.isEmpty()) {
-                CondenserBlockEntity.this.addPower(itemStack.getCount());
-            }
-            return ItemStack.EMPTY;
-        }
-    }
-
     private class CondenseItemHandler implements FixedItemInv {
         @Override
         public int getSlotCount() {
@@ -243,7 +232,7 @@ public class CondenserBlockEntity extends AEBaseInvBlockEntity implements IConfi
 
         @Override
         public boolean setInvStack(int i, ItemStack itemStack, Simulation simulation) {
-            if (simulation == Simulation.ACTION) {
+            if (simulation == Simulation.ACTION && !itemStack.isEmpty()) {
                 CondenserBlockEntity.this.addPower(itemStack.getCount());
             }
             return true;

src/main/java/appeng/tile/misc/InscriberBlockEntity.java

@@ -25,6 +25,8 @@ import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import org.jetbrains.annotations.NotNull;
+
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.item.ItemStack;
@@ -36,6 +38,7 @@ import net.minecraft.world.World;
 
 import alexiil.mc.lib.attributes.Simulation;
 import alexiil.mc.lib.attributes.item.FixedItemInv;
+import alexiil.mc.lib.attributes.item.LimitedFixedItemInv;
 
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
@@ -65,8 +68,6 @@ import appeng.util.ConfigManager;
 import appeng.util.IConfigManagerHost;
 import appeng.util.inv.InvOperation;
 import appeng.util.inv.WrapperChainedItemHandler;
-import appeng.util.inv.WrapperFilteredItemHandler;
-import appeng.util.inv.filter.IAEItemFilter;
 import appeng.util.item.AEItemStack;
 
 /**
@@ -91,15 +92,17 @@ public class InscriberBlockEntity extends AENetworkPowerBlockEntity
     private final AppEngInternalInventory bottomItemHandler = new AppEngInternalInventory(this, 1, 1);
     private final AppEngInternalInventory sideItemHandler = new AppEngInternalInventory(this, 2, 1);
 
-    private final FixedItemInv topItemHandlerExtern;
-    private final FixedItemInv bottomItemHandlerExtern;
-    private final FixedItemInv sideItemHandlerExtern;
+    private final LimitedFixedItemInv topItemHandlerExtern;
+    private final LimitedFixedItemInv bottomItemHandlerExtern;
+    private final LimitedFixedItemInv sideItemHandlerExtern;
 
     private InscriberRecipe cachedTask = null;
 
     private final FixedItemInv inv = new WrapperChainedItemHandler(this.topItemHandler, this.bottomItemHandler,
             this.sideItemHandler);
 
+    private final FixedItemInv externalInv;
+
     public InscriberBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
         super(tileEntityTypeIn);
 
@@ -113,10 +116,30 @@ public class InscriberBlockEntity extends AENetworkPowerBlockEntity
 
         this.sideItemHandler.setMaxStackSize(1, 64);
 
-        final IAEItemFilter filter = new ItemHandlerFilter();
-        this.topItemHandlerExtern = new WrapperFilteredItemHandler(this.topItemHandler, filter);
-        this.bottomItemHandlerExtern = new WrapperFilteredItemHandler(this.bottomItemHandler, filter);
-        this.sideItemHandlerExtern = new WrapperFilteredItemHandler(this.sideItemHandler, filter);
+        this.topItemHandlerExtern = this.topItemHandler.createLimitedFixedInv();
+        this.topItemHandlerExtern.getAllRule().filterInserts(this::canInsertIntoTopOrBottom)
+                .filterExtracts(stack -> !isSmash());
+
+        this.bottomItemHandlerExtern = this.bottomItemHandler.createLimitedFixedInv();
+        this.bottomItemHandlerExtern.getAllRule().filterInserts(this::canInsertIntoTopOrBottom)
+                .filterExtracts(stack -> !isSmash());
+
+        this.sideItemHandlerExtern = this.sideItemHandler.createLimitedFixedInv();
+        this.sideItemHandlerExtern.getRule(0).disallowExtraction().filterInserts(stack -> !isSmash());
+        this.sideItemHandlerExtern.getRule(1).filterExtracts(stack -> !isSmash()).disallowInsertion();
+
+        this.externalInv = new WrapperChainedItemHandler(this.topItemHandlerExtern, this.bottomItemHandlerExtern,
+                this.sideItemHandlerExtern);
+    }
+
+    private boolean canInsertIntoTopOrBottom(ItemStack stack) {
+        if (isSmash()) {
+            return false;
+        }
+        if (Api.instance().definitions().materials().namePress().isSameAs(stack)) {
+            return true;
+        }
+        return InscriberRecipes.isValidOptionalIngredient(getWorld(), stack);
     }
 
     private int getUpgradeSlots() {
@@ -212,6 +235,12 @@ public class InscriberBlockEntity extends AENetworkPowerBlockEntity
         return this.inv;
     }
 
+    @NotNull
+    @Override
+    public FixedItemInv getExternalInventory() {
+        return this.externalInv;
+    }
+
     @Override
     public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc,
             final ItemStack removed, final ItemStack added) {
@@ -276,7 +305,7 @@ public class InscriberBlockEntity extends AENetworkPowerBlockEntity
                 if (out != null) {
                     final ItemStack outputCopy = out.getOutput().copy();
 
-                    if (this.sideItemHandler.setInvStack(1, outputCopy, Simulation.ACTION)) {
+                    if (this.sideItemHandler.getSlot(1).insert(outputCopy).isEmpty()) {
                         this.setProcessingTime(0);
                         if (out.getProcessType() == InscriberProcessType.PRESS) {
                             this.topItemHandler.setInvStack(0, ItemStack.EMPTY, Simulation.ACTION);
@@ -325,7 +354,7 @@ public class InscriberBlockEntity extends AENetworkPowerBlockEntity
                 final InscriberRecipe out = this.getTask();
                 if (out != null) {
                     final ItemStack outputCopy = out.getOutput().copy();
-                    if (this.sideItemHandler.setInvStack(1, outputCopy, Simulation.SIMULATE)) {
+                    if (this.sideItemHandler.getSlot(1).wouldAccept(outputCopy)) {
                         this.setSmash(true);
                         this.finalStep = 0;
                         this.markForUpdate();
@@ -403,42 +432,4 @@ public class InscriberBlockEntity extends AENetworkPowerBlockEntity
         this.processingTime = processingTime;
     }
 
-    /**
-     * This is an item handler that exposes the inscribers inventory while providing
-     * simulation capabilities that do not reset the progress if there's already an
-     * item in a slot. Previously, the progress of the inscriber was reset when
-     * another mod attempted insertion of items when there were already items in the
-     * slot.
-     */
-    private class ItemHandlerFilter implements IAEItemFilter {
-        @Override
-        public boolean allowExtract(FixedItemInv inv, int slot, int amount) {
-            if (InscriberBlockEntity.this.isSmash()) {
-                return false;
-            }
-
-            return inv == InscriberBlockEntity.this.topItemHandler || inv == InscriberBlockEntity.this.bottomItemHandler
-                    || slot == 1;
-        }
-
-        @Override
-        public boolean allowInsert(FixedItemInv inv, int slot, ItemStack stack) {
-            // output slot
-            if (slot == 1) {
-                return false;
-            }
-
-            if (InscriberBlockEntity.this.isSmash()) {
-                return false;
-            }
-
-            if (inv == InscriberBlockEntity.this.topItemHandler || inv == InscriberBlockEntity.this.bottomItemHandler) {
-                if (Api.instance().definitions().materials().namePress().isSameAs(stack)) {
-                    return true;
-                }
-                return InscriberRecipes.isValidOptionalIngredient(getWorld(), stack);
-            }
-            return true;
-        }
-    }
 }

src/main/java/appeng/tile/misc/VibrationChamberBlockEntity.java

@@ -33,6 +33,7 @@ import net.minecraft.util.math.Direction;
 
 import alexiil.mc.lib.attributes.Simulation;
 import alexiil.mc.lib.attributes.item.FixedItemInv;
+import alexiil.mc.lib.attributes.item.LimitedFixedItemInv;
 
 import appeng.api.config.Actionable;
 import appeng.api.networking.IGridNode;
@@ -49,8 +50,6 @@ import appeng.tile.grid.AENetworkInvBlockEntity;
 import appeng.tile.inventory.AppEngInternalInventory;
 import appeng.util.Platform;
 import appeng.util.inv.InvOperation;
-import appeng.util.inv.WrapperFilteredItemHandler;
-import appeng.util.inv.filter.IAEItemFilter;
 
 public class VibrationChamberBlockEntity extends AENetworkInvBlockEntity implements IGridTickable {
     public static final double POWER_PER_TICK = 5;
@@ -58,7 +57,7 @@ public class VibrationChamberBlockEntity extends AENetworkInvBlockEntity impleme
     public static final int MAX_BURN_SPEED = 200;
     public static final double DILATION_SCALING = 25.0; // x4 ~ 40 AE/t at max
     private final AppEngInternalInventory inv = new AppEngInternalInventory(this, 1);
-    private final FixedItemInv invExt = new WrapperFilteredItemHandler(this.inv, new FuelSlotFilter());
+    private final LimitedFixedItemInv invExt;
 
     private int burnSpeed = 100;
     private double burnTime = 0;
@@ -71,6 +70,10 @@ public class VibrationChamberBlockEntity extends AENetworkInvBlockEntity impleme
         super(tileEntityTypeIn);
         this.getProxy().setIdlePowerUsage(0);
         this.getProxy().setFlags();
+
+        invExt = inv.createLimitedFixedInv();
+        invExt.getAllRule().filterInserts(stack -> FuelRegistry.INSTANCE.get(stack.getItem()) != null)
+                .filterExtracts(stack -> FuelRegistry.INSTANCE.get(stack.getItem()) == null);
     }
 
     @Override
@@ -138,8 +141,8 @@ public class VibrationChamberBlockEntity extends AENetworkInvBlockEntity impleme
     private boolean canEatFuel() {
         final ItemStack is = this.inv.getInvStack(0);
         if (!is.isEmpty()) {
-            final int newBurnTime = FuelRegistry.INSTANCE.get(is.getItem());
-            if (newBurnTime > 0 && is.getCount() > 0) {
+            final Integer newBurnTime = FuelRegistry.INSTANCE.get(is.getItem());
+            if (newBurnTime != null && is.getCount() > 0) {
                 return true;
             }
         }
@@ -210,8 +213,8 @@ public class VibrationChamberBlockEntity extends AENetworkInvBlockEntity impleme
     private void eatFuel() {
         final ItemStack is = this.inv.getInvStack(0);
         if (!is.isEmpty()) {
-            final int newBurnTime = FuelRegistry.INSTANCE.get(is.getItem());
-            if (newBurnTime > 0 && is.getCount() > 0) {
+            final Integer newBurnTime = FuelRegistry.INSTANCE.get(is.getItem());
+            if (newBurnTime != null && is.getCount() > 0) {
                 this.setBurnTime(this.getBurnTime() + newBurnTime);
                 this.setMaxBurnTime(this.getBurnTime());
 
@@ -270,15 +273,4 @@ public class VibrationChamberBlockEntity extends AENetworkInvBlockEntity impleme
         this.burnTime = burnTime;
     }
 
-    private static class FuelSlotFilter implements IAEItemFilter {
-        @Override
-        public boolean allowExtract(FixedItemInv inv, int slot, int amount) {
-            return FuelRegistry.INSTANCE.get(inv.getInvStack(slot).getItem()) == 0;
-        }
-
-        @Override
-        public boolean allowInsert(FixedItemInv inv, int slot, ItemStack stack) {
-            return FuelRegistry.INSTANCE.get(stack.getItem()) != 0;
-        }
-    }
 }

src/main/java/appeng/tile/powersink/AEBasePoweredBlockEntity.java

@@ -26,12 +26,12 @@ import com.google.common.collect.ImmutableSet;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
-import net.minecraft.world.World;
+import net.minecraft.util.math.MathHelper;
 
-import alexiil.mc.lib.attributes.AttributeList;
-import alexiil.mc.lib.attributes.AttributeProvider;
+import team.reborn.energy.EnergySide;
+import team.reborn.energy.EnergyStorage;
+import team.reborn.energy.EnergyTier;
 
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
@@ -39,10 +39,11 @@ import appeng.api.config.PowerMultiplier;
 import appeng.api.config.PowerUnits;
 import appeng.api.networking.energy.IAEPowerStorage;
 import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType;
+import appeng.core.AEConfig;
 import appeng.tile.AEBaseInvBlockEntity;
 
 public abstract class AEBasePoweredBlockEntity extends AEBaseInvBlockEntity
-        implements IAEPowerStorage, IExternalPowerSink, AttributeProvider {
+        implements IAEPowerStorage, IExternalPowerSink, EnergyStorage {
 
     // values that determine general function, are set by inheriting classes if
     // needed. These should generally remain static.
@@ -230,10 +231,37 @@ public abstract class AEBasePoweredBlockEntity extends AEBaseInvBlockEntity
     }
 
     @Override
-    public void addAllAttributes(World world, BlockPos pos, BlockState state, AttributeList<?> to) {
-        super.addAllAttributes(world, pos, state, to);
+    public double getMaxInput(EnergySide side) {
+        double attemptedInsert = AEConfig.instance().getPowerTransactionLimitTechReborn();
+        double overflow = this.injectExternalPower(PowerUnits.TR, attemptedInsert, Actionable.SIMULATE);
+        double couldInsert = attemptedInsert - overflow;
+        if (couldInsert < 0.001) {
+            return 0;
+        }
 
-        // FIXME FABRIC: Offer energy attributes
+        return PowerUnits.AE.convertTo(PowerUnits.TR, couldInsert);
+    }
+
+    @Override
+    public double getStored(EnergySide energySide) {
+        // This block acts as if it cannot actually store any energy
+        return 0.0;
+    }
+
+    @Override
+    public void setStored(double v) {
+        v = MathHelper.clamp(v, 0.001, getMaxStoredPower());
+        this.injectExternalPower(PowerUnits.TR, v, Actionable.MODULATE);
+    }
+
+    @Override
+    public double getMaxStoredPower() {
+        return AEConfig.instance().getPowerTransactionLimitTechReborn();
+    }
+
+    @Override
+    public EnergyTier getTier() {
+        return EnergyTier.INFINITE;
     }
 
 }

src/main/java/appeng/tile/spatial/SpatialIOPortBlockEntity.java

@@ -30,6 +30,7 @@ import net.minecraft.world.World;
 
 import alexiil.mc.lib.attributes.Simulation;
 import alexiil.mc.lib.attributes.item.FixedItemInv;
+import alexiil.mc.lib.attributes.item.LimitedFixedItemInv;
 
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
@@ -51,18 +52,20 @@ import appeng.tile.inventory.AppEngInternalInventory;
 import appeng.util.IWorldCallable;
 import appeng.util.Platform;
 import appeng.util.inv.InvOperation;
-import appeng.util.inv.WrapperFilteredItemHandler;
-import appeng.util.inv.filter.IAEItemFilter;
 
 public class SpatialIOPortBlockEntity extends AENetworkInvBlockEntity implements IWorldCallable<Void> {
 
     private final AppEngInternalInventory inv = new AppEngInternalInventory(this, 2);
-    private final FixedItemInv invExt = new WrapperFilteredItemHandler(this.inv, new SpatialIOFilter());
+    private final LimitedFixedItemInv invExt;
     private YesNo lastRedstoneState = YesNo.UNDECIDED;
 
     public SpatialIOPortBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
         super(tileEntityTypeIn);
         this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL);
+
+        invExt = inv.createLimitedFixedInv();
+        invExt.getRule(0).disallowExtraction().allowInsertion().filterInserts(this::isSpatialCell);
+        invExt.getRule(1).disallowInsertion().allowExtraction();
     }
 
     @Override
@@ -186,16 +189,4 @@ public class SpatialIOPortBlockEntity extends AENetworkInvBlockEntity implements
 
     }
 
-    private class SpatialIOFilter implements IAEItemFilter {
-        @Override
-        public boolean allowExtract(FixedItemInv inv, int slot, int amount) {
-            return slot == 1;
-        }
-
-        @Override
-        public boolean allowInsert(FixedItemInv inv, int slot, ItemStack stack) {
-            return (slot == 0 && SpatialIOPortBlockEntity.this.isSpatialCell(stack));
-        }
-
-    }
 }

src/main/java/appeng/tile/storage/IOPortBlockEntity.java

@@ -33,6 +33,7 @@ import net.minecraft.world.World;
 
 import alexiil.mc.lib.attributes.Simulation;
 import alexiil.mc.lib.attributes.item.FixedItemInv;
+import alexiil.mc.lib.attributes.item.LimitedFixedItemInv;
 
 import appeng.api.config.Actionable;
 import appeng.api.config.FullnessMode;
@@ -74,8 +75,6 @@ import appeng.util.helpers.ItemHandlerUtil;
 import appeng.util.inv.AdaptorFixedInv;
 import appeng.util.inv.InvOperation;
 import appeng.util.inv.WrapperChainedItemHandler;
-import appeng.util.inv.WrapperFilteredItemHandler;
-import appeng.util.inv.filter.AEItemFilters;
 
 public class IOPortBlockEntity extends AENetworkInvBlockEntity
         implements IUpgradeableHost, IConfigManagerHost, IGridTickable {
@@ -88,10 +87,8 @@ public class IOPortBlockEntity extends AENetworkInvBlockEntity
     private final AppEngInternalInventory outputCells = new AppEngInternalInventory(this, NUMBER_OF_CELL_SLOTS);
     private final FixedItemInv combinedInventory = new WrapperChainedItemHandler(this.inputCells, this.outputCells);
 
-    private final FixedItemInv inputCellsExt = new WrapperFilteredItemHandler(this.inputCells,
-            AEItemFilters.INSERT_ONLY);
-    private final FixedItemInv outputCellsExt = new WrapperFilteredItemHandler(this.outputCells,
-            AEItemFilters.EXTRACT_ONLY);
+    private final LimitedFixedItemInv inputCellsExt;
+    private final LimitedFixedItemInv outputCellsExt;
 
     private final UpgradeInventory upgrades;
     private final IActionSource mySrc;
@@ -111,6 +108,12 @@ public class IOPortBlockEntity extends AENetworkInvBlockEntity
 
         final Block ioPortBlock = Api.instance().definitions().blocks().iOPort().maybeBlock().get();
         this.upgrades = new BlockUpgradeInventory(ioPortBlock, this, NUMBER_OF_UPGRADE_SLOTS);
+
+        inputCellsExt = inputCells.createLimitedFixedInv();
+        inputCellsExt.getAllRule().disallowExtraction();
+
+        outputCellsExt = outputCells.createLimitedFixedInv();
+        outputCellsExt.getAllRule().disallowInsertion();
     }
 
     @Override

src/main/java/appeng/util/PartHostWrenching.java

@@ -0,0 +1,46 @@
+package appeng.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+import appeng.api.parts.IPartHost;
+import appeng.api.parts.PartItemStack;
+import appeng.api.parts.SelectedPart;
+
+/**
+ * Support functionality for using a wrench on parts attached to a part host.
+ */
+public final class PartHostWrenching {
+
+    private PartHostWrenching() {
+    }
+
+    public static void wrenchPart(World world, BlockPos pos, IPartHost host, SelectedPart sp) {
+        final List<ItemStack> is = new ArrayList<>();
+
+        if (sp.part != null) {
+            is.add(sp.part.getItemStack(PartItemStack.WRENCH));
+            sp.part.getDrops(is, true);
+            host.removePart(sp.side, false);
+        }
+
+        if (sp.facade != null) {
+            is.add(sp.facade.getItemStack());
+            host.getFacadeContainer().removeFacade(host, sp.side);
+            Platform.notifyBlocksOfNeighbors(world, pos);
+        }
+
+        if (host.isEmpty()) {
+            host.cleanup();
+        }
+
+        if (!is.isEmpty()) {
+            Platform.spawnDrops(world, pos, is);
+        }
+    }
+
+}

src/main/java/appeng/util/Platform.java

@@ -165,7 +165,7 @@ public class Platform {
         p = PowerUnits.AE.convertTo(displayUnits, p);
 
         final String[] preFixes = { "k", "M", "G", "T", "P", "T", "P", "E", "Z", "Y" };
-        String unitName = displayUnits.name();
+        String unitName = displayUnits.getSymbolName();
 
         String level = "";
         int offset = 0;

src/main/java/appeng/util/inv/WrapperFilteredItemHandler.java

@@ -1,83 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2017, AlgorithmX2, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
-package appeng.util.inv;
-
-import javax.annotation.Nonnull;
-
-import net.minecraft.item.ItemStack;
-
-import alexiil.mc.lib.attributes.Simulation;
-import alexiil.mc.lib.attributes.item.FixedItemInv;
-import alexiil.mc.lib.attributes.item.ItemStackUtil;
-import alexiil.mc.lib.attributes.item.filter.ItemFilter;
-import alexiil.mc.lib.attributes.item.impl.DelegatingFixedItemInv;
-
-import appeng.util.inv.filter.IAEItemFilter;
-
-// FIXME: Needs to be double checked, LBA has better ways of doing this
-public class WrapperFilteredItemHandler extends DelegatingFixedItemInv {
-    private final IAEItemFilter filter;
-
-    public WrapperFilteredItemHandler(@Nonnull FixedItemInv handler, @Nonnull IAEItemFilter filter) {
-        super(handler);
-        this.filter = filter;
-    }
-
-    @Override
-    public boolean setInvStack(int slot, ItemStack to, Simulation simulation) {
-        ItemStack current = this.getInvStack(slot);
-        boolean same = ItemStackUtil.areEqualIgnoreAmounts(current, to);
-        boolean isExtracting = !current.isEmpty() && (!same || to.getCount() < current.getCount());
-        boolean isInserting = !to.isEmpty() && (!same || to.getCount() > current.getCount());
-
-        if (isExtracting) {
-            // We may be extracting by "exchanging" the current item for something else,
-            // or we might be setting it to air
-            int extractAmount = current.getCount();
-            if (same && !to.isEmpty()) {
-                extractAmount -= to.getCount();
-            }
-
-            if (!filter.allowExtract(delegate, slot, extractAmount)) {
-                return false;
-            }
-        }
-
-        if (isInserting) {
-            if (!filter.allowInsert(delegate, slot, to)) {
-                return false;
-            }
-        }
-
-        return super.setInvStack(slot, to, simulation);
-    }
-
-    @Override
-    public boolean isItemValidForSlot(int slot, ItemStack stack) {
-        return (stack.isEmpty() || this.getFilterForSlot(slot).matches(stack)) && super.isItemValidForSlot(slot, stack);
-    }
-
-    @Override
-    public ItemFilter getFilterForSlot(int slot) {
-        ItemFilter parentFilter = super.getFilterForSlot(slot);
-        ItemFilter thisFilter = stack -> filter.allowInsert(delegate, slot, stack);
-        return thisFilter.and(parentFilter);
-    }
-
-}

src/main/java/appeng/util/inv/filter/AEItemFilters.java

@@ -1,55 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2017, AlgorithmX2, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
-package appeng.util.inv.filter;
-
-import net.minecraft.item.ItemStack;
-
-import alexiil.mc.lib.attributes.item.FixedItemInv;
-
-public class AEItemFilters {
-    public static final IAEItemFilter INSERT_ONLY = new InsertOnlyFilter();
-    public static final IAEItemFilter EXTRACT_ONLY = new ExtractOnlyFilter();
-
-    private AEItemFilters() {
-    }
-
-    private static class InsertOnlyFilter implements IAEItemFilter {
-        @Override
-        public boolean allowExtract(FixedItemInv inv, int slot, int amount) {
-            return false;
-        }
-
-        @Override
-        public boolean allowInsert(FixedItemInv inv, int slot, ItemStack stack) {
-            return true;
-        }
-    }
-
-    private static class ExtractOnlyFilter implements IAEItemFilter {
-        @Override
-        public boolean allowExtract(FixedItemInv inv, int slot, int amount) {
-            return true;
-        }
-
-        @Override
-        public boolean allowInsert(FixedItemInv inv, int slot, ItemStack stack) {
-            return false;
-        }
-    }
-}

src/main/resources/appliedenergistics2.mixins.json

@@ -24,8 +24,8 @@
     "SlotMixin",
     "TntAccessor",
     "ServerWorldCustomItemEntityMixin",
-    "HopperMixin",
-    "BootstrapMixin"
+    "BootstrapMixin",
+    "ItemEntityAccessor"
   ],
   "client": [
     "spatial.SkyRenderMixin",

src/main/resources/assets/appliedenergistics2/lang/cs_cz.json

@@ -256,7 +256,6 @@
   "gui.appliedenergistics2.security.security.tip": "Uživatel má přístupové a modifikační práva k bezpečnostnímu terminálu sítě.",
   "gui.appliedenergistics2.units.appliedenergstics": "AE",
   "gui.appliedenergistics2.units.ic2": "Jednotky energie",
-  "gui.appliedenergistics2.units.rf": "Ruditový Flux",
   "gui.tooltips.appliedenergistics2.ActiveOnPulse": "Aktivní jednou za pulz",
   "gui.tooltips.appliedenergistics2.ActiveWithSignal": "Aktivní se signálem",
   "gui.tooltips.appliedenergistics2.ActiveWithoutSignal": "Aktivní bez signálu",

src/main/resources/assets/appliedenergistics2/lang/de_de.json

@@ -283,7 +283,6 @@
   "gui.appliedenergistics2.security.security.tip": "Der Nutzer darf auf die Sicherheitskonsole des Netzwerks zugreifen.",
   "gui.appliedenergistics2.units.appliedenergstics": "AE",
   "gui.appliedenergistics2.units.ic2": "Energy Units",
-  "gui.appliedenergistics2.units.rf": "Redstone Flux",
   "gui.tooltips.appliedenergistics2.ActiveOnPulse": "Einmalig aktiv je Puls",
   "gui.tooltips.appliedenergistics2.ActiveWithSignal": "Aktiv mit Signal",
   "gui.tooltips.appliedenergistics2.ActiveWithoutSignal": "Aktiv ohne Signal",

src/main/resources/assets/appliedenergistics2/lang/en_us.json

@@ -307,7 +307,7 @@
   "gui.appliedenergistics2.security.security.tip": "User can access and modify the security terminal of the network.",
   "gui.appliedenergistics2.units.appliedenergstics": "AE",
   "gui.appliedenergistics2.units.ic2": "Energy Units",
-  "gui.appliedenergistics2.units.rf": "Redstone Flux",
+  "gui.appliedenergistics2.units.tr": "TechReborn Energy",
   "gui.tooltips.appliedenergistics2.ActiveOnPulse": "Activate once per pulse",
   "gui.tooltips.appliedenergistics2.ActiveWithSignal": "Active with signal",
   "gui.tooltips.appliedenergistics2.ActiveWithoutSignal": "Active without signal",

src/main/resources/assets/appliedenergistics2/lang/es_es.json

@@ -192,7 +192,6 @@
   "gui.appliedenergistics2.security.security.tip": "El usario puede acceder y modificar la configuración de seguridad de la red.",
   "gui.appliedenergistics2.units.appliedenergstics": "AE",
   "gui.appliedenergistics2.units.ic2": "Energy Units",
-  "gui.appliedenergistics2.units.rf": "Redstone Flux",
   "gui.tooltips.appliedenergistics2.ActiveOnPulse": "Activar una vez por pulso",
   "gui.tooltips.appliedenergistics2.ActiveWithSignal": "Activo con señal",
   "gui.tooltips.appliedenergistics2.ActiveWithoutSignal": "Active sin señal",

src/main/resources/assets/appliedenergistics2/lang/fr_fr.json

@@ -281,7 +281,6 @@
   "gui.appliedenergistics2.security.security.tip": "L'utilisateur peut accéder et modifier le terminal de sécurité du réseau.",
   "gui.appliedenergistics2.units.appliedenergstics": "AE",
   "gui.appliedenergistics2.units.ic2": "Energy Units",
-  "gui.appliedenergistics2.units.rf": "Redstone Flux",
   "gui.tooltips.appliedenergistics2.ActiveOnPulse": "Activer une fois par impulsion",
   "gui.tooltips.appliedenergistics2.ActiveWithSignal": "Actif avec un signal",
   "gui.tooltips.appliedenergistics2.ActiveWithoutSignal": "Actif sans signal",

src/main/resources/assets/appliedenergistics2/lang/it_it.json

@@ -270,7 +270,6 @@
   "gui.appliedenergistics2.security.security.tip": "Utente ha il permesso di accedere e modificare il terminale di sicurezza del sistema.",
   "gui.appliedenergistics2.units.appliedenergstics": "AE",
   "gui.appliedenergistics2.units.ic2": "Energy Units",
-  "gui.appliedenergistics2.units.rf": "Redstone Flux",
   "gui.tooltips.appliedenergistics2.ActiveOnPulse": "Attivo una volta per impulso",
   "gui.tooltips.appliedenergistics2.ActiveWithSignal": "Attivo con segnale",
   "gui.tooltips.appliedenergistics2.ActiveWithoutSignal": "Attivo senza segnale",

src/main/resources/assets/appliedenergistics2/lang/ja_jp.json

@@ -336,7 +336,6 @@
   "gui.tooltips.appliedenergistics2.P2PFrequency": "周波数: %s",
   "gui.appliedenergistics2.units.appliedenergstics": "AE",
   "gui.appliedenergistics2.units.ic2": "エネルギーユニット",
-  "gui.appliedenergistics2.units.rf": "レッドストーンフラックス",
   "gui.appliedenergistics2.White": "白色",
   "gui.appliedenergistics2.Orange": "橙色",
   "gui.appliedenergistics2.Magenta": "赤紫色",

src/main/resources/assets/appliedenergistics2/lang/ko_kr.json

@@ -298,7 +298,6 @@
   "gui.appliedenergistics2.security.security.tip": "유저는 네트워크의 보안 단말기에 액세스하여 수정할 수 있습니다.",
   "gui.appliedenergistics2.units.appliedenergstics": "AE",
   "gui.appliedenergistics2.units.ic2": "EU",
-  "gui.appliedenergistics2.units.rf": "RF",
   "gui.tooltips.appliedenergistics2.ActiveOnPulse": "한 파동 당 활성화",
   "gui.tooltips.appliedenergistics2.ActiveWithSignal": "신호있는 활성화",
   "gui.tooltips.appliedenergistics2.ActiveWithoutSignal": "신호없는 활성화",

src/main/resources/assets/appliedenergistics2/lang/pt_br.json

@@ -300,7 +300,6 @@
   "gui.appliedenergistics2.security.security.tip": "O usuário pode acessar e modificar o terminal de segurança da rede.",
   "gui.appliedenergistics2.units.appliedenergstics": "AE",
   "gui.appliedenergistics2.units.ic2": "Unidades de Energia",
-  "gui.appliedenergistics2.units.rf": "Redstone Flux",
   "gui.tooltips.appliedenergistics2.ActiveOnPulse": "Ativar uma vez por pulso",
   "gui.tooltips.appliedenergistics2.ActiveWithSignal": "Ativo com sinal",
   "gui.tooltips.appliedenergistics2.ActiveWithoutSignal": "Ativo sem sinal",

src/main/resources/assets/appliedenergistics2/lang/ro_ro.json

@@ -132,7 +132,6 @@
   "gui.appliedenergistics2.security.security.tip": "Utilizator poate accesa şi modifica terminalul de securitate a reţelei.",
   "gui.appliedenergistics2.units.appliedenergstics": "AE",
   "gui.appliedenergistics2.units.ic2": "Unități de Energie",
-  "gui.appliedenergistics2.units.rf": "Flux de Piatră-Roşie",
   "gui.tooltips.appliedenergistics2.ActiveOnPulse": "Activeaza odată per puls",
   "gui.tooltips.appliedenergistics2.ActiveWithSignal": "Activ cu semnal",
   "gui.tooltips.appliedenergistics2.ActiveWithoutSignal": "Activ fără semnal",

src/main/resources/assets/appliedenergistics2/lang/ru_ru.json

@@ -290,7 +290,6 @@
   "gui.appliedenergistics2.security.security.tip": "Пользователь может работать с терминалом безопасности и настраивать его в сети.",
   "gui.appliedenergistics2.units.appliedenergstics": "AE",
   "gui.appliedenergistics2.units.ic2": "Energy Units",
-  "gui.appliedenergistics2.units.rf": "Redstone Flux",
   "gui.tooltips.appliedenergistics2.ActiveOnPulse": "Активируется раз за импульс",
   "gui.tooltips.appliedenergistics2.ActiveWithSignal": "Активен с сигналом",
   "gui.tooltips.appliedenergistics2.ActiveWithoutSignal": "Активен без сигнала",

src/main/resources/assets/appliedenergistics2/lang/sv_se.json

@@ -306,7 +306,6 @@
   "gui.appliedenergistics2.security.security.tip": "Användare kan komma åt och ändra nätverkets säkerhetsterminal.",
   "gui.appliedenergistics2.units.appliedenergstics": "AE",
   "gui.appliedenergistics2.units.ic2": "Energy Units",
-  "gui.appliedenergistics2.units.rf": "Redstone Flux",
   "gui.tooltips.appliedenergistics2.ActiveOnPulse": "Aktivera en gång per puls",
   "gui.tooltips.appliedenergistics2.ActiveWithSignal": "Aktiv med signal",
   "gui.tooltips.appliedenergistics2.ActiveWithoutSignal": "Aktiv utan signal",

src/main/resources/assets/appliedenergistics2/lang/zh_cn.json

@@ -300,7 +300,6 @@
   "gui.appliedenergistics2.security.security.tip": "用户可以访问修改网络的安全终端.",
   "gui.appliedenergistics2.units.appliedenergstics": "AE",
   "gui.appliedenergistics2.units.ic2": "EU",
-  "gui.appliedenergistics2.units.rf": "RF",
   "gui.tooltips.appliedenergistics2.ActiveOnPulse": "有脉冲信号时激活",
   "gui.tooltips.appliedenergistics2.ActiveWithSignal": "有信号时激活",
   "gui.tooltips.appliedenergistics2.ActiveWithoutSignal": "无信号时激活",

src/main/resources/assets/appliedenergistics2/lang/zh_tw.json

@@ -290,7 +290,6 @@
   "gui.appliedenergistics2.security.security.tip": "用戶可以訪問修改網絡的安全終端。",
   "gui.appliedenergistics2.units.appliedenergstics": "AE",
   "gui.appliedenergistics2.units.ic2": "EU",
-  "gui.appliedenergistics2.units.rf": "RF",
   "gui.tooltips.appliedenergistics2.ActiveOnPulse": "有脈沖信號時激活",
   "gui.tooltips.appliedenergistics2.ActiveWithSignal": "有信號時激活",
   "gui.tooltips.appliedenergistics2.ActiveWithoutSignal": "無信號時激活",

src/main/resources/data/appliedenergistics2/recipes/network/wireless_booster.json

@@ -16,7 +16,7 @@
       "tag": "appliedenergistics2:dusts/fluix"
     },
     "c": {
-      "tag": "appliedenergistics2:dusts/ender"
+      "tag": "c:ender_pearl_dusts"
     }
   }
 }

src/main/resources/data/appliedenergistics2/tags/items/dusts/ender.json

@@ -1,3 +0,0 @@
-{
-  "values": ["appliedenergistics2:ender_dust"]
-}

src/unported/java/appeng/items/tools/powered/powersink/PoweredItemCapabilities.java

@@ -1,92 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
-package appeng.items.tools.powered.powersink;
-
-import javax.annotation.Nullable;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.Direction;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.ICapabilityProvider;
-import net.minecraftforge.common.util.LazyOptional;
-import net.minecraftforge.energy.IEnergyStorage;
-
-import appeng.api.config.Actionable;
-import appeng.api.config.PowerUnits;
-import appeng.api.implementations.items.IAEItemPowerStorage;
-import appeng.attributes.MEAttributes;
-
-/**
- * The capability provider to expose chargable items to other mods.
- */
-class PoweredItemCapabilities implements ICapabilityProvider, IEnergyStorage {
-
-    private final ItemStack is;
-
-    private final IAEItemPowerStorage item;
-
-    PoweredItemCapabilities(ItemStack is, IAEItemPowerStorage item) {
-        this.is = is;
-        this.item = item;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T> LazyOptional<T> getCapability(Capability<T> capability, @Nullable Direction facing) {
-        if (capability == MEAttributes.FORGE_ENERGY) {
-            return (LazyOptional<T>) LazyOptional.of(() -> this);
-        }
-        return LazyOptional.empty();
-    }
-
-    @Override
-    public int receiveEnergy(int maxReceive, boolean simulate) {
-        final double convertedOffer = PowerUnits.RF.convertTo(PowerUnits.AE, maxReceive);
-        final double overflow = this.item.injectAEPower(this.is, convertedOffer,
-                simulate ? Actionable.SIMULATE : Actionable.MODULATE);
-
-        return maxReceive - (int) PowerUnits.AE.convertTo(PowerUnits.RF, overflow);
-    }
-
-    @Override
-    public int extractEnergy(int maxExtract, boolean simulate) {
-        return 0;
-    }
-
-    @Override
-    public int getEnergyStored() {
-        return (int) PowerUnits.AE.convertTo(PowerUnits.RF, this.item.getAECurrentPower(this.is));
-    }
-
-    @Override
-    public int getMaxEnergyStored() {
-        return (int) PowerUnits.AE.convertTo(PowerUnits.RF, this.item.getAEMaxPower(this.is));
-    }
-
-    @Override
-    public boolean canExtract() {
-        return false;
-    }
-
-    @Override
-    public boolean canReceive() {
-        return true;
-    }
-
-}