From c70b767157273857eb794ac01bb37bd425c5da57 Mon Sep 17 00:00:00 2001 From: Superkat32 <89557012+Superkat32@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:07:25 -0400 Subject: [PATCH] 1.21 BUILD: Bumped Minecraft to 1.21 Signed-off-by: Superkat32 --- gradle.properties | 12 +++++------ .../ExplosiveEnhancement.java | 20 +++++++++---------- .../particles/BlastWaveParticle.java | 16 +++++++-------- src/main/resources/fabric.mod.json | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3f39d1f..d26daac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.6 -yarn_mappings=1.20.6+build.3 +minecraft_version=1.21 +yarn_mappings=1.21+build.1 loader_version=0.15.11 # Mod Properties -mod_version = 1.2.3-1.20.x +mod_version = 1.2.3-1.21.0 maven_group = net.superkat archives_base_name = explosive-enhancement # Dependencies -fabric_version=0.99.0+1.20.6 -modmenu_version=10.0.0-beta.1 -yacl_version=3.4.4+1.20.6-fabric \ No newline at end of file +fabric_version=0.100.1+1.21 +modmenu_version=11.0.0-beta.1 +yacl_version=3.5.0+1.21-fabric \ No newline at end of file diff --git a/src/main/java/net/superkat/explosiveenhancement/ExplosiveEnhancement.java b/src/main/java/net/superkat/explosiveenhancement/ExplosiveEnhancement.java index 10abe8f..04c6f6f 100644 --- a/src/main/java/net/superkat/explosiveenhancement/ExplosiveEnhancement.java +++ b/src/main/java/net/superkat/explosiveenhancement/ExplosiveEnhancement.java @@ -26,15 +26,15 @@ public class ExplosiveEnhancement implements ModInitializer { @Override public void onInitialize() { - Registry.register(Registries.PARTICLE_TYPE, new Identifier(MOD_ID, "blastwave"), BLASTWAVE); - Registry.register(Registries.PARTICLE_TYPE, new Identifier(MOD_ID, "fireball"), FIREBALL); - Registry.register(Registries.PARTICLE_TYPE, new Identifier(MOD_ID, "blank_fireball"), BLANK_FIREBALL); - Registry.register(Registries.PARTICLE_TYPE, new Identifier(MOD_ID, "smoke"), SMOKE); - Registry.register(Registries.PARTICLE_TYPE, new Identifier(MOD_ID, "bubble"), BUBBLE); - Registry.register(Registries.PARTICLE_TYPE, new Identifier(MOD_ID, "shockwave"), SHOCKWAVE); - Registry.register(Registries.PARTICLE_TYPE, new Identifier(MOD_ID, "blank_shockwave"), BLANK_SHOCKWAVE); - Registry.register(Registries.PARTICLE_TYPE, new Identifier(MOD_ID, "underwaterblastwave"), UNDERWATERBLASTWAVE); - Registry.register(Registries.PARTICLE_TYPE, new Identifier(MOD_ID, "sparks"), SPARKS); - Registry.register(Registries.PARTICLE_TYPE, new Identifier(MOD_ID, "underwatersparks"), UNDERWATERSPARKS); + Registry.register(Registries.PARTICLE_TYPE, Identifier.of(MOD_ID, "blastwave"), BLASTWAVE); + Registry.register(Registries.PARTICLE_TYPE, Identifier.of(MOD_ID, "fireball"), FIREBALL); + Registry.register(Registries.PARTICLE_TYPE, Identifier.of(MOD_ID, "blank_fireball"), BLANK_FIREBALL); + Registry.register(Registries.PARTICLE_TYPE, Identifier.of(MOD_ID, "smoke"), SMOKE); + Registry.register(Registries.PARTICLE_TYPE, Identifier.of(MOD_ID, "bubble"), BUBBLE); + Registry.register(Registries.PARTICLE_TYPE, Identifier.of(MOD_ID, "shockwave"), SHOCKWAVE); + Registry.register(Registries.PARTICLE_TYPE, Identifier.of(MOD_ID, "blank_shockwave"), BLANK_SHOCKWAVE); + Registry.register(Registries.PARTICLE_TYPE, Identifier.of(MOD_ID, "underwaterblastwave"), UNDERWATERBLASTWAVE); + Registry.register(Registries.PARTICLE_TYPE, Identifier.of(MOD_ID, "sparks"), SPARKS); + Registry.register(Registries.PARTICLE_TYPE, Identifier.of(MOD_ID, "underwatersparks"), UNDERWATERSPARKS); } } diff --git a/src/main/java/net/superkat/explosiveenhancement/particles/BlastWaveParticle.java b/src/main/java/net/superkat/explosiveenhancement/particles/BlastWaveParticle.java index 8c85d91..e7b8f34 100644 --- a/src/main/java/net/superkat/explosiveenhancement/particles/BlastWaveParticle.java +++ b/src/main/java/net/superkat/explosiveenhancement/particles/BlastWaveParticle.java @@ -62,16 +62,16 @@ public void buildGeometry(VertexConsumer buffer, Camera camera, float ticks) { int light = this.getBrightness(ticks); // Render the top faces - buffer.vertex(vector3fs[0].x(), vector3fs[0].y(), vector3fs[0].z()).texture(f8, f6).color(this.red, this.green, this.blue, this.alpha).light(light).next(); - buffer.vertex(vector3fs[1].x(), vector3fs[1].y(), vector3fs[1].z()).texture(f8, f5).color(this.red, this.green, this.blue, this.alpha).light(light).next(); - buffer.vertex(vector3fs[2].x(), vector3fs[2].y(), vector3fs[2].z()).texture(f7, f5).color(this.red, this.green, this.blue, this.alpha).light(light).next(); - buffer.vertex(vector3fs[3].x(), vector3fs[3].y(), vector3fs[3].z()).texture(f7, f6).color(this.red, this.green, this.blue, this.alpha).light(light).next(); + buffer.vertex(vector3fs[0].x(), vector3fs[0].y(), vector3fs[0].z()).texture(f8, f6).color(this.red, this.green, this.blue, this.alpha).light(light); + buffer.vertex(vector3fs[1].x(), vector3fs[1].y(), vector3fs[1].z()).texture(f8, f5).color(this.red, this.green, this.blue, this.alpha).light(light); + buffer.vertex(vector3fs[2].x(), vector3fs[2].y(), vector3fs[2].z()).texture(f7, f5).color(this.red, this.green, this.blue, this.alpha).light(light); + buffer.vertex(vector3fs[3].x(), vector3fs[3].y(), vector3fs[3].z()).texture(f7, f6).color(this.red, this.green, this.blue, this.alpha).light(light); // Render the underside faces - buffer.vertex(vector3fs[3].x(), vector3fs[3].y(), vector3fs[3].z()).texture(f7, f6).color(this.red, this.green, this.blue, this.alpha).light(light).next(); - buffer.vertex(vector3fs[2].x(), vector3fs[2].y(), vector3fs[2].z()).texture(f7, f5).color(this.red, this.green, this.blue, this.alpha).light(light).next(); - buffer.vertex(vector3fs[1].x(), vector3fs[1].y(), vector3fs[1].z()).texture(f8, f5).color(this.red, this.green, this.blue, this.alpha).light(light).next(); - buffer.vertex(vector3fs[0].x(), vector3fs[0].y(), vector3fs[0].z()).texture(f8, f6).color(this.red, this.green, this.blue, this.alpha).light(light).next(); + buffer.vertex(vector3fs[3].x(), vector3fs[3].y(), vector3fs[3].z()).texture(f7, f6).color(this.red, this.green, this.blue, this.alpha).light(light); + buffer.vertex(vector3fs[2].x(), vector3fs[2].y(), vector3fs[2].z()).texture(f7, f5).color(this.red, this.green, this.blue, this.alpha).light(light); + buffer.vertex(vector3fs[1].x(), vector3fs[1].y(), vector3fs[1].z()).texture(f8, f5).color(this.red, this.green, this.blue, this.alpha).light(light); + buffer.vertex(vector3fs[0].x(), vector3fs[0].y(), vector3fs[0].z()).texture(f8, f6).color(this.red, this.green, this.blue, this.alpha).light(light); } @Override diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 26b1d8c..0434125 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -34,7 +34,7 @@ "depends": { "fabricloader": ">=0.14.8", "fabric-api": "*", - "minecraft": ">=1.20.0", + "minecraft": ">=1.21", "java": ">=21" }, "suggests": {