Skip to content

Commit fcbdff4

Browse files
MrCrayfishMrCrayfish
committed
✨ Update to Minecraft 1.21.9
1 parent 1984553 commit fcbdff4

File tree

21 files changed

+164
-155
lines changed

21 files changed

+164
-155
lines changed

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.7"
33
id 'fabric-loom' version '1.11-SNAPSHOT' apply false
4-
id 'net.neoforged.gradle.userdev' version '7.0.184' apply false
5-
id 'net.neoforged.moddev' version '2.0.103' apply false
4+
id 'net.neoforged.gradle.userdev' version '7.0.192' apply false
5+
id 'net.neoforged.moddev' version '2.0.111' apply false
66
}

‎common/src/main/java/com/mrcrayfish/configured/client/ClientConfigHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static boolean isSingleplayer()
4444

4545
public static boolean isServerOwnedByPlayer(@Nullable Player player)
4646
{
47-
return player != null && Minecraft.getInstance().getSingleplayerServer() != null && Minecraft.getInstance().getSingleplayerServer().isSingleplayerOwner(player.getGameProfile());
47+
return player != null && Minecraft.getInstance().getSingleplayerServer() != null && Minecraft.getInstance().getSingleplayerServer().isSingleplayerOwner(player.nameAndId());
4848
}
4949

5050
public static boolean isPlayingRemotely()

‎common/src/main/java/com/mrcrayfish/configured/client/ClientHandler.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
package com.mrcrayfish.configured.client;
22

3-
import com.mojang.blaze3d.systems.RenderSystem;
43
import com.mrcrayfish.configured.Constants;
54
import com.mrcrayfish.configured.api.ConfigType;
65
import com.mrcrayfish.configured.api.IModConfig;
76
import com.mrcrayfish.configured.api.IModConfigProvider;
87
import com.mrcrayfish.configured.api.ModContext;
98
import com.mrcrayfish.configured.platform.Services;
109
import net.minecraft.client.KeyMapping;
11-
import net.minecraft.client.gui.components.AbstractSelectionList;
12-
import net.minecraft.client.gui.screens.Screen;
10+
import net.minecraft.resources.ResourceLocation;
1311

1412
import java.util.HashMap;
1513
import java.util.LinkedHashSet;
@@ -20,8 +18,8 @@
2018

2119
public class ClientHandler
2220
{
23-
//TODO register this on fabric
24-
public static final KeyMapping KEY_OPEN_MOD_LIST = new KeyMapping("key.configured.open_mod_list", -1, "key.categories.configured");
21+
public static final KeyMapping.Category CONFIG_CATEGORY = KeyMapping.Category.register(ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, "configured"));
22+
public static final KeyMapping KEY_OPEN_MOD_LIST = new KeyMapping("key.configured.open_mod_list", -1, CONFIG_CATEGORY);
2523
private static Set<IModConfigProvider> providers;
2624

2725
public static void init()

‎common/src/main/java/com/mrcrayfish/configured/client/screen/ChangeEnumScreen.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import net.minecraft.client.gui.narration.NarratedElementType;
1818
import net.minecraft.client.gui.narration.NarrationElementOutput;
1919
import net.minecraft.client.gui.screens.Screen;
20+
import net.minecraft.client.input.MouseButtonEvent;
2021
import net.minecraft.client.renderer.RenderPipelines;
2122
import net.minecraft.client.renderer.RenderType;
2223
import net.minecraft.network.chat.CommonComponents;
@@ -198,14 +199,14 @@ public Component getFormattedLabel()
198199
}
199200

200201
@Override
201-
public void render(GuiGraphics graphics, int index, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks)
202+
public void renderContent(GuiGraphics graphics, int mouseX, int mouseY, boolean hovered, float partialTick)
202203
{
203204
Component label = Component.literal(this.label.getString()).withStyle(ChangeEnumScreen.this.list.getSelected() == this ? ChatFormatting.YELLOW : ChatFormatting.WHITE);
204-
graphics.drawString(ChangeEnumScreen.this.minecraft.font, label, left + 5, top + 4, 0xFFFFFFFF);
205+
graphics.drawString(ChangeEnumScreen.this.minecraft.font, label, this.getX() + 5, this.getY() + 4, 0xFFFFFFFF);
205206
}
206207

207208
@Override
208-
public boolean mouseClicked(double mouseX, double mouseY, int button)
209+
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick)
209210
{
210211
ChangeEnumScreen.this.list.setSelected(this);
211212
ChangeEnumScreen.this.selectedValue = this.enumValue;

‎common/src/main/java/com/mrcrayfish/configured/client/screen/ConfigScreen.java‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -348,13 +348,13 @@ public List<? extends GuiEventListener> children()
348348
}
349349

