diff --git a/CHANGELOG.md b/CHANGELOG.md index 96f290e9..55672dc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -135,6 +135,10 @@ - Updated Russian translations ([#116](https://github.com/LambdAurora/LambDynamicLights/pull/116), [#121](https://github.com/LambdAurora/LambDynamicLights/pull/121)). - Added Ukrainian translations ([#120](https://github.com/LambdAurora/LambDynamicLights/pull/120)). +## 2.2.1 + + - Updated to Minecraft 1.19.4 ([#144](https://github.com/LambdAurora/LambDynamicLights/pull/144)). + [SpruceUI]: https://github.com/LambdAurora/SpruceUI "SpruceUI page" [pridelib]: https://github.com/Queerbric/pridelib "Pridelib page" [Sodium]: https://modrinth.com/mod/sodium "Sodium Modrinth page" diff --git a/build.gradle b/build.gradle index 5cf446d6..750c6a61 100644 --- a/build.gradle +++ b/build.gradle @@ -163,7 +163,7 @@ shadowJar { relocate 'com.electronwill.nightconfig', 'dev.lambdaurora.lambdynlights.shadow.nightconfig' } -prepareRemapJar.dependsOn(shadowJar) +remapJar.dependsOn(shadowJar) modrinth { projectId = project.modrinth_id diff --git a/gradle.properties b/gradle.properties index f399c050..dcd4407c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/use -minecraft_version=1.19.3 -quilt_mappings=8 -loader_version=0.14.11 +minecraft_version=1.19.4 +quilt_mappings=5 +loader_version=0.14.18 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api -fabric_api_version=0.68.1+1.19.3 +fabric_api_version=0.76.0+1.19.4 # Mod Properties -mod_version = 2.2.0 +mod_version = 2.2.1 maven_group = dev.lambdaurora archives_base_name = lambdynamiclights modrinth_id=yBW8D80W @@ -18,6 +18,6 @@ curseforge_id=393442 # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api -spruceui_version=4.1.0+1.19.3 +spruceui_version=4.2.0+1.19.4 pridelib_version=1.2.0+1.19.3 -modmenu_version=5.0.2 +modmenu_version=6.1.0-rc.4 diff --git a/src/main/java/dev/lambdaurora/lambdynlights/DynamicLightsConfig.java b/src/main/java/dev/lambdaurora/lambdynlights/DynamicLightsConfig.java index 5c48abd5..86cab011 100644 --- a/src/main/java/dev/lambdaurora/lambdynlights/DynamicLightsConfig.java +++ b/src/main/java/dev/lambdaurora/lambdynlights/DynamicLightsConfig.java @@ -27,7 +27,7 @@ * Represents the mod configuration. * * @author LambdAurora - * @version 2.2.0 + * @version 2.2.1 * @since 1.0.0 */ public class DynamicLightsConfig { diff --git a/src/main/java/dev/lambdaurora/lambdynlights/api/DynamicLightHandlers.java b/src/main/java/dev/lambdaurora/lambdynlights/api/DynamicLightHandlers.java index 7e9cda67..0fd6ca1b 100644 --- a/src/main/java/dev/lambdaurora/lambdynlights/api/DynamicLightHandlers.java +++ b/src/main/java/dev/lambdaurora/lambdynlights/api/DynamicLightHandlers.java @@ -22,7 +22,7 @@ /** * @author LambdAurora - * @version 2.2.0 + * @version 2.2.1 * @since 1.1.0 */ public final class DynamicLightHandlers { @@ -162,7 +162,7 @@ public static int getLuminanceFrom(T entity) { if (!canLightUp(entity)) return 0; if (handler.isWaterSensitive(entity) - && !entity.getWorld().getFluidState(new BlockPos(entity.getX(), entity.getEyeY(), entity.getZ())).isEmpty()) + && !entity.getWorld().getFluidState(BlockPos.create(entity.getX(), entity.getEyeY(), entity.getZ())).isEmpty()) return 0; return handler.getLuminance(entity); } diff --git a/src/main/java/dev/lambdaurora/lambdynlights/gui/RandomPrideFlagBackground.java b/src/main/java/dev/lambdaurora/lambdynlights/gui/RandomPrideFlagBackground.java index ac6f6814..e18da25e 100644 --- a/src/main/java/dev/lambdaurora/lambdynlights/gui/RandomPrideFlagBackground.java +++ b/src/main/java/dev/lambdaurora/lambdynlights/gui/RandomPrideFlagBackground.java @@ -52,7 +52,6 @@ public void render(MatrixStack matrices, SpruceWidget widget, int vOffset, int m RenderSystem.setShader(GameRenderer::getPositionColorShader); if (this.flag.getShape() == PrideFlagShapes.get(new Identifier("pride", "horizontal_stripes"))) { - RenderSystem.disableTexture(); var model = matrices.peek().getModel(); var tessellator = Tessellator.getInstance(); var vertices = tessellator.getBufferBuilder(); @@ -96,7 +95,6 @@ public void render(MatrixStack matrices, SpruceWidget widget, int vOffset, int m vertex(vertices, model, x, y + height, 0).color(color[0], color[1], color[2], color[3]).next(); tessellator.draw(); - RenderSystem.enableTexture(); } else { this.flag.render(matrices, x, y, widget.getWidth(), widget.getHeight()); } diff --git a/src/main/java/dev/lambdaurora/lambdynlights/gui/SettingsScreen.java b/src/main/java/dev/lambdaurora/lambdynlights/gui/SettingsScreen.java index a58b33fd..bfb7f391 100644 --- a/src/main/java/dev/lambdaurora/lambdynlights/gui/SettingsScreen.java +++ b/src/main/java/dev/lambdaurora/lambdynlights/gui/SettingsScreen.java @@ -45,7 +45,7 @@ * Represents the settings screen of LambDynamicLights. * * @author LambdAurora - * @version 2.2.0 + * @version 2.2.1 * @since 1.0.0 */ public class SettingsScreen extends SpruceScreen { diff --git a/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/EntityMixin.java b/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/EntityMixin.java index aab72478..01090eeb 100644 --- a/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/EntityMixin.java +++ b/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/EntityMixin.java @@ -177,7 +177,7 @@ public int getLuminance() { LambDynLights.updateTrackedChunks(chunkPos, this.lambdynlights$trackedLitChunkPos, newPos); var directionX = (this.getBlockPos().getX() & 15) >= 8 ? Direction.EAST : Direction.WEST; - var directionY = (MathHelper.fastFloor(this.getEyeY()) & 15) >= 8 ? Direction.UP : Direction.DOWN; + var directionY = (MathHelper.floor(this.getEyeY()) & 15) >= 8 ? Direction.UP : Direction.DOWN; var directionZ = (this.getBlockPos().getZ() & 15) >= 8 ? Direction.SOUTH : Direction.NORTH; for (int i = 0; i < 7; i++) { diff --git a/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/LivingEntityMixin.java b/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/LivingEntityMixin.java index 0d1b3ac0..220aade8 100644 --- a/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/LivingEntityMixin.java +++ b/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/LivingEntityMixin.java @@ -40,7 +40,7 @@ public void dynamicLightTick() { this.lambdynlights$luminance = 15; } else { int luminance = 0; - var eyePos = new BlockPos(this.getX(), this.getEyeY(), this.getZ()); + var eyePos = BlockPos.create(this.getX(), this.getEyeY(), this.getZ()); boolean submergedInFluid = !this.world.getFluidState(eyePos).isEmpty(); for (var equipped : this.getItemsEquipped()) { if (!equipped.isEmpty()) diff --git a/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/PlayerEntityMixin.java b/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/PlayerEntityMixin.java index c9662f19..666bfe3f 100644 --- a/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/PlayerEntityMixin.java +++ b/src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/PlayerEntityMixin.java @@ -48,7 +48,7 @@ public void dynamicLightTick() { } else { int luminance = DynamicLightHandlers.getLuminanceFrom((Entity) this); - var eyePos = new BlockPos(this.getX(), this.getEyeY(), this.getZ()); + var eyePos = BlockPos.create(this.getX(), this.getEyeY(), this.getZ()); boolean submergedInFluid = !this.world.getFluidState(eyePos).isEmpty(); for (var equipped : this.getItemsEquipped()) { if (!equipped.isEmpty()) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 95f5e5ab..3254962f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,10 +29,10 @@ "lambdynlights.lightsource.mixins.json" ], "depends": { - "fabricloader": ">=0.12.12", - "fabric": ">=0.68.1+1.19.3", - "minecraft": "1.19.3", - "spruceui": ">=4.1.0", + "fabricloader": ">=0.14.11", + "fabric": ">=0.76.0+1.19.4", + "minecraft": "1.19.4", + "spruceui": ">=4.2.0", "java": ">=17" }, "recommends": {