1.21.4 update for fabric only

can't figure out neoforge
triphora · Jan 11, 2025 · db7ca4b · db7ca4b
1 parent f655d5b
commit db7ca4b
Show file tree

Hide file tree

Showing 14 changed files with 57 additions and 58 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
       - uses: gradle/gradle-build-action@v2
         with:
           gradle-version: release-candidate
-          arguments: neoforge:modrinth fabric:modrinth
+          arguments: fabric:modrinth
           cache-read-only: ${{ github.repository_owner != 'triphora' }}
         env:
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}

diff --git a/README.md b/README.md
@@ -3,9 +3,9 @@
 <!-- modrinth_exclude.end -->
 
 ![Forge](https://raw.githubusercontent.com/intergrav/devins-badges/v1/assets/supported/forge_64h.png) ![Fabric](https://raw.githubusercontent.com/intergrav/devins-badges/v1/assets/supported/fabric_64h.png)<br>
-[![Modrinth](https://raw.githubusercontent.com/intergrav/devins-badges/v1/assets/download/modrinth_64h.png)](https://modrinth.com/mod/emcutils) [![GitHub](https://raw.githubusercontent.com/intergrav/devins-badges/v1/assets/repository/github_64h.png)](https://github.com/emmods/emcutils)
+[![Modrinth](https://raw.githubusercontent.com/intergrav/devins-badges/v1/assets/download/modrinth_64h.png)](https://modrinth.com/mod/emcutils) [![GitHub](https://raw.githubusercontent.com/intergrav/devins-badges/v1/assets/repository/github_64h.png)](https://github.com/triphora/emcutils)
 
-Empire Minecraft Utilities, aka emcutils, is a 1.16-1.19 client-side mod containing a collection of small utilities for players of [Empire Minecraft](https://ref.emc.gs/triphora).
+Empire Minecraft Utilities, aka emcutils, is a client-side mod containing a collection of small utilities for players of [Empire Minecraft](https://ref.emc.gs/triphora).
 Feature idea credits go to [Giselbaer](https://u.emc.gs/Giselbaer)/[gbl](https://github.com/gbl).
 
 Made by [MrFrydae](https://u.emc.gs/GreenMeanie) and [triphora](https://u.emc.gs/triphora), available under the MIT License.

diff --git a/common/build.gradle b/common/build.gradle
@@ -2,6 +2,6 @@ dependencies {
 	modImplementation libs.fabric.loader
 }
 
-architectury.common 'fabric', 'forge', 'neoforge'
+architectury.common 'fabric'
 
 loom.accessWidenerPath.set file('src/main/resources/emcutils.accesswidener')
diff --git a/common/src/main/java/coffee/waffle/emcutils/feature/VaultScreen.java b/common/src/main/java/coffee/waffle/emcutils/feature/VaultScreen.java
@@ -3,12 +3,11 @@
 import coffee.waffle.emcutils.Config;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
-import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider;
 import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.render.RenderLayer;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.ProfileComponent;
 import net.minecraft.entity.player.PlayerInventory;
@@ -38,7 +37,6 @@ public class VaultScreen extends HandledScreen<VaultScreenHandler> implements Sc
 
 	public VaultScreen(VaultScreenHandler handler, PlayerInventory inventory, Text title) {
 		super(handler, inventory, title);
-		//this.passEvents = false;
 		this.backgroundHeight = 114 + 7 * 18;
 		this.playerInventoryTitleY = this.backgroundHeight - 94;
 
@@ -106,12 +104,9 @@ private void drawButton(DrawContext context, ItemStack button, int mouseX, int m
 
 	@Override
 	protected void drawBackground(DrawContext context, float delta, int mouseX, int mouseY) {
-		RenderSystem.setShader(GameRenderer::getPositionTexProgram);
-		RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
-		RenderSystem.setShaderTexture(0, TEXTURE);
 		int x = (width - backgroundWidth) / 2;
 		int y = (height - backgroundHeight) / 2;
-		context.drawTexture(TEXTURE, x, y, 0, 0, backgroundWidth, backgroundHeight);
+		context.drawTexture(RenderLayer::getGuiTextured, TEXTURE, x, y, 0, 0, backgroundWidth, backgroundHeight, 256, 256);
 	}
 
 	@Override

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -30,11 +30,11 @@
 	],
 	"accessWidener": "emcutils.accesswidener",
 	"depends": {
-		"minecraft": ">=1.20.4",
-		"midnightlib": ">=1.5.3"
+		"minecraft": ">=1.21.4",
+		"midnightlib": ">=1.6.6"
 	},
 	"recommends": {
-		"modmenu": ">=9.1.0"
+		"modmenu": ">=13.0.0"
 	},
 	"custom": {
 		"modmenu": {

diff --git a/forge/src/main/java/coffee/waffle/emcutils/forge/EMCUtilsForge.java b/forge/src/main/java/coffee/waffle/emcutils/forge/EMCUtilsForge.java
@@ -1,13 +1,11 @@
 package coffee.waffle.emcutils.forge;
 
-import coffee.waffle.emcutils.event.TooltipCallback;
 import coffee.waffle.emcutils.feature.VaultScreen;
 import coffee.waffle.emcutils.Util;
 import net.minecraft.client.gui.screen.ingame.HandledScreens;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.IExtensionPoint.DisplayTest;
-import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@@ -25,14 +23,14 @@
 
 @Mod(MODID)
 public class EMCUtilsForge {
-	public EMCUtilsForge() {
-		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::clientSetupEvent);
+	public EMCUtilsForge(FMLJavaModLoadingContext context) {
+		context.getModEventBus().addListener(this::clientSetupEvent);
 
-		ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ConfigImpl.SPEC);
+		context.registerConfig(ModConfig.Type.CLIENT, ConfigImpl.SPEC);
 
 		movePacks("vt-dark-vault", "dark-ui-vault");
 
-		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> "", (a, b) -> b));
+		context.registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> "", (a, b) -> b));
 
 		LOG.info("Initialized " + MODID);
 	}

diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -1,6 +1,6 @@
 modLoader = "javafml"
 loaderVersion = "[44,)"
-issueTrackerURL = "https://github.com/emmods/emcutils/issues"
+issueTrackerURL = "https://github.com/triphora/emcutils/issues"
 license = "MIT"
 
 [[mods]]

diff --git a/gradle.properties b/gradle.properties
@@ -2,4 +2,4 @@
 org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
 
-mod_version=9.0.2
+mod_version=9.1.0
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,41 +1,41 @@
 [versions]
-minecraft = '1.21'
+minecraft = '1.21.4'
 
 [libraries]
 # MC, loaders, and mappings
 minecraft = { module = 'com.mojang:minecraft', version.ref = 'minecraft' }
 # https://fabricmc.net/develop
-yarn = 'net.fabricmc:yarn:1.21+build.2'
-fabric_loader = 'net.fabricmc:fabric-loader:0.15.11'
-fabric_api = 'net.fabricmc.fabric-api:fabric-api:0.100.3+1.21'
+yarn = 'net.fabricmc:yarn:1.21.4+build.8'
+fabric_loader = 'net.fabricmc:fabric-loader:0.16.10'
+fabric_api = 'net.fabricmc.fabric-api:fabric-api:0.114.2+1.21.4'
 # https://maven.architectury.dev/dev/architectury/yarn-mappings-patch-neoforge/1.21%2Bbuild.4/
 yarn_patch = "dev.architectury:yarn-mappings-patch-neoforge:1.21+build.4"
-# https://files.minecraftforge.net/net/minecraftforge/forge/index_1.21.html
-forge = 'net.minecraftforge:forge:1.21-51.0.18'
+# https://files.minecraftforge.net/net/minecraftforge/forge/index_1.21.4.html
+forge = 'net.minecraftforge:forge:1.21.4-54.0.16'
 # https://neoforged.net
-neoforge = 'net.neoforged:neoforge:21.0.37-beta'
+neoforge = 'net.neoforged:neoforge:21.4.51-beta'
 
 # Fabric subproject
 # https://modrinth.com/mod/midnightlib/version/latest?loader=fabric&game_version=1.21
-midnightlib = 'maven.modrinth:midnightlib:1.5.7-fabric'
+midnightlib = 'maven.modrinth:midnightlib:1.6.6-fabric'
 # https://modrinth.com/mod/modmenu/version/latest?loader=fabric&game_version=1.21
-modmenu = 'maven.modrinth:modmenu:11.0.1'
+modmenu = 'maven.modrinth:modmenu:13.0.0'
 
 # Journey subproject
 # https://jm.gserv.me/service/rest/repository/browse/maven-public/info/journeymap/journeymap-api-fabric/
-journeymap_api = 'info.journeymap:journeymap-api-fabric:2.0.0-1.21-SNAPSHOT'
-# https://modrinth.com/mod/journeymap/version/latest?loader=fabric&game_version=1.21
-journeymap = 'maven.modrinth:journeymap:1.20.6-5.10.0-fabric'
+journeymap_api = 'info.journeymap:journeymap-api-fabric:2.0.0-1.21.4-SNAPSHOT'
+# https://modrinth.com/mod/journeymap/version/latest?loader=fabric&game_version=1.21.4
+journeymap = 'maven.modrinth:journeymap:1.21.4-6.0.0-beta.32+fabric'
 
 # Xaero subproject
-# https://modrinth.com/mod/xaeros-minimap/version/latest?loader=fabric&game_version=1.21
-xaeros_minimap = 'maven.modrinth:xaeros-minimap:24.2.1_Fabric_1.21'
-# https://modrinth.com/mod/xaeros-world-map/version/latest?loader=fabric&game_version=1.21
-xaeros_world_map = 'maven.modrinth:xaeros-world-map:1.38.8_Fabric_1.21'
+# https://modrinth.com/mod/xaeros-minimap/version/latest?loader=fabric&game_version=1.21.4
+xaeros_minimap = 'maven.modrinth:xaeros-minimap:24.7.1_Fabric_1.21.4'
+# https://modrinth.com/mod/xaeros-world-map/version/latest?loader=fabric&game_version=1.21.4
+xaeros_world_map = 'maven.modrinth:xaeros-world-map:1.39.2_Fabric_1.21.4'
 
 [plugins]
 architectury_plugin = 'architectury-plugin:3.4.+'
-architectury_loom = 'dev.architectury.loom:1.6.+'
+architectury_loom = 'dev.architectury.loom:1.7.+'
 
 minotaur = 'com.modrinth.minotaur:2.+'
-shadow = 'com.github.johnrengelman.shadow:8.+'
+shadow = 'com.gradleup.shadow:9.+'
diff --git a/gradle/loader.gradle b/gradle/loader.gradle
@@ -8,29 +8,37 @@ String projectName = "${name.substring(0, 1).toUpperCase()}${name.substring(1)}"
 if (projectName == 'Neoforge') projectName = 'NeoForge'
 
 configurations {
-	common
-	shadowCommon
+	common {
+		canBeResolved = true
+		canBeConsumed = false
+	}
+
 	compileClasspath.extendsFrom common
 	runtimeClasspath.extendsFrom common
+
+	shadowBundle {
+		canBeResolved = true
+		canBeConsumed = false
+	}
 }
 
 dependencies {
-	common(project(path: ':common', configuration: 'namedElements')) { transitive false }
-	shadowCommon(project(path: ':common', configuration: "transformProduction$projectName")) { transitive false }
+	common(project(path: ':common', configuration: 'namedElements')) { transitive = false }
+	shadowBundle project(path: ':common', configuration: "transformProduction$projectName")
 }
 
 shadowJar {
-	configurations = [project.configurations.shadowCommon]
+	configurations = [project.configurations.shadowBundle]
 	archiveClassifier = 'dev-shadow'
 }
 
 remapJar {
 	inputFile.set shadowJar.archiveFile
 
-	archiveClassifier = null
+	//archiveClassifier = null
 }
 
-jar.archiveClassifier = 'dev'
+//jar.archiveClassifier = 'dev'
 
 sourcesJar {
 	def commonSources = project(':common').sourcesJar
@@ -39,11 +47,11 @@ sourcesJar {
 	exclude 'emcutils.accesswidener'
 }
 
-components.java {
-	withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-		skip()
-	}
-}
+//components.java {
+//	withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+//		skip()
+//	}
+//}
 
 modrinth {
 	projectId = 'emcutils'

diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -14,7 +14,7 @@ loom {
 }
 
 configurations {
-	developmentForge.extendsFrom common
+	developmentNeoForge.extendsFrom common
 }
 
 dependencies {

diff --git a/neoforge/src/main/java/coffee/waffle/emcutils/neoforge/EMCUtilsNeoForge.java b/neoforge/src/main/java/coffee/waffle/emcutils/neoforge/EMCUtilsNeoForge.java
@@ -3,7 +3,6 @@
 import coffee.waffle.emcutils.event.TooltipCallback;
 import coffee.waffle.emcutils.feature.VaultScreen;
 import coffee.waffle.emcutils.Util;
-import net.minecraft.registry.Registries;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.ModContainer;
@@ -14,7 +13,6 @@
 import net.neoforged.fml.config.ModConfig;
 import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 import net.neoforged.fml.loading.FMLPaths;
-import net.neoforged.neoforge.registries.DeferredRegister;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -1,6 +1,6 @@
 modLoader = "javafml"
 loaderVersion = "[4,)"
-issueTrackerURL = "https://github.com/emmods/emcutils/issues"
+issueTrackerURL = "https://github.com/triphora/emcutils/issues"
 license = "MIT"
 
 [[mods]]

diff --git a/settings.gradle b/settings.gradle
@@ -18,7 +18,7 @@ pluginManagement {
 
 include 'common'
 include 'fabric'
-include 'forge'
+//include 'forge'
 include 'journey'
-include 'neoforge'
+//include 'neoforge'
 include 'xaero'