diff --git a/.gitignore b/.gitignore index 0eeb19b4..a3dfa441 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /fabric-1.16.1_server.launch /fabric-1.16.2_client.launch /fabric-1.16.2_server.launch + diff --git a/bukkit-helper/.gitignore b/bukkit-helper/.gitignore index 5d644ec0..be198374 100644 --- a/bukkit-helper/.gitignore +++ b/bukkit-helper/.gitignore @@ -1,3 +1,5 @@ +/.project +/.settings/ /target/ /build/ /bin/ diff --git a/bukkit-helper/.project b/bukkit-helper/.project deleted file mode 100644 index 33f7105e..00000000 --- a/bukkit-helper/.project +++ /dev/null @@ -1,40 +0,0 @@ - - - Dynmap(Spigot-Common) - bukkit-helper - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.buildship.core.gradleprojectnature - - - - 1 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - - diff --git a/bukkit-helper/.settings/org.eclipse.jdt.core.prefs b/bukkit-helper/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index e8fc724f..00000000 --- a/bukkit-helper/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,19 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=ignore -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=javax.annotation.Nonnull -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=javax.annotation.ParametersAreNonnullByDefault -org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/DynmapPlugin.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/DynmapPlugin.java index 1eb6a083..2f1700e6 100644 --- a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/DynmapPlugin.java +++ b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/DynmapPlugin.java @@ -163,7 +163,7 @@ public class DynmapPlugin { } statename += p.getName() + "=" + bs.get(p).toString(); } - int lightAtten = bs.isOpaqueFullCube(EmptyBlockView.INSTANCE, BlockPos.ORIGIN) ? 15 : (bs.isTransparent(EmptyBlockView.INSTANCE, BlockPos.ORIGIN) ? 0 : 1); + int lightAtten = bs.isOpaqueFullCube() ? 15 : (bs.isTransparent() ? 0 : 1); //Log.info("statename=" + bn + "[" + statename + "], lightAtten=" + lightAtten); // Fill in base attributes bld.setBaseState(basebs).setStateIndex(idx - baseidx).setBlockName(bn).setStateName(statename).setLegacyBlockID(idx).setAttenuatesLight(lightAtten); diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricMapChunkCache.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricMapChunkCache.java index a9e675d9..8847b5be 100644 --- a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricMapChunkCache.java +++ b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricMapChunkCache.java @@ -8,12 +8,12 @@ import net.minecraft.util.collection.PackedIntegerArray; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.WordPackedArray; -import net.minecraft.world.ChunkSerializer; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeEffects; import net.minecraft.world.chunk.ChunkManager; import net.minecraft.world.chunk.ChunkStatus; +import net.minecraft.world.chunk.SerializedChunk; import org.dynmap.DynmapChunk; import org.dynmap.DynmapCore; @@ -66,7 +66,8 @@ public class FabricMapChunkCache extends GenericMapChunkCache { if (cps.isChunkLoaded(chunk.x, chunk.z)) { NbtCompound nbt = null; try { - nbt = ChunkSerializer.serialize((ServerWorld) w, cps.getWorldChunk(chunk.x, chunk.z, false)); + SerializedChunk sc = SerializedChunk.fromChunk((ServerWorld) w, cps.getWorldChunk(chunk.x, chunk.z, false)); + nbt = sc.serialize(); } catch (NullPointerException e) { // TODO: find out why this is happening and why it only seems to happen since 1.16.2 Log.severe("ChunkSerializer.serialize threw a NullPointerException", e); diff --git a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricServer.java b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricServer.java index ac227883..91316b9a 100644 --- a/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricServer.java +++ b/fabric-1.21.3/src/main/java/org/dynmap/fabric_1_21_3/FabricServer.java @@ -60,7 +60,7 @@ public class FabricServer extends DynmapServerInterface { public FabricServer(DynmapPlugin plugin, MinecraftServer server) { this.plugin = plugin; this.server = server; - this.biomeRegistry = server.getRegistryManager().get(RegistryKeys.BIOME); + this.biomeRegistry = server.getRegistryManager().getOrThrow(RegistryKeys.BIOME); } private Optional getProfileByName(String player) {