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

[CHORE] Port for 1.21

Browse Source
This commit is contained in:
HypherionSA
2024-06-09 01:48:07 +02:00
parent 493a1568ff
commit d3ffc2856f
9 changed files with 47 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
View File

@@ -158,7 +158,7 @@ public class CraterConfigScreen extends Screen {
return new TextConfigOption<>(Objects::toString, BigDecimal::new); return new TextConfigOption<>(Objects::toString, BigDecimal::new);
} }
if (value instanceof ResourceLocation) { if (value instanceof ResourceLocation) {
return new TextConfigOption<>(Objects::toString, ResourceLocation::new); return new TextConfigOption<>(Objects::toString, ResourceLocation::parse);
} }
if (isSubConfig) { if (isSubConfig) {
return new SubConfigWidget<>(config, this, value); return new SubConfigWidget<>(config, this, value);
@@ -216,24 +216,23 @@ public class CraterConfigScreen extends Screen {
int maxY = this.height - BOTTOM; int maxY = this.height - BOTTOM;
//RenderSystem.disableTexture(); //RenderSystem.disableTexture();
Tesselator tesselator = Tesselator.getInstance(); Tesselator tesselator = Tesselator.getInstance();
BufferBuilder buffer = tesselator.getBuilder(); BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
RenderSystem.setShader(GameRenderer::getPositionColorShader); RenderSystem.setShader(GameRenderer::getPositionColorShader);
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
buffer.vertex(scrollbarPositionMinX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); buffer.addVertex(scrollbarPositionMinX, maxY, 0.0f).setColor(0, 0, 0, 255);
buffer.vertex(scrollbarPositionMaxX, maxY, 0.0D).color(0, 0, 0, 255).endVertex(); buffer.addVertex(scrollbarPositionMaxX, maxY, 0.0f).setColor(0, 0, 0, 255);
buffer.vertex(scrollbarPositionMaxX, TOP, 0.0D).color(0, 0, 0, 255).endVertex(); buffer.addVertex(scrollbarPositionMaxX, TOP, 0.0f).setColor(0, 0, 0, 255);
buffer.vertex(scrollbarPositionMinX, TOP, 0.0D).color(0, 0, 0, 255).endVertex(); buffer.addVertex(scrollbarPositionMinX, TOP, 0.0f).setColor(0, 0, 0, 255);
buffer.vertex(scrollbarPositionMinX, minY + height, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); buffer.addVertex(scrollbarPositionMinX, minY + height, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1);
buffer.vertex(scrollbarPositionMaxX, minY + height, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); buffer.addVertex(scrollbarPositionMaxX, minY + height, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1);
buffer.vertex(scrollbarPositionMaxX, minY, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); buffer.addVertex(scrollbarPositionMaxX, minY, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1);
buffer.vertex(scrollbarPositionMinX, minY, 0.0D).color(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1).endVertex(); buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, SCROLLBAR_BOTTOM_COLOR, 1);
buffer.vertex(scrollbarPositionMinX, (minY + height - 1), 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex(); buffer.addVertex(scrollbarPositionMinX, (minY + height - 1), 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1);
buffer.vertex((scrollbarPositionMaxX - 1), (minY + height - 1), 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex(); buffer.addVertex((scrollbarPositionMaxX - 1), (minY + height - 1), 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1);
buffer.vertex((scrollbarPositionMaxX - 1), minY, 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex(); buffer.addVertex((scrollbarPositionMaxX - 1), minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1);
buffer.vertex(scrollbarPositionMinX, minY, 0.0D).color(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1).endVertex(); buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1);
tesselator.end(); BufferUploader.drawWithShader(buffer.buildOrThrow());
RenderSystem.disableBlend(); RenderSystem.disableBlend();
//RenderSystem.enableTexture(); //RenderSystem.enableTexture();
} }
@@ -241,22 +240,21 @@ public class CraterConfigScreen extends Screen {
private void renderShadow(PoseStack matrices) { private void renderShadow(PoseStack matrices) {
Tesselator tesselator = Tesselator.getInstance(); Tesselator tesselator = Tesselator.getInstance();
BufferBuilder buffer = tesselator.getBuilder(); BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
RenderSystem.enableBlend(); RenderSystem.enableBlend();
RenderSystem.blendFuncSeparate(770, 771, 0, 1); RenderSystem.blendFuncSeparate(770, 771, 0, 1);
//RenderSystem.disableTexture(); //RenderSystem.disableTexture();
RenderSystem.setShader(GameRenderer::getPositionTexColorShader); RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
Matrix4f matrix = matrices.last().pose(); Matrix4f matrix = matrices.last().pose();
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); buffer.addVertex(matrix, 0, TOP + 4, 0.0F).setUv(0, 1).setColor(0, 0, 0, 0);
buffer.vertex(matrix, 0, TOP + 4, 0.0F).uv(0, 1).color(0, 0, 0, 0).endVertex(); buffer.addVertex(matrix, width, TOP + 4, 0.0F).setUv(1, 1).setColor(0, 0, 0, 0);
buffer.vertex(matrix, width, TOP + 4, 0.0F).uv(1, 1).color(0, 0, 0, 0).endVertex(); buffer.addVertex(matrix, width, TOP, 0.0F).setUv(1, 0).setColor(0, 0, 0, 185);
buffer.vertex(matrix, width, TOP, 0.0F).uv(1, 0).color(0, 0, 0, 185).endVertex(); buffer.addVertex(matrix, 0, TOP, 0.0F).setUv(0, 0).setColor(0, 0, 0, 185);
buffer.vertex(matrix, 0, TOP, 0.0F).uv(0, 0).color(0, 0, 0, 185).endVertex(); buffer.addVertex(matrix, 0, height - BOTTOM, 0.0F).setUv(0, 1).setColor(0, 0, 0, 185);
buffer.vertex(matrix, 0, height - BOTTOM, 0.0F).uv(0, 1).color(0, 0, 0, 185).endVertex(); buffer.addVertex(matrix, width, height - BOTTOM, 0.0F).setUv(1, 1).setColor(0, 0, 0, 185);
buffer.vertex(matrix, width, height - BOTTOM, 0.0F).uv(1, 1).color(0, 0, 0, 185).endVertex(); buffer.addVertex(matrix, width, height - BOTTOM - 4, 0.0F).setUv(1, 0).setColor(0, 0, 0, 0);
buffer.vertex(matrix, width, height - BOTTOM - 4, 0.0F).uv(1, 0).color(0, 0, 0, 0).endVertex(); buffer.addVertex(matrix, 0, height - BOTTOM - 4, 0.0F).setUv(0, 0).setColor(0, 0, 0, 0);
buffer.vertex(matrix, 0, height - BOTTOM - 4, 0.0F).uv(0, 0).color(0, 0, 0, 0).endVertex(); BufferUploader.drawWithShader(buffer.buildOrThrow());
tesselator.end();
//RenderSystem.enableTexture(); //RenderSystem.enableTexture();
RenderSystem.disableBlend(); RenderSystem.disableBlend();
} }
@@ -267,16 +265,15 @@ public class CraterConfigScreen extends Screen {
protected void overlayBackground(Matrix4f matrix, int minX, int minY, int maxX, int maxY, int red, int green, int blue, int startAlpha, int endAlpha) { 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(); Tesselator tesselator = Tesselator.getInstance();
BufferBuilder buffer = tesselator.getBuilder(); BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
RenderSystem.setShader(GameRenderer::getPositionTexColorShader); RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND); RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND);
RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); buffer.addVertex(matrix, minX, maxY, 0.0F).setUv(minX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
buffer.vertex(matrix, minX, maxY, 0.0F).uv(minX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex(); buffer.addVertex(matrix, maxX, maxY, 0.0F).setUv(maxX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
buffer.vertex(matrix, maxX, maxY, 0.0F).uv(maxX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex(); buffer.addVertex(matrix, maxX, minY, 0.0F).setUv(maxX / 32.0F, minY / 32.0F).setColor(red, green, blue, startAlpha);
buffer.vertex(matrix, maxX, minY, 0.0F).uv(maxX / 32.0F, minY / 32.0F).color(red, green, blue, startAlpha).endVertex(); buffer.addVertex(matrix, minX, minY, 0.0F).setUv(minX / 32.0F, minY / 32.0F).setColor(red, green, blue, startAlpha);
buffer.vertex(matrix, minX, minY, 0.0F).uv(minX / 32.0F, minY / 32.0F).color(red, green, blue, startAlpha).endVertex(); BufferUploader.drawWithShader(buffer.buildOrThrow());
tesselator.end();
} }
public int scrollHeight() { public int scrollHeight() {

4
Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java
View File

@@ -7,11 +7,11 @@ public class ResourceIdentifier {
private final ResourceLocation internal; private final ResourceLocation internal;
public ResourceIdentifier(String namespace, String path) { public ResourceIdentifier(String namespace, String path) {
this.internal = new ResourceLocation(namespace, path); this.internal = ResourceLocation.fromNamespaceAndPath(namespace, path);
} }
public ResourceIdentifier(String path) { public ResourceIdentifier(String path) {
this.internal = new ResourceLocation(path); this.internal = ResourceLocation.withDefaultNamespace(path);
} }
public String getNamespace() { public String getNamespace() {

4
Fabric/build.gradle
View File

@@ -110,8 +110,8 @@ publisher {
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")
setDisplayName("[FABRIC/QUILT 1.20.6] CraterLib - ${project.version}") setDisplayName("[FABRIC/QUILT 1.21.0] CraterLib - ${project.version}")
setGameVersions("1.20.6") setGameVersions("1.21")
setLoaders("fabric", "quilt") setLoaders("fabric", "quilt")
setArtifact(remapJar) setArtifact(remapJar)
setCurseEnvironment("both") setCurseEnvironment("both")

2
Fabric/src/main/resources/fabric.mod.json
View File

@@ -33,7 +33,7 @@
"depends": { "depends": {
"fabricloader": ">=0.15.0", "fabricloader": ">=0.15.0",
"fabric-api": "*", "fabric-api": "*",
"minecraft": ">=1.20.6", "minecraft": ">=1.21",
"java": ">=21" "java": ">=21"
} }
} }

6
NeoForge/build.gradle
View File

@@ -31,7 +31,7 @@ shadowJar {
unimined.minecraft { unimined.minecraft {
neoForged { neoForged {
loader neoforge_version loader "net.neoforged:neoforge:${neoforge_version}:universal"
mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
} }
} }
@@ -103,8 +103,8 @@ publisher {
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")
setDisplayName("[NeoForge 1.20.6] CraterLib - ${project.version}") setDisplayName("[NeoForge 1.21.0] CraterLib - ${project.version}")
setGameVersions("1.20.6") setGameVersions("1.21")
setLoaders("neoforge") setLoaders("neoforge")
setArtifact(remapJar) setArtifact(remapJar)
setCurseEnvironment("both") setCurseEnvironment("both")

4
NeoForge/src/main/resources/META-INF/neoforge.mods.toml
View File

@@ -19,13 +19,13 @@ issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues"
[[dependencies.${ mod_id }]] [[dependencies.${ mod_id }]]
modId = "neoforge" modId = "neoforge"
type="required" type="required"
versionRange = "[20.6,)" versionRange = "[21.0,)"
ordering = "NONE" ordering = "NONE"
side = "BOTH" side = "BOTH"
[[dependencies.${ mod_id }]] [[dependencies.${ mod_id }]]
modId = "minecraft" modId = "minecraft"
type="required" type="required"
versionRange = "[1.20.6,1.21)" versionRange = "[*,)"
ordering = "NONE" ordering = "NONE"
side = "BOTH" side = "BOTH"

1
build.gradle
View File

@@ -11,6 +11,7 @@ orion.setup {
multiProject = true multiProject = true
enableMirrorMaven = true enableMirrorMaven = true
enableReleasesMaven = true enableReleasesMaven = true
enableSnapshotsMaven = true
dopplerToken = System.getenv("DOPPLER_KEY") dopplerToken = System.getenv("DOPPLER_KEY")

8
gradle.properties
View File

@@ -9,18 +9,18 @@ mod_id=craterlib
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
minecraft_version=1.20.6 minecraft_version=1.21-pre4
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
fabric_loader=0.15.0 fabric_loader=0.15.11
fabric_api=0.97.8+1.20.6 fabric_api=0.100.0+1.21
# Forge # Forge
forge_version=50.0.6 forge_version=50.0.6
# NeoForged # NeoForged
neoforge_version=41-beta neoforge_version=21.0.0-alpha.1.21-pre4.20240608.221725
# Dependencies # Dependencies
moon_config=1.0.9 moon_config=1.0.9

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists