Skip to content

Commit 241eff9

Browse files
committed
Update to mc1.21.11
1 parent f4122a9 commit 241eff9

6 files changed

Lines changed: 27 additions & 28 deletions

File tree

common/src/main/java/dev/terminalmc/effecttimerplus/gui/screen/ConfigScreenProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package dev.terminalmc.effecttimerplus.gui.screen;
1919

20-
import net.minecraft.Util;
20+
import net.minecraft.util.Util;
2121
import net.minecraft.client.Minecraft;
2222
import net.minecraft.client.gui.components.Button;
2323
import net.minecraft.client.gui.components.MultiLineTextWidget;

common/src/main/java/dev/terminalmc/effecttimerplus/mixin/MixinGui.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import net.minecraft.client.Minecraft;
2828
import net.minecraft.client.gui.Gui;
2929
import net.minecraft.client.gui.GuiGraphics;
30-
import net.minecraft.resources.ResourceLocation;
30+
import net.minecraft.resources.Identifier;
3131
import net.minecraft.world.effect.MobEffectInstance;
3232
import org.jetbrains.annotations.Nullable;
3333
import org.spongepowered.asm.mixin.Final;
@@ -81,12 +81,12 @@ private void descale(GuiGraphics graphics, DeltaTracker delta, CallbackInfo ci)
8181
method = "renderEffects",
8282
at = @At(
8383
value = "INVOKE",
84-
target = "Lnet/minecraft/client/gui/GuiGraphics;blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/ResourceLocation;IIII)V"
84+
target = "Lnet/minecraft/client/gui/GuiGraphics;blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIII)V"
8585
)
8686
)
8787
private void CreateOverlayRunnable(
8888
GuiGraphics graphics, RenderPipeline pipeline,
89-
ResourceLocation sprite, int x, int y, int width, int height,
89+
Identifier sprite, int x, int y, int width, int height,
9090
Operation<Void> original, @Local MobEffectInstance effectInstance
9191
) {
9292
original.call(graphics, pipeline, sprite, x, y, width, height);
@@ -173,7 +173,7 @@ private void CreateOverlayRunnable(
173173
method = "renderEffects",
174174
at = @At(
175175
value = "INVOKE",
176-
target = "Lnet/minecraft/client/gui/GuiGraphics;blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/ResourceLocation;IIIII)V",
176+
target = "Lnet/minecraft/client/gui/GuiGraphics;blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIIII)V",
177177
shift = At.Shift.AFTER
178178
)
179179
)

common/src/main/java/dev/terminalmc/effecttimerplus/mixin/accessor/GuiAccessor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@
1818
package dev.terminalmc.effecttimerplus.mixin.accessor;
1919

2020
import net.minecraft.client.gui.Gui;
21-
import net.minecraft.resources.ResourceLocation;
21+
import net.minecraft.resources.Identifier;
2222
import org.spongepowered.asm.mixin.Mixin;
2323
import org.spongepowered.asm.mixin.gen.Accessor;
2424

2525
@Mixin(Gui.class)
2626
public interface GuiAccessor {
2727

2828
@Accessor("EFFECT_BACKGROUND_SPRITE")
29-
static ResourceLocation etp$getEffectBackgroundSprite() {
29+
static Identifier etp$getEffectBackgroundSprite() {
3030
throw new AssertionError();
3131
}
3232

3333
@Accessor("EFFECT_BACKGROUND_AMBIENT_SPRITE")
34-
static ResourceLocation etp$getEffectBackgroundAmbientSprite() {
34+
static Identifier etp$getEffectBackgroundAmbientSprite() {
3535
throw new UnsupportedOperationException();
3636
}
3737
}

gradle.properties

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,37 +55,37 @@ mod_curseforge_slug=effecttimerplus
5555
# Subproject Build Compatibility
5656
# -> Comment out or unset to disable publishing of a subproject.
5757
mod_loaders_fabric=fabric
58-
mc_versions_fabric=1.21.6,1.21.7,1.21.8,1.21.9,1.21.10
58+
mc_versions_fabric=1.21.11
5959
mod_loaders_neoforge=neoforge
60-
mc_versions_neoforge=1.21.8,1.21.9,1.21.10
60+
mc_versions_neoforge=1.21.11
6161

6262
# Java
6363
java_version=21
6464
java_versions_fabric=>=21
6565
java_versions_neoforge=[21,)
6666

6767
# Minecraft
68-
minecraft_version=1.21.8
69-
minecraft_versions_fabric=>1.21.5
70-
minecraft_versions_neoforge=[1.21.8,)
68+
minecraft_version=1.21.11
69+
minecraft_versions_fabric=>1.21.10
70+
minecraft_versions_neoforge=[1.21.11,)
7171

7272
# Parchment https://parchmentmc.org/docs/getting-started#choose-a-version
73-
parchment_minecraft_version=1.21.8
74-
parchment_version=2025.09.14
73+
parchment_minecraft_version=1.21.10
74+
parchment_version=2025.10.12
7575

7676
# Fabric https://fabricmc.net/develop
7777
# -> See also 'mixinextras_jij_fabric'
7878
fabric_loader_version=0.17.2
7979
fabric_loader_versions=>=0.17.0
80-
fabric_api_version=0.134.0+1.21.8
80+
fabric_api_version=0.139.4+1.21.11
8181
fabric_api_versions=*
8282

8383
# NeoForge https://projects.neoforged.net/neoforged/neoforge
8484
# -> See also 'mixinextras_jij_neoforge'
85-
neoforge_version=21.8.47
86-
neoforge_versions=[21.8.18,)
85+
neoforge_version=21.11.0-beta
86+
neoforge_versions=[21.11.0-beta,)
8787
# NeoForm https://projects.neoforged.net/neoforged/neoform
88-
neoform_version=1.21.8-20250717.133445
88+
neoform_version=1.21.11-20251209.172050
8989

9090
# Dependency Property Identifiers
9191
# -> These values point to other properties with full dependency specification.
@@ -118,8 +118,8 @@ vr_neoforge_yacl=[3.7.1,)
118118

119119
# ModMenu https://modrinth.com/project/mOgUt4GM/versions
120120
d_fabric_modmenu=-:-:imp:maven.modrinth:mOgUt4GM:$v:-,recommends:modmenu,req:mOgUt4GM,req:modmenu
121-
v_modmenu=15.0.0
122-
vr_fabric_modmenu=>=15.0.0-beta.1
121+
v_modmenu=17.0.0-alpha.1
122+
vr_fabric_modmenu=>=17.0.0-alpha.1
123123

124124
# Dependency Version Extensions
125125
# -> Intended for addon mods to show which version they were compiled against.
@@ -156,11 +156,11 @@ mixinextras_jij_fabric=false
156156
mixinextras_jij_neoforge=false
157157

158158
# Fabric Loom https://mvnrepository.com/artifact/net.fabricmc/fabric-loom
159-
loom_version=1.11.8
159+
loom_version=1.14.4
160160
# ModDev https://plugins.gradle.org/plugin/net.neoforged.moddev
161-
moddev_version=2.0.112
161+
moddev_version=2.0.123
162162
# Mod Publish Plugin https://plugins.gradle.org/plugin/me.modmuss50.mod-publish-plugin
163-
mpp_version=1.0.0
163+
mpp_version=1.1.0
164164
# grgit-service https://github.com/ajoberstar/grgit/releases
165165
grgitservice_version=5.3.2
166166
# licenser https://maven.neoforged.net/#/releases/net/neoforged/licenser/net.neoforged.licenser.gradle.plugin

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
# Gradle https://gradle.org/releases
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

neoforge/src/main/java/dev/terminalmc/effecttimerplus/platform/NeoForgeServices.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,19 @@
2020
import dev.terminalmc.effecttimerplus.platform.services.IPlatformServices;
2121
import net.neoforged.fml.loading.FMLLoader;
2222
import net.neoforged.fml.loading.FMLPaths;
23-
import net.neoforged.fml.loading.LoadingModList;
2423

2524
import java.nio.file.Path;
2625

2726
public class NeoForgeServices implements IPlatformServices {
2827

2928
@Override
3029
public boolean isDevEnv() {
31-
return !FMLLoader.isProduction();
30+
return !FMLLoader.getCurrent().isProduction();
3231
}
3332

3433
@Override
3534
public boolean isModLoaded(String modId) {
36-
return LoadingModList.get().getModFileById(modId) != null;
35+
return FMLLoader.getCurrent().getLoadingModList().getModFileById(modId) != null;
3736
}
3837

3938
@Override

0 commit comments

Comments
 (0)