Skip to content

Commit

Permalink
added a null check and fixed missing parenthesis (#651)
Browse files Browse the repository at this point in the history
* fixed create valuebox rendering on ships

* hm forgot ()

* hm forgot a inject 💀

* hm forgot a inject 💀

* added back the `block_external_repositories`
  • Loading branch information
mrsterner authored Dec 30, 2023
1 parent be944c1 commit cf26261
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,4 @@ forge*changelog.txt

# Files generated for Fabric
/fabric/src/generated/
/.architectury-transformer/debug.log
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,14 @@ public void deleteShipObjectWorldClient() {
shipObjectWorldCopy.destroyWorld();
shipObjectWorld = null;
}

@Inject(
method = "clearLevel",
at = @At("TAIL")
)
private void postClearLevel(final CallbackInfo ci) {
if (shipObjectWorld != null) {
deleteShipObjectWorldClient();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ private void beforeClose(final CallbackInfo ci) {
cancellable = true
)
private void beforeHandleLevelChunk(final ClientboundLevelChunkWithLightPacket packet, final CallbackInfo ci) {
if (chunks.queue(packet.getX(), packet.getZ(), packet, level)) {
if (level != null && chunks.queue(packet.getX(), packet.getZ(), packet, level)) {
ci.cancel();
}
}
Expand Down
6 changes: 3 additions & 3 deletions fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ dependencies {
}

// CC Restitched
modImplementation("curse.maven:cc-restitched-462672:3908334"){
exclude module: "jsonschema.module.addon"
}
//modImplementation("curse.maven:cc-restitched-462672:3908334"){
// exclude module: "jsonschema.module.addon"
//}

// CC Restitched
//modImplementation("curse.maven:cc-tweaked-282001:${cc_tweaked_version}")
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=1G
minecraft_version=1.20.1
enabled_platforms=quilt,fabric,forge
archives_base_name=valkyrienskies-120
mod_version=2.1.4
mod_version=2.1.6
maven_group=org.valkyrienskies.mod

# https://www.curseforge.com/minecraft/mc-mods/architectury-api/files/
Expand All @@ -26,7 +26,7 @@ flywheel_version_fabric=0.6.9-6
# https://modrinth.com/mod/create-big-cannons/versions
createbigcannons_version= 0.5.2.a

vs_core_version=1.1.0+f2a6aaad81
vs_core_version=1.1.0+d0aa57abb9
# Prevent kotlin from autoincluding stdlib as a dependency, which breaks
# gradle's composite builds (includeBuild) for some reason. We'll add it manually
kotlin.stdlib.default.dependency=false
Expand Down

0 comments on commit cf26261

Please sign in to comment.