350350
@Override
351-
public void render(GuiGraphics graphics, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean selected, float partialTicks)
351+
public void renderContent(GuiGraphics graphics, int mouseX, int mouseY, boolean hovered, float partialTick)
352352
{
353-
super.render(graphics, index, top, left, width, height, mouseX, mouseY, selected, partialTicks);
354-
this.button.setX(left - 1);
355-
this.button.setY(top);
356-
this.button.setWidth(width);
357-
this.button.render(graphics, mouseX, mouseY, partialTicks);
353+
super.renderContent(graphics, mouseX, mouseY, hovered, partialTick);
354+
this.button.setX(this.getX() - 1);
355+
this.button.setY(this.getY());
356+
this.button.setWidth(this.getWidth());
357+
this.button.render(graphics, mouseX, mouseY, partialTick);
358358
}
359359

360360
private static Component createLabelForFolderEntry(IConfigEntry entry)
@@ -403,26 +403,26 @@ public List<? extends GuiEventListener> children()
403403
}
404404

405405
@Override
406-
public void render(GuiGraphics graphics, int x, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks)
406+
public void renderContent(GuiGraphics graphics, int mouseX, int mouseY, boolean hovered, float partialTick)
407407
{
408408
boolean showValidationHint = this.validationHint != null;
409409
int trimLength = showValidationHint ? 100 : 80;
410410
ChatFormatting labelStyle = this.holder.isChanged() ? Config.getChangedFormatting() : ChatFormatting.RESET;
411-
graphics.drawString(Minecraft.getInstance().font, this.getTrimmedLabel(width - trimLength).withStyle(labelStyle), left, top + 6, 0xFFFFFFFF);
411+
graphics.drawString(Minecraft.getInstance().font, this.getTrimmedLabel(this.getWidth() - trimLength).withStyle(labelStyle), this.getX(), this.getY() + 6, 0xFFFFFFFF);
412412

413413
if(showValidationHint)
414414
{
415-
graphics.blit(RenderPipelines.GUI_TEXTURED, IconButton.ICONS, left + width - 88, top + 3, 11, 11, 16, 16, 11, 11, 64, 64);
415+
graphics.blit(RenderPipelines.GUI_TEXTURED, IconButton.ICONS, this.getX() + this.getWidth() - 88, this.getY() + 3, 11, 11, 16, 16, 11, 11, 64, 64);
416416
}
417417

418418
if(!ConfigScreen.this.config.isReadOnly())
419419
{
420420
if(this.holder.requiresGameRestart() || this.holder.requiresWorldRestart())
421421
{
422422
boolean gameRestart = this.holder.requiresGameRestart();
423-
graphics.blit(RenderPipelines.GUI_TEXTURED, IconButton.ICONS, left - 18, top + 5, gameRestart ? 51 : 11, 22, 11, 11, 11, 11, 64, 64);
423+
graphics.blit(RenderPipelines.GUI_TEXTURED, IconButton.ICONS, this.getX() - 18, this.getY() + 5, gameRestart ? 51 : 11, 22, 11, 11, 11, 11, 64, 64);
424424

425-
if(ScreenUtil.isMouseWithin(left - 18, top + 5, 11, 11, mouseX, mouseY))
425+
if(ScreenUtil.isMouseWithin(this.getX() - 18, this.getY() + 5, 11, 11, mouseX, mouseY))
426426
{
427427
String translationKey = gameRestart ? "configured.gui.requires_game_restart" : "configured.gui.requires_world_restart";
428428
TooltipStyle style = gameRestart ? TooltipStyle.HINT : TooltipStyle.SUCCESS;
@@ -433,7 +433,7 @@ public void render(GuiGraphics graphics, int x, int top, int left, int width, in
433433

434434
if(this.isMouseOver(mouseX, mouseY))
435435
{
436-
if(showValidationHint && ScreenUtil.isMouseWithin(left + width - 92, top, 23, 20, mouseX, mouseY))
436+
if(showValidationHint && ScreenUtil.isMouseWithin(this.getX() + this.getWidth() - 92, this.getY(), 23, 20, mouseX, mouseY))
437437
{
438438
ConfigScreen.this.setActiveTooltip(graphics, this.validationHint, mouseX, mouseY, TooltipStyle.ERROR);
439439
}
@@ -444,9 +444,9 @@ else if(mouseX < ConfigScreen.this.list.getRowLeft() + ConfigScreen.this.list.ge
444444
}
445445

446446
this.resetButton.active = !this.holder.isDefault() && !ConfigScreen.this.config.isReadOnly();
447-
this.resetButton.setX(left + width - 21);
448-
this.resetButton.setY(top);
449-
this.resetButton.render(graphics, mouseX, mouseY, partialTicks);
447+
this.resetButton.setX(this.getX() + this.getWidth() - 21);
448+
this.resetButton.setY(this.getY());
449+
this.resetButton.render(graphics, mouseX, mouseY, partialTick);
450450
}
451451

452452
private MutableComponent getTrimmedLabel(int maxWidth)
@@ -538,18 +538,18 @@ public NumberItem(IConfigValue<T> holder, Function<String, Number> parser)
538538
}
539539

540540
@Override
541-
public void render(GuiGraphics graphics, int index, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks)
541+
public void renderContent(GuiGraphics graphics, int mouseX, int mouseY, boolean hovered, float partialTick)
542542
{
543-
super.render(graphics, index, top, left, width, p_230432_6_, mouseX, mouseY, hovered, partialTicks);
543+
super.renderContent(graphics, mouseX, mouseY, hovered, partialTick);
544544
long time = Util.getMillis();
545545
if(time - this.lastTick >= 50)
546546
{
547547
//this.textField.tick(); // TODO what happened to this
548548
this.lastTick = time;
549549
}
550-
this.textField.setX(left + width - 68);
551-
this.textField.setY(top + 1);
552-
this.textField.render(graphics, mouseX, mouseY, partialTicks);
550+
this.textField.setX(this.getX() + this.getWidth() - 68);
551+
this.textField.setY(this.getY() + 1);
552+
this.textField.render(graphics, mouseX, mouseY, partialTick);
553553
}
554554

555555
@Override
@@ -600,12 +600,12 @@ public BooleanItem(IConfigValue<Boolean> holder)
600600
}
601601

602602
@Override
603-
public void render(GuiGraphics graphics, int index, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks)
603+
public void renderContent(GuiGraphics graphics, int mouseX, int mouseY, boolean hovered, float partialTick)
604604
{
605-
super.render(graphics, index, top, left, width, p_230432_6_, mouseX, mouseY, hovered, partialTicks);
606-
this.button.setX(left + width - 69);
607-
this.button.setY(top);
608-
this.button.render(graphics, mouseX, mouseY, partialTicks);
605+
super.renderContent(graphics, mouseX, mouseY, hovered, partialTick);
606+
this.button.setX(this.getX() + this.getWidth() - 69);
607+
this.button.setY(this.getY());
608+
this.button.render(graphics, mouseX, mouseY, partialTick);
609609
}
610610

611611
@Override
@@ -633,12 +633,12 @@ public StringItem(IConfigValue<String> holder)
633633
}
634634

635635
@Override
636-
public void render(GuiGraphics graphics, int index, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks)
636+
public void renderContent(GuiGraphics graphics, int mouseX, int mouseY, boolean hovered, float partialTick)
637637
{
638-
super.render(graphics, index, top, left, width, p_230432_6_, mouseX, mouseY, hovered, partialTicks);
639-
this.button.setX(left + width - 69);
640-
this.button.setY(top);
641-
this.button.render(graphics, mouseX, mouseY, partialTicks);
638+
super.renderContent(graphics, mouseX, mouseY, hovered, partialTick);
639+
this.button.setX(this.getX() + this.getWidth() - 69);
640+
this.button.setY(this.getY());
641+
this.button.render(graphics, mouseX, mouseY, partialTick);
642642
}
643643
}
644644

@@ -662,12 +662,12 @@ public ListItem(IConfigValue<List<?>> holder)
662662
}
663663

