Skip to content

Commit 574bf5f

Browse files
NotRykenNotRyken
committed
Update to mc26.2-pre.2
1 parent e6de08c commit 574bf5f

9 files changed

Lines changed: 51 additions & 42 deletions

File tree

‎changelog.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 3.3.0-beta.1
4+
5+
- Updated to mc26.2-pre.2
6+
- Temporarily disabled config screen
7+
- Mod versioning scheme now resets `minor` on increment of either `major` or `mc`
8+
39
## 3.2.0
410

511
- Updated to mc26.1.2

‎common/src/main/java/dev/terminalmc/effecttimerplus/command/Commands.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static <S> void register(CommandDispatcher<S> dispatcher, CommandBuildCon
3838
//noinspection unchecked
3939
dispatcher.register((LiteralArgumentBuilder<S>) literal(EffectTimerPlus.MOD_ID)
4040
.executes((ctx) -> {
41-
mc.schedule(() -> mc.setScreen(ConfigScreenProvider.getConfigScreen(null)));
41+
mc.schedule(() -> mc.gui.setScreen(ConfigScreenProvider.getConfigScreen(null)));
4242
return Command.SINGLE_SUCCESS;
4343
})
4444
);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public class ConfigScreenProvider {
3535

3636
public static Screen getConfigScreen(Screen parent) {
3737
try {
38-
return YaclScreenProvider.getConfigScreen(parent);
39-
// return new DisabledScreen(parent);
38+
// return YaclScreenProvider.getConfigScreen(parent);
39+
return new DisabledScreen(parent);
4040
} catch (NoClassDefFoundError ignored) {
4141
return new BackupScreen(parent, "installYacl", "https://modrinth.com/project/1eAoo2KR");
4242
}
@@ -69,7 +69,7 @@ public void init() {
6969

7070
Button openLinkButton = Button.builder(
7171
localized("message", "viewModrinth"),
72-
(button) -> Minecraft.getInstance().setScreen(new ConfirmLinkScreen(
72+
(button) -> Minecraft.getInstance().gui.setScreen(new ConfirmLinkScreen(
7373
(open) -> {
7474
if (open)
7575
Util.getPlatform().openUri(modUrl);
@@ -91,7 +91,7 @@ public void init() {
9191

9292
@Override
9393
public void onClose() {
94-
Minecraft.getInstance().setScreen(parent);
94+
Minecraft.getInstance().gui.setScreen(parent);
9595
}
9696
}
9797

@@ -126,7 +126,7 @@ public void init() {
126126

127127
@Override
128128
public void onClose() {
129-
Minecraft.getInstance().setScreen(parent);
129+
Minecraft.getInstance().gui.setScreen(parent);
130130
}
131131
}
132132
}

common/src/main/java/dev/terminalmc/effecttimerplus/gui/screen/YaclScreenProvider.java renamed to common/src/main/java/dev/terminalmc/effecttimerplus/gui/screen/YaclScreenProvider.java.disabled

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import dev.isxander.yacl3.api.controller.*;
2525
import dev.isxander.yacl3.gui.image.ImageRenderer;
2626
import dev.terminalmc.effecttimerplus.config.Config;
27-
import dev.terminalmc.effecttimerplus.mixin.accessor.GuiAccessor;
27+
import dev.terminalmc.effecttimerplus.mixin.accessor.HudAccessor;
2828
import dev.terminalmc.effecttimerplus.util.IndicatorUtil;
2929
import net.minecraft.client.Minecraft;
3030
import net.minecraft.client.gui.Gui;
@@ -419,13 +419,13 @@ public int render(GuiGraphicsExtractor graphics, int x, int y, int width, float
419419
if (effect.isAmbient()) {
420420
graphics.blitSprite(
421421
RenderPipelines.GUI_TEXTURED,
422-
GuiAccessor.etp$getEffectBackgroundAmbientSprite(),
422+
HudAccessor.etp$getEffectBackgroundAmbientSprite(),
423423
movingX, movingY, spriteSize, spriteSize
424424
);
425425
} else {
426426
graphics.blitSprite(
427427
RenderPipelines.GUI_TEXTURED,
428-
GuiAccessor.etp$getEffectBackgroundSprite(),
428+
HudAccessor.etp$getEffectBackgroundSprite(),
429429
movingX, movingY, spriteSize, spriteSize
430430
);
431431
}

common/src/main/java/dev/terminalmc/effecttimerplus/mixin/GuiMixin.java renamed to common/src/main/java/dev/terminalmc/effecttimerplus/mixin/HudMixin.java

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import dev.terminalmc.effecttimerplus.config.Config;
2626
import net.minecraft.client.DeltaTracker;
2727
import net.minecraft.client.Minecraft;
28-
import net.minecraft.client.gui.Gui;
2928
import net.minecraft.client.gui.GuiGraphicsExtractor;
29+
import net.minecraft.client.gui.Hud;
3030
import net.minecraft.resources.Identifier;
3131
import net.minecraft.world.effect.MobEffectInstance;
3232
import org.jetbrains.annotations.Nullable;
@@ -45,10 +45,10 @@
4545
* <a href="https://github.com/magicus/statuseffecttimer">Status Effect Timer</a>
4646
*/
4747
@Mixin(
48-
value = Gui.class,
48+
value = Hud.class,
4949
priority = 2000
5050
)
51-
public abstract class GuiMixin {
51+
public abstract class HudMixin {
5252

5353
@Final
5454
@Shadow
@@ -85,9 +85,16 @@ private void descale(GuiGraphicsExtractor graphics, DeltaTracker delta, Callback
8585
)
8686
)
8787
private void CreateOverlayRunnable(
88-
GuiGraphicsExtractor graphics, RenderPipeline pipeline,
89-
Identifier sprite, int x, int y, int width, int height,
90-
Operation<Void> original, @Local MobEffectInstance effectInstance
88+
GuiGraphicsExtractor graphics,
89+
RenderPipeline pipeline,
90+
Identifier sprite,
91+
int x,
92+
int y,
93+
int width,
94+
int height,
95+
Operation<Void> original,
96+
@Local(name = "instance") MobEffectInstance effectInstance
97+
9198
) {
9299
original.call(graphics, pipeline, sprite, x, y, width, height);
93100

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717

1818
package dev.terminalmc.effecttimerplus.mixin.accessor;
1919

20-
import net.minecraft.client.gui.Gui;
20+
import net.minecraft.client.gui.Hud;
2121
import net.minecraft.resources.Identifier;
2222
import org.spongepowered.asm.mixin.Mixin;
2323
import org.spongepowered.asm.mixin.gen.Accessor;
2424

25-
@Mixin(Gui.class)
26-
public interface GuiAccessor {
25+
@Mixin(Hud.class)
26+
public interface HudAccessor {
2727

2828
@Accessor("EFFECT_BACKGROUND_SPRITE")
2929
static Identifier etp$getEffectBackgroundSprite() {

‎common/src/main/java/dev/terminalmc/effecttimerplus/util/IndicatorUtil.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package dev.terminalmc.effecttimerplus.util;
1919

20-
import net.minecraft.client.resources.language.I18n;
20+
import net.minecraft.locale.Language;
2121
import net.minecraft.world.effect.MobEffectInstance;
2222

2323
public class IndicatorUtil {
@@ -56,11 +56,7 @@ public static String getAmplifierAsString(int amplifier) {
5656
int value = amplifier + 1;
5757
if (value > 1) {
5858
String key = String.format("enchantment.level.%d", value);
59-
if (I18n.exists(key)) {
60-
return I18n.get(key);
61-
} else {
62-
return String.valueOf(value);
63-
}
59+
return Language.getInstance().getOrDefault(key, String.valueOf(value));
6460
}
6561
return "";
6662
}

‎common/src/main/resources/effecttimerplus.mixins.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"mixins": [
1111
],
1212
"client": [
13-
"accessor.GuiAccessor",
14-
"GuiMixin"
13+
"accessor.HudAccessor",
14+
"HudMixin"
1515
],
1616
"server": [
1717
],

‎gradle.properties‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
template_version=20
1111

1212
# Mod Version
13-
mod_version=3.2.0
13+
mod_version=3.3.0-beta.1
1414
# 'STABLE', 'BETA' or 'ALPHA'
15-
mod_version_type=STABLE
15+
mod_version_type=BETA
1616

1717
# Project Info
1818
mod_group=dev.terminalmc
@@ -34,7 +34,7 @@ mod_license=LGPL-3.0-only
3434
# 'att_license_files_other-mod-b=**/NeoForgeServices.java'
3535
# Header file must be located at `{assets_dir}/licenses/{mod_id}/HEADER.txt`
3636
att_license_mods=statuseffecttimer
37-
att_license_files_statuseffecttimer=**/GuiMixin.java
37+
att_license_files_statuseffecttimer=**/HudMixin.java
3838

3939
# Links
4040
homepage_url=https://modrinth.com/project/JIUF2Wb5
@@ -53,7 +53,7 @@ fabric_entrypoints_modmenu=compat.modmenu.ModMenuImpl
5353
curseforge_environments=client
5454

5555
# Build Configuration
56-
build_subprojects=fabric,neoforge
56+
build_subprojects=fabric
5757
build_sources_jar=true
5858
build_javadoc_jar=false
5959

@@ -65,33 +65,33 @@ mod_curseforge_id=1049882
6565
# Subproject Build Compatibility
6666
# -> Comment out or unset to disable publishing of a subproject.
6767
mod_loaders_fabric=fabric
68-
mc_versions_fabric=26.1,26.1.1,26.1.2
68+
mc_versions_fabric=26.2-pre-2
6969
mod_loaders_neoforge=neoforge
70-
mc_versions_neoforge=26.1,26.1.1,26.1.2
70+
mc_versions_neoforge=26.2-pre-2
7171

7272
# Java
7373
java_version=25
7474
java_versions_fabric=>=25
7575
java_versions_neoforge=[25,)
7676

7777
# Minecraft
78-
minecraft_version=26.1.2
79-
minecraft_versions_fabric=>=26.1-rc.1 <27
80-
minecraft_versions_neoforge=[26.1-rc.1,27)
78+
minecraft_version=26.2-pre-2
79+
minecraft_versions_fabric=>=26.2-pre.2 <27
80+
minecraft_versions_neoforge=[26.2-pre.2,27)
8181

8282
# Fabric https://fabricmc.net/develop
8383
# -> See also 'mixinextras_jij_fabric'
8484
fabric_loader_version=0.19.2
8585
fabric_loader_versions=>=0.18.5
86-
fabric_api_version=0.150.0+26.1.2
86+
fabric_api_version=0.150.1+26.2
8787
fabric_api_versions=*
8888

8989
# NeoForge https://projects.neoforged.net/neoforged/neoforge
9090
# -> See also 'mixinextras_jij_neoforge'
9191
neoforge_version=26.1.2.68-beta
9292
neoforge_versions=[26.1.0.2-beta,)
9393
# NeoForm https://projects.neoforged.net/neoforged/neoform
94-
neoform_version=26.1.2-1
94+
neoform_version=26.2-pre-2-1
9595

9696
# Dependency Repositories
9797
# Notation: `dep_repos=[{repo_alias_list}]`
@@ -106,9 +106,9 @@ dep_repo_isxander=maven.isxander.dev/releases
106106

107107
# Dependency Property Identifiers
108108
# -> These values point to other properties with full dependency specification.
109-
common_deps=yacl
110-
fabric_deps=modmenu,yacl
111-
neoforge_deps=yacl
109+
common_deps=
110+
fabric_deps=modmenu
111+
neoforge_deps=
112112

113113
# Dependency Notation:
114114
# `d_{subproject}_{dep}=[{gradle_config}],[{loader_config}],[{modrinth_config}],[{curseforge_config}]`
@@ -135,8 +135,8 @@ vr_neoforge_yacl=[3.9.1,)
135135

136136
# ModMenu https://modrinth.com/project/mOgUt4GM/versions
137137
d_fabric_modmenu=-:-:imp:maven.modrinth:mOgUt4GM:$v:-,recommends:modmenu,req:mOgUt4GM,req:modmenu
138-
v_modmenu=18.0.0-alpha.8
139-
vr_fabric_modmenu=>=18.0.0-alpha.6
138+
v_modmenu=20.0.0-alpha.1
139+
vr_fabric_modmenu=>=20.0.0-alpha.1
140140

141141
# Dependency Version Extensions
142142
# -> Intended for addon mods to show which version they were compiled against.

0 commit comments

Comments
 (0)