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

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

@@ -20,7 +20,15 @@
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
@@ -159,7 +158,7 @@
@@ -37,7 +36,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;
@@ -160,7 +158,7 @@
return new TextConfigOption<>(Objects::toString, BigDecimal::new);
}
if (value instanceof ResourceLocation) {
@@ -29,12 +37,12 @@
}
if (isSubConfig) {
return new SubConfigWidget<>(config, this, value);
@@ -178,19 +177,19 @@
@@ -179,19 +177,19 @@
}
@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);
+
@@ -59,7 +67,16 @@
int y = (int) (TOP + 4 - Math.round(scrollerAmount));
for (Option<?> option : options) {
@@ -217,47 +216,49 @@
@@ -199,7 +197,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 +216,49 @@
int maxY = this.height - BOTTOM;
//RenderSystem.disableTexture();
Tesselator tesselator = Tesselator.getInstance();
@@ -141,21 +158,22 @@
}
protected void overlayBackground(PoseStack matrices, int h1, int h2, int color) {
@@ -266,15 +267,16 @@
@@ -267,15 +267,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();
@@ -166,7 +184,7 @@
}
public int scrollHeight() {
@@ -332,12 +334,12 @@
@@ -333,12 +334,12 @@
}
@Override
@@ -181,7 +199,7 @@
}
@Override
@@ -376,7 +378,7 @@
@@ -377,7 +378,7 @@
}
}
@@ -190,11 +208,11 @@
if (mouseX > startX && mouseX < startX + sizeX) {
if (mouseY > startY && mouseY < startY + sizeY) {
List<Component> list = new ArrayList<>();
@@ -384,7 +386,7 @@
@@ -385,7 +386,7 @@
for (String desc : description) {
list.add(Component.translatable(desc));
}
- stack.renderComponentTooltip(font, list, mouseX, mouseY);
- //stack.renderComponentTooltip(font, list, mouseX, mouseY);
+ renderComponentTooltip(stack, list, mouseX, mouseY);
}
}

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

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

11
patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java
@@ -38,7 +38,7 @@
}
public String getName() {
- return SharedConstants.getCurrentVersion().name();
+ return SharedConstants.getCurrentVersion().getName();
}
public boolean usesAuthentication() {

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

@@ -20,7 +20,15 @@
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.Style;
@@ -32,24 +25,12 @@
@@ -25,31 +18,19 @@
@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);