664664
@Override
665-
public void render(GuiGraphics graphics, int index, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks)
665+
public void renderContent(GuiGraphics graphics, int mouseX, int mouseY, boolean hovered, float partialTick)
666666
{
667-
super.render(graphics, index, top, left, width, p_230432_6_, mouseX, mouseY, hovered, partialTicks);
668-
this.button.setX(left + width - 69);
669-
this.button.setY(top);
670-
this.button.render(graphics, mouseX, mouseY, partialTicks);
667+
super.renderContent(graphics, mouseX, mouseY, hovered, partialTick);
668+
this.button.setX(this.getX() + this.getWidth() - 69);
669+
this.button.setY(this.getY());
670+
this.button.render(graphics, mouseX, mouseY, partialTick);
671671
if(this.listType == ListTypes.getUnknown() && this.button.isHovered())
672672
{
673673
ConfigScreen.this.setActiveTooltip(graphics, Component.translatable("configured.gui.unsupported_property"), mouseX, mouseY, TooltipStyle.ERROR);
@@ -691,12 +691,12 @@ public EnumItem(IConfigValue<Enum<?>> holder)
691691
}
692692

693693
@Override
694-
public void render(GuiGraphics graphics, int index, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks)
694+
public void renderContent(GuiGraphics graphics, int mouseX, int mouseY, boolean hovered, float partialTick)
695695
{
696-
super.render(graphics, index, top, left, width, p_230432_6_, mouseX, mouseY, hovered, partialTicks);
697-
this.button.setX(left + width - 69);
698-
this.button.setY(top);
699-
this.button.render(graphics, mouseX, mouseY, partialTicks);
696+
super.renderContent(graphics, mouseX, mouseY, hovered, partialTick);
697+
this.button.setX(this.getX() + this.getWidth() - 69);
698+
this.button.setY(this.getY());
699+
this.button.render(graphics, mouseX, mouseY, partialTick);
700700
}
701701
}
702702

