Skip to content

Commit 6ddfa14

Browse files
NotRykenNotRyken
committed
Update to mc26.2-pre.2
1 parent 3985b8f commit 6ddfa14

10 files changed

Lines changed: 44 additions & 46 deletions

File tree

‎changelog.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# Changelog
22

3-
## 3.2.3
3+
## 3.3.0-beta.1
44

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`
58
- Fixed a potential compat issue caused by removal of action buttons from old screens
69
- Removed refmap usages
710

‎common/src/main/java/dev/terminalmc/clientsort/client/gui/TriggerButtonManager.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public static void afterScreenInit(Screen initScreen) {
125125

126126
boolean isEditorC = false;
127127
boolean isEditorP = false;
128-
Screen currentScreen = Minecraft.getInstance().screen;
128+
Screen currentScreen = Minecraft.getInstance().gui.screen();
129129
if (currentScreen instanceof SelectorScreen) {
130130
isEditorC = true;
131131
isEditorP = true;
@@ -337,7 +337,7 @@ private static void generateSimpleButton(
337337
ClientSort.taskManager.schedule(
338338
isPlayerInv ? options().autoOpDelayPlayer : options().autoOpDelayContainer,
339339
() -> {
340-
if (Minecraft.getInstance().screen == screen
340+
if (Minecraft.getInstance().gui.screen() == screen
341341
&& !KeybindManager.isDown(KeybindManager.CANCEL_AUTO_KEY)
342342
&& (isPlayerInv ? playerButtons : containerButtons)
343343
.contains(button)) {
@@ -465,7 +465,7 @@ private static void generateDirectionalButton(
465465
ClientSort.taskManager.schedule(
466466
isPlayerInv ? options().autoOpDelayPlayer : options().autoOpDelayContainer,
467467
() -> {
468-
if (Minecraft.getInstance().screen == screen
468+
if (Minecraft.getInstance().gui.screen() == screen
469469
&& !KeybindManager.isDown(KeybindManager.CANCEL_AUTO_KEY)
470470
&& (isPlayerInv ? playerButtons : containerButtons)
471471
.contains(button)) {

common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/config/ClothScreenProvider.java renamed to common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/config/ClothScreenProvider.java.disabled

File renamed without changes.

‎common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/config/ConfigScreenProvider.java‎

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

3535
public static Screen getConfigScreen(Screen parent) {
3636
try {
37-
return ClothScreenProvider.getConfigScreen(parent);
38-
// return new DisabledScreen(parent);
37+
// return ClothScreenProvider.getConfigScreen(parent);
38+
return new DisabledScreen(parent);
3939
} catch (NoClassDefFoundError ignored) {
4040
return new BackupScreen(
4141
parent,
@@ -72,7 +72,7 @@ public void init() {
7272

7373
Button openLinkButton = Button.builder(
7474
localized("message", "viewModrinth"),
75-
(button) -> Minecraft.getInstance().setScreen(new ConfirmLinkScreen(
75+
(button) -> Minecraft.getInstance().gui.setScreen(new ConfirmLinkScreen(
7676
(open) -> {
7777
if (open)
7878
Util.getPlatform().openUri(modUrl);
@@ -94,7 +94,7 @@ public void init() {
9494

9595
@Override
9696
public void onClose() {
97-
Minecraft.getInstance().setScreen(parent);
97+
Minecraft.getInstance().gui.setScreen(parent);
9898
}
9999
}
100100

@@ -129,7 +129,7 @@ public void init() {
129129

130130
@Override
131131
public void onClose() {
132-
Minecraft.getInstance().setScreen(parent);
132+
Minecraft.getInstance().gui.setScreen(parent);
133133
}
134134
}
135135
}

‎common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/edit/EditorScreen.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ private void rebuildGui() {
232232
// Split the current config off the parent class key
233233
Button splitPolicyClassButton = Button.builder(
234234
localized("editor", "splitPolicyClass"),
235-
(button) -> Minecraft.getInstance().setScreen(new ConfirmScreen(
235+
(button) -> Minecraft.getInstance().gui.setScreen(new ConfirmScreen(
236236
(confirm) -> {
237237
if (confirm) {
238238
options().classPolicies.put(
@@ -270,7 +270,7 @@ private void rebuildGui() {
270270
Config.save();
271271
init();
272272
}
273-
Minecraft.getInstance().setScreen(this);
273+
Minecraft.getInstance().gui.setScreen(this);
274274
},
275275
localized("title", "confirm.splitPolicyClass"),
276276
localized(
@@ -303,7 +303,7 @@ private void rebuildGui() {
303303
Component invTitle = isPlayerInv
304304
? ((AbstractContainerScreenAccessor) underlay).clientsort$getPlayerInventoryTitle()
305305
: underlay.getTitle();
306-
Minecraft.getInstance().setScreen(new ConfirmScreen(
306+
Minecraft.getInstance().gui.setScreen(new ConfirmScreen(
307307
(confirm) -> {
308308
if (confirm) {
309309
if (ClassPolicy.hasInvTitle(rep.activePolicyKey)) {
@@ -352,7 +352,7 @@ private void rebuildGui() {
352352
Config.save();
353353
init();
354354
}
355-
Minecraft.getInstance().setScreen(this);
355+
Minecraft.getInstance().gui.setScreen(this);
356356
},
357357
localized("title", "confirm.splitPolicyTitle"),
358358
localized(
@@ -420,14 +420,14 @@ private void rebuildGui() {
420420
// Save the current position as default
421421
Button saveAsDefaultButton = Button.builder(
422422
localized("editor", "saveAsDefault"),
423-
(button) -> Minecraft.getInstance().setScreen(new ConfirmScreen(
423+
(button) -> Minecraft.getInstance().gui.setScreen(new ConfirmScreen(
424424
(confirm) -> {
425425
if (confirm) {
426426
options().layoutOffset = buttons.getFirst().offset;
427427
Config.save();
428428
init();
429429
}
430-
Minecraft.getInstance().setScreen(this);
430+
Minecraft.getInstance().gui.setScreen(this);
431431
},
432432
localized("title", "confirm.saveAsDefault"),
433433
localized("message", "confirm.saveAsDefault")
@@ -535,7 +535,7 @@ private void rebuildGui() {
535535
localized("editor", "reselect"),
536536
(button) -> {
537537
onClose();
538-
Minecraft.getInstance().setScreen(
538+
Minecraft.getInstance().gui.setScreen(
539539
new SelectorScreen(underlay, this)
540540
);
541541
}
@@ -706,7 +706,7 @@ private void drawLineFor(GuiGraphicsExtractor graphics, TriggerButton button) {
706706
public void onClose() {
707707
super.onClose();
708708
lastScreen.init(width, height);
709-
Minecraft.getInstance().setScreen(lastScreen);
709+
Minecraft.getInstance().gui.setScreen(lastScreen);
710710
}
711711

712712
/**

‎common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/edit/SelectorScreen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public void onClose() {
155155
pes.onClose();
156156
} else {
157157
lastScreen.init(width, height);
158-
Minecraft.getInstance().setScreen(lastScreen);
158+
Minecraft.getInstance().gui.setScreen(lastScreen);
159159
}
160160
}
161161

‎common/src/main/java/dev/terminalmc/clientsort/client/gui/widget/TriggerButton.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ protected TriggerButton(
121121
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
122122
if (isMouseOver(event.x(), event.y())) {
123123
boolean rightClick = event.button() == InputConstants.MOUSE_BUTTON_RIGHT;
124-
if (Minecraft.getInstance().screen instanceof EditorScreen) {
124+
if (Minecraft.getInstance().gui.screen() instanceof EditorScreen) {
125125
if (rightClick) {
126126
if (event.hasShiftDown()) {
127127
operationAllowed = !operationAllowed;
@@ -150,7 +150,7 @@ public boolean isMouseOver(double mouseX, double mouseY) {
150150
}
151151

152152
public void openEditScreen() {
153-
Minecraft.getInstance().setScreen(
153+
Minecraft.getInstance().gui.setScreen(
154154
isPlayerInv
155155
? new PlayerEditorScreen(screen, this)
156156
: new ContainerEditorScreen(screen, this)
@@ -188,7 +188,7 @@ public void extractContents(
188188
// Refresh tooltip
189189
if (isMouseOver(mouseX, mouseY)) {
190190
if (((AbstractWidgetAccessor) this).clientsort$getTooltip().get() == null) {
191-
if (Minecraft.getInstance().screen instanceof EditorScreen) {
191+
if (Minecraft.getInstance().gui.screen() instanceof EditorScreen) {
192192
Component visibilityStatus = localized(
193193
"editor", active ? "enabled" : "disabled")
194194
.withStyle(active
@@ -215,7 +215,7 @@ public void extractContents(
215215

216216
@Override
217217
protected void onDrag(@NotNull MouseButtonEvent event, double dragX, double dragY) {
218-
if (Minecraft.getInstance().screen instanceof EditorScreen) {
218+
if (Minecraft.getInstance().gui.screen() instanceof EditorScreen) {
219219
AbstractContainerScreenAccessor acs = (AbstractContainerScreenAccessor) screen;
220220
int newX = Math.clamp((int) event.x() - HALF_WIDTH, 0, screen.width - WIDTH);
221221
int newY = Math.clamp((int) event.y() - HALF_HEIGHT, 0, screen.height - HEIGHT);

‎common/src/main/java/dev/terminalmc/clientsort/mixin/client/AbstractContainerScreenMixin.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import net.minecraft.world.inventory.AbstractContainerMenu;
4242
import net.minecraft.world.inventory.ContainerInput;
4343
import net.minecraft.world.inventory.Slot;
44-
import net.minecraft.world.item.ItemStack;
4544
import org.jetbrains.annotations.Nullable;
4645
import org.spongepowered.asm.mixin.Final;
4746
import org.spongepowered.asm.mixin.Mixin;
@@ -76,9 +75,6 @@ protected AbstractContainerScreenMixin(Component title) {
7675
@Shadow
7776
protected Slot hoveredSlot;
7877

79-
@Shadow
80-
private ItemStack draggingItem;
81-
8278
@Shadow
8379
public abstract T getMenu();
8480

@@ -161,7 +157,6 @@ private void beforeKeyPressed(KeyEvent event, CallbackInfoReturnable<Boolean> ci
161157
if (((inputMatcher.apply(options.keyPickItem)
162158
&& this.minecraft.player.hasInfiniteMaterials()
163159
&& (this.hoveredSlot.hasItem()
164-
|| !this.draggingItem.isEmpty()
165160
|| !this.menu.getCarried().isEmpty())))) {
166161
return null;
167162
}
@@ -196,7 +191,7 @@ private void beforeKeyPressed(KeyEvent event, CallbackInfoReturnable<Boolean> ci
196191
@Unique
197192
private boolean clientsort$openEditor() {
198193
Minecraft.getInstance()
199-
.setScreen(new SelectorScreen((AbstractContainerScreen<?>) (Object) this));
194+
.gui.setScreen(new SelectorScreen((AbstractContainerScreen<?>) (Object) this));
200195
return true;
201196
}
202197

@@ -269,7 +264,7 @@ private void afterRender(
269264
float partialTick,
270265
CallbackInfo ci
271266
) {
272-
if (!this.equals(Minecraft.getInstance().screen))
267+
if (!this.equals(Minecraft.getInstance().gui.screen()))
273268
return;
274269

275270
if (ClientSort.overlayMessage != null) {
@@ -298,7 +293,7 @@ private void afterRender(
298293
int slotIdx = ((ISlot) slot).clientsort$getIndexInContainer();
299294

300295
// Draw disabled indicator, top left
301-
if (!(Minecraft.getInstance().screen instanceof EditorScreen)) {
296+
if (!(Minecraft.getInstance().gui.screen() instanceof EditorScreen)) {
302297
Object object = getObj(slot, getMenu());
303298
if (object == null)
304299
continue;

‎common/src/main/java/dev/terminalmc/clientsort/mixin/client/ScreenMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public abstract class ScreenMixin {
4040
)
4141
)
4242
private void afterInit(CallbackInfo ci) {
43-
if (Minecraft.getInstance().screen instanceof CreativeModeInventoryScreen)
43+
if (Minecraft.getInstance().gui.screen() instanceof CreativeModeInventoryScreen)
4444
return;
4545
clientsort$afterInit();
4646
}

‎gradle.properties‎

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

1212
# Mod Version
13-
mod_version=3.2.3
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
@@ -71,7 +71,7 @@ fabric_entrypoints_modmenu=client.compat.modmenu.ModMenuImpl
7171
curseforge_environments=client,server
7272

7373
# Build Configuration
74-
build_subprojects=fabric,neoforge
74+
build_subprojects=fabric
7575
build_sources_jar=true
7676
build_javadoc_jar=false
7777

@@ -83,33 +83,33 @@ mod_curseforge_id=1049891
8383
# Subproject Build Compatibility
8484
# -> Comment out or unset to disable publishing of a subproject.
8585
mod_loaders_fabric=fabric
86-
mc_versions_fabric=26.1,26.1.1,26.1.2
86+
mc_versions_fabric=26.2-pre-2
8787
mod_loaders_neoforge=neoforge
88-
mc_versions_neoforge=26.1,26.1.1,26.1.2
88+
mc_versions_neoforge=26.2-pre-2
8989

9090
# Java
9191
java_version=25
9292
java_versions_fabric=>=25
9393
java_versions_neoforge=[25,)
9494

9595
# Minecraft
96-
minecraft_version=26.1.2
97-
minecraft_versions_fabric=>=26.1-rc.1 <27
98-
minecraft_versions_neoforge=[26.1-rc.1,27)
96+
minecraft_version=26.2-pre-2
97+
minecraft_versions_fabric=>=26.2-pre.2 <27
98+
minecraft_versions_neoforge=[26.2-pre.2,27)
9999

100100
# Fabric https://fabricmc.net/develop
101101
# -> See also 'mixinextras_jij_fabric'
102102
fabric_loader_version=0.19.2
103103
fabric_loader_versions=>=0.18.5
104-
fabric_api_version=0.150.0+26.1.2
104+
fabric_api_version=0.150.1+26.2
105105
fabric_api_versions=*
106106

107107
# NeoForge https://projects.neoforged.net/neoforged/neoforge
108108
# -> See also 'mixinextras_jij_neoforge'
109109
neoforge_version=26.1.2.68-beta
110110
neoforge_versions=[26.1.0.2-beta,)
111111
# NeoForm https://projects.neoforged.net/neoforged/neoform
112-
neoform_version=26.1.2-1
112+
neoform_version=26.2-pre-2-1
113113

114114
# Dependency Repositories
115115
# Notation: `dep_repos=[{repo_alias_list}]`
@@ -124,9 +124,9 @@ dep_repo_shedaniel=maven.shedaniel.me:me.shedaniel
124124

125125
# Dependency Property Identifiers
126126
# -> These values point to other properties with full dependency specification.
127-
common_deps=clothconfig
128-
fabric_deps=modmenu,clothconfig
129-
neoforge_deps=clothconfig
127+
common_deps=
128+
fabric_deps=modmenu
129+
neoforge_deps=
130130

131131
# Dependency Notation:
132132
# `d_{subproject}_{dep}=[{gradle_config}],[{loader_config}],[{modrinth_config}],[{curseforge_config}]`
@@ -153,8 +153,8 @@ vr_neoforge_clothconfig=[26.1,)
153153

154154
# ModMenu https://modrinth.com/project/mOgUt4GM/versions
155155
d_fabric_modmenu=-:-:imp:maven.modrinth:mOgUt4GM:$v:-,recommends:modmenu,req:mOgUt4GM,req:modmenu
156-
v_modmenu=18.0.0-alpha.8
157-
vr_fabric_modmenu=>=18.0.0-alpha.6
156+
v_modmenu=20.0.0-alpha.1
157+
vr_fabric_modmenu=>=20.0.0-alpha.1
158158

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

0 commit comments

Comments
 (0)