Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump: Update to Minecraft 1.19.4 (#144). #144

Merged
merged 1 commit into from
Mar 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ 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
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
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

/**
* @author LambdAurora
* @version 2.2.0
* @version 2.2.1
* @since 1.1.0
*/
public final class DynamicLightHandlers {
Expand Down Expand Up @@ -162,7 +162,7 @@ public static <T extends Entity> 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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down