diff --git a/CHANGELOG.md b/CHANGELOG.md index 198fab4..46b3c11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1 @@ -- Fixed import export bus recipe -- Fixed import export bus not import types not present in the export filter (#99) -- Fixed ResourceLocationException that happens with the Turkish language (#100) -- Added the fuzzy card upgrade to the import export bus -- Fixed Quantum Armor consuming full power even when nothing needed recharging with the recharging card (#98) \ No newline at end of file +- Updated to latest AE2 \ No newline at end of file diff --git a/build.gradle b/build.gradle index 5e0220d..0e26ea3 100644 --- a/build.gradle +++ b/build.gradle @@ -124,8 +124,8 @@ repositories { dependencies { implementation "curse.maven:glodium-957920:5614731" - implementation "appeng:appliedenergistics2:19.1.0-beta" - implementation "curse.maven:ex-pattern-provider-892005:5976911" + implementation "org.appliedenergistics:appliedenergistics2:19.2.1-beta" + implementation "curse.maven:ex-pattern-provider-892005:6138925" implementation "de.mari_023:ae2wtlib_api:19.1.7" implementation "software.bernie.geckolib:geckolib-neoforge-${minecraft_version}:${geckolib_version}" compileOnly "curse.maven:emi-580555:5872513" diff --git a/gradle.properties b/gradle.properties index af6ee0f..1001da7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,14 +7,14 @@ parchment_mappings_version=2024.11.17 minecraft_release=1.21.1 minecraft_version=1.21.1 minecraft_version_range=1.21.1 -neoforge_version=21.1.62 +neoforge_version=21.1.113 neoforge_version_range=[21.1.1,) loader_version_range=[4,) ## Mod Properties mod_id=advanced_ae mod_name=Advanced AE mod_license=LGPL-3.0 -mod_version=1.2.2-1.21.1 +mod_version=1.2.3-1.21.1 mod_group_id=net.pedroksl.advanced_ae mod_authors=Pedroksl mod_description=An AE2 addon that adds a lot of utilities and quality of life. diff --git a/src/main/java/net/pedroksl/advanced_ae/client/gui/AdvPatternEncoderScreen.java b/src/main/java/net/pedroksl/advanced_ae/client/gui/AdvPatternEncoderScreen.java index fd7098e..3c9d803 100644 --- a/src/main/java/net/pedroksl/advanced_ae/client/gui/AdvPatternEncoderScreen.java +++ b/src/main/java/net/pedroksl/advanced_ae/client/gui/AdvPatternEncoderScreen.java @@ -28,8 +28,6 @@ import appeng.client.gui.AEBaseScreen; import appeng.client.gui.style.ScreenStyle; import appeng.client.gui.widgets.Scrollbar; -import appeng.client.guidebook.document.LytRect; -import appeng.client.guidebook.render.SimpleRenderContext; import appeng.core.AppEng; import appeng.menu.slot.FakeSlot; @@ -103,13 +101,10 @@ public void drawFG(GuiGraphics guiGraphics, int offsetX, int offsetY, int mouseX } InputRow row = this.rows.get(currentRow); - var renderContext = new SimpleRenderContext(LytRect.empty(), guiGraphics); - renderContext.renderItem( + guiGraphics.renderItem( row.key().wrapForDisplayOrFilter(), LIST_ANCHOR_X + 1, - LIST_ANCHOR_Y + 1 + i * (ROW_HEIGHT + ROW_SPACING), - 16, - 16); + LIST_ANCHOR_Y + 1 + i * (ROW_HEIGHT + ROW_SPACING)); var buttons = this.directionButtons.get(row.key); var highlight = getSelectedDirButton(row.dir); diff --git a/src/main/java/net/pedroksl/advanced_ae/client/gui/QuantumCrafterConfigPatternScreen.java b/src/main/java/net/pedroksl/advanced_ae/client/gui/QuantumCrafterConfigPatternScreen.java index 2178616..b108a69 100644 --- a/src/main/java/net/pedroksl/advanced_ae/client/gui/QuantumCrafterConfigPatternScreen.java +++ b/src/main/java/net/pedroksl/advanced_ae/client/gui/QuantumCrafterConfigPatternScreen.java @@ -23,8 +23,6 @@ import appeng.client.gui.implementations.AESubScreen; import appeng.client.gui.style.ScreenStyle; import appeng.client.gui.widgets.Scrollbar; -import appeng.client.guidebook.document.LytRect; -import appeng.client.guidebook.render.SimpleRenderContext; import appeng.core.AppEng; import appeng.menu.slot.FakeSlot; @@ -94,8 +92,7 @@ public void drawFG(GuiGraphics guiGraphics, int offsetX, int offsetY, int mouseX var x = LIST_ANCHOR_X + 1; var y = LIST_ANCHOR_Y + 1 + i * (ROW_HEIGHT + ROW_SPACING); InputRow row = this.rows.get(currentRow); - var renderContext = new SimpleRenderContext(LytRect.empty(), guiGraphics); - renderContext.renderItem(row.key().wrapForDisplayOrFilter(), x, y, 16, 16); + guiGraphics.renderItem(row.key.wrapForDisplayOrFilter(), x, y); x += 37; y += 4; @@ -115,8 +112,7 @@ public void drawFG(GuiGraphics guiGraphics, int offsetX, int offsetY, int mouseX if (outputRow != null) { var x = OUTPUT_X + 1; var y = OUTPUT_Y + 1; - var renderContext = new SimpleRenderContext(LytRect.empty(), guiGraphics); - renderContext.renderItem(outputRow.key().wrapForDisplayOrFilter(), x, y, 16, 16); + guiGraphics.renderItem(outputRow.key.wrapForDisplayOrFilter(), x, y); x += 37; y += 4; diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml index 94b3191..9e3d4cc 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -30,7 +30,7 @@ side="BOTH" [[dependencies.${mod_id}]] modId="ae2" type="required" -versionRange="[19.0.26,)" +versionRange="[19.2.0-beta,)" ordering="AFTER" side="BOTH" [[dependencies.${mod_id}]]