firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

[DEV] Rebuild porting patches

Browse Source
This commit is contained in:
HypherionSA
2025-04-28 13:49:31 +02:00
parent fe00eabdff
commit 799a0fecc7
100 changed files with 789 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch
View File

@@ -23,7 +23,15 @@
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
@@ -50,7 +51,7 @@
@@ -37,7 +38,6 @@
/**
* @author HypherionSA
*/
-@SuppressWarnings("deprecation")
@Deprecated(forRemoval = true, since = "2.1.3")
public class CraterConfigScreen extends Screen {
public static final float SCROLLBAR_BOTTOM_COLOR = .5f;
@@ -51,7 +51,7 @@
private boolean dragging;
public CraterConfigScreen(AbstractConfig config, Screen parent, Object subConfig) {
@@ -32,7 +40,7 @@
this.parent = parent;
this.config = config;
if (subConfig != null) {
@@ -65,11 +66,11 @@
@@ -66,11 +66,11 @@
}
private static Component toText(Enum<?> val) {
@@ -46,7 +54,7 @@
}
private void setupScreenFromConfig(Object object, Class<?> clazz) {
@@ -95,7 +96,7 @@
@@ -96,7 +96,7 @@
tooltipLang = field.getAnnotation(Tooltip.class).value();
}
@@ -55,7 +63,7 @@
val,
() -> val,
(ret) -> {
@@ -159,7 +160,7 @@
@@ -160,7 +160,7 @@
return new TextConfigOption<>(Objects::toString, BigDecimal::new);
}
if (value instanceof ResourceLocation) {
@@ -64,7 +72,7 @@
}
if (isSubConfig) {
return new SubConfigWidget<>(config, this, value);
@@ -173,24 +174,24 @@
@@ -174,24 +174,24 @@
((List) children()).addAll(options);
int buttonWidths = Math.min(200, (width - 50 - 12) / 3);
@@ -76,7 +84,7 @@
@Override
- public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) {
- overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32);
- /*overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32);
+ public void render(@NotNull PoseStack matrices, int mouseX, int mouseY, float delta) {
+ overlayBackground(matrices, TOP, height - BOTTOM, 32);
+
@@ -101,7 +109,16 @@
int y = (int) (TOP + 4 - Math.round(scrollerAmount));
for (Option<?> option : options) {
@@ -217,47 +218,49 @@
@@ -199,7 +199,7 @@
option.render(minecraft, font, 40, y, width - 80, height1, matrices, mouseX, mouseY, delta);
renderConfigTooltip(matrices, font, mouseX, mouseY, 40, y, font.width(option.text), height1, option.text.getString(), option.getLangKeys().toArray(new String[0]));
y += height1;
- }*/
+ }
}
private void renderScrollBar() {
@@ -218,47 +218,49 @@
int maxY = this.height - BOTTOM;
//RenderSystem.disableTexture();
Tesselator tesselator = Tesselator.getInstance();
@@ -183,21 +200,22 @@
}
protected void overlayBackground(PoseStack matrices, int h1, int h2, int color) {
@@ -266,15 +269,16 @@
@@ -267,15 +269,16 @@
protected void overlayBackground(Matrix4f matrix, int minX, int minY, int maxX, int maxY, int red, int green, int blue, int startAlpha, int endAlpha) {
Tesselator tesselator = Tesselator.getInstance();
- BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
- //RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
- //RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND);
+ BufferBuilder buffer = tesselator.getBuilder();
+ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
- //RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
- buffer.addVertex(matrix, minX, maxY, 0.0F).setUv(minX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
- buffer.addVertex(matrix, maxX, maxY, 0.0F).setUv(maxX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
- buffer.addVertex(matrix, maxX, minY, 0.0F).setUv(maxX / 32.0F, minY / 32.0F).setColor(red, green, blue, startAlpha);
- buffer.addVertex(matrix, minX, minY, 0.0F).setUv(minX / 32.0F, minY / 32.0F).setColor(red, green, blue, startAlpha);
- //BufferUploader.drawWithShader(buffer.buildOrThrow());
+ BufferBuilder buffer = tesselator.getBuilder();
+ RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
+ RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+ RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
+ buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
+ buffer.vertex(matrix, minX, maxY, 0.0F).uv(minX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex();
@@ -208,7 +226,7 @@
}
public int scrollHeight() {
@@ -322,22 +326,22 @@
@@ -323,22 +326,22 @@
@Override
public void onClose() {
if (isEdited()) {
@@ -237,7 +255,7 @@
}
@Override
@@ -376,15 +380,15 @@
@@ -377,15 +380,15 @@
}
}
@@ -252,7 +270,7 @@
- list.add(Component.translatable(desc));
+ list.add(new TranslatableComponent(desc));
}
- stack.renderComponentTooltip(font, list, mouseX, mouseY);
- //stack.renderComponentTooltip(font, list, mouseX, mouseY);
+ renderComponentTooltip(stack, list, mouseX, mouseY);
}
}

9
patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch
View File

@@ -9,6 +9,15 @@
}
public boolean isSinglePlayer() {
@@ -55,7 +55,7 @@
}
public String getGameVersion() {
- return SharedConstants.getCurrentVersion().name();
+ return SharedConstants.getCurrentVersion().getName();
}
public String getUserName() {
@@ -63,7 +63,7 @@
}

9
patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch
View File

@@ -9,6 +9,15 @@
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.players.UserBanListEntry;
import net.minecraft.server.players.UserWhiteListEntry;
@@ -38,7 +40,7 @@
}
public String getName() {
- return SharedConstants.getCurrentVersion().name();
+ return SharedConstants.getCurrentVersion().getName();
}
public boolean usesAuthentication() {
@@ -46,7 +48,7 @@
}

10
patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch
View File

@@ -8,7 +8,7 @@
import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
import lombok.Getter;
import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer;
@@ -13,13 +11,10 @@
@@ -13,51 +11,36 @@
import net.minecraft.ChatFormatting;
import net.minecraft.SharedConstants;
import net.minecraft.Util;
@@ -24,7 +24,13 @@
public class ChatUtils {
@@ -32,32 +27,20 @@
@Getter
private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options(
- JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().dataVersion().version())
+ JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion())
).build();
private static final MiniMessage miniMessage = MiniMessage.miniMessage();
public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) {
final String serialised = adventureSerializer.serialize(inComponent);