‎common/src/main/java/com/mrcrayfish/configured/client/screen/EditListScreen.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -163,27 +163,28 @@ public int addEntry(StringEntry entry)
163163
}
164164

165165
@Override
166-
public boolean removeEntry(StringEntry entry)
166+
public void removeEntry(StringEntry entry)
167167
{
168-
return super.removeEntry(entry);
168+
super.removeEntry(entry);
169169
}
170170

171-
/*@Override
172-
public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks)
171+
@Override
172+
protected void renderListItems(GuiGraphics graphics, int mouseX, int mouseY, float partialTick)
173173
{
174-
super.render(graphics, mouseX, mouseY, partialTicks);
175-
this.children().forEach(entry ->
174+
List<StringEntry> entries = this.children();
175+
for(int i = 0; i < entries.size(); i++)
176176
{
177-
entry.children().forEach(o ->
177+
var entry = entries.get(i);
178+
if(entry.getY() + entry.getHeight() >= this.getY() && entry.getY() <= this.getBottom())
178179
{
179-
if(o instanceof Button)
180+
if(i % 2 != 0)
180181
{
181-
//TODO invesigate new tooltip system
182-
//((Button) o).renderToolTip(poseStack, mouseX, mouseY);
182+
graphics.fill(entry.getX() - 2, entry.getY(), entry.getX() + entry.getWidth() + 2, entry.getY() + entry.getHeight(), 0x55000000);
183183
}
184-
});
185-
});
186-
}*/
184+
this.renderItem(graphics, mouseX, mouseY, partialTick, entry);
185+
}
186+
}
187+
}
187188
}
188189

189190
public class StringEntry extends ContainerObjectSelectionList.Entry<StringEntry>
@@ -224,18 +225,17 @@ public StringEntry(ObjectList list, StringHolder holder)
224225
}
225226

226227
@Override
227-
public void render(GuiGraphics graphics, int x, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean selected, float partialTicks)
228+
public void renderContent(GuiGraphics graphics, int mouseX, int mouseY, boolean hovered, float partialTick)
228229
{
229-
if(x % 2 != 0) graphics.fill(left, top, left + width, top + 24, 0x55000000);
230-
graphics.drawString(EditListScreen.this.minecraft.font, Component.literal(this.holder.getValue()), left + 5, top + 8, 0xFFFFFFFF);
230+
graphics.drawString(EditListScreen.this.minecraft.font, Component.literal(this.holder.getValue()), this.getX() + 5, this.getY() + 8, 0xFFFFFFFF);
231231
this.editButton.visible = true;
232-
this.editButton.setX(left + width - 44);
233-
this.editButton.setY(top + 2);
234-
this.editButton.render(graphics, mouseX, mouseY, partialTicks);
232+
this.editButton.setX(this.getX() + this.getWidth() - 44);
233+
this.editButton.setY(this.getY() + 2);
234+
this.editButton.render(graphics, mouseX, mouseY, partialTick);
235235
this.deleteButton.visible = true;
236-
this.deleteButton.setX(left + width - 22);
237-
this.deleteButton.setY(top + 2);
238-
this.deleteButton.render(graphics, mouseX, mouseY, partialTicks);
236+
this.deleteButton.setX(this.getX() + this.getWidth() - 22);
237+
this.deleteButton.setY(this.getY() + 2);
238+
this.deleteButton.render(graphics, mouseX, mouseY, partialTick);
239239
}
240240

241241
@Override

‎common/src/main/java/com/mrcrayfish/configured/client/screen/EntryBackground.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package com.mrcrayfish.configured.client.screen;
2+
3+
public interface EntryBackground
4+
{
5+
}

0 commit comments

Comments
 (0)