update to latest ae2 (#290)

CHANGELOG.md

@@ -1 +1,2 @@
 - resize the scrollbar with the upgrade panel
+- update ae2

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("net.neoforged.moddev") version "0.1.114"
+    id("net.neoforged.moddev") version "1.0.7"
     id("com.diffplug.spotless") version "7.0.0.BETA1"
     id("maven-publish")
     java
@@ -71,6 +71,13 @@ dependencies {
 repositories {
     mavenLocal()
     mavenCentral()
+    maven {
+        url = uri("https://prmaven.neoforged.net/NeoForge/pr1199")
+        content {
+            includeModule("net.neoforged", "testframework")
+            includeModule("net.neoforged", "neoforge")
+        }
+    }
     maven {
         url = uri("https://modmaven.dev/")
         content {

gradle.properties

@@ -1,19 +1,19 @@
-neoforgeVersion=21.0.30-beta
+neoforgeVersion=21.0.126-beta-pr-1199-ui
 neoForge.parchment.minecraftVersion=1.21
 neoForge.parchment.mappingsVersion=2024.06.23
 
 # Mod Properties
 mavenGroup=de.mari_023
 modID=ae2wtlib
 
-ae2Version=19.0.7-alpha
+ae2Version=19.0.10-alpha
 curiosVersion=8.0.0-beta.4+1.20.6
 
 reiVersion=16.0.729
-architecturyVersion=13.0.1
+architecturyVersion=13.0.4
 jeiMinecraftVersion=1.21
 jeiVersion=19.0.0.3
-emiVersion=1.1.7
+emiVersion=1.1.10
 emiMinecraftVersion=1.21
 
 runtimeItemlistMod=rei

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/de/mari_023/ae2wtlib/AE2wtlibForge.java

@@ -46,7 +46,7 @@ public AE2wtlibForge(IEventBus modEventBus) {
         ModLoadingContext.get().getActiveContainer().registerConfig(ModConfig.Type.COMMON, AE2wtlibConfig.SPEC,
                 AE2wtlib.MOD_NAME + ".toml");
         modEventBus.addListener((RegisterEvent e) -> {
-            if (!e.getRegistryKey().equals(Registries.BLOCK))
+            if (!e.getRegistryKey().equals(Registries.ITEM))
                 return;
             AE2wtlibItems.init();
             AE2wtlib.onAe2Initialized();

src/main/java/de/mari_023/ae2wtlib/recipeviewer/AE2wtlibEmiPlugin.java

@@ -1,14 +1,18 @@
 package de.mari_023.ae2wtlib.recipeviewer;
 
+import net.minecraft.world.item.ItemStack;
+
 import dev.emi.emi.api.EmiEntrypoint;
 import dev.emi.emi.api.EmiPlugin;
 import dev.emi.emi.api.EmiRegistry;
 import dev.emi.emi.api.recipe.VanillaEmiRecipeCategories;
 import dev.emi.emi.api.stack.EmiStack;
 
+import appeng.api.config.Actionable;
 import appeng.integration.modules.emi.EmiEncodePatternHandler;
 import appeng.integration.modules.emi.EmiUseCraftingRecipeHandler;
 
+import de.mari_023.ae2wtlib.AE2wtlibItems;
 import de.mari_023.ae2wtlib.wct.WCTMenu;
 import de.mari_023.ae2wtlib.wet.WETMenu;
 import de.mari_023.ae2wtlib.wut.WTDefinitions;
@@ -21,7 +25,11 @@ public void register(EmiRegistry registry) {
                 new EmiEncodePatternHandler<>(WETMenu.class));
         registry.addRecipeHandler(WCTMenu.TYPE, new EmiUseCraftingRecipeHandler<>(WCTMenu.class));
 
+        ItemStack wut = WTDefinitions.CRAFTING.universalTerminal();
+        AE2wtlibItems.UNIVERSAL_TERMINAL.injectAEPower(wut,
+                AE2wtlibItems.UNIVERSAL_TERMINAL.getAEMaxPower(wut), Actionable.MODULATE);
+
         registry.addWorkstation(VanillaEmiRecipeCategories.CRAFTING,
-                EmiStack.of(WTDefinitions.CRAFTING.universalTerminal()));
+                EmiStack.of(wut));
     }
 }

src/main/java/de/mari_023/ae2wtlib/recipeviewer/JEIPlugin.java

@@ -1,14 +1,18 @@
 package de.mari_023.ae2wtlib.recipeviewer;
 
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemStack;
 
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.JeiPlugin;
 import mezz.jei.api.constants.RecipeTypes;
 import mezz.jei.api.registration.IRecipeCatalystRegistration;
 import mezz.jei.api.registration.IRecipeTransferRegistration;
 
+import appeng.api.config.Actionable;
+
 import de.mari_023.ae2wtlib.AE2wtlib;
+import de.mari_023.ae2wtlib.AE2wtlibItems;
 import de.mari_023.ae2wtlib.wut.WTDefinitions;
 
 @JeiPlugin
@@ -27,7 +31,11 @@ public void registerRecipeTransferHandlers(IRecipeTransferRegistration registrat
 
     @Override
     public void registerRecipeCatalysts(IRecipeCatalystRegistration registry) {
-        registry.addRecipeCatalyst(WTDefinitions.CRAFTING.universalTerminal(),
+        ItemStack wut = WTDefinitions.CRAFTING.universalTerminal();
+        AE2wtlibItems.UNIVERSAL_TERMINAL.injectAEPower(wut,
+                AE2wtlibItems.UNIVERSAL_TERMINAL.getAEMaxPower(wut), Actionable.MODULATE);
+
+        registry.addRecipeCatalyst(wut,
                 RecipeTypes.CRAFTING);
     }
 }

src/main/java/de/mari_023/ae2wtlib/recipeviewer/REIPlugin.java

@@ -1,12 +1,17 @@
 package de.mari_023.ae2wtlib.recipeviewer;
 
+import net.minecraft.world.item.ItemStack;
+
 import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
 import me.shedaniel.rei.api.client.registry.category.CategoryRegistry;
 import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.forge.REIPluginClient;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
 
+import appeng.api.config.Actionable;
+
 import de.mari_023.ae2wtlib.AE2wtlib;
+import de.mari_023.ae2wtlib.AE2wtlibItems;
 import de.mari_023.ae2wtlib.wut.WTDefinitions;
 
 @REIPluginClient
@@ -18,7 +23,11 @@ public String getPluginProviderName() {
 
     @Override
     public void registerCategories(CategoryRegistry registry) {
+        ItemStack wut = WTDefinitions.CRAFTING.universalTerminal();
+        AE2wtlibItems.UNIVERSAL_TERMINAL.injectAEPower(wut,
+                AE2wtlibItems.UNIVERSAL_TERMINAL.getAEMaxPower(wut), Actionable.MODULATE);
+
         registry.addWorkstations(BuiltinPlugin.CRAFTING,
-                EntryStacks.of(WTDefinitions.CRAFTING.universalTerminal()));
+                EntryStacks.of(wut));
     }
 }

src/main/java/de/mari_023/ae2wtlib/wat/WATScreen.java

@@ -30,11 +30,6 @@ public void init() {
         upgradesPanel.setMaxRows(Math.max(2, getVisibleRows()));
     }
 
-    @Override
-    public int getVisibleRows() {
-        return 2;
-    }
-
     @Override
     public WTMenuHost getHost() {
         return (WTMenuHost) getMenu().getHost();

src/main/java/de/mari_023/ae2wtlib/wct/WCTMenu.java

@@ -59,7 +59,7 @@ public boolean mayPlace(ItemStack stack) {
     }
 
     @Override
-    public IGridNode getNetworkNode() {
+    public IGridNode getGridNode() {
         return wctMenuHost.getActionableNode();
     }
 

src/main/java/de/mari_023/ae2wtlib/wet/WETMenu.java

@@ -26,7 +26,7 @@ public WETMenu(int id, final Inventory ip, final WETMenuHost gui) {
     }
 
     @Override
-    public IGridNode getNetworkNode() {
+    public IGridNode getGridNode() {
         return wetMenuHost.getActionableNode();
     }
 

src/main/java/de/mari_023/ae2wtlib/wut/IUniversalTerminalCapable.java

@@ -2,18 +2,13 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.UnknownNullability;
 
-import net.minecraft.client.gui.navigation.ScreenRectangle;
 import net.neoforged.neoforge.network.PacketDistributor;
 
 import appeng.client.Hotkeys;
 import appeng.client.gui.WidgetContainer;
-import appeng.client.gui.style.ScreenStyle;
-import appeng.core.AEConfig;
 import appeng.core.network.serverbound.HotkeyPacket;
 import appeng.menu.AEBaseMenu;
 import appeng.menu.SlotSemantics;
@@ -77,15 +72,4 @@ default ScrollingUpgradesPanel addUpgradePanel(WidgetContainer widgets, AEBaseMe
         widgets.add("scrollingUpgrades", panel);
         return panel;
     }
-
-    default int getVisibleRows() {
-        int availableHeight = getRectangle().height() - 2 * AEConfig.instance().getTerminalMargin();
-        var style = Objects.requireNonNull(getStyle().getTerminalStyle());
-        return AEConfig.instance().getTerminalStyle().getRows(style.getPossibleRows(availableHeight));
-    }
-
-    @UnknownNullability
-    ScreenStyle getStyle();
-
-    ScreenRectangle getRectangle();
 }

src/main/java/de/mari_023/ae2wtlib/wut/WTDefinitionBuilder.java

@@ -11,7 +11,6 @@
 import net.minecraft.world.item.ItemStack;
 import net.neoforged.neoforge.network.codec.NeoForgeStreamCodecs;
 
-import appeng.api.config.Actionable;
 import appeng.hotkeys.HotkeyActions;
 
 import de.mari_023.ae2wtlib.AE2wtlibComponents;
@@ -64,8 +63,6 @@ public void addTerminal() {
         ItemStack wut = new ItemStack(AE2wtlibItems.UNIVERSAL_TERMINAL);
 
         wut.set(componentType, Unit.INSTANCE);
-        AE2wtlibItems.UNIVERSAL_TERMINAL.injectAEPower(wut,
-                AE2wtlibItems.UNIVERSAL_TERMINAL.getAEMaxPower(wut), Actionable.MODULATE);
 
         WTDefinition wtDefinition = new WTDefinition(name, item::tryOpen, wTMenuHostFactory, menuType, item, wut,
                 TextConstants.formatTerminalName(translationKey), translationKey, hotkeyName, componentType,