diff --git a/assets/minecraft/items/music_disc_lava_chicken.json b/assets/minecraft/items/music_disc_lava_chicken.json deleted file mode 100644 index 2a3de6db..00000000 --- a/assets/minecraft/items/music_disc_lava_chicken.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "minecraft:item/music_disc_lava_chicken" - } -} \ No newline at end of file diff --git a/assets/minecraft/lang/en_us.json b/assets/minecraft/lang/en_us.json index 0abcfa67..f0e61c85 100644 --- a/assets/minecraft/lang/en_us.json +++ b/assets/minecraft/lang/en_us.json @@ -4355,8 +4355,6 @@ "item.minecraft.music_disc_creator.desc": "Lena Raine - Creator", "item.minecraft.music_disc_far": "Music Disc", "item.minecraft.music_disc_far.desc": "C418 - far", - "item.minecraft.music_disc_lava_chicken": "Music Disc", - "item.minecraft.music_disc_lava_chicken.desc": "Hyper Potions - Lava Chicken", "item.minecraft.music_disc_mall": "Music Disc", "item.minecraft.music_disc_mall.desc": "C418 - mall", "item.minecraft.music_disc_mellohi": "Music Disc", @@ -4753,7 +4751,6 @@ "jukebox_song.minecraft.creator": "Lena Raine - Creator", "jukebox_song.minecraft.creator_music_box": "Lena Raine - Creator (Music Box)", "jukebox_song.minecraft.far": "C418 - far", - "jukebox_song.minecraft.lava_chicken": "Hyper Potions - Lava Chicken", "jukebox_song.minecraft.mall": "C418 - mall", "jukebox_song.minecraft.mellohi": "C418 - mellohi", "jukebox_song.minecraft.otherside": "Lena Raine - otherside", @@ -5819,8 +5816,6 @@ "painting.minecraft.courbet.title": "Bonjour Monsieur Courbet", "painting.minecraft.creebet.author": "Kristoffer Zetterstrand", "painting.minecraft.creebet.title": "Creebet", - "painting.minecraft.dennis.author": "Sarah Boeving", - "painting.minecraft.dennis.title": "Dennis", "painting.minecraft.donkey_kong.author": "Kristoffer Zetterstrand", "painting.minecraft.donkey_kong.title": "Kong", "painting.minecraft.earth.author": "Mojang", diff --git a/assets/minecraft/models/item/music_disc_lava_chicken.json b/assets/minecraft/models/item/music_disc_lava_chicken.json deleted file mode 100644 index ada6dd1f..00000000 --- a/assets/minecraft/models/item/music_disc_lava_chicken.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/template_music_disc", - "textures": { - "layer0": "minecraft:item/music_disc_lava_chicken" - } -} \ No newline at end of file diff --git a/assets/minecraft/textures/item/music_disc_lava_chicken.png b/assets/minecraft/textures/item/music_disc_lava_chicken.png deleted file mode 100644 index 5e3e9f53..00000000 --- a/assets/minecraft/textures/item/music_disc_lava_chicken.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2c765a3392ae57b6b73657c8c3c5f09178a68dfbccfdf00a6f2481c1ea760bd -size 195 diff --git a/assets/minecraft/textures/painting/dennis.png b/assets/minecraft/textures/painting/dennis.png deleted file mode 100644 index 513717f8..00000000 --- a/assets/minecraft/textures/painting/dennis.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef22e0b4c15011bdc411d24636d72e09b7e987f90b2a7fb1e0656399e8385d90 -size 1518 diff --git a/com/mojang/blaze3d/GraphicsWorkarounds.java b/com/mojang/blaze3d/GraphicsWorkarounds.java deleted file mode 100644 index d5ff4a43..00000000 --- a/com/mojang/blaze3d/GraphicsWorkarounds.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.mojang.blaze3d; - -import com.mojang.blaze3d.platform.GLX; -import com.mojang.blaze3d.systems.GpuDevice; -import java.lang.ref.WeakReference; -import java.util.List; -import java.util.Locale; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import org.jetbrains.annotations.Nullable; - -@Environment(EnvType.CLIENT) -public class GraphicsWorkarounds { - private static final List INTEL_GEN11_CORE = List.of( - "i3-1000g1", - "i3-1000g4", - "i3-1000ng4", - "i3-1005g1", - "i3-l13g4", - "i5-1030g4", - "i5-1030g7", - "i5-1030ng7", - "i5-1034g1", - "i5-1035g1", - "i5-1035g4", - "i5-1035g7", - "i5-1038ng7", - "i5-l16g7", - "i7-1060g7", - "i7-1060ng7", - "i7-1065g7", - "i7-1068g7", - "i7-1068ng7" - ); - private static final List INTEL_GEN11_ATOM = List.of("x6211e", "x6212re", "x6214re", "x6413e", "x6414re", "x6416re", "x6425e", "x6425re", "x6427fe"); - private static final List INTEL_GEN11_CELERON = List.of("j6412", "j6413", "n4500", "n4505", "n5095", "n5095a", "n5100", "n5105", "n6210", "n6211"); - private static final List INTEL_GEN11_PENTIUM = List.of("6805", "j6426", "n6415", "n6000", "n6005"); - @Nullable - private static GraphicsWorkarounds instance; - private final WeakReference gpuDevice; - private final boolean alwaysCreateFreshImmediateBuffer; - - private GraphicsWorkarounds(GpuDevice device) { - this.gpuDevice = new WeakReference(device); - this.alwaysCreateFreshImmediateBuffer = isIntelGen11(device); - } - - public static GraphicsWorkarounds get(GpuDevice device) { - GraphicsWorkarounds graphicsWorkarounds = instance; - if (graphicsWorkarounds == null || graphicsWorkarounds.gpuDevice.get() != device) { - instance = graphicsWorkarounds = new GraphicsWorkarounds(device); - } - - return graphicsWorkarounds; - } - - public boolean alwaysCreateFreshImmediateBuffer() { - return this.alwaysCreateFreshImmediateBuffer; - } - - private static boolean isIntelGen11(GpuDevice device) { - String string = GLX._getCpuInfo().toLowerCase(Locale.ROOT); - String string2 = device.getRenderer().toLowerCase(Locale.ROOT); - if (!string.contains("intel") || !string2.contains("intel") || string2.contains("mesa")) { - return false; - } else if (string2.endsWith("gen11")) { - return true; - } else { - return !string2.contains("uhd graphics") && !string2.contains("iris") - ? false - : string.contains("atom") && INTEL_GEN11_ATOM.stream().anyMatch(string::contains) - || string.contains("celeron") && INTEL_GEN11_CELERON.stream().anyMatch(string::contains) - || string.contains("pentium") && INTEL_GEN11_PENTIUM.stream().anyMatch(string::contains) - || INTEL_GEN11_CORE.stream().anyMatch(string::contains); - } - } -} diff --git a/com/mojang/blaze3d/opengl/DirectStateAccess.java b/com/mojang/blaze3d/opengl/DirectStateAccess.java index 711cda3c..845b8bb0 100644 --- a/com/mojang/blaze3d/opengl/DirectStateAccess.java +++ b/com/mojang/blaze3d/opengl/DirectStateAccess.java @@ -8,7 +8,6 @@ import org.jetbrains.annotations.Nullable; import org.lwjgl.opengl.ARBBufferStorage; import org.lwjgl.opengl.ARBDirectStateAccess; import org.lwjgl.opengl.GL30; -import org.lwjgl.opengl.GL31; import org.lwjgl.opengl.GLCapabilities; @Environment(EnvType.CLIENT) @@ -49,8 +48,6 @@ public abstract class DirectStateAccess { abstract void flushMappedBufferRange(int buffer, int offset, int length); - abstract void copyBufferSubData(int readBuffer, int writeBuffer, int readOffset, int writeOffset, int size); - @Environment(EnvType.CLIENT) static class Core extends DirectStateAccess { @Override @@ -119,11 +116,6 @@ public abstract class DirectStateAccess { void flushMappedBufferRange(int buffer, int offset, int length) { ARBDirectStateAccess.glFlushMappedNamedBufferRange(buffer, offset, length); } - - @Override - void copyBufferSubData(int readBuffer, int writeBuffer, int readOffset, int writeOffset, int size) { - ARBDirectStateAccess.glCopyNamedBufferSubData(readBuffer, writeBuffer, readOffset, writeOffset, size); - } } @Environment(EnvType.CLIENT) @@ -191,15 +183,6 @@ public abstract class DirectStateAccess { GlStateManager._glBindBuffer(36663, 0); } - @Override - void copyBufferSubData(int readBuffer, int writeBuffer, int readOffset, int writeOffset, int size) { - GlStateManager._glBindBuffer(36662, readBuffer); - GlStateManager._glBindBuffer(36663, writeBuffer); - GL31.glCopyBufferSubData(36662, 36663, readOffset, writeOffset, size); - GlStateManager._glBindBuffer(36662, 0); - GlStateManager._glBindBuffer(36663, 0); - } - @Override public int createFrameBufferObject() { return GlStateManager.glGenFramebuffers(); diff --git a/com/mojang/blaze3d/opengl/GlCommandEncoder.java b/com/mojang/blaze3d/opengl/GlCommandEncoder.java index b7cb3349..7ab66786 100644 --- a/com/mojang/blaze3d/opengl/GlCommandEncoder.java +++ b/com/mojang/blaze3d/opengl/GlCommandEncoder.java @@ -3,21 +3,14 @@ package com.mojang.blaze3d.opengl; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.buffers.GpuFence; -import com.mojang.blaze3d.buffers.GpuBuffer.MappedView; -import com.mojang.blaze3d.opengl.Uniform.Sampler; -import com.mojang.blaze3d.opengl.Uniform.Ubo; -import com.mojang.blaze3d.opengl.Uniform.Utb; import com.mojang.blaze3d.pipeline.BlendFunction; import com.mojang.blaze3d.pipeline.RenderPipeline; import com.mojang.blaze3d.platform.DepthTestFunction; import com.mojang.blaze3d.platform.NativeImage; -import com.mojang.blaze3d.platform.NativeImage.Format; import com.mojang.blaze3d.shaders.UniformType; import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.systems.RenderPass.Draw; -import com.mojang.blaze3d.systems.RenderPass.UniformUploader; import com.mojang.blaze3d.textures.GpuTexture; import com.mojang.blaze3d.textures.GpuTextureView; import com.mojang.blaze3d.textures.TextureFormat; @@ -275,12 +268,12 @@ public class GlCommandEncoder implements CommandEncoder { } @Override - public MappedView mapBuffer(GpuBuffer gpuBuffer, boolean bl, boolean bl2) { + public GpuBuffer.MappedView mapBuffer(GpuBuffer gpuBuffer, boolean bl, boolean bl2) { return this.mapBuffer(gpuBuffer.slice(), bl, bl2); } @Override - public MappedView mapBuffer(GpuBufferSlice gpuBufferSlice, boolean bl, boolean bl2) { + public GpuBuffer.MappedView mapBuffer(GpuBufferSlice gpuBufferSlice, boolean bl, boolean bl2) { if (this.inRenderPass) { throw new IllegalStateException("Close the existing render pass before performing additional commands"); } else { @@ -318,55 +311,6 @@ public class GlCommandEncoder implements CommandEncoder { } } - @Override - public void copyToBuffer(GpuBufferSlice gpuBufferSlice, GpuBufferSlice gpuBufferSlice2) { - if (this.inRenderPass) { - throw new IllegalStateException("Close the existing render pass before performing additional commands"); - } else { - GlBuffer glBuffer = (GlBuffer)gpuBufferSlice.buffer(); - if (glBuffer.closed) { - throw new IllegalStateException("Source buffer already closed"); - } else if ((glBuffer.usage() & 8) == 0) { - throw new IllegalStateException("Source buffer needs USAGE_COPY_DST to be a destination for a copy"); - } else { - GlBuffer glBuffer2 = (GlBuffer)gpuBufferSlice2.buffer(); - if (glBuffer2.closed) { - throw new IllegalStateException("Target buffer already closed"); - } else if ((glBuffer2.usage() & 8) == 0) { - throw new IllegalStateException("Target buffer needs USAGE_COPY_DST to be a destination for a copy"); - } else if (gpuBufferSlice.length() != gpuBufferSlice2.length()) { - throw new IllegalArgumentException( - "Cannot copy from slice of size " + gpuBufferSlice.length() + " to slice of size " + gpuBufferSlice2.length() + ", they must be equal" - ); - } else if (gpuBufferSlice.offset() + gpuBufferSlice.length() > glBuffer.size) { - throw new IllegalArgumentException( - "Cannot copy more data than the source buffer holds (attempting to copy " - + gpuBufferSlice.length() - + " bytes at offset " - + gpuBufferSlice.offset() - + " from " - + glBuffer.size - + " size buffer)" - ); - } else if (gpuBufferSlice2.offset() + gpuBufferSlice2.length() > glBuffer2.size) { - throw new IllegalArgumentException( - "Cannot copy more data than the target buffer can hold (attempting to copy " - + gpuBufferSlice2.length() - + " bytes at offset " - + gpuBufferSlice2.offset() - + " to " - + glBuffer2.size - + " size buffer)" - ); - } else { - this.device - .directStateAccess() - .copyBufferSubData(glBuffer.handle, glBuffer2.handle, gpuBufferSlice.offset(), gpuBufferSlice2.offset(), gpuBufferSlice.length()); - } - } - } - } - @Override public void writeToTexture(GpuTexture gpuTexture, NativeImage nativeImage) { int i = gpuTexture.getWidth(0); @@ -436,7 +380,7 @@ public class GlCommandEncoder implements CommandEncoder { } @Override - public void writeToTexture(GpuTexture gpuTexture, IntBuffer intBuffer, Format format, int i, int j, int k, int l, int m, int n) { + public void writeToTexture(GpuTexture gpuTexture, IntBuffer intBuffer, NativeImage.Format format, int i, int j, int k, int l, int m, int n) { if (this.inRenderPass) { throw new IllegalStateException("Close the existing render pass before performing additional commands"); } else if (i >= 0 && i < gpuTexture.getMipLevels()) { @@ -661,7 +605,7 @@ public class GlCommandEncoder implements CommandEncoder { protected void executeDrawMultiple( GlRenderPass renderPass, - Collection> draws, + Collection> draws, @Nullable GpuBuffer buffer, @Nullable VertexFormat.IndexType indexType, Collection uniforms, @@ -672,7 +616,7 @@ public class GlCommandEncoder implements CommandEncoder { indexType = VertexFormat.IndexType.SHORT; } - for (Draw draw : draws) { + for (RenderPass.Draw draw : draws) { VertexFormat.IndexType indexType2 = draw.indexType() == null ? indexType : draw.indexType(); renderPass.setIndexBuffer(draw.indexBuffer() == null ? buffer : draw.indexBuffer(), indexType2); renderPass.setVertexBuffer(draw.slot(), draw.vertexBuffer()); @@ -694,10 +638,10 @@ public class GlCommandEncoder implements CommandEncoder { } } - BiConsumer biConsumer = draw.uniformUploaderConsumer(); + BiConsumer biConsumer = draw.uniformUploaderConsumer(); if (biConsumer != null) { - biConsumer.accept(data, (UniformUploader)(string, gpuBufferSlice) -> { - if (renderPass.pipeline.program().getUniform(string) instanceof Ubo(int i)) { + biConsumer.accept(data, (RenderPass.UniformUploader)(string, gpuBufferSlice) -> { + if (renderPass.pipeline.program().getUniform(string) instanceof Uniform.Ubo(int i)) { GL32.glBindBufferRange(35345, i, ((GlBuffer)gpuBufferSlice.buffer()).handle, gpuBufferSlice.offset(), gpuBufferSlice.length()); } }); @@ -812,7 +756,7 @@ public class GlCommandEncoder implements CommandEncoder { } for (Entry entry : renderPass.pipeline.program().getUniforms().entrySet()) { - if (entry.getValue() instanceof Sampler) { + if (entry.getValue() instanceof Uniform.Sampler) { String string = (String)entry.getKey(); GlTextureView glTextureView = (GlTextureView)renderPass.samplers.get(string); if (glTextureView == null) { @@ -849,14 +793,14 @@ public class GlCommandEncoder implements CommandEncoder { String string2 = (String)entry2.getKey(); boolean bl2 = renderPass.dirtyUniforms.contains(string2); switch ((Uniform)entry2.getValue()) { - case Ubo(int var61): + case Uniform.Ubo(int var61): int var39 = var61; if (bl2) { GpuBufferSlice gpuBufferSlice2 = (GpuBufferSlice)renderPass.uniforms.get(string2); GL32.glBindBufferRange(35345, var39, ((GlBuffer)gpuBufferSlice2.buffer()).handle, gpuBufferSlice2.offset(), gpuBufferSlice2.length()); } break; - case Utb(int var41, int var42, TextureFormat var43, int var59): + case Uniform.Utb(int var41, int var42, TextureFormat var43, int var59): int var44 = var59; if (bl || bl2) { GlStateManager._glUniform1i(var41, var42); @@ -869,7 +813,7 @@ public class GlCommandEncoder implements CommandEncoder { GL31.glTexBuffer(35882, GlConst.toGlInternalId(var43), ((GlBuffer)gpuBufferSlice3.buffer()).handle); } break; - case Sampler(int glTextureView2, int var51): + case Uniform.Sampler(int glTextureView2, int var51): int var46 = var51; GlTextureView glTextureView2x = (GlTextureView)renderPass.samplers.get(string2); if (glTextureView2x == null) { diff --git a/com/mojang/blaze3d/opengl/GlDevice.java b/com/mojang/blaze3d/opengl/GlDevice.java index 5ec4ba4c..5b80de87 100644 --- a/com/mojang/blaze3d/opengl/GlDevice.java +++ b/com/mojang/blaze3d/opengl/GlDevice.java @@ -25,14 +25,13 @@ import java.util.function.Supplier; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.renderer.ShaderDefines; -import net.minecraft.client.renderer.ShaderManager.CompilationException; +import net.minecraft.client.renderer.ShaderManager; import net.minecraft.resources.ResourceLocation; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; import org.lwjgl.glfw.GLFW; import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL31; import org.lwjgl.opengl.GLCapabilities; import org.slf4j.Logger; @@ -304,29 +303,6 @@ public class GlDevice implements GpuDevice { } this.shaderCache.clear(); - String string = GlStateManager._getString(7937); - if (string.contains("AMD")) { - amdDummyShaderWorkaround(); - } - } - - private static void amdDummyShaderWorkaround() { - int i = GlStateManager.glCreateShader(35633); - GlStateManager.glShaderSource(i, "#version 150\nvoid main() {\n gl_Position = vec4(0.0);\n}\n"); - GlStateManager.glCompileShader(i); - int j = GlStateManager.glCreateShader(35632); - GlStateManager.glShaderSource( - j, "#version 150\nlayout(std140) uniform Dummy {\n float Value;\n};\nout vec4 fragColor;\nvoid main() {\n fragColor = vec4(0.0);\n}\n" - ); - GlStateManager.glCompileShader(j); - int k = GlStateManager.glCreateProgram(); - GlStateManager.glAttachShader(k, i); - GlStateManager.glAttachShader(k, j); - GlStateManager.glLinkProgram(k); - GL31.glGetUniformBlockIndex(k, "Dummy"); - GlStateManager.glDeleteShader(i); - GlStateManager.glDeleteShader(j); - GlStateManager.glDeleteProgram(k); } @Override @@ -395,7 +371,7 @@ public class GlDevice implements GpuDevice { GlProgram glProgram; try { glProgram = GlProgram.link(glShaderModule, glShaderModule2, pipeline.getVertexFormat(), pipeline.getLocation().toString()); - } catch (CompilationException var7) { + } catch (ShaderManager.CompilationException var7) { LOGGER.error("Couldn't compile program for pipeline {}: {}", pipeline.getLocation(), var7); return new GlRenderPipeline(pipeline, GlProgram.INVALID_PROGRAM); } diff --git a/com/mojang/blaze3d/opengl/GlProgram.java b/com/mojang/blaze3d/opengl/GlProgram.java index cc9ae0b1..db9c6009 100644 --- a/com/mojang/blaze3d/opengl/GlProgram.java +++ b/com/mojang/blaze3d/opengl/GlProgram.java @@ -1,10 +1,7 @@ package com.mojang.blaze3d.opengl; import com.google.common.collect.Sets; -import com.mojang.blaze3d.opengl.Uniform.Sampler; -import com.mojang.blaze3d.opengl.Uniform.Ubo; -import com.mojang.blaze3d.opengl.Uniform.Utb; -import com.mojang.blaze3d.pipeline.RenderPipeline.UniformDescription; +import com.mojang.blaze3d.pipeline.RenderPipeline; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.textures.TextureFormat; import com.mojang.blaze3d.vertex.VertexFormat; @@ -16,7 +13,7 @@ import java.util.Objects; import java.util.Set; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.renderer.ShaderManager.CompilationException; +import net.minecraft.client.renderer.ShaderManager; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.VisibleForTesting; import org.lwjgl.opengl.GL31; @@ -36,10 +33,10 @@ public class GlProgram implements AutoCloseable { this.debugLabel = debugLabel; } - public static GlProgram link(GlShaderModule vertexShader, GlShaderModule fragmentShader, VertexFormat vertexFormat, String debugLabel) throws CompilationException { + public static GlProgram link(GlShaderModule vertexShader, GlShaderModule fragmentShader, VertexFormat vertexFormat, String debugLabel) throws ShaderManager.CompilationException { int i = GlStateManager.glCreateProgram(); if (i <= 0) { - throw new CompilationException("Could not create shader program (returned program ID " + i + ")"); + throw new ShaderManager.CompilationException("Could not create shader program (returned program ID " + i + ")"); } else { int j = 0; @@ -52,26 +49,22 @@ public class GlProgram implements AutoCloseable { GlStateManager.glAttachShader(i, fragmentShader.getShaderId()); GlStateManager.glLinkProgram(i); int k = GlStateManager.glGetProgrami(i, 35714); - String string = GlStateManager.glGetProgramInfoLog(i, 32768); - if (k != 0 && !string.contains("Failed for unknown reason")) { - if (!string.isEmpty()) { - LOGGER.info("Info log when linking program containing VS {} and FS {}. Log output: {}", vertexShader.getId(), fragmentShader.getId(), string); - } - - return new GlProgram(i, debugLabel); - } else { - throw new CompilationException( + if (k == 0) { + String string = GlStateManager.glGetProgramInfoLog(i, 32768); + throw new ShaderManager.CompilationException( "Error encountered when linking program containing VS " + vertexShader.getId() + " and FS " + fragmentShader.getId() + ". Log output: " + string ); + } else { + return new GlProgram(i, debugLabel); } } } - public void setupUniforms(List uniforms, List samplers) { + public void setupUniforms(List uniforms, List samplers) { int i = 0; int j = 0; - for (UniformDescription uniformDescription : uniforms) { + for (RenderPipeline.UniformDescription uniformDescription : uniforms) { String string = uniformDescription.name(); Object var10000_1 = switch (uniformDescription.type()) { @@ -82,7 +75,7 @@ public class GlProgram implements AutoCloseable { } else { int l = i++; GL31.glUniformBlockBinding(this.programId, k, l); - yield new Ubo(l); + yield new Uniform.Ubo(l); } } case TEXEL_BUFFER -> { @@ -92,7 +85,7 @@ public class GlProgram implements AutoCloseable { yield null; } else { int l = j++; - yield new Utb(k, l, (TextureFormat)Objects.requireNonNull(uniformDescription.textureFormat())); + yield new Uniform.Utb(k, l, (TextureFormat)Objects.requireNonNull(uniformDescription.textureFormat())); } } }; @@ -109,7 +102,7 @@ public class GlProgram implements AutoCloseable { LOGGER.warn("{} shader program does not use sampler {} defined in the pipeline. This might be a bug.", this.debugLabel, string2); } else { int n = j++; - this.uniformsByName.put(string2, new Sampler(m, n)); + this.uniformsByName.put(string2, new Uniform.Sampler(m, n)); } } @@ -121,7 +114,7 @@ public class GlProgram implements AutoCloseable { if (!samplers.contains(string) && BUILT_IN_UNIFORMS.contains(string)) { int n = i++; GL31.glUniformBlockBinding(this.programId, p, n); - this.uniformsByName.put(string, new Ubo(n)); + this.uniformsByName.put(string, new Uniform.Ubo(n)); } else { LOGGER.warn("Found unknown and unsupported uniform {} in {}", string, this.debugLabel); } diff --git a/com/mojang/blaze3d/opengl/VertexArrayCache.java b/com/mojang/blaze3d/opengl/VertexArrayCache.java index c46a6959..1e679b6e 100644 --- a/com/mojang/blaze3d/opengl/VertexArrayCache.java +++ b/com/mojang/blaze3d/opengl/VertexArrayCache.java @@ -2,7 +2,6 @@ package com.mojang.blaze3d.opengl; import com.mojang.blaze3d.vertex.VertexFormat; import com.mojang.blaze3d.vertex.VertexFormatElement; -import com.mojang.blaze3d.vertex.VertexFormatElement.Type; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -70,7 +69,7 @@ public abstract class VertexArrayCache { case POSITION: case GENERIC: case UV: - if (vertexFormatElement.type() == Type.FLOAT) { + if (vertexFormatElement.type() == VertexFormatElement.Type.FLOAT) { GlStateManager._vertexAttribPointer( j, vertexFormatElement.count(), GlConst.toGl(vertexFormatElement.type()), false, i, vertexFormat.getOffset(vertexFormatElement) ); @@ -112,6 +111,7 @@ public abstract class VertexArrayCache { if (vertexArray == null) { int i = GlStateManager._glGenVertexArrays(); GlStateManager._glBindVertexArray(i); + ARBVertexAttribBinding.glBindVertexBuffer(0, buffer.handle, 0L, format.getVertexSize()); List list = format.getElements(); for (int j = 0; j < list.size(); j++) { @@ -121,7 +121,7 @@ public abstract class VertexArrayCache { case POSITION: case GENERIC: case UV: - if (vertexFormatElement.type() == Type.FLOAT) { + if (vertexFormatElement.type() == VertexFormatElement.Type.FLOAT) { ARBVertexAttribBinding.glVertexAttribFormat( j, vertexFormatElement.count(), GlConst.toGl(vertexFormatElement.type()), false, format.getOffset(vertexFormatElement) ); @@ -141,7 +141,6 @@ public abstract class VertexArrayCache { ARBVertexAttribBinding.glVertexAttribBinding(j, 0); } - ARBVertexAttribBinding.glBindVertexBuffer(0, buffer.handle, 0L, format.getVertexSize()); VertexArrayCache.VertexArray vertexArray2 = new VertexArrayCache.VertexArray(i, format, buffer); this.debugLabels.applyLabel(vertexArray2); this.cache.put(format, vertexArray2); diff --git a/com/mojang/blaze3d/pipeline/BlendFunction.java b/com/mojang/blaze3d/pipeline/BlendFunction.java index e360dde1..bca767d4 100644 --- a/com/mojang/blaze3d/pipeline/BlendFunction.java +++ b/com/mojang/blaze3d/pipeline/BlendFunction.java @@ -22,9 +22,6 @@ public record BlendFunction(SourceFactor sourceColor, DestFactor destColor, Sour public static final BlendFunction ENTITY_OUTLINE_BLIT = new BlendFunction( SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ZERO, DestFactor.ONE ); - public static final BlendFunction INVERT = new BlendFunction( - SourceFactor.ONE_MINUS_DST_COLOR, DestFactor.ONE_MINUS_SRC_COLOR, SourceFactor.ONE, DestFactor.ZERO - ); public BlendFunction(SourceFactor sourceFactor, DestFactor destFactor) { this(sourceFactor, destFactor, sourceFactor, destFactor); diff --git a/com/mojang/blaze3d/pipeline/RenderPipeline.java b/com/mojang/blaze3d/pipeline/RenderPipeline.java index 7af43232..ac8719e9 100644 --- a/com/mojang/blaze3d/pipeline/RenderPipeline.java +++ b/com/mojang/blaze3d/pipeline/RenderPipeline.java @@ -343,7 +343,6 @@ public class RenderPipeline { return this; } - @Deprecated public RenderPipeline.Builder withColorLogic(LogicOp logicOp) { this.colorLogic = Optional.of(logicOp); return this; diff --git a/com/mojang/blaze3d/platform/NativeImage.java b/com/mojang/blaze3d/platform/NativeImage.java index e2c56042..00229d9f 100644 --- a/com/mojang/blaze3d/platform/NativeImage.java +++ b/com/mojang/blaze3d/platform/NativeImage.java @@ -428,13 +428,13 @@ public final class NativeImage implements AutoCloseable { this.copyRect(this, xFrom, yFrom, xFrom + xToDelta, yFrom + yToDelta, width, height, mirrorX, mirrorY); } - public void copyRect(NativeImage target, int xFrom, int yFrom, int xTo, int yTo, int width, int height, boolean mirrorX, boolean mirrorY) { + public void copyRect(NativeImage source, int xFrom, int yFrom, int xTo, int yTo, int width, int height, boolean mirrorX, boolean mirrorY) { for (int i = 0; i < height; i++) { for (int j = 0; j < width; j++) { int k = mirrorX ? width - 1 - j : j; int l = mirrorY ? height - 1 - i : i; int m = this.getPixelABGR(xFrom + j, yFrom + i); - target.setPixelABGR(xTo + k, yTo + l, m); + source.setPixelABGR(xTo + k, yTo + l, m); } } } diff --git a/com/mojang/blaze3d/systems/CommandEncoder.java b/com/mojang/blaze3d/systems/CommandEncoder.java index 9f082187..c5fbc5ba 100644 --- a/com/mojang/blaze3d/systems/CommandEncoder.java +++ b/com/mojang/blaze3d/systems/CommandEncoder.java @@ -4,9 +4,7 @@ import com.mojang.blaze3d.DontObfuscate; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.buffers.GpuFence; -import com.mojang.blaze3d.buffers.GpuBuffer.MappedView; import com.mojang.blaze3d.platform.NativeImage; -import com.mojang.blaze3d.platform.NativeImage.Format; import com.mojang.blaze3d.textures.GpuTexture; import com.mojang.blaze3d.textures.GpuTextureView; import java.nio.ByteBuffer; @@ -37,17 +35,15 @@ public interface CommandEncoder { void writeToBuffer(GpuBufferSlice gpuBufferSlice, ByteBuffer byteBuffer); - MappedView mapBuffer(GpuBuffer gpuBuffer, boolean bl, boolean bl2); + GpuBuffer.MappedView mapBuffer(GpuBuffer gpuBuffer, boolean bl, boolean bl2); - MappedView mapBuffer(GpuBufferSlice gpuBufferSlice, boolean bl, boolean bl2); - - void copyToBuffer(GpuBufferSlice gpuBufferSlice, GpuBufferSlice gpuBufferSlice2); + GpuBuffer.MappedView mapBuffer(GpuBufferSlice gpuBufferSlice, boolean bl, boolean bl2); void writeToTexture(GpuTexture gpuTexture, NativeImage nativeImage); void writeToTexture(GpuTexture gpuTexture, NativeImage nativeImage, int i, int j, int k, int l, int m, int n, int o, int p); - void writeToTexture(GpuTexture gpuTexture, IntBuffer intBuffer, Format format, int i, int j, int k, int l, int m, int n); + void writeToTexture(GpuTexture gpuTexture, IntBuffer intBuffer, NativeImage.Format format, int i, int j, int k, int l, int m, int n); void copyTextureToBuffer(GpuTexture gpuTexture, GpuBuffer gpuBuffer, int i, Runnable runnable, int j); diff --git a/com/mojang/blaze3d/vertex/VertexFormat.java b/com/mojang/blaze3d/vertex/VertexFormat.java index 5f97312b..5e8dd02e 100644 --- a/com/mojang/blaze3d/vertex/VertexFormat.java +++ b/com/mojang/blaze3d/vertex/VertexFormat.java @@ -3,7 +3,6 @@ package com.mojang.blaze3d.vertex; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.mojang.blaze3d.DontObfuscate; -import com.mojang.blaze3d.GraphicsWorkarounds; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; @@ -13,20 +12,14 @@ import it.unimi.dsi.fastutil.ints.IntList; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.List; -import java.util.function.Supplier; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.Util; -import net.minecraft.Util.OS; import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) @DontObfuscate public class VertexFormat { public static final int UNKNOWN_ELEMENT = -1; - private static final boolean USE_STAGING_BUFFER_WORKAROUND = Util.getPlatform() == OS.WINDOWS && Util.isAarch64(); - @Nullable - private static GpuBuffer UPLOAD_STAGING_BUFFER; private final List elements; private final List names; private final int vertexSize; @@ -109,60 +102,37 @@ public class VertexFormat { return this.elementsMask * 31 + Arrays.hashCode(this.offsetsByElement); } - private static GpuBuffer uploadToBuffer(@Nullable GpuBuffer gpuBuffer, ByteBuffer byteBuffer, int i, Supplier supplier) { + public GpuBuffer uploadImmediateVertexBuffer(ByteBuffer byteBuffer) { GpuDevice gpuDevice = RenderSystem.getDevice(); - if (gpuBuffer == null) { - gpuBuffer = gpuDevice.createBuffer(supplier, i, byteBuffer); + if (this.immediateDrawVertexBuffer == null) { + this.immediateDrawVertexBuffer = gpuDevice.createBuffer(() -> "Immediate vertex buffer for " + this, 40, byteBuffer); } else { CommandEncoder commandEncoder = gpuDevice.createCommandEncoder(); - if (gpuBuffer.size() < byteBuffer.remaining()) { - gpuBuffer.close(); - gpuBuffer = gpuDevice.createBuffer(supplier, i, byteBuffer); + if (this.immediateDrawVertexBuffer.size() < byteBuffer.remaining()) { + this.immediateDrawVertexBuffer.close(); + this.immediateDrawVertexBuffer = gpuDevice.createBuffer(() -> "Immediate vertex buffer for " + this, 40, byteBuffer); } else { - commandEncoder.writeToBuffer(gpuBuffer.slice(), byteBuffer); + commandEncoder.writeToBuffer(this.immediateDrawVertexBuffer.slice(), byteBuffer); } } - return gpuBuffer; - } - - private GpuBuffer uploadToBufferWithWorkaround(@Nullable GpuBuffer gpuBuffer, ByteBuffer byteBuffer, int i, Supplier supplier) { - GpuDevice gpuDevice = RenderSystem.getDevice(); - if (USE_STAGING_BUFFER_WORKAROUND) { - if (gpuBuffer == null) { - gpuBuffer = gpuDevice.createBuffer(supplier, i, byteBuffer); - } else { - CommandEncoder commandEncoder = gpuDevice.createCommandEncoder(); - if (gpuBuffer.size() < byteBuffer.remaining()) { - gpuBuffer.close(); - gpuBuffer = gpuDevice.createBuffer(supplier, i, byteBuffer); - } else { - UPLOAD_STAGING_BUFFER = uploadToBuffer(UPLOAD_STAGING_BUFFER, byteBuffer, i, supplier); - commandEncoder.copyToBuffer(UPLOAD_STAGING_BUFFER.slice(0, byteBuffer.remaining()), gpuBuffer.slice(0, byteBuffer.remaining())); - } - } - - return gpuBuffer; - } else if (GraphicsWorkarounds.get(gpuDevice).alwaysCreateFreshImmediateBuffer()) { - if (gpuBuffer != null) { - gpuBuffer.close(); - } - - return gpuDevice.createBuffer(supplier, i, byteBuffer); - } else { - return uploadToBuffer(gpuBuffer, byteBuffer, i, supplier); - } - } - - public GpuBuffer uploadImmediateVertexBuffer(ByteBuffer byteBuffer) { - this.immediateDrawVertexBuffer = this.uploadToBufferWithWorkaround( - this.immediateDrawVertexBuffer, byteBuffer, 40, () -> "Immediate vertex buffer for " + this - ); return this.immediateDrawVertexBuffer; } public GpuBuffer uploadImmediateIndexBuffer(ByteBuffer byteBuffer) { - this.immediateDrawIndexBuffer = this.uploadToBufferWithWorkaround(this.immediateDrawIndexBuffer, byteBuffer, 72, () -> "Immediate index buffer for " + this); + GpuDevice gpuDevice = RenderSystem.getDevice(); + if (this.immediateDrawIndexBuffer == null) { + this.immediateDrawIndexBuffer = RenderSystem.getDevice().createBuffer(() -> "Immediate index buffer for " + this, 72, byteBuffer); + } else { + CommandEncoder commandEncoder = gpuDevice.createCommandEncoder(); + if (this.immediateDrawIndexBuffer.size() < byteBuffer.remaining()) { + this.immediateDrawIndexBuffer.close(); + this.immediateDrawIndexBuffer = RenderSystem.getDevice().createBuffer(() -> "Immediate index buffer for " + this, 72, byteBuffer); + } else { + commandEncoder.writeToBuffer(this.immediateDrawIndexBuffer.slice(), byteBuffer); + } + } + return this.immediateDrawIndexBuffer; } diff --git a/data/minecraft/datapacks/minecart_improvements/pack.mcmeta b/data/minecraft/datapacks/minecart_improvements/pack.mcmeta index 1cef5beb..0ed5aa7a 100644 --- a/data/minecraft/datapacks/minecart_improvements/pack.mcmeta +++ b/data/minecraft/datapacks/minecart_improvements/pack.mcmeta @@ -8,6 +8,6 @@ "description": { "translate": "dataPack.minecart_improvements.description" }, - "pack_format": 81 + "pack_format": 80 } } \ No newline at end of file diff --git a/data/minecraft/datapacks/redstone_experiments/pack.mcmeta b/data/minecraft/datapacks/redstone_experiments/pack.mcmeta index 692f3bd5..7bd121c2 100644 --- a/data/minecraft/datapacks/redstone_experiments/pack.mcmeta +++ b/data/minecraft/datapacks/redstone_experiments/pack.mcmeta @@ -8,6 +8,6 @@ "description": { "translate": "dataPack.redstone_experiments.description" }, - "pack_format": 81 + "pack_format": 80 } } \ No newline at end of file diff --git a/data/minecraft/datapacks/trade_rebalance/pack.mcmeta b/data/minecraft/datapacks/trade_rebalance/pack.mcmeta index 6aac7ff8..bd51de48 100644 --- a/data/minecraft/datapacks/trade_rebalance/pack.mcmeta +++ b/data/minecraft/datapacks/trade_rebalance/pack.mcmeta @@ -8,6 +8,6 @@ "description": { "translate": "dataPack.trade_rebalance.description" }, - "pack_format": 81 + "pack_format": 80 } } \ No newline at end of file diff --git a/data/minecraft/jukebox_song/lava_chicken.json b/data/minecraft/jukebox_song/lava_chicken.json deleted file mode 100644 index cc84a7fd..00000000 --- a/data/minecraft/jukebox_song/lava_chicken.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "comparator_output": 9, - "description": { - "translate": "jukebox_song.minecraft.lava_chicken" - }, - "length_in_seconds": 134.0, - "sound_event": "minecraft:music_disc.lava_chicken" -} \ No newline at end of file diff --git a/data/minecraft/loot_table/entities/zombie.json b/data/minecraft/loot_table/entities/zombie.json index 26521938..9a2bbc6a 100644 --- a/data/minecraft/loot_table/entities/zombie.json +++ b/data/minecraft/loot_table/entities/zombie.json @@ -101,33 +101,6 @@ } ], "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:killed_by_player" - }, - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "flags": { - "is_baby": true - }, - "vehicle": { - "type": "minecraft:chicken" - } - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:music_disc_lava_chicken" - } - ], - "rolls": 1.0 } ], "random_sequence": "minecraft:entities/zombie" diff --git a/data/minecraft/painting_variant/dennis.json b/data/minecraft/painting_variant/dennis.json deleted file mode 100644 index 468684c3..00000000 --- a/data/minecraft/painting_variant/dennis.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "asset_id": "minecraft:dennis", - "author": { - "color": "gray", - "translate": "painting.minecraft.dennis.author" - }, - "height": 3, - "title": { - "color": "yellow", - "translate": "painting.minecraft.dennis.title" - }, - "width": 3 -} \ No newline at end of file diff --git a/data/minecraft/structure/ancient_city/city/entrance/entrance_connector.nbt b/data/minecraft/structure/ancient_city/city/entrance/entrance_connector.nbt index c1fcc2af..71e0c519 100644 --- a/data/minecraft/structure/ancient_city/city/entrance/entrance_connector.nbt +++ b/data/minecraft/structure/ancient_city/city/entrance/entrance_connector.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fd76e82c7a1e9f3b54051d33e8d2f373331649cf4332d30ac05ddef9d486f8a +oid sha256:c288b9d3c76241a265cc962a07f7a3bc979b050c7426c4f64076bb123b6205aa size 9416 diff --git a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_1.nbt b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_1.nbt index 2eef08eb..85701902 100644 --- a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_1.nbt +++ b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c0d464559401f6045dfc307b4f77c3793eae93413ee00859f101a3ebca9fcb9 -size 9751 +oid sha256:e232f01dd3f5566cf70b9165436a87e6a5a845392e09e82cfe69297ac99f5eb9 +size 9752 diff --git a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_2.nbt b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_2.nbt index fa13a323..eb7aa1c8 100644 --- a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_2.nbt +++ b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b86cfce70ee2a4510fc6958319fc59bc539907f45ce916d7fef0523599c5cf12 +oid sha256:ac1b5174e21cb959125756e9d4b3e9360d709b5054f43154ab5a1fbfe3a1e53a size 13777 diff --git a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_3.nbt b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_3.nbt index ba583a1c..a402f5e7 100644 --- a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_3.nbt +++ b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f30f9d0a26ba0ca08016c9b6ad12d76c4d4e27b532c2ad33f20973073b3c6f85 +oid sha256:e74cd7b918889d533541f2a9d296bdcd7e62ae0bf4ffc6bc614039902be00f5a size 12153 diff --git a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_4.nbt b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_4.nbt index 7e690e24..c4865cc8 100644 --- a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_4.nbt +++ b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e39c56ab6b2c98cc1f6bf6d753d0c8d2c8b0d4fed0e7c5aac6c58f448422b26 -size 11786 +oid sha256:c4d49cb5f2a954fb4cfbe0498717dc8a89a1bc6ea62c5ea87d2e51f2b7289069 +size 11787 diff --git a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_5.nbt b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_5.nbt index 71a4e690..9f72fc6c 100644 --- a/data/minecraft/structure/ancient_city/city/entrance/entrance_path_5.nbt +++ b/data/minecraft/structure/ancient_city/city/entrance/entrance_path_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e18250c75ea6d5112a98888c817649df98a438e8b829495a66077368f6debef -size 9067 +oid sha256:923fd272df41188a21aac3a5d2b89f7527e28ddbdc19b9f57b94d71c201165d0 +size 9068 diff --git a/data/minecraft/structure/ancient_city/city_center/city_center_1.nbt b/data/minecraft/structure/ancient_city/city_center/city_center_1.nbt index 97baff28..f1f31adc 100644 --- a/data/minecraft/structure/ancient_city/city_center/city_center_1.nbt +++ b/data/minecraft/structure/ancient_city/city_center/city_center_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f8d708c68c2dbe91b5739061da1c3804d1086ab62bf5056d48491b1f95432a0 +oid sha256:489908fc7a119943a9eed2c870ebe844dccd601c926310f63972689e348bc0a4 size 26259 diff --git a/data/minecraft/structure/ancient_city/city_center/city_center_2.nbt b/data/minecraft/structure/ancient_city/city_center/city_center_2.nbt index f0d41422..7c5e2499 100644 --- a/data/minecraft/structure/ancient_city/city_center/city_center_2.nbt +++ b/data/minecraft/structure/ancient_city/city_center/city_center_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8cb7082de8cd79848cdf3cde0e9d53b8875095146a4940b54e265ab6dd733344 +oid sha256:2fdbc95234cc08259eb2862c2d2b3f25b3fe5fee36432256cf4ec42c941a8159 size 26676 diff --git a/data/minecraft/structure/ancient_city/city_center/city_center_3.nbt b/data/minecraft/structure/ancient_city/city_center/city_center_3.nbt index b2711446..8507184f 100644 --- a/data/minecraft/structure/ancient_city/city_center/city_center_3.nbt +++ b/data/minecraft/structure/ancient_city/city_center/city_center_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6bd41cf8cb03273dfb5c88cb6e602d65eac8e99f5a136791641181df8641410 -size 26122 +oid sha256:7aa8b8f9e2a608a4d8c886d0b016277a2955b4dae4319637efd9dd13b04be0e7 +size 26121 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/bottom_1.nbt b/data/minecraft/structure/ancient_city/city_center/walls/bottom_1.nbt index 10d2dd3d..c1286701 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/bottom_1.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/bottom_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:352387d4063a422884b5a26192d03f8dde88e3637242d4a0254f411970412095 -size 7472 +oid sha256:f7f6c951741f6c6c7d50d80dbd5369463bbf69c7c11c2adfba0ff9f001fe72ea +size 7473 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/bottom_2.nbt b/data/minecraft/structure/ancient_city/city_center/walls/bottom_2.nbt index 85963a8b..5a31e0f2 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/bottom_2.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/bottom_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7290fccf672ad8b989cb8594faf799119f66cda4cbe7085c0fad15a31fb8c12b +oid sha256:a2dfedc106de6d3fd673351f1ce2ea9b0f2b66dddaa21ef7baf181870886c70c size 7001 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/bottom_left_corner.nbt b/data/minecraft/structure/ancient_city/city_center/walls/bottom_left_corner.nbt index 10e505b1..aacf121c 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/bottom_left_corner.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/bottom_left_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec1e72af71dc2f3276a5b00d7a0067786058bdefc842968b6d42eb0263f6ffa0 +oid sha256:96b7fd66f2307de57a450c40ebe5f83c06a17caab3ff4e0d26b63e27205f9ec7 size 2610 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner.nbt b/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner.nbt index 4e2a84f6..3fdf3c87 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:017b4283dd185fabc842eccb8a05c31e18a98b935f918c60927d9a64db2f5625 +oid sha256:11a880446f6d6afbb4687c07991fae587f36a99bbb6187e905d4d4fffff9ea85 size 3047 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner_1.nbt b/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner_1.nbt index fcfe93bb..8dea00ec 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner_1.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf9a7f90cac5354242c0ee61029cd14e2a241d5c5daec647b3339da8ea1725b9 -size 2594 +oid sha256:55bc8cfe43e27149abe0a5e3aac129d4a34d4c6b687fd1e7635ae76054320c6a +size 2595 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner_2.nbt b/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner_2.nbt index c517b4e2..8975ab26 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner_2.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/bottom_right_corner_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca76e0e3ef55680bca78fd361f9808df79b6b8de011f147e906cfd67a63972fe +oid sha256:c38823a7dca99df6b61efad447daef69e5d207761e2037abc0225d92247fff83 size 2666 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/left.nbt b/data/minecraft/structure/ancient_city/city_center/walls/left.nbt index b97fac65..2c163306 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/left.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/left.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdf47a9c203b7d98a0d5c7286ead7cf7abe9d66dab8bca0cf70002f65d483d70 +oid sha256:6cecda131beba8c70ce8c33467fd835f9b63d7728b5293cd1942fb428a477b7d size 3182 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/right.nbt b/data/minecraft/structure/ancient_city/city_center/walls/right.nbt index db030793..1edeeacf 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/right.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/right.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a67005b77f3d29738a4020578df89e379787c0861a82dda6fe3d943d8e9cb5dc +oid sha256:db94a136c85486122f5986af20070117c59ee1e40291f652911459b7cee5dd9b size 3177 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/top.nbt b/data/minecraft/structure/ancient_city/city_center/walls/top.nbt index 0e7a275b..33ab2630 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/top.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/top.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ec499be547418c299006c88de7e0e16332b9b1958167dd65a2cd5be03abc5b4 +oid sha256:e3b7d5a32e682ecaf92975ed3ce4b07beb6d7cda07afac2d17944648ef1187d0 size 7119 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/top_left_corner.nbt b/data/minecraft/structure/ancient_city/city_center/walls/top_left_corner.nbt index a6a0902e..737fd6f8 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/top_left_corner.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/top_left_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aefbb74063eff0d8a55994ddecf260efecb7b657d54d7532a65d9a926a42c1d1 +oid sha256:ad67e93581ac042470ebda91950cfbaf5b963aba597b5d763ace9b4e77481c6b size 2597 diff --git a/data/minecraft/structure/ancient_city/city_center/walls/top_right_corner.nbt b/data/minecraft/structure/ancient_city/city_center/walls/top_right_corner.nbt index a3fe66b8..f917d969 100644 --- a/data/minecraft/structure/ancient_city/city_center/walls/top_right_corner.nbt +++ b/data/minecraft/structure/ancient_city/city_center/walls/top_right_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b494b5de3e39341d492036c4f3c029a409352eb8602afd69d1585395352532f1 +oid sha256:918b546c8f761211783e1c3202444763784740a34bcd695b2bd2db61ea0c3b2c size 2643 diff --git a/data/minecraft/structure/ancient_city/structures/barracks.nbt b/data/minecraft/structure/ancient_city/structures/barracks.nbt index 77cb2e92..3cdee348 100644 --- a/data/minecraft/structure/ancient_city/structures/barracks.nbt +++ b/data/minecraft/structure/ancient_city/structures/barracks.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4622062b817a59782fc596d36f2104c9b8b6655fc8afeb86d46172c77b34e85 -size 5633 +oid sha256:1f89707ae4b1b4e911fe6be420f9ddcbedc59a5b021cde6ad43fc7a2efcc299a +size 5632 diff --git a/data/minecraft/structure/ancient_city/structures/camp_1.nbt b/data/minecraft/structure/ancient_city/structures/camp_1.nbt index f59c2ef1..ecb6eec5 100644 --- a/data/minecraft/structure/ancient_city/structures/camp_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/camp_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:050fb3ad58bc43cae8777c382cfbb0553d239beb9ae0a77038e99244e7b62f2c +oid sha256:53e3e286a5297ff4c3de51117389b10df512d2a1aced6340dd995514155797c2 size 1165 diff --git a/data/minecraft/structure/ancient_city/structures/camp_2.nbt b/data/minecraft/structure/ancient_city/structures/camp_2.nbt index e9d0eb3f..4ce552a9 100644 --- a/data/minecraft/structure/ancient_city/structures/camp_2.nbt +++ b/data/minecraft/structure/ancient_city/structures/camp_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be4885c0965003b3a4857a07b11658f37bd51732b27ead3261008e758e8adbb2 -size 1273 +oid sha256:f4d7e6b7f0427e759aa340afde626ffda60106d81ef49a72fdec745ba3bf6349 +size 1272 diff --git a/data/minecraft/structure/ancient_city/structures/camp_3.nbt b/data/minecraft/structure/ancient_city/structures/camp_3.nbt index b987b768..804a878b 100644 --- a/data/minecraft/structure/ancient_city/structures/camp_3.nbt +++ b/data/minecraft/structure/ancient_city/structures/camp_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77db536194020cb0d49692db6bdc76663c67343129ad91fb839ebdcc726c833b -size 1015 +oid sha256:1964c06fd453ae73c2a0d974c3bab93fe93f470dbc4ff61cbab7413c2cd8b41f +size 1014 diff --git a/data/minecraft/structure/ancient_city/structures/chamber_1.nbt b/data/minecraft/structure/ancient_city/structures/chamber_1.nbt index 3b592930..994e74fb 100644 --- a/data/minecraft/structure/ancient_city/structures/chamber_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/chamber_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87138c71d4a99ad8530947188e77cffafdf664c31cede585bcc75afd9cec5def -size 2535 +oid sha256:65a6c102e4a671b8843f1f6d76485418d6234b3ac6f7d60ddd08bbe6775da3bb +size 2534 diff --git a/data/minecraft/structure/ancient_city/structures/chamber_2.nbt b/data/minecraft/structure/ancient_city/structures/chamber_2.nbt index c89340d8..4dae6c9e 100644 --- a/data/minecraft/structure/ancient_city/structures/chamber_2.nbt +++ b/data/minecraft/structure/ancient_city/structures/chamber_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38814a5e768d161db14ba7c53921443807515e866275b16db5438130709b0272 -size 1312 +oid sha256:8ab389bde1de2975194f1721e825c3034686db81ceede308377d09c413aac1b5 +size 1311 diff --git a/data/minecraft/structure/ancient_city/structures/chamber_3.nbt b/data/minecraft/structure/ancient_city/structures/chamber_3.nbt index 5cdb24d3..217f24fd 100644 --- a/data/minecraft/structure/ancient_city/structures/chamber_3.nbt +++ b/data/minecraft/structure/ancient_city/structures/chamber_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48e207e7172f4cd5d761b3fe578f357eb25187974696feaaa89b314970d950b1 +oid sha256:a0eacefa3c9455959f4b126530a825b8d154ca06e92c0619a715d377b08f66db size 1100 diff --git a/data/minecraft/structure/ancient_city/structures/ice_box_1.nbt b/data/minecraft/structure/ancient_city/structures/ice_box_1.nbt index 45c26b91..3ef27980 100644 --- a/data/minecraft/structure/ancient_city/structures/ice_box_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/ice_box_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:680f742a837f7bf7108db40897db7f98a3e56f621451cfad68d0216dfdcf21fb +oid sha256:c71a8343f6d6c1dd122100331a20427db32281d4a9ad9a877adfcc04a80bbb7e size 3907 diff --git a/data/minecraft/structure/ancient_city/structures/large_pillar_1.nbt b/data/minecraft/structure/ancient_city/structures/large_pillar_1.nbt index 3544807a..980169cf 100644 --- a/data/minecraft/structure/ancient_city/structures/large_pillar_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/large_pillar_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22417c9c7da86c0952a3aa32355a7be78f6cd713c1b64d636513d8b61fd2ca53 +oid sha256:962c30d5799f045943a88dd7ad6d25ec2b9b5a4a89b4d280be0e8500b148acbe size 1476 diff --git a/data/minecraft/structure/ancient_city/structures/large_ruin_1.nbt b/data/minecraft/structure/ancient_city/structures/large_ruin_1.nbt index 6cd31440..729d2922 100644 --- a/data/minecraft/structure/ancient_city/structures/large_ruin_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/large_ruin_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2655d29644aaccf1e51458a085364eda8b30525be697a64ae94b51537cb55e76 +oid sha256:f70c3438a2d8f3cef431cb53a8caac1b23145602c508360d582c226199f52249 size 397 diff --git a/data/minecraft/structure/ancient_city/structures/medium_pillar_1.nbt b/data/minecraft/structure/ancient_city/structures/medium_pillar_1.nbt index e21f829b..ac96ece3 100644 --- a/data/minecraft/structure/ancient_city/structures/medium_pillar_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/medium_pillar_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d20dff14f0780defc7293dcf0adf8b3f8787beddddadd7c32c7d5a038b90f8f +oid sha256:309bb78a175fa9f7a74f601f2f0895438480877bc69dccd1a98c35e3fc3b5c13 size 959 diff --git a/data/minecraft/structure/ancient_city/structures/medium_ruin_1.nbt b/data/minecraft/structure/ancient_city/structures/medium_ruin_1.nbt index 6da80a14..b802268f 100644 --- a/data/minecraft/structure/ancient_city/structures/medium_ruin_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/medium_ruin_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73d4a02bcce3cbca1ccff5285d01f7deee46b361ebce10f3966cd53658c2fcec +oid sha256:43826db6a0e94c8f9654e40c99ed54f134c56b41794b6ce746292db743156060 size 326 diff --git a/data/minecraft/structure/ancient_city/structures/medium_ruin_2.nbt b/data/minecraft/structure/ancient_city/structures/medium_ruin_2.nbt index 5b3de062..ecd66f7e 100644 --- a/data/minecraft/structure/ancient_city/structures/medium_ruin_2.nbt +++ b/data/minecraft/structure/ancient_city/structures/medium_ruin_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2c86ef798c73d54eda7bc475c0011c0dd870e011d5dd0eb6879b2a9ce712299 +oid sha256:449a015270d13deccdf2f9d915d1d4ca536436767969de3ef43da496631b035b size 353 diff --git a/data/minecraft/structure/ancient_city/structures/sauna_1.nbt b/data/minecraft/structure/ancient_city/structures/sauna_1.nbt index bd81f60f..553a7669 100644 --- a/data/minecraft/structure/ancient_city/structures/sauna_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/sauna_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a057f7ac4f947ee5c14de1edd8966f3249dfa5574bcf597767e72aa4fa4a3a1c -size 6957 +oid sha256:c9aad06839ab1df6e48372772a11f4f3fb86229fbcd8fc6175e8c7955f594989 +size 6956 diff --git a/data/minecraft/structure/ancient_city/structures/small_ruin_1.nbt b/data/minecraft/structure/ancient_city/structures/small_ruin_1.nbt index 85ade93c..5e782014 100644 --- a/data/minecraft/structure/ancient_city/structures/small_ruin_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/small_ruin_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf81d0d42ef73d862fb4c27a8d8a3974e285371765b277fa95967aa90f06aca2 +oid sha256:77b8048e8740c46ca9bba2e613ba0245f0868d2eef3c8c1f21660944c9e89aad size 313 diff --git a/data/minecraft/structure/ancient_city/structures/small_ruin_2.nbt b/data/minecraft/structure/ancient_city/structures/small_ruin_2.nbt index c48599ec..58efe20c 100644 --- a/data/minecraft/structure/ancient_city/structures/small_ruin_2.nbt +++ b/data/minecraft/structure/ancient_city/structures/small_ruin_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88304e177fdb08f035d6192ac9edd5497e7d439c35fda2b5f8ad872e04d65a4d +oid sha256:09b9a8ecfc66ed7aff36eedfe51b42a2a9b40af396745f60944cc1dae5445c5b size 310 diff --git a/data/minecraft/structure/ancient_city/structures/small_statue.nbt b/data/minecraft/structure/ancient_city/structures/small_statue.nbt index 5ce79a83..f0e037a3 100644 --- a/data/minecraft/structure/ancient_city/structures/small_statue.nbt +++ b/data/minecraft/structure/ancient_city/structures/small_statue.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e47464c6b2180b1718dbac5b76c44630bedb7482de94c734e642b09ab934498c -size 891 +oid sha256:efaebf2348d2c0a9ae0e119a491750e8712790df8098f1c7174c7f9d9e35a868 +size 892 diff --git a/data/minecraft/structure/ancient_city/structures/tall_ruin_1.nbt b/data/minecraft/structure/ancient_city/structures/tall_ruin_1.nbt index e07147bc..73f84eaf 100644 --- a/data/minecraft/structure/ancient_city/structures/tall_ruin_1.nbt +++ b/data/minecraft/structure/ancient_city/structures/tall_ruin_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:457ae619378306e035ac130d2b7253f978337b843a6d66fc86273b322898c8df +oid sha256:0175ac804510fdaf3ab7eb38cacbdae3fe69f0365fd0080af7752923c28ce215 size 2792 diff --git a/data/minecraft/structure/ancient_city/structures/tall_ruin_2.nbt b/data/minecraft/structure/ancient_city/structures/tall_ruin_2.nbt index eba17e03..8e734e84 100644 --- a/data/minecraft/structure/ancient_city/structures/tall_ruin_2.nbt +++ b/data/minecraft/structure/ancient_city/structures/tall_ruin_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4438020eae0eceb08aaa9b522ad3935175a56c7ef11656b09092fc413975e87b -size 3486 +oid sha256:019acb83644b53229b6443a552ecd9bbf8c1c9e5d599060781cc0b0e34cc2910 +size 3485 diff --git a/data/minecraft/structure/ancient_city/structures/tall_ruin_3.nbt b/data/minecraft/structure/ancient_city/structures/tall_ruin_3.nbt index 2f2e8f63..dbddcada 100644 --- a/data/minecraft/structure/ancient_city/structures/tall_ruin_3.nbt +++ b/data/minecraft/structure/ancient_city/structures/tall_ruin_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5eeb3abddce2233f8122869c63273b0872d718b4e570570e0672f868ed189721 +oid sha256:1c678265fcd90c057b9d5301e0c121e95342afe340247e407010d5271ee96747 size 1521 diff --git a/data/minecraft/structure/ancient_city/structures/tall_ruin_4.nbt b/data/minecraft/structure/ancient_city/structures/tall_ruin_4.nbt index b7068e39..2f024207 100644 --- a/data/minecraft/structure/ancient_city/structures/tall_ruin_4.nbt +++ b/data/minecraft/structure/ancient_city/structures/tall_ruin_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e688d32e55b16d8d9880a677793987eb6c966b0680d41b60ded8fd9c1ad14944 -size 2296 +oid sha256:9b2fe8c060db79e5ba4c39cdfc79c48bbefe9a3951faa2026529c071498d1775 +size 2295 diff --git a/data/minecraft/structure/ancient_city/walls/intact_corner_wall_1.nbt b/data/minecraft/structure/ancient_city/walls/intact_corner_wall_1.nbt index 5423996a..6d6d69c2 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_corner_wall_1.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_corner_wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f818b813715be7785ca6a7288ae994bc7bf2b26762b99d2e30047021131d69db -size 3836 +oid sha256:ec0a24c9c0f6968adc24234aa0f01054b54788adc67a8c604c2ccb7a14a1005d +size 3837 diff --git a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_1.nbt b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_1.nbt index a4e7fad6..f90f18ed 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_1.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:177e96efe95d80a0498aa5962a26e722c7a9a244860b7586b5fceba276f45636 +oid sha256:2b0a676f98a11feb82dd8113826768a9bd56f0c05fc13804cdae2e021b5410a2 size 2026 diff --git a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_2.nbt b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_2.nbt index ce530b0d..80732f11 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_2.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fdb78b7e3b0fe2ad836cf9e531953c75371f892bdca761452aee1e2c3193e1c +oid sha256:360c1a2e00c7403522f425267b9567519a69115521b17e734b9bbf2f8c9dc5d2 size 2006 diff --git a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_bridge.nbt b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_bridge.nbt index 0741209d..098c379e 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_bridge.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_bridge.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50d08f613566b58bbfe7a6cfeeb0e210bdf3904271097c22f91c50fa438dc2e6 +oid sha256:ae78a46807dd6bca3abf2b232d345060102bd1b3989bad2f24ac3fd376d1a493 size 2720 diff --git a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_passage_1.nbt b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_passage_1.nbt index 90fc53f5..93684ac0 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_passage_1.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_passage_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d255180df4cf068a835cda0ab202523dcaaf4ce27d47f9c656a70c508b475f9 +oid sha256:4aace45e7e83361979a5e73ea69ad544b0ae8a8f738bc57feb8e8e68ee0fd0d9 size 1661 diff --git a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_1.nbt b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_1.nbt index b9f5d8ef..ef9e24e9 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_1.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1c14b9a0e9c61a1837d719722eda0cf167ff1d5369a6c80ea27706891868b03 +oid sha256:4b20dbfe523163e701f30f43b0681c3402285121fb8e159601488c1ed352a276 size 2119 diff --git a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_2.nbt b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_2.nbt index 15aff236..c6b56e81 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_2.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb5b03cfb052268c0bf8b4e64e769f4d7f801ce6b8b235e3708f5cb039289adb +oid sha256:38dfcf439e387ed273b56bfb5ae65cbb924afd9c98d83c3243a0c1c4fbe2c835 size 2169 diff --git a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_3.nbt b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_3.nbt index 342b698d..abd63c85 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_3.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3eca409d2ecb959f60b00eb263e38c614fb8cf94448776baca52d3a769c871a8 +oid sha256:327f34a2fc13f21fd94a3c15b44d2c8a608122e819b3d32d74d4cb8c4da143fc size 2155 diff --git a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_4.nbt b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_4.nbt index 6775fcca..9cff3f65 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_4.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_horizontal_wall_stairs_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ccc7f37096bccf92b7b6ec68d4bcae63e2021dee6f29fca190f9370f8133d21 +oid sha256:35efce9ceac502f11bd60d1853f5aedffb923b0bc56e440f9bf365679a10ce4a size 2057 diff --git a/data/minecraft/structure/ancient_city/walls/intact_intersection_wall_1.nbt b/data/minecraft/structure/ancient_city/walls/intact_intersection_wall_1.nbt index c9a8c95a..f18a7aa8 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_intersection_wall_1.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_intersection_wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e369f1cc09ce97589e786dde251fa90e3d2874c17dcd44995f1a9eb516153066 +oid sha256:cf91ff3b8c6aaf69ff05e22983f68af0b13381ba29152ec80910801cef1f0aae size 3125 diff --git a/data/minecraft/structure/ancient_city/walls/intact_lshape_wall_1.nbt b/data/minecraft/structure/ancient_city/walls/intact_lshape_wall_1.nbt index b0ae9355..107d4803 100644 --- a/data/minecraft/structure/ancient_city/walls/intact_lshape_wall_1.nbt +++ b/data/minecraft/structure/ancient_city/walls/intact_lshape_wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:820e796e5b8fb0ff83de23ed85febd12b0f7ef0b10a2c8ec5f0cc9f9b1fa837c +oid sha256:d5594cf2361ed15f71669e9fa79afe822a5e1f602279704632789195b69a7f29 size 2384 diff --git a/data/minecraft/structure/ancient_city/walls/ruined_corner_wall_1.nbt b/data/minecraft/structure/ancient_city/walls/ruined_corner_wall_1.nbt index ce7af501..7fe2f11a 100644 --- a/data/minecraft/structure/ancient_city/walls/ruined_corner_wall_1.nbt +++ b/data/minecraft/structure/ancient_city/walls/ruined_corner_wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9708b69a5811067f7179d17951b5c6be614197a72cb2184fc21b308fb87b7e32 +oid sha256:bcbba1f3b9743c7af0acaf33cd69d9fd833297c80ae0bf28d02d36db6b95cd47 size 4170 diff --git a/data/minecraft/structure/ancient_city/walls/ruined_corner_wall_2.nbt b/data/minecraft/structure/ancient_city/walls/ruined_corner_wall_2.nbt index b2f717d2..345f29ba 100644 --- a/data/minecraft/structure/ancient_city/walls/ruined_corner_wall_2.nbt +++ b/data/minecraft/structure/ancient_city/walls/ruined_corner_wall_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31b6c0873bccf648d4e479d45873277adc5fc017c2134bbb2e9106ca1da4a673 -size 3303 +oid sha256:0ab82d428bba2bb8c55329d75c7c6cfbeeff04b8856c4dfebfd68bd300aacd0b +size 3304 diff --git a/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_1.nbt b/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_1.nbt index a5af30c8..3744b126 100644 --- a/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_1.nbt +++ b/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a787af3a6bb635738c896f1023c3d72d665d71efd0e131b08fd53342c7a9cb8d +oid sha256:e7d62e3681b483aeb6b149ea6f3996a8ccd5bd87974524be9135fc28178149b3 size 1490 diff --git a/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_2.nbt b/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_2.nbt index 62074e36..e89e1f6f 100644 --- a/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_2.nbt +++ b/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8734e3243d9d448a8ffd0a1c7bdd903a70ae1695294822c94c31ae92f97a69ff +oid sha256:336130661f957eedcc6360f2b1f128750c1eacd938f3d71382699c5761d182fb size 1975 diff --git a/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_3.nbt b/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_3.nbt index cf18e5b4..501987f7 100644 --- a/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_3.nbt +++ b/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7977cc6bdbccfff88b09e00bd37748ef2faa2bd08c90cfba6cd3fcda1a025dd +oid sha256:1ec13dcbb194517d121b6f729a6bb5c62c085b5de8b3174471f7b7a82e3f6fee size 1385 diff --git a/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_4.nbt b/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_4.nbt index 497b7e64..d95dc5bf 100644 --- a/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_4.nbt +++ b/data/minecraft/structure/ancient_city/walls/ruined_horizontal_wall_stairs_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b14873a02148ec3de0189c2b879b43398f0ef46ef0adc50c21efc0666642fe8c +oid sha256:5c66e7b0a5aade70170af66844e83d4ee6970f7e26d2b80702af7d55b4fc6001 size 1340 diff --git a/data/minecraft/structure/bastion/blocks/air.nbt b/data/minecraft/structure/bastion/blocks/air.nbt index bbe95741..77ed1444 100644 --- a/data/minecraft/structure/bastion/blocks/air.nbt +++ b/data/minecraft/structure/bastion/blocks/air.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5489fbbdcc97748d90d2d82d38d2e22b29b75c9fb207ec1fff46ef9e0000b2d +oid sha256:74be73c85b8c295829873dd2a06a0a1971bb001beafb83097b24c90e04fc258a size 228 diff --git a/data/minecraft/structure/bastion/blocks/gold.nbt b/data/minecraft/structure/bastion/blocks/gold.nbt index 7792dd72..1a750da0 100644 --- a/data/minecraft/structure/bastion/blocks/gold.nbt +++ b/data/minecraft/structure/bastion/blocks/gold.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36e8f46abdcc412f1bbbefbd86a4313dae1df33a7e7c9e9e1351a1f0150cd0ed +oid sha256:49ce6070229dadbe6475c3b66c784c3218417eb0ec95a1094ccfb2241b11c756 size 233 diff --git a/data/minecraft/structure/bastion/bridge/bridge_pieces/bridge.nbt b/data/minecraft/structure/bastion/bridge/bridge_pieces/bridge.nbt index de621cfb..952d326e 100644 --- a/data/minecraft/structure/bastion/bridge/bridge_pieces/bridge.nbt +++ b/data/minecraft/structure/bastion/bridge/bridge_pieces/bridge.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e8431e4841a562cbf47ebcb43fa0eca8bbdfa959f08a8b01d12a67653f6ff28 -size 15685 +oid sha256:9a143530d72a79ffe74780a7f7376f6ced5528c5c4c15db13fd5beae5dd8903f +size 15686 diff --git a/data/minecraft/structure/bastion/bridge/connectors/back_bridge_bottom.nbt b/data/minecraft/structure/bastion/bridge/connectors/back_bridge_bottom.nbt index b556d03a..b16a7df8 100644 --- a/data/minecraft/structure/bastion/bridge/connectors/back_bridge_bottom.nbt +++ b/data/minecraft/structure/bastion/bridge/connectors/back_bridge_bottom.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93a641249d171938d837fb8b703eb15df464830563199e1b1cd0d1fa0ae3e628 +oid sha256:cefb011c343b3745db0a1eaec387d86ac32148599f8eb6fa4bd90f6518502297 size 1427 diff --git a/data/minecraft/structure/bastion/bridge/connectors/back_bridge_top.nbt b/data/minecraft/structure/bastion/bridge/connectors/back_bridge_top.nbt index 145e4b00..fce74ab7 100644 --- a/data/minecraft/structure/bastion/bridge/connectors/back_bridge_top.nbt +++ b/data/minecraft/structure/bastion/bridge/connectors/back_bridge_top.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c94c8b281cfb44a99039101977e4e2c597d2dbaeebd98346d6485b970de59726 -size 1373 +oid sha256:8c81b4e051e9f4c242671ee96201db0a60f15f7213e5fca2cdca400ac6eff2d2 +size 1374 diff --git a/data/minecraft/structure/bastion/bridge/legs/leg_0.nbt b/data/minecraft/structure/bastion/bridge/legs/leg_0.nbt index 93ab22c9..fb4cdc3f 100644 --- a/data/minecraft/structure/bastion/bridge/legs/leg_0.nbt +++ b/data/minecraft/structure/bastion/bridge/legs/leg_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f721fea0b6dc3f70b1260405b196f57fe2208117fd1a7112c714ee82954f779e +oid sha256:6560daffa9694f74e470a33a0c603d3475dee4e934f3fa8ee5febf2baa5f6676 size 707 diff --git a/data/minecraft/structure/bastion/bridge/legs/leg_1.nbt b/data/minecraft/structure/bastion/bridge/legs/leg_1.nbt index 8b395e0f..9d943f69 100644 --- a/data/minecraft/structure/bastion/bridge/legs/leg_1.nbt +++ b/data/minecraft/structure/bastion/bridge/legs/leg_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:587ceffeea344118aba8192cd275ca8cabd82958503cc65d292e16d3d8a24ebe +oid sha256:733c2cd82d20577a574c7ce4da48d3d898ce232d0a8b796181bf4f12bc3e4a42 size 738 diff --git a/data/minecraft/structure/bastion/bridge/rampart_plates/plate_0.nbt b/data/minecraft/structure/bastion/bridge/rampart_plates/plate_0.nbt index 41aa4faf..20e052c7 100644 --- a/data/minecraft/structure/bastion/bridge/rampart_plates/plate_0.nbt +++ b/data/minecraft/structure/bastion/bridge/rampart_plates/plate_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a317b27367adc6bd32cdf939b057155ba92979a53cb8703d9124d6ebdcd6b12a +oid sha256:8baf0847b63c3508d117d369fb6950fad45c1bf9e25c6ebd4ba4c3dd41638568 size 2054 diff --git a/data/minecraft/structure/bastion/bridge/ramparts/rampart_0.nbt b/data/minecraft/structure/bastion/bridge/ramparts/rampart_0.nbt index 19d0790b..6d47ae05 100644 --- a/data/minecraft/structure/bastion/bridge/ramparts/rampart_0.nbt +++ b/data/minecraft/structure/bastion/bridge/ramparts/rampart_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b20d818ff8c7e4f1db10d09c3575623f1bd5eebd96b63842bd7d2106584701e +oid sha256:aa0a5ae38be5d9d78f8ed24a71067dc736c975fe5b34a73ffb0dd7d087c4a60d size 12578 diff --git a/data/minecraft/structure/bastion/bridge/ramparts/rampart_1.nbt b/data/minecraft/structure/bastion/bridge/ramparts/rampart_1.nbt index 7346ba6b..5b25035c 100644 --- a/data/minecraft/structure/bastion/bridge/ramparts/rampart_1.nbt +++ b/data/minecraft/structure/bastion/bridge/ramparts/rampart_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af51d39709df7b22d6f265f5cda9d733c3eb982157c0afa3f60610d2bca5f313 -size 19409 +oid sha256:5dd80cbd5209b1fe1312f0278359b56ea0cc27f9c8110a14ff560c34c5dfeb19 +size 19408 diff --git a/data/minecraft/structure/bastion/bridge/starting_pieces/entrance.nbt b/data/minecraft/structure/bastion/bridge/starting_pieces/entrance.nbt index bf7a26ff..cc6c474e 100644 --- a/data/minecraft/structure/bastion/bridge/starting_pieces/entrance.nbt +++ b/data/minecraft/structure/bastion/bridge/starting_pieces/entrance.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6075e458b8fefd6315770fe0dd8976a52598819b351e162b7b34d1da1a7ed3e2 -size 41137 +oid sha256:ba735a8bc81a64d455bdcb8e7382e0dae0ddf9b14f5540b2f29cf13ee8643bba +size 41136 diff --git a/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_base.nbt b/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_base.nbt index a8f13d24..fc8818a2 100644 --- a/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_base.nbt +++ b/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_base.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47089d5afa68eba75ef78181db21852bbb2fa52adc5e9974ff9cdb89918ac33c +oid sha256:0b8eda700ee9d2f95d38fa30d4a748a8a73eccd4e249ac69e09e97d03bee8a61 size 45584 diff --git a/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_face.nbt b/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_face.nbt index 3155938a..0f0c7c3a 100644 --- a/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_face.nbt +++ b/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_face.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43c8c026a0aabc352e3091e4c3aa95f6e5f13c404c1f5eba316c8ac4b1c383ea +oid sha256:7eff040303ace67ecf5efa2950e686fde3532249e1e8f8c9763885477b57e4df size 2738 diff --git a/data/minecraft/structure/bastion/bridge/walls/wall_base_0.nbt b/data/minecraft/structure/bastion/bridge/walls/wall_base_0.nbt index 52175bfd..87d1e4e0 100644 --- a/data/minecraft/structure/bastion/bridge/walls/wall_base_0.nbt +++ b/data/minecraft/structure/bastion/bridge/walls/wall_base_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02db6bff405c5532d080c73cd4e7f10b50dfd02632004459a3ae0c598af6d8c3 +oid sha256:d3c03025ac9edcf4c9f41b0a0de163b0a819b0fbdb8053540f97d1461a35a5f3 size 17432 diff --git a/data/minecraft/structure/bastion/bridge/walls/wall_base_1.nbt b/data/minecraft/structure/bastion/bridge/walls/wall_base_1.nbt index f1edc181..16e3715f 100644 --- a/data/minecraft/structure/bastion/bridge/walls/wall_base_1.nbt +++ b/data/minecraft/structure/bastion/bridge/walls/wall_base_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e72b030262620068355fb4e8121de82a5827adce44ef6cb5760e3396547ee298 +oid sha256:46ac87d2fa9688b6cd620e1127ecf8765baa5d3e04f130515e15500e6e68dcb2 size 17258 diff --git a/data/minecraft/structure/bastion/hoglin_stable/air_base.nbt b/data/minecraft/structure/bastion/hoglin_stable/air_base.nbt index b99d2689..94e246fd 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/air_base.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/air_base.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc69802e20b471cba56a92bd2fe25884baa21d6f941b734174a383889116dc1a +oid sha256:c20bd7272a234f90bb8c5aae3a368734dc303b6958f37a85690b8c8dc82a59cd size 80382 diff --git a/data/minecraft/structure/bastion/hoglin_stable/connectors/end_post_connector.nbt b/data/minecraft/structure/bastion/hoglin_stable/connectors/end_post_connector.nbt index cf215867..1975866b 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/connectors/end_post_connector.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/connectors/end_post_connector.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef40354ce802bc763d37c2f0e69aa02b70ecdc7010b9401e6ae6e0f510645cb1 +oid sha256:578a2ecae5a224ebebbbd6dd6f9b5dd7db0e06a3854eedf9122699bd215be69f size 288 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_0.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_0.nbt index 4df73118..050893d3 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_0.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9a18dc3d5389441bd83a84f3b80f468a53d1293f4d7806aa7c753316b58c6db -size 1878 +oid sha256:d5eff1de9a798c69a55329bf18f2f7fb67d8734ad47f31475ea80b8310b3e47f +size 1879 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_1.nbt index 3dd977f8..34493f22 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bdb5594aff619ccc8a28309c97fc8e97e3ce3022e6a863c46f8da10e75c8ca90 +oid sha256:e8dbe1f6081fc5d4e95f015b7a47f749faa893a25ce01d5a3c9e2c0d278c4729 size 2076 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_2.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_2.nbt index 2f619297..f1796bad 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_2.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a4bb6d5e90ae4eb7ea0fc02bbd4e1462934a879d404d92700e53549eefaf0a3 +oid sha256:c6654a93bb073d27b51f11dbfec23743e783a7d4541f8e6905eb228a58056841 size 2352 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_3.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_3.nbt index d1611fd5..3ae06747 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_3.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fe2b5d600a1638509cea998e2baed495f38f54f64afddae9feebbbca53b9507 +oid sha256:04267a330e6700fac318d3d35fcdee394864d76bcdebbf517ac6546b59a5597c size 2398 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_4.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_4.nbt index c610504b..ea672d78 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_4.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/inner_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:479dcf2c1bd2979f3ab658e034a9b39007a9783f0bab98ee982200256ae26976 -size 2145 +oid sha256:00c06185b9692c353c752ea1faed9050ed999a3d3a9578bb967c9a0fb934b600 +size 2146 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_0.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_0.nbt index 35d92f68..c631e10f 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_0.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1870648a258cd562b9b628bfcacc578c9bf38176232c3cffd8f0441febf8857e -size 1964 +oid sha256:e1f4963e62d2a76661f60a22c1d7f08c6c5c0c9a83a474526e87ad5bba15a0ba +size 1965 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_1.nbt index 74687916..25c8b63c 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f504a2142f5a6b135cf473b49b50ccab25d16a858c73a8f4422cc56062a143c +oid sha256:d3dcd243ec015eaa3b8de995ab0934fc95c77a4daa906dcd4719429ae3790f95 size 2317 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_2.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_2.nbt index c2235c53..5093cb7a 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_2.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:502d9e83623910e78522f76b3bd5e94a27db3e4cf34b682dc6e7e1e4a056e7e5 +oid sha256:f670268dc4e8b545a6cabe6c5e83b707724fa51079d5af03515644f75e4d9ead size 2555 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_3.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_3.nbt index 48e2ebcc..1232876a 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_3.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58043f70cb94f685da1c455909777438c9ef4eb377d9d5ff5eab05578fd2ffa8 -size 2452 +oid sha256:b9b72afe055d2e12673acceb3693d08501003864b2dbd9413b7e261b368b2433 +size 2453 diff --git a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_4.nbt b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_4.nbt index 229435ea..c384b0cd 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_4.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/large_stables/outer_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96783037e83ab1e86d5ad779ca82a887fe2cf0cdd474f7b13479411bde377703 -size 2397 +oid sha256:fd635b5a614dfa6644af0998d68e7d87e5eb98ea4f679b7238514cd571c0730f +size 2398 diff --git a/data/minecraft/structure/bastion/hoglin_stable/posts/end_post.nbt b/data/minecraft/structure/bastion/hoglin_stable/posts/end_post.nbt index 5749d8ae..e63d7c39 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/posts/end_post.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/posts/end_post.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a90ef7d588903f13f12fefba7d016136c8e814f9fdb44c72797c46d50b3c92e +oid sha256:20e3bfbc1eb516dd6db21d8b1b01e7878f31a8a4c0c1934aa33f7d3adfd44b33 size 530 diff --git a/data/minecraft/structure/bastion/hoglin_stable/posts/stair_post.nbt b/data/minecraft/structure/bastion/hoglin_stable/posts/stair_post.nbt index 51b8b7ac..c4978e75 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/posts/stair_post.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/posts/stair_post.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:992ab122506b5322684bfb35071774bb565cef54a76729d0c1887c3acf90f80c -size 1166 +oid sha256:e98c1d60591f20ec80eaaac80ba28dee248cc139ec7fc74c5ac91bbb581a9111 +size 1167 diff --git a/data/minecraft/structure/bastion/hoglin_stable/rampart_plates/rampart_plate_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/rampart_plates/rampart_plate_1.nbt index ba53b13e..0b4977ae 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/rampart_plates/rampart_plate_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/rampart_plates/rampart_plate_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a879977e9037ba95a68678c40a4309519146224b56f03fe513eefb1d42e23d09 -size 2178 +oid sha256:0ef69d7b57b28575704cdd32a08fe66f8ac34bfd5a0e77b1547220d371abaea7 +size 2179 diff --git a/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_1.nbt index 875803fb..0aebc877 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ef8f72300d05f9cf3a8c773e9279ff831fef869d6cd749e68cd12406cc74813 +oid sha256:9941b70f8a180ebd47f25b5042c2c6ac82c29da738fb12965d3f7fcd05b32d07 size 19109 diff --git a/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_2.nbt b/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_2.nbt index a8797c4d..37aa96da 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_2.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a9854c8b5618a1426d30f9ba8a77fccd48384ee800bb2322cfff5f0e1237cd8 -size 12207 +oid sha256:4b8fb5b8b597a51f5d148dc0ec62ae3a17835be34b2dc94ccf13141fafe592e9 +size 12206 diff --git a/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_3.nbt b/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_3.nbt index 037b9a97..4a982b7e 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_3.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/ramparts/ramparts_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39577d6818e7473936e96a2e47422907d15b038835194e5c4d74fe37b695dc66 -size 6390 +oid sha256:e34b045095cba1a16aa3122bfe6e15db5c106b71353c24a2ff3b592d69f7aba2 +size 6389 diff --git a/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_0.nbt b/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_0.nbt index a11e93e4..4b8a1c6e 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_0.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0008e9fe487caca4d17270d5d9dd9bd608d89bb96a82bef896b01cf41b061ee -size 1896 +oid sha256:ebdc5043928efcef8c3a7485a99b30efbd079f5308202f0ede0cbf067773dddd +size 1897 diff --git a/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_1.nbt index 5ff210d9..9e025113 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a3516f2641c9899f7a3cdc26c0717788acfabdbd59a3942201e7696f733c21b -size 1979 +oid sha256:da042d9ce36ad53b6806884b92410978f4db9dc0db662c5b1c6b36c8535938f1 +size 1980 diff --git a/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_2.nbt b/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_2.nbt index 075496ec..2f526736 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_2.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1cc4cd74ebf1119212979220471dd6861a1b32e95acc1832cb872a3f20c1dd3 +oid sha256:be1cc4f38c6bc9c1158cb962f5640e2194a1d43c402af43a727a473434923fbc size 2209 diff --git a/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_3.nbt b/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_3.nbt index 0cb20f80..d5ce609f 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_3.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/small_stables/inner_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49e900acbddac20e4b9b3941654d312b8542ef8ce5387f8ed15c93f0f2f25b43 +oid sha256:c85c61cbf78e6ed8da39bf2c190ac27f5f3012e7916adb9588d9993361656ede size 1680 diff --git a/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_0.nbt b/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_0.nbt index d755ab98..17f9c800 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_0.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcfd3ffb221a552abbbd01b5c71d1866439a6d83bfb7a33a80cc54e4164718b2 +oid sha256:c6616a2a68aeaeed2dc890437be1af0ca5ab3ccd098c8e461c0f372596b07090 size 2137 diff --git a/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_1.nbt index 53335e92..40646960 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1abc26f6bc83e46dd6e631be7b87962644157e579743e72cbb3e5605984645f +oid sha256:7f08fd26c57eaf2adfa287c18696001bc523bbb934c637bf7cc9cdac93f77b33 size 2064 diff --git a/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_2.nbt b/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_2.nbt index 2db26339..c4c5ff65 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_2.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbc9f68f8b56b3fa15c156adf5828277410fa85f889060c672827279f12d34ff +oid sha256:3a1ceb14388769f34fa9705bbe427daa124eed0bf4b8d268b444650fb7c6d5bd size 2149 diff --git a/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_3.nbt b/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_3.nbt index a1afcfe2..540bc653 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_3.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/small_stables/outer_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a46b605bb387ad5d89f8533555861f0e523e9aa77b1cbe39dd387785111838ca +oid sha256:c262717dbcfec5881f7cf2dfb6fe5a78d6faa8445d9779c6af6e19c86f317c03 size 1849 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_0.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_0.nbt index 2ce519de..c5dcc5b4 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_0.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a5a967d422ef93f290c736501da40786401be471a5e72079f2f693a1a023e5f +oid sha256:dc8974b4adac37a47e783d4b26f86a6fc796b6ce8611bc3ca28133764f84b968 size 4465 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_1.nbt index f9477426..bc8eaeaa 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02df9b9216eed70e718308b8e57c75b6e7fbdd0d0359fbfd1e2341e91e99c670 +oid sha256:d147a01b68977509147433bdee84d5e1efc6cf286e76936b096124ec9ce92d3f size 4274 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_2.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_2.nbt index c80e4be6..83e37b56 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_2.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a8d7544ff8ed02b86e2bf640acb2861e5ed12745afe32bf94d62dbe6e4a402f +oid sha256:f09c989c2caddbb6e31bab4be3c57fbad98bc3650a160bbcc747c49b423cb36d size 4336 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_3.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_3.nbt index d066cdca..5f98698c 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_3.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03f7f7ecef983ade733b2a7c50e515bd5c21ad0f31ac74ee9d4547643af50313 +oid sha256:f7529ec3c1e9b2c46bba22f40c6d99953e39dc0b784ecbc20529b5707da9dc66 size 4497 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_4.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_4.nbt index 14bec0b8..b6677a73 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_4.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_1_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c75239e7fda377f7d679282988491cd5d90b6dc18c65b62764f3b921d97fb22 +oid sha256:2ef35a48e446af1f321dfb03e0aa91da046309ae525a8eb87515896e563689a4 size 4438 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_0.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_0.nbt index 94fd7d37..4f24b4d3 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_0.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58034866aee38de83e9408b8bfac79b01dfe3eb4dd105ef6562efff545ffcad9 +oid sha256:4e405d5fa1e3756e61d9d3f7723d0caf0342837763888f06237f6785037f6e13 size 4413 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_1.nbt index e360dc44..42620183 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4705a57318e912c029163cde634de5c75854ad23fcad84d5abd27617ae1ae40c -size 4333 +oid sha256:bad1fbc50e86ec502ecb2ca5c3f36e6a9a602827448a3ce1b8f90af4c2c4a292 +size 4334 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_2.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_2.nbt index 73110f78..d1f92a83 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_2.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6e3d5684f1025a08a6fe1f4df84e4ed88e776e8f60c7f61db3df1ae80c435f6 +oid sha256:351640893681b10ee769181f3e19880d3bbc5d154227cce920ac16413b0e240d size 4118 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_3.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_3.nbt index 6fefb2e0..53262754 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_3.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0c9cb47f5518dcb1948fd8fb3b2c53f6fe891b337977cf1907ff520b99de261 -size 3301 +oid sha256:c10c4ae3ba180099447784be48ccea8f55a02726d1f4ca1b324a6b2d331cd22f +size 3302 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_4.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_4.nbt index 442293dc..089babd3 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_4.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_2_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61dbf166b1ed4f3fb8feb3471fa672bd8bc3a4091b15153245ce5af354b01fe1 +oid sha256:205cc3532d29d9d14c5ff6f908b2f4e03b4705e9f9873879429afe60e8528642 size 4378 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_0.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_0.nbt index 79cf9e4f..6778ff95 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_0.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9a38f126544fe51d9c0381132ea5a1c2a8f856c106344ec9ab4ffef5f0c44a4 +oid sha256:b2be04e2dc91d410b8b871fccec62fc45327d9a718bd6d6c240487f1c01db5a0 size 4020 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_1.nbt index 0dc9fef5..0e988cee 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6be08ffbd0fb42759e28ca874992dc358b0a6999a7291937e00526ebdc232b5d -size 4004 +oid sha256:8bf14b6ef306594c40f1a3417b2fd446c9402c50e05bf912b6e22fea59836f8b +size 4005 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_2.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_2.nbt index 8bc8159c..c62c8e60 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_2.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8490738a10ae3510a74d8d1edc3b8d4ebd6d99bbcba721be3567f041cad7822 +oid sha256:ca8aa8b38fe0fb464fc894dccae83b80179aae0fe98ecf1745a896531fd4ec20 size 4209 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_3.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_3.nbt index 0eba4366..03281c3e 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_3.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee72d8985c15882bca3808302bc2e86e721af9f4d3981f38e91883be3a7a56ee +oid sha256:27a1742d45734cbaed2b5fdb7977beda9bce35110222a4f3ac0a4c61ffb05214 size 4321 diff --git a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_4.nbt b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_4.nbt index 345bc274..791ca96f 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_4.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/stairs/stairs_3_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb2239baa840a3ae4500cc445dc0dd8cba49cf4d400d4a869910ab71c00b2ff9 -size 2778 +oid sha256:ce4191c51d95207cfec1bdb62f59511f27a8062f7a3342798cfc49e248f68e26 +size 2779 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.nbt index 226f4ac4..ebcba6bb 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8397b44bf73307566d1e766c97111d204c31c0cdc2866daf7ff069ff75d0b2cb +oid sha256:a0e07c17bfe198df7d6e2e8cfb741b60322c924cf098215624b04674b83e68a6 size 4611 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.nbt index 1262461a..c55f3b46 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4feb09b9f6a66b57968ccab8a7123576505593af4dd0396c032054c55d5c49f +oid sha256:412e2ca1cbf4c2d0e105a9223114d1e161e6222db05f532c6279033856dcfb3c size 4626 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.nbt index 9615ae03..5651db5c 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d06db246f386e4bc012ab61d641295cac0f4f3a6f7d84992380cac10d43a8353 +oid sha256:7b707d97a083f149d02fc370fa301b0f414e4a8d7b68a8bb7d959ebc9f5d9f98 size 4543 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.nbt index dd087586..e39c351a 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5b758fa67ab10027bea53702857d4c5ffc266e61b359034346a696243ca1b69 +oid sha256:93afb46a48b40bfb8d19839f879f0eba8962454a07d975c9b2e5da8ffabded3e size 4741 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.nbt index d9d1021b..d5dffc7f 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d79c37f6ba39096214ab38d9485c657490e431e08a0a5200c03005180a621a6e -size 4590 +oid sha256:183447caff4b35b0653219787ce1fa6747e254d7b3e4fb046f4b1ec775026280 +size 4591 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_0.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_0.nbt index b4fefe50..a4e0ace4 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_0.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df62ed4bd7d4fd18cdceddb215e23f87d545136a928bcb88017727efe6a0e7c1 +oid sha256:cf99a75e4293f46c0147c927146f93c91816d546ebc2c070874d6f933172a5d6 size 4627 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_1.nbt index 1709013c..3397770e 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98d5b9f7dc45f20b2d92e2df3179abc34e72f7cb5f6173ad7e16e139ef6b47fe +oid sha256:8c3fafef36f60370b77f359a8105d5a6884221601a2d4583a89d39b78c46d322 size 4910 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_2.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_2.nbt index a828473b..4c4c8fdd 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_2.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2570c48311713ca4372e22f56fd760513f9304019cf281346d65c1ac89b2d398 -size 4909 +oid sha256:9ef411d694aa9c27ebc6c2df7693bd7a13a8f2e7239cecb3f3595d418d2d5e4a +size 4910 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_3.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_3.nbt index d38aa457..2bf02507 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_3.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee33e3b7baba51fc50e4dcda14d52937f8bb536bfd9c45532e33bfd5311d91ee -size 4915 +oid sha256:4c630b99449cb3d3909bc45f78ab1655e00adc1e40d314823887a7a9db742b48 +size 4916 diff --git a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_4.nbt b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_4.nbt index b1c0d002..03faabe2 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_4.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/starting_pieces/starting_stairs_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d55923d29a980af3d933bb62906098bea73f72e0783a0446fa70118bbe11bf7 -size 4584 +oid sha256:8cedd98ced57bc2f63ace429f99cea0c142dea8da4a6d7458280ce2ec1da65d5 +size 4585 diff --git a/data/minecraft/structure/bastion/hoglin_stable/walls/side_wall_0.nbt b/data/minecraft/structure/bastion/hoglin_stable/walls/side_wall_0.nbt index 17e5a338..7f89785a 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/walls/side_wall_0.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/walls/side_wall_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db43f296fa154f7e9b598b98bd28336500919dfd17dfd83bb34cd8fbe2115fb5 -size 16617 +oid sha256:d0047067442c1785bea74264adec3f031a3c1420f51a6e923c1efca4ae3b02d0 +size 16616 diff --git a/data/minecraft/structure/bastion/hoglin_stable/walls/side_wall_1.nbt b/data/minecraft/structure/bastion/hoglin_stable/walls/side_wall_1.nbt index f0c38e79..8546f6c4 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/walls/side_wall_1.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/walls/side_wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2c792eb500b968932ec8238be120ba66e27f8c011f6a9411ef15d1b19c44683 +oid sha256:c4d72c56e11cc15b025d9c5f50a51f7d225b9013fe6e3fe4f84971cbccb07087 size 17025 diff --git a/data/minecraft/structure/bastion/hoglin_stable/walls/wall_base.nbt b/data/minecraft/structure/bastion/hoglin_stable/walls/wall_base.nbt index d9b23992..038fd8c0 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/walls/wall_base.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/walls/wall_base.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efd276f9dfe3ed396c77026efbaaf3c8d9b7b1678b268fbdef646bd23964a41e -size 16415 +oid sha256:66074d73b74007ea3b67a142b437359a828cd966419a33736173e98171069aa6 +size 16414 diff --git a/data/minecraft/structure/bastion/mobs/crossbow_piglin.nbt b/data/minecraft/structure/bastion/mobs/crossbow_piglin.nbt index 8104c6d7..90d2e092 100644 --- a/data/minecraft/structure/bastion/mobs/crossbow_piglin.nbt +++ b/data/minecraft/structure/bastion/mobs/crossbow_piglin.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d6c179d5f30e46c2ff3e0cb76ba17a4d22533cf06c0190fa8cddd00972873aa -size 683 +oid sha256:ce24d71bed2a07284f9d4f96d0a316ae67418a060f6a2e6a169d6dd29f9de687 +size 684 diff --git a/data/minecraft/structure/bastion/mobs/empty.nbt b/data/minecraft/structure/bastion/mobs/empty.nbt index 9ae34adb..8119e8eb 100644 --- a/data/minecraft/structure/bastion/mobs/empty.nbt +++ b/data/minecraft/structure/bastion/mobs/empty.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7a6f3430e7cae3ee9717c418299f13f181050f4f51cafac15a949066f0f7e48 +oid sha256:2e09ae428d23cda8b1abf8d7cefff987f608c5d3cc426efa2472da1aba5839ce size 228 diff --git a/data/minecraft/structure/bastion/mobs/hoglin.nbt b/data/minecraft/structure/bastion/mobs/hoglin.nbt index aa6ddced..71a1ac2f 100644 --- a/data/minecraft/structure/bastion/mobs/hoglin.nbt +++ b/data/minecraft/structure/bastion/mobs/hoglin.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be8828a48b4e4710101000a49242c308109dc47da50fec0d50e78072bcca774a -size 706 +oid sha256:06b0d9ba5efa3c1b41efd1ebf1942ca0491fd535edd7b78922e5708785479c93 +size 705 diff --git a/data/minecraft/structure/bastion/mobs/melee_piglin.nbt b/data/minecraft/structure/bastion/mobs/melee_piglin.nbt index c59fa584..9519bc51 100644 --- a/data/minecraft/structure/bastion/mobs/melee_piglin.nbt +++ b/data/minecraft/structure/bastion/mobs/melee_piglin.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92c411a4eb82275726cad7e32dde1863a25577ca6e1a3065247f0f4fb35dc81e +oid sha256:3815108611ff30aa3b11cb62beae13a23b64db39d247b0e914ee3746ca494f53 size 651 diff --git a/data/minecraft/structure/bastion/mobs/melee_piglin_always.nbt b/data/minecraft/structure/bastion/mobs/melee_piglin_always.nbt index 7ba206c3..05268a73 100644 --- a/data/minecraft/structure/bastion/mobs/melee_piglin_always.nbt +++ b/data/minecraft/structure/bastion/mobs/melee_piglin_always.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07f304e4a7707f70796187805d8c79336fed7a2427aad6de01e43e4f17e44430 +oid sha256:f93fd1337033d07d44ecca552e16d77b91a8cf95b822ac7fcf80d7cfa9050e22 size 644 diff --git a/data/minecraft/structure/bastion/mobs/sword_piglin.nbt b/data/minecraft/structure/bastion/mobs/sword_piglin.nbt index 652b8671..02ba5e36 100644 --- a/data/minecraft/structure/bastion/mobs/sword_piglin.nbt +++ b/data/minecraft/structure/bastion/mobs/sword_piglin.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fcb4bd256ab49c4fe571fffea3a75ce8ef0c7b79c4cdef8f56b2cdb9add16df +oid sha256:c46dbcc4f1746102e6a584226aa19d0a66faf36fc2aaf0b4c0711ffd33f0416a size 690 diff --git a/data/minecraft/structure/bastion/treasure/bases/centers/center_0.nbt b/data/minecraft/structure/bastion/treasure/bases/centers/center_0.nbt index 8409575f..896c43a5 100644 --- a/data/minecraft/structure/bastion/treasure/bases/centers/center_0.nbt +++ b/data/minecraft/structure/bastion/treasure/bases/centers/center_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f8744a9c94377a604d000cabd5cf0885f119339c5b237560b7093b5d0fe26bd +oid sha256:7c111db1d533aa90d4317594ac55ea47d5f3df011351f9c98c814c5c78f940f8 size 1024 diff --git a/data/minecraft/structure/bastion/treasure/bases/centers/center_1.nbt b/data/minecraft/structure/bastion/treasure/bases/centers/center_1.nbt index 926aa9f6..f963481e 100644 --- a/data/minecraft/structure/bastion/treasure/bases/centers/center_1.nbt +++ b/data/minecraft/structure/bastion/treasure/bases/centers/center_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd97175eb47121edfbf8fcc97689b5cfbba660611e4d980b6bf7154287ed19fc +oid sha256:d2217b6a80f17662b893b2811dc909dd557477d2aa63feb13ef6709872ffdcfb size 959 diff --git a/data/minecraft/structure/bastion/treasure/bases/centers/center_2.nbt b/data/minecraft/structure/bastion/treasure/bases/centers/center_2.nbt index f33c9bf1..8a905d7a 100644 --- a/data/minecraft/structure/bastion/treasure/bases/centers/center_2.nbt +++ b/data/minecraft/structure/bastion/treasure/bases/centers/center_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:193ec8c4face5f6b7bf968d3445c49c1ecb6ac62ae884249957c9bc648a2164a -size 1075 +oid sha256:3e9231f90974ded199ac6ac4b19ada9b8148bcd0dcc6d29da51716c9bab96fda +size 1074 diff --git a/data/minecraft/structure/bastion/treasure/bases/centers/center_3.nbt b/data/minecraft/structure/bastion/treasure/bases/centers/center_3.nbt index ebe58502..df123c22 100644 --- a/data/minecraft/structure/bastion/treasure/bases/centers/center_3.nbt +++ b/data/minecraft/structure/bastion/treasure/bases/centers/center_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fb5b95320fbd14eaef05fdd151f55e7575962837d370323d1a0f2a624ac220e +oid sha256:d7daec1b62176801ef58ff8b817a82945abba2d4cf0b45890386774dce5eeac8 size 735 diff --git a/data/minecraft/structure/bastion/treasure/bases/lava_basin.nbt b/data/minecraft/structure/bastion/treasure/bases/lava_basin.nbt index a07b39da..0218f31f 100644 --- a/data/minecraft/structure/bastion/treasure/bases/lava_basin.nbt +++ b/data/minecraft/structure/bastion/treasure/bases/lava_basin.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10a84db36fd57d0e6c63bfefea5d3aea9ae33590595030db240bea3be35ae6e4 -size 6584 +oid sha256:8523b4405911bf3b8d67247194416a30e8c27934ed42b245718bf053af947f18 +size 6583 diff --git a/data/minecraft/structure/bastion/treasure/big_air_full.nbt b/data/minecraft/structure/bastion/treasure/big_air_full.nbt index e6ad4fe3..b3897c13 100644 --- a/data/minecraft/structure/bastion/treasure/big_air_full.nbt +++ b/data/minecraft/structure/bastion/treasure/big_air_full.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e2054862ba0cd707efbdeeea72c3b510231fdd55a8393d897edcd716962198f +oid sha256:186bb361d853743a2d7fed0609763747f41c01e5f33d3a8dffdea71ba4d7b023 size 69673 diff --git a/data/minecraft/structure/bastion/treasure/brains/center_brain.nbt b/data/minecraft/structure/bastion/treasure/brains/center_brain.nbt index a4a4decc..6db49a58 100644 --- a/data/minecraft/structure/bastion/treasure/brains/center_brain.nbt +++ b/data/minecraft/structure/bastion/treasure/brains/center_brain.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39bff776c2ac53c6122253674cf0b48312443d93b698997f9defd5872e512c09 -size 415 +oid sha256:9a89022283879b7d188bcbe921396f3cd96830124a52293917cf9d75104f02d8 +size 416 diff --git a/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_middle.nbt b/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_middle.nbt index 10882504..0c0af79c 100644 --- a/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_middle.nbt +++ b/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_middle.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54c5caa9146f718d41639539bad82a01b53449bb16d75a976d3dbedb8f2e435c +oid sha256:49b0e8f51de8987fb623443e1d1b51f8db786a360b48e10b24c1d9023615fd5b size 287 diff --git a/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_top.nbt b/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_top.nbt index ca3e5540..8ff93c78 100644 --- a/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_top.nbt +++ b/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_top.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e40564a5205f338ecb6d0a226a188c2349893cd8124b748ef371df492839009 +oid sha256:e001c3ce424faea037c7d0646dc56a0435ed0527ebb777f247b2d851635b91c0 size 286 diff --git a/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_top_entrance.nbt b/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_top_entrance.nbt index 31b57a1c..b8e19c4b 100644 --- a/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_top_entrance.nbt +++ b/data/minecraft/structure/bastion/treasure/connectors/center_to_wall_top_entrance.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc54bcdb7830aecec1e1f15a05d76e0e7603b97b6605c373ba90a77a00f6b6ef +oid sha256:1376b07077a81088f6a6c6101c65aaa18321769e0bef0da099f925d40a04c4dc size 290 diff --git a/data/minecraft/structure/bastion/treasure/corners/bottom/corner_0.nbt b/data/minecraft/structure/bastion/treasure/corners/bottom/corner_0.nbt index 16a158c8..4e5636cd 100644 --- a/data/minecraft/structure/bastion/treasure/corners/bottom/corner_0.nbt +++ b/data/minecraft/structure/bastion/treasure/corners/bottom/corner_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e012b9f96c7da755a69c3270b230f63bf7f6c7b8893bf2e496a0018f16691755 -size 1684 +oid sha256:fb6299529fc61f5c3ce3cb7ef7ff653d7896fcd1189213a36da6dff42ffb502f +size 1685 diff --git a/data/minecraft/structure/bastion/treasure/corners/bottom/corner_1.nbt b/data/minecraft/structure/bastion/treasure/corners/bottom/corner_1.nbt index dcd654d8..b1aa3729 100644 --- a/data/minecraft/structure/bastion/treasure/corners/bottom/corner_1.nbt +++ b/data/minecraft/structure/bastion/treasure/corners/bottom/corner_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fac98a30a6a885f5ba8e59a3d2098f21ac2db458470c16b0f8ce1147d9ff1fe7 +oid sha256:ea8376a4f1786f4c94cc4243aabcb06f2fc847394ca12ef4ec9c2c826c6c1a87 size 1680 diff --git a/data/minecraft/structure/bastion/treasure/corners/edges/bottom.nbt b/data/minecraft/structure/bastion/treasure/corners/edges/bottom.nbt index 298932c8..aa2b8e1e 100644 --- a/data/minecraft/structure/bastion/treasure/corners/edges/bottom.nbt +++ b/data/minecraft/structure/bastion/treasure/corners/edges/bottom.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d13fdb1acd34f8d2cc2506e66a39ff313f26d8c2417922ed2cd304e068815fde +oid sha256:03757887f587fd5c58fd1277f85c2a7b0e89d39aa37c9c8d8667fbb5110d3c55 size 450 diff --git a/data/minecraft/structure/bastion/treasure/corners/edges/middle.nbt b/data/minecraft/structure/bastion/treasure/corners/edges/middle.nbt index 801df979..58243b36 100644 --- a/data/minecraft/structure/bastion/treasure/corners/edges/middle.nbt +++ b/data/minecraft/structure/bastion/treasure/corners/edges/middle.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10c7f245a08fb6f57ef220076e1e8ac03ed4e947fa5e54af99865b06c19d2cec +oid sha256:fa114fa5c15694bdd7f8d83474d55ef6a81a9857e416add18cf330c272fb2d34 size 440 diff --git a/data/minecraft/structure/bastion/treasure/corners/edges/top.nbt b/data/minecraft/structure/bastion/treasure/corners/edges/top.nbt index 2045a54f..e3028421 100644 --- a/data/minecraft/structure/bastion/treasure/corners/edges/top.nbt +++ b/data/minecraft/structure/bastion/treasure/corners/edges/top.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f109b49db3cbd3dc8970b4f1860239a9c830290699f13ea60958dcc781b102a1 +oid sha256:63ca9e12b4f342b0ed4adc961c7f7661559161f41a126c7bff0dd97a8448121b size 456 diff --git a/data/minecraft/structure/bastion/treasure/corners/middle/corner_0.nbt b/data/minecraft/structure/bastion/treasure/corners/middle/corner_0.nbt index d7361e7d..8ad353c3 100644 --- a/data/minecraft/structure/bastion/treasure/corners/middle/corner_0.nbt +++ b/data/minecraft/structure/bastion/treasure/corners/middle/corner_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f474bb227ab1429e6a57a0b72d8757738ef923714487a40e3ce307f7a1d78f9 +oid sha256:a1abd2ac0875e818c3db41d6e24b08f7458f2b15bfbde92dd7a4d295923979e5 size 1585 diff --git a/data/minecraft/structure/bastion/treasure/corners/middle/corner_1.nbt b/data/minecraft/structure/bastion/treasure/corners/middle/corner_1.nbt index fe24e4af..add9085d 100644 --- a/data/minecraft/structure/bastion/treasure/corners/middle/corner_1.nbt +++ b/data/minecraft/structure/bastion/treasure/corners/middle/corner_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdd8bb9dbff7a51e673db904ea4e31fd5ccb1ce1c78d31aa05aaae2d4510deb5 -size 1537 +oid sha256:0f7e177d317c27deada7ad0b58c1fa172949e23d01327f3f9fb119f6f13a488b +size 1538 diff --git a/data/minecraft/structure/bastion/treasure/corners/top/corner_0.nbt b/data/minecraft/structure/bastion/treasure/corners/top/corner_0.nbt index 40b75f0b..6caa119e 100644 --- a/data/minecraft/structure/bastion/treasure/corners/top/corner_0.nbt +++ b/data/minecraft/structure/bastion/treasure/corners/top/corner_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e0ec6781d702eb55789716f5d6697ab5c68bc319ed2fd85155f9f5c7b9ff4d3 +oid sha256:4b05fffb5ca44fc11b86c070aa3433f77a7397efc6e8b9a88f35d3aff56d1777 size 1553 diff --git a/data/minecraft/structure/bastion/treasure/corners/top/corner_1.nbt b/data/minecraft/structure/bastion/treasure/corners/top/corner_1.nbt index 852548b8..b9a18fbf 100644 --- a/data/minecraft/structure/bastion/treasure/corners/top/corner_1.nbt +++ b/data/minecraft/structure/bastion/treasure/corners/top/corner_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d5ab2b97721d82ebcd897ba1c1f84b4fa21ab123ea2c2566a786d9625aa530d -size 1572 +oid sha256:47182901008f437a4e6990b9f3e88b59f71301805fe2f5ad4f3f3a1a55fce523 +size 1573 diff --git a/data/minecraft/structure/bastion/treasure/entrances/entrance_0.nbt b/data/minecraft/structure/bastion/treasure/entrances/entrance_0.nbt index 81c9f2af..baf5d5ed 100644 --- a/data/minecraft/structure/bastion/treasure/entrances/entrance_0.nbt +++ b/data/minecraft/structure/bastion/treasure/entrances/entrance_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77b00e676128083bfe95b61fec513016450c15434e4ddc3bd3248e6303f8101d +oid sha256:47d144f7ddd7b83acefd3a343d2b4b1f2ecb06ae3f6af5c203e12661256d9a47 size 11196 diff --git a/data/minecraft/structure/bastion/treasure/extensions/empty.nbt b/data/minecraft/structure/bastion/treasure/extensions/empty.nbt index a9cc97a2..daefc55c 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/empty.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/empty.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:514a132b4037fb5bbb42df49d4e8236189cafecb2d958d2620be64440383af4b +oid sha256:ae28d82c55ecbbd20a9cc1ed269c2b3206094047dbf0f6af41c28b8cf67ecdc4 size 232 diff --git a/data/minecraft/structure/bastion/treasure/extensions/fire_room.nbt b/data/minecraft/structure/bastion/treasure/extensions/fire_room.nbt index d33382dc..04b7c23e 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/fire_room.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/fire_room.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b495b254b23f2251e463433772ffe80c67f10a7b7e5f844c72fa8a7a1cddf24 +oid sha256:9c8c459d153fe5ba2165e87e9f05674c23b7493f1f765790ec3dae3887cd4df1 size 1866 diff --git a/data/minecraft/structure/bastion/treasure/extensions/house_0.nbt b/data/minecraft/structure/bastion/treasure/extensions/house_0.nbt index 8443f5eb..be1a8450 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/house_0.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/house_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b88566fd619fc375cc3f50a0df643932b8a3508560deceeeabedd799848f561 -size 2076 +oid sha256:530c179b815416da0f5cad50f6a02a1f09f950054aab05615c3105e0c087a9c9 +size 2078 diff --git a/data/minecraft/structure/bastion/treasure/extensions/house_1.nbt b/data/minecraft/structure/bastion/treasure/extensions/house_1.nbt index 0c43caf4..2d2d05d0 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/house_1.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fa9902485a5d64a20494977083158d14d2de3ba91472164e66814ec9d791fe2 -size 2158 +oid sha256:f005e43d28bff3919a0f36244885098a34490842c66ed75f9877dc32b171f01b +size 2159 diff --git a/data/minecraft/structure/bastion/treasure/extensions/large_bridge_0.nbt b/data/minecraft/structure/bastion/treasure/extensions/large_bridge_0.nbt index 20eef6eb..87f41e13 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/large_bridge_0.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/large_bridge_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24847cc98d48c2fc2bea0bbc6e7b37d8e51940b0dd41762fdd5ea5d0f0a8ea25 +oid sha256:b2a851c62b0523c294df4c8f10434dece4dbdcf40ec1b67c58f448a5f0825525 size 455 diff --git a/data/minecraft/structure/bastion/treasure/extensions/large_bridge_1.nbt b/data/minecraft/structure/bastion/treasure/extensions/large_bridge_1.nbt index 55768e38..34ade502 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/large_bridge_1.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/large_bridge_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c2ced0f85b28583ebc843a1707e3aa8587f44d201b379739c00185918ebac51 +oid sha256:a6b800962066d6a9b514fded1610cb4a05b94d0d36a8a02aad6d96e323f6e1c0 size 418 diff --git a/data/minecraft/structure/bastion/treasure/extensions/large_bridge_2.nbt b/data/minecraft/structure/bastion/treasure/extensions/large_bridge_2.nbt index 622a488c..c412451a 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/large_bridge_2.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/large_bridge_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3ec013ec3b850b056b81ce1f0c011dbc7a255139bd389ae9b4ae1a9e76ca9cc +oid sha256:205fe27155a0d3bb4ba518de7b4a414b6b1693fb4dac4374c03c4608572a4e6a size 538 diff --git a/data/minecraft/structure/bastion/treasure/extensions/large_bridge_3.nbt b/data/minecraft/structure/bastion/treasure/extensions/large_bridge_3.nbt index a9e96ea4..76cb6522 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/large_bridge_3.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/large_bridge_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bd4bb069f9630821f002ddc0f055809abe1bb52bfebcd89481eae0ef3fd32bd +oid sha256:5a40a13360e8ff8f370687e4fa21879f37ff3d1fcb583c1238733e6b02568431 size 615 diff --git a/data/minecraft/structure/bastion/treasure/extensions/roofed_bridge.nbt b/data/minecraft/structure/bastion/treasure/extensions/roofed_bridge.nbt index 933dd35e..718cc99f 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/roofed_bridge.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/roofed_bridge.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cdba4c698e2e7b42102ea6bf6e5f16e02d9800012d98e18db636eb302131b60 -size 641 +oid sha256:d9d47775db394f4bf9a7bde0448ef7e27c55a2e4d454aca226a82c64b5d0ac99 +size 642 diff --git a/data/minecraft/structure/bastion/treasure/extensions/small_bridge_0.nbt b/data/minecraft/structure/bastion/treasure/extensions/small_bridge_0.nbt index 4f6b0d86..7fe2b71e 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/small_bridge_0.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/small_bridge_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f8ce7dedc639b9f9b0b8de53113c4960a88305415de179b19f2cbd3007f87e4 +oid sha256:f3f96f0778ec91d3d936fe16934e3ad55b594c5f4d35e2cde0b440cbee234691 size 320 diff --git a/data/minecraft/structure/bastion/treasure/extensions/small_bridge_1.nbt b/data/minecraft/structure/bastion/treasure/extensions/small_bridge_1.nbt index be2cc3c5..3cb0aca9 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/small_bridge_1.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/small_bridge_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3b605320aae810240ae7ee8e0f470b80c859a0d177a40a45c67f1f262759a15 +oid sha256:3b4079800519c8b99edf3c2d696e69ecc84475cf5d77fab52553478e237278c4 size 390 diff --git a/data/minecraft/structure/bastion/treasure/extensions/small_bridge_2.nbt b/data/minecraft/structure/bastion/treasure/extensions/small_bridge_2.nbt index a4774257..b999614b 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/small_bridge_2.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/small_bridge_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:310929d0c9ace48c9b9e88e86051a8b415d71861f8c9e7f1a39021ab08460344 -size 348 +oid sha256:d340d35eb76faee8d53ea02e0817a75453e2ebb54eebd63ff78079b6beeab2c1 +size 349 diff --git a/data/minecraft/structure/bastion/treasure/extensions/small_bridge_3.nbt b/data/minecraft/structure/bastion/treasure/extensions/small_bridge_3.nbt index d0eaddfc..fd8512a4 100644 --- a/data/minecraft/structure/bastion/treasure/extensions/small_bridge_3.nbt +++ b/data/minecraft/structure/bastion/treasure/extensions/small_bridge_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5123d15c0df2b5081b7d100bfdefb06f40213ce626191afa9b844e29d57957bd +oid sha256:04bf148958c090859d19622386d51da0bc109c1c711fabc32d1c526550e113ab size 479 diff --git a/data/minecraft/structure/bastion/treasure/ramparts/bottom_wall_0.nbt b/data/minecraft/structure/bastion/treasure/ramparts/bottom_wall_0.nbt index bd9e0cf9..8ea19c07 100644 --- a/data/minecraft/structure/bastion/treasure/ramparts/bottom_wall_0.nbt +++ b/data/minecraft/structure/bastion/treasure/ramparts/bottom_wall_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e151dbcdfc40a803a9d966e71bacaff99962e69850e6ec4101c093554f3a5a4 -size 11779 +oid sha256:199fa5b8a88a94233ec1bc9a2c4cd3b3929f46a9796140b48c012d0158980e58 +size 11780 diff --git a/data/minecraft/structure/bastion/treasure/ramparts/lava_basin_main.nbt b/data/minecraft/structure/bastion/treasure/ramparts/lava_basin_main.nbt index 8b874e52..e78b2513 100644 --- a/data/minecraft/structure/bastion/treasure/ramparts/lava_basin_main.nbt +++ b/data/minecraft/structure/bastion/treasure/ramparts/lava_basin_main.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d906ca168d4949d3ec57ed33e76b4a86b98f59f9bbdfec84354fb9b20a44cb0c +oid sha256:fd7aea849ec9920817f475af4fb949f53aae323cd4e0f571da74981c87bb3b28 size 24168 diff --git a/data/minecraft/structure/bastion/treasure/ramparts/lava_basin_side.nbt b/data/minecraft/structure/bastion/treasure/ramparts/lava_basin_side.nbt index f04c3316..2de08c5e 100644 --- a/data/minecraft/structure/bastion/treasure/ramparts/lava_basin_side.nbt +++ b/data/minecraft/structure/bastion/treasure/ramparts/lava_basin_side.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:046861b68885eb5a533813e5e0c8b09ed5a880d70339153116b5113b2eb07d0e +oid sha256:8da578bf14f735dfc1d23eafee05be9bf6457c14a5f2f8eef8c87439751569b0 size 23969 diff --git a/data/minecraft/structure/bastion/treasure/ramparts/mid_wall_main.nbt b/data/minecraft/structure/bastion/treasure/ramparts/mid_wall_main.nbt index 35d1ca25..ace12d2d 100644 --- a/data/minecraft/structure/bastion/treasure/ramparts/mid_wall_main.nbt +++ b/data/minecraft/structure/bastion/treasure/ramparts/mid_wall_main.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33db991ac4fe4be80ea13d7e283f9d495c4d35eab76ba7cfde680b59ef8146d2 +oid sha256:da26d3993daf17d5bfad13bf780fd95cd203ea87e289fef8d164b16e9b9011fc size 18998 diff --git a/data/minecraft/structure/bastion/treasure/ramparts/mid_wall_side.nbt b/data/minecraft/structure/bastion/treasure/ramparts/mid_wall_side.nbt index 8b2f3348..86ece26f 100644 --- a/data/minecraft/structure/bastion/treasure/ramparts/mid_wall_side.nbt +++ b/data/minecraft/structure/bastion/treasure/ramparts/mid_wall_side.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d61c2ee1a2e1ba35ce51d2facc1f27989f796c4bf2b73e8aed058a5efcc37868 -size 18146 +oid sha256:dffd928abd650a13f15af8563077e01328d10431a1fd9367016c974f4c84923f +size 18145 diff --git a/data/minecraft/structure/bastion/treasure/ramparts/top_wall.nbt b/data/minecraft/structure/bastion/treasure/ramparts/top_wall.nbt index ef9a7abc..1e523ea2 100644 --- a/data/minecraft/structure/bastion/treasure/ramparts/top_wall.nbt +++ b/data/minecraft/structure/bastion/treasure/ramparts/top_wall.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb375c900a3d1f02f0f98ca6ed3c0e228fbe9e93c5dda06bdce3d11ed804a532 +oid sha256:0f00c76d2f4634f0e28e8f652eff0042beebe709097d5a887ab2f9127e53732f size 9860 diff --git a/data/minecraft/structure/bastion/treasure/roofs/center_roof.nbt b/data/minecraft/structure/bastion/treasure/roofs/center_roof.nbt index 5fe9bf06..56a54af2 100644 --- a/data/minecraft/structure/bastion/treasure/roofs/center_roof.nbt +++ b/data/minecraft/structure/bastion/treasure/roofs/center_roof.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff2473ee384f5d5fab127a81e41d3c358ba3e5f1473653c18a59dab98e47f2ea +oid sha256:7cbb849cf214ed20e3b56e586ac08b636334aa89c4ff4d08f43b37c2aa588007 size 3445 diff --git a/data/minecraft/structure/bastion/treasure/roofs/corner_roof.nbt b/data/minecraft/structure/bastion/treasure/roofs/corner_roof.nbt index edaa8afd..13561d1a 100644 --- a/data/minecraft/structure/bastion/treasure/roofs/corner_roof.nbt +++ b/data/minecraft/structure/bastion/treasure/roofs/corner_roof.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ba00f17b65a75a2c6f241e5ab60b5bcb6b997ff074ebb36da598a137a8340a5 +oid sha256:0e214a5e2da6006215bd882a7649ca28f5bbace572e8e20bb48d87510c6d315a size 425 diff --git a/data/minecraft/structure/bastion/treasure/roofs/wall_roof.nbt b/data/minecraft/structure/bastion/treasure/roofs/wall_roof.nbt index 2531a207..7a2ff9ee 100644 --- a/data/minecraft/structure/bastion/treasure/roofs/wall_roof.nbt +++ b/data/minecraft/structure/bastion/treasure/roofs/wall_roof.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb4680dc8459c6022ef6468eccc501dae17d110a2398787f3a3c85c02103d40b +oid sha256:d4f7c8d14ec497c95d48b845e246117b87e3d4d581d973f8cbb51386f8bd411e size 991 diff --git a/data/minecraft/structure/bastion/treasure/stairs/lower_stairs.nbt b/data/minecraft/structure/bastion/treasure/stairs/lower_stairs.nbt index 024fc856..fdefdc69 100644 --- a/data/minecraft/structure/bastion/treasure/stairs/lower_stairs.nbt +++ b/data/minecraft/structure/bastion/treasure/stairs/lower_stairs.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7514a8506206e33690f33e7bcd13a96c979e6b68f2760e75a888fa9a3ab9d993 -size 446 +oid sha256:9f2ab72514f81439e127e6e786859159e2112cb354756e6337ae8b49ec613bfd +size 447 diff --git a/data/minecraft/structure/bastion/treasure/walls/bottom/wall_0.nbt b/data/minecraft/structure/bastion/treasure/walls/bottom/wall_0.nbt index c941b6db..95fd292c 100644 --- a/data/minecraft/structure/bastion/treasure/walls/bottom/wall_0.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/bottom/wall_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4dde0cbe9ba2a11c23cc0ea63e8c994f68742a200d6730179ea39e0b39f2d745 +oid sha256:1bbc5356df5e46339b81a9a257ab4feb521dc9d1920c12891ca8b6c312c5b278 size 6611 diff --git a/data/minecraft/structure/bastion/treasure/walls/bottom/wall_1.nbt b/data/minecraft/structure/bastion/treasure/walls/bottom/wall_1.nbt index 86a58a38..60ddc77f 100644 --- a/data/minecraft/structure/bastion/treasure/walls/bottom/wall_1.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/bottom/wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:561d857965acd0ce395aba8a123edcad3cec2688c587974ada76fd63c72f7b00 +oid sha256:a1681513e167eefd7579a52d194512d9c22ba99434295fddffe670259e3cd3eb size 6499 diff --git a/data/minecraft/structure/bastion/treasure/walls/bottom/wall_2.nbt b/data/minecraft/structure/bastion/treasure/walls/bottom/wall_2.nbt index dc0748b3..081eb676 100644 --- a/data/minecraft/structure/bastion/treasure/walls/bottom/wall_2.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/bottom/wall_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8a75b42e8e37e5e35d2ac6e7c73e353e58bc675c5605863ed707ce1bc5dfa73 +oid sha256:a151b8241c6447ca764cc609934be77e6e374de890f78b0932f3514d614f24d9 size 6442 diff --git a/data/minecraft/structure/bastion/treasure/walls/bottom/wall_3.nbt b/data/minecraft/structure/bastion/treasure/walls/bottom/wall_3.nbt index d6997d8a..46052c6c 100644 --- a/data/minecraft/structure/bastion/treasure/walls/bottom/wall_3.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/bottom/wall_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1177079082c08cec9f70750bd8de344f2ee14e2bbeb1e09243ecb587e3482098 +oid sha256:d95cd9f66b3c8c1f75c85a5f062ed75256efaf1b15ad3f149ce3800a87124adf size 6489 diff --git a/data/minecraft/structure/bastion/treasure/walls/entrance_wall.nbt b/data/minecraft/structure/bastion/treasure/walls/entrance_wall.nbt index fd625059..5f80473f 100644 --- a/data/minecraft/structure/bastion/treasure/walls/entrance_wall.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/entrance_wall.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd4ddb56cb5c6a7f7648c6bd9f75666f83ea67b288b728c8a3343d5c4709a174 +oid sha256:a63bbcf684102933879eb68f397dc6678736cada271c569d106d72823360e4c2 size 2678 diff --git a/data/minecraft/structure/bastion/treasure/walls/lava_wall.nbt b/data/minecraft/structure/bastion/treasure/walls/lava_wall.nbt index b1d0fbae..a96c380d 100644 --- a/data/minecraft/structure/bastion/treasure/walls/lava_wall.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/lava_wall.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e92ef37140437c6f01b9b7c2417a3bc30fafe871d8b494255b8b6fe1ac464659 +oid sha256:30998c0d321af565ed7dab2d73db5fa1b06f1d4db5143e6c3191e1fff156bf2b size 2798 diff --git a/data/minecraft/structure/bastion/treasure/walls/mid/wall_0.nbt b/data/minecraft/structure/bastion/treasure/walls/mid/wall_0.nbt index dc2c28af..2c9c54d0 100644 --- a/data/minecraft/structure/bastion/treasure/walls/mid/wall_0.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/mid/wall_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a74ee004b15e7b51873801205f3b4029d6994eecb40ea299e41bdd6e76e467d -size 6296 +oid sha256:f9cc50631fe766ff0a0b3c7b9fe6ca53b657cfaf03f79018fb58d2b640878b08 +size 6295 diff --git a/data/minecraft/structure/bastion/treasure/walls/mid/wall_1.nbt b/data/minecraft/structure/bastion/treasure/walls/mid/wall_1.nbt index cf0448bd..7fe5cff5 100644 --- a/data/minecraft/structure/bastion/treasure/walls/mid/wall_1.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/mid/wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:916b78bdc0f68dd8303528620feeebd9cd494d269dc4ac9e5347d69ca0371f42 +oid sha256:ab719ea2b269ffd29770dafb1e0b27473c8ca7eeab5df4ece387ebd3a641e8db size 6152 diff --git a/data/minecraft/structure/bastion/treasure/walls/mid/wall_2.nbt b/data/minecraft/structure/bastion/treasure/walls/mid/wall_2.nbt index edd983f1..762b038e 100644 --- a/data/minecraft/structure/bastion/treasure/walls/mid/wall_2.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/mid/wall_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c73968770fe40bf6b1bb1f68035b9cb5b315a9d9d4f680aee9c4b0249ff446e7 +oid sha256:bf0fee2964fc096e2a4c4224f69e7e79e5308eedc055bc548712abc50f703cdc size 6174 diff --git a/data/minecraft/structure/bastion/treasure/walls/outer/bottom_corner.nbt b/data/minecraft/structure/bastion/treasure/walls/outer/bottom_corner.nbt index db50679a..beb11e50 100644 --- a/data/minecraft/structure/bastion/treasure/walls/outer/bottom_corner.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/outer/bottom_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef05f5476993ba92e8aac3c4500be13f9c23f11e36b3755bcc445644703c6f95 +oid sha256:eca60d6cd203e3912513965b5b5836041849f100af90f1e2cdd41b2855c50b8f size 781 diff --git a/data/minecraft/structure/bastion/treasure/walls/outer/medium_outer_wall.nbt b/data/minecraft/structure/bastion/treasure/walls/outer/medium_outer_wall.nbt index aaf0f924..8739ea07 100644 --- a/data/minecraft/structure/bastion/treasure/walls/outer/medium_outer_wall.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/outer/medium_outer_wall.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:672cf8777d4a55916f1050a54a29c1369c26bdaed0eff25be7dfa0c201f0eeba +oid sha256:6aa5ff98bfa3eecfbf3f8388161d59527076209ff6ddaba1369c86ec946597b5 size 2332 diff --git a/data/minecraft/structure/bastion/treasure/walls/outer/mid_corner.nbt b/data/minecraft/structure/bastion/treasure/walls/outer/mid_corner.nbt index dce7efcd..83814793 100644 --- a/data/minecraft/structure/bastion/treasure/walls/outer/mid_corner.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/outer/mid_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:709cc3753aa86a161ad0b0f3a238edf86793337fdd3f4ae72881e5cb26d88600 +oid sha256:a0b5c52ab50a2f3b6ba687433f6f3c2115b7cc932ba0beaecbbbfb259265c6af size 714 diff --git a/data/minecraft/structure/bastion/treasure/walls/outer/outer_wall.nbt b/data/minecraft/structure/bastion/treasure/walls/outer/outer_wall.nbt index 94196994..c22a090f 100644 --- a/data/minecraft/structure/bastion/treasure/walls/outer/outer_wall.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/outer/outer_wall.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27aaab62800df1354de8aaa64455dd201bdee19a38427369c4796744851dc545 +oid sha256:e81723f07423f2d157458af73b5f15598acb60d8879d479e9532c7c5efacf0e2 size 2205 diff --git a/data/minecraft/structure/bastion/treasure/walls/outer/tall_outer_wall.nbt b/data/minecraft/structure/bastion/treasure/walls/outer/tall_outer_wall.nbt index d5d1767a..0a9445f5 100644 --- a/data/minecraft/structure/bastion/treasure/walls/outer/tall_outer_wall.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/outer/tall_outer_wall.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbfbc63812032f8b8dbb0bc34f92abdb9ea763567b26b5d4b57e8a82d80a0773 +oid sha256:b8855e23bcb4fc45b77a701f139ebd405acce85a51d949f38d1517ebf466cc3f size 2453 diff --git a/data/minecraft/structure/bastion/treasure/walls/outer/top_corner.nbt b/data/minecraft/structure/bastion/treasure/walls/outer/top_corner.nbt index e83f2de0..f75e8dfa 100644 --- a/data/minecraft/structure/bastion/treasure/walls/outer/top_corner.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/outer/top_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e411a3389068c06e55ab37802631cb1e60032391828c0816e150a24403b40d33 +oid sha256:7e59c62e6e161a62957d5f0219d7419f4536e75a567b303cdb39c91d1d06448b size 805 diff --git a/data/minecraft/structure/bastion/treasure/walls/top/main_entrance.nbt b/data/minecraft/structure/bastion/treasure/walls/top/main_entrance.nbt index a5b88160..fbf8d98b 100644 --- a/data/minecraft/structure/bastion/treasure/walls/top/main_entrance.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/top/main_entrance.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:018784239222594bcbc71d005214cd086ee10faeefd46ca7982f0f6090a20ab1 +oid sha256:0b68305a5a2ba284c69006ef80bc60a9e1a704249ec367f1619fd8108d3587df size 6219 diff --git a/data/minecraft/structure/bastion/treasure/walls/top/wall_0.nbt b/data/minecraft/structure/bastion/treasure/walls/top/wall_0.nbt index 490325b8..40d19cb3 100644 --- a/data/minecraft/structure/bastion/treasure/walls/top/wall_0.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/top/wall_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66a5b41e0b3b65d8fc37ccea373be3e7113753e3b3f0a721f9250415760c466d +oid sha256:5641960054c6e7fbfca1e619644de4930d6dc282e731c0d853352a179397eda9 size 6225 diff --git a/data/minecraft/structure/bastion/treasure/walls/top/wall_1.nbt b/data/minecraft/structure/bastion/treasure/walls/top/wall_1.nbt index dbfb2ec4..109ffaa8 100644 --- a/data/minecraft/structure/bastion/treasure/walls/top/wall_1.nbt +++ b/data/minecraft/structure/bastion/treasure/walls/top/wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0df602b735bf4123020676a72335d5de93f8a6170fe6d0ab06afb5126435930e -size 6217 +oid sha256:079ab8b8f6190e604b89ea92abe93b839d35a8296f15b9fea7b9d43be83060e5 +size 6218 diff --git a/data/minecraft/structure/bastion/units/air_base.nbt b/data/minecraft/structure/bastion/units/air_base.nbt index c5806360..7887002b 100644 --- a/data/minecraft/structure/bastion/units/air_base.nbt +++ b/data/minecraft/structure/bastion/units/air_base.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c1b4cb31b191e6405719090884da6d885273c8f6280e726197e64a59786a220 -size 63630 +oid sha256:69adec0f932e888f27278647c75d9c7e919fb73faabcc65ad6f550c5ee2bfe5e +size 63631 diff --git a/data/minecraft/structure/bastion/units/center_pieces/center_0.nbt b/data/minecraft/structure/bastion/units/center_pieces/center_0.nbt index 4f7f47ae..6f22f0d6 100644 --- a/data/minecraft/structure/bastion/units/center_pieces/center_0.nbt +++ b/data/minecraft/structure/bastion/units/center_pieces/center_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb3c4886d6a0407cfbd1db79ec87c86d9c57190347c744e3e9c3000aec1ab18a +oid sha256:061b0a0f06233823dd34d8f574cac8be233cd2a3ab37db8b80784014b47a7386 size 3082 diff --git a/data/minecraft/structure/bastion/units/center_pieces/center_1.nbt b/data/minecraft/structure/bastion/units/center_pieces/center_1.nbt index cfa58c26..1c947f7d 100644 --- a/data/minecraft/structure/bastion/units/center_pieces/center_1.nbt +++ b/data/minecraft/structure/bastion/units/center_pieces/center_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d342e77b804a436ad746243b2e8be54c78494444eb06b9528bd9909bd637ad29 -size 3292 +oid sha256:6b40b5c9ee5a72480cd7d5d0c1fd154cc40a3a45935c62d6c080602b108624a9 +size 3291 diff --git a/data/minecraft/structure/bastion/units/center_pieces/center_2.nbt b/data/minecraft/structure/bastion/units/center_pieces/center_2.nbt index b2fc3619..194af83c 100644 --- a/data/minecraft/structure/bastion/units/center_pieces/center_2.nbt +++ b/data/minecraft/structure/bastion/units/center_pieces/center_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37befb6a2a47779fe205514f33832b692d83bc41abc836dc1b1dbba5b192528f -size 3358 +oid sha256:9136e08b33ea659d212c4420e0a154f3a769074781f01aee9fa0bcab6f37d759 +size 3357 diff --git a/data/minecraft/structure/bastion/units/edges/edge_0.nbt b/data/minecraft/structure/bastion/units/edges/edge_0.nbt index 14596224..36ce42cb 100644 --- a/data/minecraft/structure/bastion/units/edges/edge_0.nbt +++ b/data/minecraft/structure/bastion/units/edges/edge_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69aa082d8591c2e4fdc5c25955f84236c8e734d6bd40833fe3ddcb9d36c81c26 +oid sha256:fe0ddef6f7dc6e1da6ea3d8c72d6f1e08c0952ffe04b19600be86b96f4a9f1d8 size 2381 diff --git a/data/minecraft/structure/bastion/units/fillers/stage_0.nbt b/data/minecraft/structure/bastion/units/fillers/stage_0.nbt index 79921432..1a5b0b0f 100644 --- a/data/minecraft/structure/bastion/units/fillers/stage_0.nbt +++ b/data/minecraft/structure/bastion/units/fillers/stage_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2aaf1aa403ca459af78f35f08eb3573fbe7b841836e3f64d885330cdd41e729 -size 2453 +oid sha256:0db8b532223b0378f56cb95fd1fc3a68c87a89ce7a99f5de9833d39496aa90b5 +size 2454 diff --git a/data/minecraft/structure/bastion/units/pathways/pathway_0.nbt b/data/minecraft/structure/bastion/units/pathways/pathway_0.nbt index 3b74d89e..f97018b7 100644 --- a/data/minecraft/structure/bastion/units/pathways/pathway_0.nbt +++ b/data/minecraft/structure/bastion/units/pathways/pathway_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e952c7e22d9412c09f024783fcadb95b159aa70f005fffb6a1c3148b0326437 -size 354 +oid sha256:15f8fa3685ada469536d491c46159b37e4eb8066ae6abfade6cdffe412b03364 +size 355 diff --git a/data/minecraft/structure/bastion/units/pathways/pathway_wall_0.nbt b/data/minecraft/structure/bastion/units/pathways/pathway_wall_0.nbt index 4c83902c..8d4efeb9 100644 --- a/data/minecraft/structure/bastion/units/pathways/pathway_wall_0.nbt +++ b/data/minecraft/structure/bastion/units/pathways/pathway_wall_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3bb27dfbab0b6688984ea6f97152487c7adb1aacec0d06a513a80ac506f9cec4 +oid sha256:cc0736c959a26236483bcc02ae0d247538449a76ef9b56a9b71af6366429d753 size 354 diff --git a/data/minecraft/structure/bastion/units/rampart_plates/plate_0.nbt b/data/minecraft/structure/bastion/units/rampart_plates/plate_0.nbt index dad6e93f..23470a51 100644 --- a/data/minecraft/structure/bastion/units/rampart_plates/plate_0.nbt +++ b/data/minecraft/structure/bastion/units/rampart_plates/plate_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f19178c80a4108e2d5e2ab535691dddb2d22871bb436aad2d2ce691e579beac4 -size 3656 +oid sha256:1bed79012925cf03b29849e1ba13e534530068f1dca6df2c85c1aac9ad740fc3 +size 3657 diff --git a/data/minecraft/structure/bastion/units/ramparts/ramparts_0.nbt b/data/minecraft/structure/bastion/units/ramparts/ramparts_0.nbt index 63001b27..d4c77f9d 100644 --- a/data/minecraft/structure/bastion/units/ramparts/ramparts_0.nbt +++ b/data/minecraft/structure/bastion/units/ramparts/ramparts_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:622baeea42d15871b8ea8e0f156614ab5dc4805af5fa56e6d69c5ff568680cf3 -size 23659 +oid sha256:ed82af3db6ae0d3b9f7e005cc175c340c5813543432bfb77008923b101f2815e +size 23658 diff --git a/data/minecraft/structure/bastion/units/ramparts/ramparts_1.nbt b/data/minecraft/structure/bastion/units/ramparts/ramparts_1.nbt index dbc910dd..e8365a60 100644 --- a/data/minecraft/structure/bastion/units/ramparts/ramparts_1.nbt +++ b/data/minecraft/structure/bastion/units/ramparts/ramparts_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1769ba41a4a46adcb9bed79abf1ead421958a97de37adbd1b3287bcbfc1d38b -size 11770 +oid sha256:af6ebb6ebb5045c93483136be24bf9aae065fe3423baa787efaa84d328bf5af6 +size 11769 diff --git a/data/minecraft/structure/bastion/units/ramparts/ramparts_2.nbt b/data/minecraft/structure/bastion/units/ramparts/ramparts_2.nbt index d6b7fb7f..82d16ff6 100644 --- a/data/minecraft/structure/bastion/units/ramparts/ramparts_2.nbt +++ b/data/minecraft/structure/bastion/units/ramparts/ramparts_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:110aa7bc3cca4f81c45618ffba63ed7fb457ba0c093f14671c1812cf0ffb74de +oid sha256:005b2ccf73d3e6f34064d2b7511d16dc6275e60bf908eb6843e5ca3df4a7a8c1 size 6940 diff --git a/data/minecraft/structure/bastion/units/stages/rot/stage_1_0.nbt b/data/minecraft/structure/bastion/units/stages/rot/stage_1_0.nbt index f42c8a6d..7d471182 100644 --- a/data/minecraft/structure/bastion/units/stages/rot/stage_1_0.nbt +++ b/data/minecraft/structure/bastion/units/stages/rot/stage_1_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c9c6422e5735c914ecc6043ac70c8ac05080d9c88cf60c82c0426c9ab930bd4 +oid sha256:2d31cdc8aaf45907a1003ea8522abe8b3f89a91ba89bc269a061e530a553c4eb size 2400 diff --git a/data/minecraft/structure/bastion/units/stages/stage_0_0.nbt b/data/minecraft/structure/bastion/units/stages/stage_0_0.nbt index 204dab1a..086dd457 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_0_0.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_0_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32b05b85a25d4710f951f8eaf5359c9e7be58da9664f6e8bc63699742fc43253 +oid sha256:9512d136fbaa22017b36cedd9bb21e86cc20c75fb89ac7b521259ba9ddfff432 size 2548 diff --git a/data/minecraft/structure/bastion/units/stages/stage_0_1.nbt b/data/minecraft/structure/bastion/units/stages/stage_0_1.nbt index e6c60183..789dcfda 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_0_1.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_0_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85c2eb136e78e9cc8507cb52ecaedb8933074e5859a28f75c4f56b03ff709f6f -size 2612 +oid sha256:e067ff7b2fc1431faf76372300c5eaad8c48c6c7cf5a825e1d1289b00eb089e5 +size 2613 diff --git a/data/minecraft/structure/bastion/units/stages/stage_0_2.nbt b/data/minecraft/structure/bastion/units/stages/stage_0_2.nbt index aee44a49..f4514a9a 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_0_2.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_0_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90fbacc3e1add7317e2dc52e716261641946f1ce66ae0a73f71b75d7ec6bcff2 +oid sha256:cf3d46f539a99c205794e9e8e87e15b4fed256a4a618367f06a035bb399070cb size 2703 diff --git a/data/minecraft/structure/bastion/units/stages/stage_0_3.nbt b/data/minecraft/structure/bastion/units/stages/stage_0_3.nbt index 7957e41b..f295a029 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_0_3.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_0_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03941289efb32b6f068ea168af6d5acc0fd2fe00c7ba81492d1747f00ca89bae +oid sha256:c40b05ccbe61ca84b141488056b6283ea04ac1c49ede8d1430f1c1065c0a139b size 2506 diff --git a/data/minecraft/structure/bastion/units/stages/stage_1_0.nbt b/data/minecraft/structure/bastion/units/stages/stage_1_0.nbt index c6ecb9d4..f085c13f 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_1_0.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_1_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9227767fadb2d80ff430f50be43f2ddfab3f7948744947e9b8fc8dad623cc80 +oid sha256:bfe184e5006aba80f45a693afdc9f4c15ca247debd66f4aba3016f470cba7b00 size 2442 diff --git a/data/minecraft/structure/bastion/units/stages/stage_1_1.nbt b/data/minecraft/structure/bastion/units/stages/stage_1_1.nbt index ec14b74d..ded33d49 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_1_1.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_1_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b211580ec9ccc9dd296007f808a4b80a26400c307d66e07ce360679339080cc4 +oid sha256:59dc9b1ebd5fdb22ea0b2ce1089d77fea9eac8dd0381eba776871b9198c751f7 size 2421 diff --git a/data/minecraft/structure/bastion/units/stages/stage_1_2.nbt b/data/minecraft/structure/bastion/units/stages/stage_1_2.nbt index 5ddddd90..0170335b 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_1_2.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_1_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:039b6819af1e70854894937e1e529788c269a9a1bbe5439c047cb290cec04c40 +oid sha256:15e8bd8e24c3a236c6a676a31108630906a3da5306d5147f69ae417d805268bc size 2509 diff --git a/data/minecraft/structure/bastion/units/stages/stage_1_3.nbt b/data/minecraft/structure/bastion/units/stages/stage_1_3.nbt index f4188cb3..d00703ff 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_1_3.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_1_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8ad1561f0d8d9744258c4af0fd3d00681cdc0183ab5f23eba8dfcf9c375933b +oid sha256:bddc0df35a237c4e1f9b9c3a68cd09246ee01b06f88fbbdd73c9e60e767c308e size 2486 diff --git a/data/minecraft/structure/bastion/units/stages/stage_2_0.nbt b/data/minecraft/structure/bastion/units/stages/stage_2_0.nbt index d5906da4..2268a539 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_2_0.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_2_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e237d212ba2c3b16fa647b326da70e77ba940ec9b160244e85a4a226e63618c +oid sha256:236e730545bc3d7001550fbbf54c2bd7a0f30d92c7c4424b50654f3da05a7efe size 2423 diff --git a/data/minecraft/structure/bastion/units/stages/stage_2_1.nbt b/data/minecraft/structure/bastion/units/stages/stage_2_1.nbt index b348223e..3801d3df 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_2_1.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_2_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c69e7a2421a42c551fe8c933edf7e409e9df38315c248004762da760ec06c3a3 +oid sha256:bdd86a0867cd31d20b6b90c73dfc967593eec06dd0ef9f7ff3b7090acd55568a size 2460 diff --git a/data/minecraft/structure/bastion/units/stages/stage_3_0.nbt b/data/minecraft/structure/bastion/units/stages/stage_3_0.nbt index 4a25943a..e01a86c4 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_3_0.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_3_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39db5c41fd6f57613001fe77b3195b510db7968b4ddbbf0d5512346a976ce524 -size 631 +oid sha256:ad2dab6268e334ea5d1c8223765cade1962f55cf545148934735e53a5aa99846 +size 632 diff --git a/data/minecraft/structure/bastion/units/stages/stage_3_1.nbt b/data/minecraft/structure/bastion/units/stages/stage_3_1.nbt index e74c35d0..52e3f2ae 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_3_1.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_3_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da408698d218e3dae0c475182ed2e55c9ff6fa616ace56241c2c13245d46f9cf +oid sha256:9fa65ed83834b324d4a066bf3a05461a424cc98339acb1c926cf38f2928a64df size 689 diff --git a/data/minecraft/structure/bastion/units/stages/stage_3_2.nbt b/data/minecraft/structure/bastion/units/stages/stage_3_2.nbt index 9436453e..3f006713 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_3_2.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_3_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f4701b6702bbff157f48832d3935839422871d44155623327c401179357a4c1 +oid sha256:4c74987044e6b7eaa76fa47ac5ebc5537a53ee3233f6ef524b6cd39e00576d98 size 628 diff --git a/data/minecraft/structure/bastion/units/stages/stage_3_3.nbt b/data/minecraft/structure/bastion/units/stages/stage_3_3.nbt index 598eb26d..83a6d223 100644 --- a/data/minecraft/structure/bastion/units/stages/stage_3_3.nbt +++ b/data/minecraft/structure/bastion/units/stages/stage_3_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c761605a1f841614ae5d10727eab2edf2a50e71e80c27973efa4a0e408ce0c81 +oid sha256:b8b75428881e411017f17760a7f5fd6c3c23a8c8a50e2344066e8336656f06ed size 654 diff --git a/data/minecraft/structure/bastion/units/wall_units/edge_0_large.nbt b/data/minecraft/structure/bastion/units/wall_units/edge_0_large.nbt index 2d361e0f..51ed6ffd 100644 --- a/data/minecraft/structure/bastion/units/wall_units/edge_0_large.nbt +++ b/data/minecraft/structure/bastion/units/wall_units/edge_0_large.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a67ba3254ff8d4da1b1bae60337d5c24f43c8d17fc00844cd04dc9b227dfd914 +oid sha256:6461ca85f210b5175d1e183c34ca278fc7b61eb51eae4a977ffcb6e570e17dcb size 2821 diff --git a/data/minecraft/structure/bastion/units/wall_units/unit_0.nbt b/data/minecraft/structure/bastion/units/wall_units/unit_0.nbt index 03adddd2..7932ddea 100644 --- a/data/minecraft/structure/bastion/units/wall_units/unit_0.nbt +++ b/data/minecraft/structure/bastion/units/wall_units/unit_0.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:740bac7eed6da19f3b1d46e7c7d71967789cb46a862d3b3afbefe08324e1ec9e +oid sha256:c62fee247252564d3e0e9e8e6fa0566111ae962dc74639b8a1e4d250377f4237 size 2499 diff --git a/data/minecraft/structure/bastion/units/walls/connected_wall.nbt b/data/minecraft/structure/bastion/units/walls/connected_wall.nbt index a94992a8..4b2b5a46 100644 --- a/data/minecraft/structure/bastion/units/walls/connected_wall.nbt +++ b/data/minecraft/structure/bastion/units/walls/connected_wall.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19147b51ed33c6daa9feeeed9ea68ba53875b97746560aa6c65928ce4d34a155 +oid sha256:6a76a64901904c9a8cdf4eb7d761f63ea43ddbe6a9b900858da09bc020064761 size 15616 diff --git a/data/minecraft/structure/bastion/units/walls/wall_base.nbt b/data/minecraft/structure/bastion/units/walls/wall_base.nbt index e3c0e3bb..f6f7393a 100644 --- a/data/minecraft/structure/bastion/units/walls/wall_base.nbt +++ b/data/minecraft/structure/bastion/units/walls/wall_base.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:938240b7921e9b42d50414d578d143e9bbc8973f80703b97ca29c84aa87e6021 -size 16903 +oid sha256:722d24354600384f554d51d5bc0c9a52f1a3cdc7401cb510f251e04a4ab9fa9b +size 16902 diff --git a/data/minecraft/structure/empty.nbt b/data/minecraft/structure/empty.nbt index 5962c5a9..16e5230e 100644 --- a/data/minecraft/structure/empty.nbt +++ b/data/minecraft/structure/empty.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b06d880a47f68ac104d2fcb1f0bf3e4ca64172becb8c07a557c9b16cacb23574 +oid sha256:9dc15b495faf46c846a3bd2281940b9cac2abe970155a7bfc1ed2801dfe22bf3 size 124 diff --git a/data/minecraft/structure/end_city/base_floor.nbt b/data/minecraft/structure/end_city/base_floor.nbt index 2e98a0e3..e74e5a9b 100644 --- a/data/minecraft/structure/end_city/base_floor.nbt +++ b/data/minecraft/structure/end_city/base_floor.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ed07d917157ce5299094368379c74316026ce2e5a514a7e8124f744d6d9d76a +oid sha256:2d8750fb3ee8b6fb6b8b22cb21e0f11986c2e15b2f1987648f58401a28310f14 size 1685 diff --git a/data/minecraft/structure/end_city/base_roof.nbt b/data/minecraft/structure/end_city/base_roof.nbt index cd48ad36..ffdfcc0b 100644 --- a/data/minecraft/structure/end_city/base_roof.nbt +++ b/data/minecraft/structure/end_city/base_roof.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7eb340fcd63a8409f495ab95d7454f64e029cd8f3c107ebbb5936dc2606a5e20 -size 1179 +oid sha256:033d6283eaeadbfe27da75e87ad4e5de26b79f2d09e67787fb712cead7070a18 +size 1178 diff --git a/data/minecraft/structure/end_city/bridge_end.nbt b/data/minecraft/structure/end_city/bridge_end.nbt index f6fd0f42..c803be8c 100644 --- a/data/minecraft/structure/end_city/bridge_end.nbt +++ b/data/minecraft/structure/end_city/bridge_end.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62f982074cfb3a9b3e13c92769c6603ac0f03813623f58c65f25681793ddccbb +oid sha256:e61e7f1aea0407303c68c3417ba64af27c7a34a9760fc56b3ac12f3e9b94e003 size 474 diff --git a/data/minecraft/structure/end_city/bridge_gentle_stairs.nbt b/data/minecraft/structure/end_city/bridge_gentle_stairs.nbt index a20aac75..26b7d05c 100644 --- a/data/minecraft/structure/end_city/bridge_gentle_stairs.nbt +++ b/data/minecraft/structure/end_city/bridge_gentle_stairs.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1134e45699831949a949634e6560679ea84d76ea3ad870b20441295889a233f3 +oid sha256:b8bf20feaa01140dd9fe1abede0fea907e3d0f4c68b0347bdac8c2a3e67c0a8f size 1142 diff --git a/data/minecraft/structure/end_city/bridge_piece.nbt b/data/minecraft/structure/end_city/bridge_piece.nbt index ea5fb44b..1787e989 100644 --- a/data/minecraft/structure/end_city/bridge_piece.nbt +++ b/data/minecraft/structure/end_city/bridge_piece.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:789344962c68dbb3a6cbd9313480ba14e251681ed2831b850328bcf9ba245108 +oid sha256:4f66ecb804da072c4ffce7e1d5401b65fc206ef6bbb98e88a1aa9b1a206d67d1 size 598 diff --git a/data/minecraft/structure/end_city/bridge_steep_stairs.nbt b/data/minecraft/structure/end_city/bridge_steep_stairs.nbt index 786da4b1..eeef58a6 100644 --- a/data/minecraft/structure/end_city/bridge_steep_stairs.nbt +++ b/data/minecraft/structure/end_city/bridge_steep_stairs.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82baefdec3c80f5b6d117650a5de5a3c2a4bf93ede172df318a38d6489bcfed3 +oid sha256:d2cae7ae8a5137a16dda8804c0bf40997f5c876fc2378830ddefe74e35f11b6a size 713 diff --git a/data/minecraft/structure/end_city/fat_tower_base.nbt b/data/minecraft/structure/end_city/fat_tower_base.nbt index 2629131a..28c2f8ce 100644 --- a/data/minecraft/structure/end_city/fat_tower_base.nbt +++ b/data/minecraft/structure/end_city/fat_tower_base.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:044373d9d134bc7263af73a9870c664f003d38cda25111d32d69c7f1cb325563 +oid sha256:3b1ee48d0493bb3e225d1abdcec2f0e962cd34cbc01c375963ddc23bb5d977be size 2337 diff --git a/data/minecraft/structure/end_city/fat_tower_middle.nbt b/data/minecraft/structure/end_city/fat_tower_middle.nbt index 1aa1ed96..add52a64 100644 --- a/data/minecraft/structure/end_city/fat_tower_middle.nbt +++ b/data/minecraft/structure/end_city/fat_tower_middle.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b91378ade04e0b359eb2dfb9b7b09478515b1d26e6baacfb1322d65f4a5929ef +oid sha256:9135efc462fe771ad379b1fafe6b50d6436e2bb54f265255624d611bf5df68e5 size 4466 diff --git a/data/minecraft/structure/end_city/fat_tower_top.nbt b/data/minecraft/structure/end_city/fat_tower_top.nbt index 328b2de9..cb6fdf1a 100644 --- a/data/minecraft/structure/end_city/fat_tower_top.nbt +++ b/data/minecraft/structure/end_city/fat_tower_top.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db3fa798586ebef9fc1ae9f9ece4ff756b399862a80ac92054f6968baf12c20d +oid sha256:f5378a31e12b608883ed4b74c44736d65a66a5e7dafde680e3cf7de18d92b9b0 size 5958 diff --git a/data/minecraft/structure/end_city/second_floor_1.nbt b/data/minecraft/structure/end_city/second_floor_1.nbt index f2921f87..8798f8fa 100644 --- a/data/minecraft/structure/end_city/second_floor_1.nbt +++ b/data/minecraft/structure/end_city/second_floor_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12e89c89487391b87091f0a1c9b94489873889c4e32f587cac7d945eab993e4e +oid sha256:caa60bd53ade980cb85eab4f3a02c7bc26c5d4e23437b9bcf2c16cd09c2a3884 size 3715 diff --git a/data/minecraft/structure/end_city/second_floor_2.nbt b/data/minecraft/structure/end_city/second_floor_2.nbt index fe7f0554..638f44a1 100644 --- a/data/minecraft/structure/end_city/second_floor_2.nbt +++ b/data/minecraft/structure/end_city/second_floor_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:603340fad19f2acc2d6c4bc405b230b96c003d45729e8f37e3ff6378355de3c5 +oid sha256:7a394d86fcec4d9d6c58d25cdcd883ed5b02fb0323152006715700297165a28d size 3968 diff --git a/data/minecraft/structure/end_city/second_roof.nbt b/data/minecraft/structure/end_city/second_roof.nbt index a451ab67..993fec50 100644 --- a/data/minecraft/structure/end_city/second_roof.nbt +++ b/data/minecraft/structure/end_city/second_roof.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a11534be1730b291ea5681c600d8d1a1d41e5bdb40af8802302716c588712b9a +oid sha256:2edbe7ce3e12ec738bbd0b0807ca246592b42507fa0b4bb70ffc25b490b48895 size 1425 diff --git a/data/minecraft/structure/end_city/ship.nbt b/data/minecraft/structure/end_city/ship.nbt index e904111d..a907e676 100644 --- a/data/minecraft/structure/end_city/ship.nbt +++ b/data/minecraft/structure/end_city/ship.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0994e1330051d00c9c63ccb952fbda915f82b24ac7bdbd348acfa136c524a3ce +oid sha256:3ffd87210eb5ab8e930270e96b23b05d6a12f1f993fd4c3389f3240e1530b5f7 size 26443 diff --git a/data/minecraft/structure/end_city/third_floor_1.nbt b/data/minecraft/structure/end_city/third_floor_1.nbt index 53882057..b5ad9db6 100644 --- a/data/minecraft/structure/end_city/third_floor_1.nbt +++ b/data/minecraft/structure/end_city/third_floor_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9e670e66ac28a5610fe62d469e7bfdb0a6bcd82aa00edb4171ef1d21d141cbf -size 4785 +oid sha256:e3055acd7997792b834b425e430508849580c29242c2e267bcadb44b52c4fd24 +size 4786 diff --git a/data/minecraft/structure/end_city/third_floor_2.nbt b/data/minecraft/structure/end_city/third_floor_2.nbt index 3d1b8316..05904c24 100644 --- a/data/minecraft/structure/end_city/third_floor_2.nbt +++ b/data/minecraft/structure/end_city/third_floor_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81e54f09bc2b9ff7b05e1a88ace0f03c19acb02434aefa3b1654417e8b09c150 +oid sha256:3a97386c335decb06316b09753245e3ea2c4dd9b458213bf40ee1a25c41ae92d size 5157 diff --git a/data/minecraft/structure/end_city/third_roof.nbt b/data/minecraft/structure/end_city/third_roof.nbt index 48fdce12..8632ef69 100644 --- a/data/minecraft/structure/end_city/third_roof.nbt +++ b/data/minecraft/structure/end_city/third_roof.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bda930d568b95fdd7a0c3fc43d6b1300bfeb61f90fe288ca1e875512453b4454 +oid sha256:99b3de8c26e670fea7e8fe9987519a5348e76109da4a37f3ee1df447b7ab25b7 size 1830 diff --git a/data/minecraft/structure/end_city/tower_base.nbt b/data/minecraft/structure/end_city/tower_base.nbt index 022d36ca..200feff2 100644 --- a/data/minecraft/structure/end_city/tower_base.nbt +++ b/data/minecraft/structure/end_city/tower_base.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cea787e714a9731b6638e018d1d4c0fa12de4c76c477bb5c4105781095ced0ad +oid sha256:17e9c7045cf0498d72934393becdf2b26101dcf59c647f4f6e297da067ac1382 size 933 diff --git a/data/minecraft/structure/end_city/tower_floor.nbt b/data/minecraft/structure/end_city/tower_floor.nbt index 941dc7e9..eaa3caa8 100644 --- a/data/minecraft/structure/end_city/tower_floor.nbt +++ b/data/minecraft/structure/end_city/tower_floor.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7405d29928e16045ba3ccd083bd6551a6198ae083403a80496f62d7639792db9 +oid sha256:9d530feac1bae807570134838636b8a3cdb451194758b3e474d2994343f52568 size 979 diff --git a/data/minecraft/structure/end_city/tower_piece.nbt b/data/minecraft/structure/end_city/tower_piece.nbt index 976a95a7..39f3381d 100644 --- a/data/minecraft/structure/end_city/tower_piece.nbt +++ b/data/minecraft/structure/end_city/tower_piece.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ef6aba00dd0914f9daaac8e677e632917ca5532a8a60e134501707692454ad2 +oid sha256:0c2523c941bfc2e9211fae69ed041f7b0da9eb87fe38504c8467cf29ba7f0238 size 898 diff --git a/data/minecraft/structure/end_city/tower_top.nbt b/data/minecraft/structure/end_city/tower_top.nbt index 99d4b0c8..e6f8ad18 100644 --- a/data/minecraft/structure/end_city/tower_top.nbt +++ b/data/minecraft/structure/end_city/tower_top.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6727266ac2215983fded21ccef1aae0f5fe1079d163f73282445f2b240835493 +oid sha256:08e76eb4ceccb6de5d2f8420e3efbbfbca89831df9d164c36cf9f52a0c13180c size 2034 diff --git a/data/minecraft/structure/fossil/skull_1.nbt b/data/minecraft/structure/fossil/skull_1.nbt index a94b9078..a9f42bb2 100644 --- a/data/minecraft/structure/fossil/skull_1.nbt +++ b/data/minecraft/structure/fossil/skull_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f67a9ccb8bcbff6f1affbaf542c8ecf9e9338e109451a1b3e080baa0265cd77a +oid sha256:2deb52abdcf7b070edb6b9c8daba6a4bad7e8685a3ef329d7f0dd8d3aafb5c4f size 440 diff --git a/data/minecraft/structure/fossil/skull_1_coal.nbt b/data/minecraft/structure/fossil/skull_1_coal.nbt index 9a8378eb..6ed5f91f 100644 --- a/data/minecraft/structure/fossil/skull_1_coal.nbt +++ b/data/minecraft/structure/fossil/skull_1_coal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d5b3d22b02d552ba2b6af47b582c02a214f1455e390ed33fcc3694fe0614aec +oid sha256:76538ce777066954a06f9db9ac71ccfca6192e9a99f54ccf991736c2a49e7e01 size 395 diff --git a/data/minecraft/structure/fossil/skull_2.nbt b/data/minecraft/structure/fossil/skull_2.nbt index 690c5cd6..477fe43a 100644 --- a/data/minecraft/structure/fossil/skull_2.nbt +++ b/data/minecraft/structure/fossil/skull_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82c4ba1598926f570f8f6d1b926902f6e02c35f8265c8e3abf4f5d7ad4a25e2e +oid sha256:63955c0dc62e238896bec48f53853679e6ed47d651e16e081036a31c570f7fab size 397 diff --git a/data/minecraft/structure/fossil/skull_2_coal.nbt b/data/minecraft/structure/fossil/skull_2_coal.nbt index 10948cca..5416e68e 100644 --- a/data/minecraft/structure/fossil/skull_2_coal.nbt +++ b/data/minecraft/structure/fossil/skull_2_coal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccb73c56c152a1c88a99aa63685851322406bb83c70dd4c9e15f737528ea92a5 +oid sha256:980fe5078f82fe511d894e9a7bbf6c78229756bf6829c2115201a72c5464fd3f size 344 diff --git a/data/minecraft/structure/fossil/skull_3.nbt b/data/minecraft/structure/fossil/skull_3.nbt index dde30921..2bdb752a 100644 --- a/data/minecraft/structure/fossil/skull_3.nbt +++ b/data/minecraft/structure/fossil/skull_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3512059e86b1e3543d94ba3b82408e1e71655c0afbdc7812f0a926633d3037b8 +oid sha256:5c9309a83cc388b8f33082cf1a52b78e8e16bcde4fdf66a75d9a16b6d1f4583a size 347 diff --git a/data/minecraft/structure/fossil/skull_3_coal.nbt b/data/minecraft/structure/fossil/skull_3_coal.nbt index 9afa341b..cdfb0907 100644 --- a/data/minecraft/structure/fossil/skull_3_coal.nbt +++ b/data/minecraft/structure/fossil/skull_3_coal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1017ddba90675b7af3899daee66b512bc96862d2fd8933b33c79b3f1098e6b3c +oid sha256:990d8c8870aef2209fe5257ccd035fb39c539992b52d237bdd476f27cd5758a5 size 316 diff --git a/data/minecraft/structure/fossil/skull_4.nbt b/data/minecraft/structure/fossil/skull_4.nbt index 05e85457..e7fc636b 100644 --- a/data/minecraft/structure/fossil/skull_4.nbt +++ b/data/minecraft/structure/fossil/skull_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62d1d9dc82222b5a22d4366c444dd4b8051da9e41cba4d221840c32e433dbc02 -size 269 +oid sha256:2010ccdc4ced26d31076078163122611fe4714c8156b364459d5a4898d264456 +size 268 diff --git a/data/minecraft/structure/fossil/skull_4_coal.nbt b/data/minecraft/structure/fossil/skull_4_coal.nbt index 38c87e53..13ad8219 100644 --- a/data/minecraft/structure/fossil/skull_4_coal.nbt +++ b/data/minecraft/structure/fossil/skull_4_coal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78fe6e2c6cb0f90df1390174c1e9e3e61b0f9c0f2a4493b0ea1706a6939cf78a +oid sha256:4a3285c86000f9860d14ce6803bade9e7375d4765ee357994ec8f2567eea7b7e size 234 diff --git a/data/minecraft/structure/fossil/spine_1.nbt b/data/minecraft/structure/fossil/spine_1.nbt index 142faa8f..c146b873 100644 --- a/data/minecraft/structure/fossil/spine_1.nbt +++ b/data/minecraft/structure/fossil/spine_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12b9b08678a7d8fc0532430a1f9c24939a2f5d7d8dd332e0e21886fc40d91363 +oid sha256:410203c0ea1c9369f1ecbed4dc0af228733460df273cee2c79246062f3421cfc size 271 diff --git a/data/minecraft/structure/fossil/spine_1_coal.nbt b/data/minecraft/structure/fossil/spine_1_coal.nbt index b884919f..20843cb5 100644 --- a/data/minecraft/structure/fossil/spine_1_coal.nbt +++ b/data/minecraft/structure/fossil/spine_1_coal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d81bac4c3759db1cbc8660ca55830ed5b10a06d000cc21991936961a5da6166 +oid sha256:5066c7b5a3ae13c2f84dd1ec969ed9fad1ba28558493a5036e0b855acb2ed5d1 size 251 diff --git a/data/minecraft/structure/fossil/spine_2.nbt b/data/minecraft/structure/fossil/spine_2.nbt index 06f2f9c3..f31a24d5 100644 --- a/data/minecraft/structure/fossil/spine_2.nbt +++ b/data/minecraft/structure/fossil/spine_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1672f2faf5bdb5bce5297fa3280013ece1e555a530845fdffaae5dbdcfd9967d +oid sha256:5705759805b3147844436e39329f6c52864dd75816a6f95170dabd9aa9cd506a size 360 diff --git a/data/minecraft/structure/fossil/spine_2_coal.nbt b/data/minecraft/structure/fossil/spine_2_coal.nbt index 0e5a8474..cad9e04a 100644 --- a/data/minecraft/structure/fossil/spine_2_coal.nbt +++ b/data/minecraft/structure/fossil/spine_2_coal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a93a203668363d82b6acce4acd033a700502c5a6d24f0604cc46acad1df9249b +oid sha256:fa5949b4692f6b9e07048cf139a7f775a28c42c20ab9f94bd9abfad7c0ed8264 size 324 diff --git a/data/minecraft/structure/fossil/spine_3.nbt b/data/minecraft/structure/fossil/spine_3.nbt index 80793545..88593bed 100644 --- a/data/minecraft/structure/fossil/spine_3.nbt +++ b/data/minecraft/structure/fossil/spine_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fc29e2470a0937d265d0ad12aee4a328867a5fa485ca11104d9bb8dbb076bf3 +oid sha256:4a3db2628a6d8e597b88987fa44f0ce4de1311963d333ae17f6d02f1866738e6 size 456 diff --git a/data/minecraft/structure/fossil/spine_3_coal.nbt b/data/minecraft/structure/fossil/spine_3_coal.nbt index ab3c6063..ad0ae184 100644 --- a/data/minecraft/structure/fossil/spine_3_coal.nbt +++ b/data/minecraft/structure/fossil/spine_3_coal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b5a7e98900175160baee213356e92e350a074b93e2fe69ef15682e11d02e157 +oid sha256:25edd01ea22aa1ecac7078b5dd7e25b38621a8f5cdf4042d3a2a1b06efd3564d size 436 diff --git a/data/minecraft/structure/fossil/spine_4.nbt b/data/minecraft/structure/fossil/spine_4.nbt index 556dbeda..c41cd504 100644 --- a/data/minecraft/structure/fossil/spine_4.nbt +++ b/data/minecraft/structure/fossil/spine_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3acbd2eb38b5c2f39d7e43dc03ab14ee172907cc2dfa3c9da28e2816a99db79e +oid sha256:4fb0db494297a08b7f5aa1bdcc187090e5111ba77af38b03245ae07cd3b05b99 size 528 diff --git a/data/minecraft/structure/fossil/spine_4_coal.nbt b/data/minecraft/structure/fossil/spine_4_coal.nbt index 9f8ecfa5..8517945b 100644 --- a/data/minecraft/structure/fossil/spine_4_coal.nbt +++ b/data/minecraft/structure/fossil/spine_4_coal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d50cb4b635251fdd308e66af93c3a4aaada670125ed27916b0acb349157e461 +oid sha256:18b9efdc772eab1243bd8f17776466b3fb0096317faad319400a6714ff929b3f size 481 diff --git a/data/minecraft/structure/igloo/bottom.nbt b/data/minecraft/structure/igloo/bottom.nbt index 12fee73d..444a79e4 100644 --- a/data/minecraft/structure/igloo/bottom.nbt +++ b/data/minecraft/structure/igloo/bottom.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e58c94869df737aba243b0d71475e0de4a2e362ecbd9558685c8c639467d792 -size 2733 +oid sha256:60cd57be1fc967a53952f6043661b2a6b5ffe3792c8f64f11d37454df407e263 +size 2732 diff --git a/data/minecraft/structure/igloo/middle.nbt b/data/minecraft/structure/igloo/middle.nbt index e2cc7580..0032e927 100644 --- a/data/minecraft/structure/igloo/middle.nbt +++ b/data/minecraft/structure/igloo/middle.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63f0b9fb373b16c117c0c1ceb0f59641d7884c0e9bf9d62b100be2a7043a7036 +oid sha256:585c9ec4bb1132ab61858986499aa85aab5598832dd1d8a20c41bdb90471ff52 size 236 diff --git a/data/minecraft/structure/igloo/top.nbt b/data/minecraft/structure/igloo/top.nbt index 86da4675..3d29c0f6 100644 --- a/data/minecraft/structure/igloo/top.nbt +++ b/data/minecraft/structure/igloo/top.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:678058bf03793e84c2d20a6c17478f2419e13a4e192ead375799a0dda9eee42b +oid sha256:e01aa83cde8f6ad41c731ed42d432218d0af273dcc218fc0e9f2d555b24e1b69 size 924 diff --git a/data/minecraft/structure/nether_fossils/fossil_1.nbt b/data/minecraft/structure/nether_fossils/fossil_1.nbt index 04593bf0..5f39b6ba 100644 --- a/data/minecraft/structure/nether_fossils/fossil_1.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5d9ae24aefc3ccec718be5c4697159fafd681a1515fd9f6abed07c08681808a +oid sha256:ccbaf0075fee9b503fff80b9c0172b27c344a2f5aa6703838b9ddfcad14857e8 size 397 diff --git a/data/minecraft/structure/nether_fossils/fossil_10.nbt b/data/minecraft/structure/nether_fossils/fossil_10.nbt index b18b84af..c95d24e8 100644 --- a/data/minecraft/structure/nether_fossils/fossil_10.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_10.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77d5104f24443d54645e2c97433862670c7b32732928766aa305bfd4ab9f8f4b +oid sha256:2e4946cd44712ccaec97b8d504c6c66c16a2ebad3e8fa6062393e3f949cc6de1 size 237 diff --git a/data/minecraft/structure/nether_fossils/fossil_11.nbt b/data/minecraft/structure/nether_fossils/fossil_11.nbt index af046c27..f2886a35 100644 --- a/data/minecraft/structure/nether_fossils/fossil_11.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_11.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f78dcc50eee4cb17173e6c69c0cd2e24d8e2f9fe32a4fcfff86ed1586448fdc7 +oid sha256:69db10414205eb46eb529a76ca742d7cd2dd47a2845d1605a07a85a80268c4f4 size 674 diff --git a/data/minecraft/structure/nether_fossils/fossil_12.nbt b/data/minecraft/structure/nether_fossils/fossil_12.nbt index d62b0a50..76e4a6e2 100644 --- a/data/minecraft/structure/nether_fossils/fossil_12.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_12.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d560f426ef13145e2bff4d10511dbb7c58d5791e573e809cc5756fb0870ecd97 +oid sha256:e3479ebe730e5e688c78e37b1ba60e6d5ed77f770e9c7cfbf543a95dd03d4d53 size 316 diff --git a/data/minecraft/structure/nether_fossils/fossil_13.nbt b/data/minecraft/structure/nether_fossils/fossil_13.nbt index 4e3ed3c4..a4f7ecb2 100644 --- a/data/minecraft/structure/nether_fossils/fossil_13.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_13.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b41179108bf89b88c4f9158a409ab98fc31b99e517d6847c7458255c82d93a01 +oid sha256:8db3b01c3afaef14c7baa166615d5909e86233da21fa9cc0b4a779d6d2669fcb size 523 diff --git a/data/minecraft/structure/nether_fossils/fossil_14.nbt b/data/minecraft/structure/nether_fossils/fossil_14.nbt index dd70c285..dec5700f 100644 --- a/data/minecraft/structure/nether_fossils/fossil_14.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_14.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64268ce9be318da6fe1a934ebc7b4560d9bda03d29161790c029a6431ae13ff3 +oid sha256:7801c75bdbc1bfe17704e391059b7cab1604e8b39b9571bdb121cabce64990fc size 938 diff --git a/data/minecraft/structure/nether_fossils/fossil_2.nbt b/data/minecraft/structure/nether_fossils/fossil_2.nbt index 9fdef584..c3415bc7 100644 --- a/data/minecraft/structure/nether_fossils/fossil_2.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92635343c28ea63d2122bc37db4641877fdc8b466483a839f93ad6323af59f20 +oid sha256:f1a55b29d6bb446b1e410c525338a681fb814293cdc5c1dd39b879401622258f size 258 diff --git a/data/minecraft/structure/nether_fossils/fossil_3.nbt b/data/minecraft/structure/nether_fossils/fossil_3.nbt index 2a7fd425..091f4b3a 100644 --- a/data/minecraft/structure/nether_fossils/fossil_3.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1774f020a602c85f301bbc608bfebe3771d40a71ed0eba10d9c1f3d78354329 +oid sha256:e3d6f2f0d3addf8c0fd5f5f0117eb82adcdeaa374d6157b6580cde4953ffca60 size 249 diff --git a/data/minecraft/structure/nether_fossils/fossil_4.nbt b/data/minecraft/structure/nether_fossils/fossil_4.nbt index 92bd3426..2130b22d 100644 --- a/data/minecraft/structure/nether_fossils/fossil_4.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b10f4f7bca5519163f3f078e4300a52b01e5c31c7311c9d4a0e9b5c12e78124 +oid sha256:e3efc5e0af88ddc8e347810286397722839164f24a845a5d111b1f08d57954a6 size 211 diff --git a/data/minecraft/structure/nether_fossils/fossil_5.nbt b/data/minecraft/structure/nether_fossils/fossil_5.nbt index 35b6d9fc..a08b4cd0 100644 --- a/data/minecraft/structure/nether_fossils/fossil_5.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4999726aa143e45b6bb492f7c4b5144227e0a1fe68026778fb4871e4d607e364 +oid sha256:580805ad435696c9dc4c67ef2c5a78567635f9da7040eb0b5a3d407a8da9992b size 205 diff --git a/data/minecraft/structure/nether_fossils/fossil_6.nbt b/data/minecraft/structure/nether_fossils/fossil_6.nbt index f1aa346d..ce33c133 100644 --- a/data/minecraft/structure/nether_fossils/fossil_6.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:715e4b46fdd98d198d7ea241267dd1753a53c6a701c6e68a96768e8ce741c394 +oid sha256:8d8c6ca0b5a4eb93824f9011d7b9aee07c610da000a7b254f26274d23485aaec size 630 diff --git a/data/minecraft/structure/nether_fossils/fossil_7.nbt b/data/minecraft/structure/nether_fossils/fossil_7.nbt index b1cd5992..ec82cbe1 100644 --- a/data/minecraft/structure/nether_fossils/fossil_7.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33023708a00867e7086e75b0d3747012266c62a927d9998f706181fed1fa96b0 -size 509 +oid sha256:b7b070a9ba488a7aa83e61377a23f47bf1a6774d545958212b7edf26186d07d7 +size 510 diff --git a/data/minecraft/structure/nether_fossils/fossil_8.nbt b/data/minecraft/structure/nether_fossils/fossil_8.nbt index 08a96ca5..9def0969 100644 --- a/data/minecraft/structure/nether_fossils/fossil_8.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:872403887b06b9ce9cefa5bcb5caea1c905a209819c4887f4f285a66ca3c8408 +oid sha256:b8b598967ce21557c5066923519eb6ec9630ccb85c78df518820859336584d55 size 219 diff --git a/data/minecraft/structure/nether_fossils/fossil_9.nbt b/data/minecraft/structure/nether_fossils/fossil_9.nbt index 9c6ad2d9..7d6ce793 100644 --- a/data/minecraft/structure/nether_fossils/fossil_9.nbt +++ b/data/minecraft/structure/nether_fossils/fossil_9.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d87a3ddde615fd48f75508d4d793296592c0d47fc1166edc7dc50af56b2ed433 -size 394 +oid sha256:0273dcad1b2228e31566be4d41e1c09cd656ac7d85fd6af6d8d93c376381a2b8 +size 393 diff --git a/data/minecraft/structure/pillager_outpost/base_plate.nbt b/data/minecraft/structure/pillager_outpost/base_plate.nbt index b88e218f..4185bdb5 100644 --- a/data/minecraft/structure/pillager_outpost/base_plate.nbt +++ b/data/minecraft/structure/pillager_outpost/base_plate.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84355755e68a62a98435e44904b2b65c3cf1377b1257c2ab84d927aa85a7141c +oid sha256:edbef658ef561bed7ddf952541cd8f97f83fa64760ea94d420281131ca671be7 size 19281 diff --git a/data/minecraft/structure/pillager_outpost/feature_cage1.nbt b/data/minecraft/structure/pillager_outpost/feature_cage1.nbt index 2c0b6459..abd1ae06 100644 --- a/data/minecraft/structure/pillager_outpost/feature_cage1.nbt +++ b/data/minecraft/structure/pillager_outpost/feature_cage1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96bab8a329a9f5a6a5e97591c0d32464ea91d6b078fabbe6369f23b3f0ec71d6 +oid sha256:200279e54e56d8ba8308d069e2a8102578cbb428a54a6f8dc445c5df9cc7fff9 size 1629 diff --git a/data/minecraft/structure/pillager_outpost/feature_cage2.nbt b/data/minecraft/structure/pillager_outpost/feature_cage2.nbt index 3a7bc89d..8243dc4e 100644 --- a/data/minecraft/structure/pillager_outpost/feature_cage2.nbt +++ b/data/minecraft/structure/pillager_outpost/feature_cage2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ede97b143cadda6488e6abe62dca924df7417b123695a42febb478e6b9154aef +oid sha256:4edd0284a5432f0b0e2e33cb4b28090d0bad2ada7048109273e585d6f5cb253a size 1031 diff --git a/data/minecraft/structure/pillager_outpost/feature_cage_with_allays.nbt b/data/minecraft/structure/pillager_outpost/feature_cage_with_allays.nbt index 43b1fc6b..299307dc 100644 --- a/data/minecraft/structure/pillager_outpost/feature_cage_with_allays.nbt +++ b/data/minecraft/structure/pillager_outpost/feature_cage_with_allays.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e9582060b76d5b4f9ff1e8a4d5245875171f188eed4d973bf0b5e3e5eaac93d -size 1755 +oid sha256:bc79e799e34ebb1b51c39c42abfeb351ef7202c8ed96e256ce939afe88eca378 +size 1756 diff --git a/data/minecraft/structure/pillager_outpost/feature_logs.nbt b/data/minecraft/structure/pillager_outpost/feature_logs.nbt index b8953c03..8102afc7 100644 --- a/data/minecraft/structure/pillager_outpost/feature_logs.nbt +++ b/data/minecraft/structure/pillager_outpost/feature_logs.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6f03c98575628849c648c1dcb02b799b92081096d56d2708fec13478c8c475a +oid sha256:bae9d60dd2529af2b176c267f1003ef194f79acbb081f17361dab7ca0c2cb4bd size 658 diff --git a/data/minecraft/structure/pillager_outpost/feature_plate.nbt b/data/minecraft/structure/pillager_outpost/feature_plate.nbt index 77475789..96c708c0 100644 --- a/data/minecraft/structure/pillager_outpost/feature_plate.nbt +++ b/data/minecraft/structure/pillager_outpost/feature_plate.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b321650cbea6b1e0e52a1fa231634fc35e959a8f1f3467381fa6926430ae32e +oid sha256:f045d31791527cf15d5cf987ca94609c9797ffbf36402a8eff94f6c766665f13 size 6039 diff --git a/data/minecraft/structure/pillager_outpost/feature_targets.nbt b/data/minecraft/structure/pillager_outpost/feature_targets.nbt index e8f72d3d..59af6744 100644 --- a/data/minecraft/structure/pillager_outpost/feature_targets.nbt +++ b/data/minecraft/structure/pillager_outpost/feature_targets.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08d2d41aa6df50ed9e44465226c1bef060dfd42b5422f63888e8dc2d28164ee5 +oid sha256:48e480afab44fd29ea1b5ec06a5e74420d5e1258d25dc669020e4c7ae9c14d61 size 578 diff --git a/data/minecraft/structure/pillager_outpost/feature_tent1.nbt b/data/minecraft/structure/pillager_outpost/feature_tent1.nbt index d9565072..84702ee8 100644 --- a/data/minecraft/structure/pillager_outpost/feature_tent1.nbt +++ b/data/minecraft/structure/pillager_outpost/feature_tent1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0dacf6fdfaab06e39bf1c32173ec672dd3c739096bafb655356be6af8f573c53 -size 856 +oid sha256:6530c41ff633977073234d3f6b787abdd4cff7f33fe94daf083ba4cc216ea5c0 +size 857 diff --git a/data/minecraft/structure/pillager_outpost/feature_tent2.nbt b/data/minecraft/structure/pillager_outpost/feature_tent2.nbt index c5454d6a..e19cffa8 100644 --- a/data/minecraft/structure/pillager_outpost/feature_tent2.nbt +++ b/data/minecraft/structure/pillager_outpost/feature_tent2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16dd9a2f021cebb8f40b0e0eb63f27692b0a24dd517b2cb70e10f20fdc80ae30 +oid sha256:eb10d5daab4576c7486bc6e5de7db9303acc3edf6ce44d9d1010be06a956d813 size 867 diff --git a/data/minecraft/structure/pillager_outpost/watchtower.nbt b/data/minecraft/structure/pillager_outpost/watchtower.nbt index e75d54fd..f7b798a4 100644 --- a/data/minecraft/structure/pillager_outpost/watchtower.nbt +++ b/data/minecraft/structure/pillager_outpost/watchtower.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:987c57670e3bdcfa5a1e620ffe74d49aa10f03cd451ceacdce85f19dd2d7fdf8 +oid sha256:8a2a8e248f8887b68c288584657ca837aa5fb0c8441deeaca46638daab96f83d size 14584 diff --git a/data/minecraft/structure/pillager_outpost/watchtower_overgrown.nbt b/data/minecraft/structure/pillager_outpost/watchtower_overgrown.nbt index dff4f56b..b86b7f48 100644 --- a/data/minecraft/structure/pillager_outpost/watchtower_overgrown.nbt +++ b/data/minecraft/structure/pillager_outpost/watchtower_overgrown.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e7dfc37b6f86436fe208431522a40b371f36cf895ea663095d9bd605a7bfe69 +oid sha256:d1ab72ab29078acdc997d3ab099dc39aeb4837f6e719190fee821d1fa9691fdc size 16025 diff --git a/data/minecraft/structure/ruined_portal/giant_portal_1.nbt b/data/minecraft/structure/ruined_portal/giant_portal_1.nbt index 2eaaf265..9cb389ae 100644 --- a/data/minecraft/structure/ruined_portal/giant_portal_1.nbt +++ b/data/minecraft/structure/ruined_portal/giant_portal_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efe8e7453786769b9ce794994e50872c922a99f442482a41bbfe44062a5bf282 +oid sha256:6de29d0560315b8a284b3f3c41ed69ded7c297a147d52ee540ba2191a4f0a778 size 7196 diff --git a/data/minecraft/structure/ruined_portal/giant_portal_2.nbt b/data/minecraft/structure/ruined_portal/giant_portal_2.nbt index 4c7e9637..333e275c 100644 --- a/data/minecraft/structure/ruined_portal/giant_portal_2.nbt +++ b/data/minecraft/structure/ruined_portal/giant_portal_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8f3b44bbf4592192360daaf6969f54c4ead3813e64fc54609289f86b475e243 +oid sha256:dc6810728d60975a259c2b8a2d7f2775e3151ff195fb70bdba3470f10396385f size 6837 diff --git a/data/minecraft/structure/ruined_portal/giant_portal_3.nbt b/data/minecraft/structure/ruined_portal/giant_portal_3.nbt index 12762cf4..d21a17c5 100644 --- a/data/minecraft/structure/ruined_portal/giant_portal_3.nbt +++ b/data/minecraft/structure/ruined_portal/giant_portal_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:855ff28d86daa866c6ce9e6944fbdc87760884b1e9bdc758a31e81238ddb9af3 +oid sha256:e601432d72d3c6fa7e0cce260f5adfca10b79fd1c1f7feb8a3ac7203d63f9698 size 9897 diff --git a/data/minecraft/structure/ruined_portal/portal_1.nbt b/data/minecraft/structure/ruined_portal/portal_1.nbt index 6415843c..3a2cde52 100644 --- a/data/minecraft/structure/ruined_portal/portal_1.nbt +++ b/data/minecraft/structure/ruined_portal/portal_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c00bfcb209983c0eef9243739725e43cef733743d315ce77b00b654a5b2dbef5 +oid sha256:5ff326d4898b45a83386756ca4355e8881354cfa55f53f34d4bc5f058b17e4c3 size 1431 diff --git a/data/minecraft/structure/ruined_portal/portal_10.nbt b/data/minecraft/structure/ruined_portal/portal_10.nbt index 8b74015d..f89a1ab7 100644 --- a/data/minecraft/structure/ruined_portal/portal_10.nbt +++ b/data/minecraft/structure/ruined_portal/portal_10.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d594e7fc036d769724f8db44c285dd2db8285d16cca0d131a11e17e5d946d71 +oid sha256:13e33e0046580fcb88888dcee158a6e98561393e37e185fdbfb40b43151a5890 size 2878 diff --git a/data/minecraft/structure/ruined_portal/portal_2.nbt b/data/minecraft/structure/ruined_portal/portal_2.nbt index acfcb6d5..89dcb5a1 100644 --- a/data/minecraft/structure/ruined_portal/portal_2.nbt +++ b/data/minecraft/structure/ruined_portal/portal_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:473904fda3fd5623c2d26c7a11d3b7a3da12672bb54bd5631ef8f4a5b3f79b05 +oid sha256:6bde439559b7452c40cf040ce6c472f8a223be03d281b92a8a20bfd3e5bd9b7f size 2762 diff --git a/data/minecraft/structure/ruined_portal/portal_3.nbt b/data/minecraft/structure/ruined_portal/portal_3.nbt index 812a9c87..90e935be 100644 --- a/data/minecraft/structure/ruined_portal/portal_3.nbt +++ b/data/minecraft/structure/ruined_portal/portal_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f37c9efd82caba830112049a338dac3c5bee2e23f6109d94aff958ef0d9ae4f4 -size 1994 +oid sha256:b49623eb572e54a267f5e7532ab50e11a10390f3a0fdd6f7aa624eed2713e9d9 +size 1993 diff --git a/data/minecraft/structure/ruined_portal/portal_4.nbt b/data/minecraft/structure/ruined_portal/portal_4.nbt index 74536afe..851a6d00 100644 --- a/data/minecraft/structure/ruined_portal/portal_4.nbt +++ b/data/minecraft/structure/ruined_portal/portal_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:916d94ae7a63be83be089f061cb4f3200fa526bf183eae61174a30298e5c54ab +oid sha256:a7687260bd47d1efd66fe9ca1f2b58cdfa530c32623e7bb3b9a68dd306501af3 size 1885 diff --git a/data/minecraft/structure/ruined_portal/portal_5.nbt b/data/minecraft/structure/ruined_portal/portal_5.nbt index 830a871b..0b2f1347 100644 --- a/data/minecraft/structure/ruined_portal/portal_5.nbt +++ b/data/minecraft/structure/ruined_portal/portal_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67972b294fd8d52eb2e2660256fb750e975baa4cb76bc264e586612915501fcf +oid sha256:be686a5b4239af5ef14eec546c9b3b4eb05a70669583d8d8430cb44c666001b8 size 2215 diff --git a/data/minecraft/structure/ruined_portal/portal_6.nbt b/data/minecraft/structure/ruined_portal/portal_6.nbt index 5998ff90..a7105912 100644 --- a/data/minecraft/structure/ruined_portal/portal_6.nbt +++ b/data/minecraft/structure/ruined_portal/portal_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1deb0760464ffb71eb13c27066e3648895770b7eda9a67ca3748bb2b7d422c2b +oid sha256:880158a0baddfa8d2b64043f5da69bc0e0c979b6abaa665165f63e895b92936c size 982 diff --git a/data/minecraft/structure/ruined_portal/portal_7.nbt b/data/minecraft/structure/ruined_portal/portal_7.nbt index 4f78ecd0..98ff0e6c 100644 --- a/data/minecraft/structure/ruined_portal/portal_7.nbt +++ b/data/minecraft/structure/ruined_portal/portal_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89dbdaf2eeb09149625127bbe222b31a1c3a7abd97ead865483fe07f15ef49ba -size 1830 +oid sha256:51f805ff00a7265a6d30f03176198a3cbfce26ed9ee08a4fa21c4cd3a3be4239 +size 1829 diff --git a/data/minecraft/structure/ruined_portal/portal_8.nbt b/data/minecraft/structure/ruined_portal/portal_8.nbt index 4f10260e..3c73a98c 100644 --- a/data/minecraft/structure/ruined_portal/portal_8.nbt +++ b/data/minecraft/structure/ruined_portal/portal_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18e750d49c3a95f3042e150c490aee610987fb51ae6476c5d18188e255c598f5 -size 3407 +oid sha256:aa8ab6cfaa7c552196ff61d09400277af9280b2f76edc43d8e78b00de7f74197 +size 3406 diff --git a/data/minecraft/structure/ruined_portal/portal_9.nbt b/data/minecraft/structure/ruined_portal/portal_9.nbt index 2ff8ba52..ed6c4db5 100644 --- a/data/minecraft/structure/ruined_portal/portal_9.nbt +++ b/data/minecraft/structure/ruined_portal/portal_9.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b7e58054c05db85e6f7731cb464efa5946df793886c58b464ea158ec1d8dff2 -size 2168 +oid sha256:d9ae5664daab0fe71385d4ba170c925020239e6859bd1dd47d807be8d6e6f5cb +size 2167 diff --git a/data/minecraft/structure/shipwreck/rightsideup_backhalf.nbt b/data/minecraft/structure/shipwreck/rightsideup_backhalf.nbt index 837ac46e..fcc21658 100644 --- a/data/minecraft/structure/shipwreck/rightsideup_backhalf.nbt +++ b/data/minecraft/structure/shipwreck/rightsideup_backhalf.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1772746fcfcc5ba06ee8cd8692a7569b01877c1e268177874690129d01fd06e +oid sha256:4a50a6fe58a4380d3709f96215c0e6f55eb9a892b3cb1e1d6ea4b5aed8633c31 size 2711 diff --git a/data/minecraft/structure/shipwreck/rightsideup_backhalf_degraded.nbt b/data/minecraft/structure/shipwreck/rightsideup_backhalf_degraded.nbt index 35f3b6cf..eccab338 100644 --- a/data/minecraft/structure/shipwreck/rightsideup_backhalf_degraded.nbt +++ b/data/minecraft/structure/shipwreck/rightsideup_backhalf_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf840c590068980a85534735e7d83568ee33f66857be10cd268a52da6145bf81 -size 2568 +oid sha256:b8c583c59545e3b19ac4f39bc15492803581be9189ecc8a1d12ff9acdea2f2d9 +size 2569 diff --git a/data/minecraft/structure/shipwreck/rightsideup_fronthalf.nbt b/data/minecraft/structure/shipwreck/rightsideup_fronthalf.nbt index b08cae8a..9c337bae 100644 --- a/data/minecraft/structure/shipwreck/rightsideup_fronthalf.nbt +++ b/data/minecraft/structure/shipwreck/rightsideup_fronthalf.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:653ab2e95527f48c59540b17fe2ee90e16d246ba59f55f5711e74e8552a446a0 -size 2471 +oid sha256:d3173ba5fed0a3d107449d657eea0332db7892e0bc67075d1c8cdb3daf107226 +size 2474 diff --git a/data/minecraft/structure/shipwreck/rightsideup_fronthalf_degraded.nbt b/data/minecraft/structure/shipwreck/rightsideup_fronthalf_degraded.nbt index 2f1c452e..03f0f9e2 100644 --- a/data/minecraft/structure/shipwreck/rightsideup_fronthalf_degraded.nbt +++ b/data/minecraft/structure/shipwreck/rightsideup_fronthalf_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a7ee8dc2499a3a09332a2465b37829e64c7879f86050f282bdddb436929755c +oid sha256:cc66d71676eea92415ed86ff9176c0e9a877f696b835f2c5730ca4890459fd98 size 2251 diff --git a/data/minecraft/structure/shipwreck/rightsideup_full.nbt b/data/minecraft/structure/shipwreck/rightsideup_full.nbt index 327c27fd..ef0ddeb1 100644 --- a/data/minecraft/structure/shipwreck/rightsideup_full.nbt +++ b/data/minecraft/structure/shipwreck/rightsideup_full.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0fe0ac83d89a96df1df1368e134ef32825ed85040681b665eb83002a8c15628 -size 3753 +oid sha256:d7c598266f776857a75cb2f8edea435c5464c8a3128469305c4da73bc7ca3e91 +size 3754 diff --git a/data/minecraft/structure/shipwreck/rightsideup_full_degraded.nbt b/data/minecraft/structure/shipwreck/rightsideup_full_degraded.nbt index 6866aef9..56bb92ff 100644 --- a/data/minecraft/structure/shipwreck/rightsideup_full_degraded.nbt +++ b/data/minecraft/structure/shipwreck/rightsideup_full_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d13db481ba0e7a2fb8962a9a40da19bb401977fe6dae9b04ce266cb2ed35f39 +oid sha256:39de852e0f32c0f46ca9c4ad7f5a4134a78630c95b1dbc5abd56a09de2486b24 size 3526 diff --git a/data/minecraft/structure/shipwreck/sideways_backhalf.nbt b/data/minecraft/structure/shipwreck/sideways_backhalf.nbt index dab00014..9eb9dedf 100644 --- a/data/minecraft/structure/shipwreck/sideways_backhalf.nbt +++ b/data/minecraft/structure/shipwreck/sideways_backhalf.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9644a99cecc46795cdb02ca844be99cbca15d36c60c10dbf08e257061507bc71 +oid sha256:c76b475211b2a49088ca4de5aab0f363b816b1f09fc69865c24411e79bb5851e size 2434 diff --git a/data/minecraft/structure/shipwreck/sideways_backhalf_degraded.nbt b/data/minecraft/structure/shipwreck/sideways_backhalf_degraded.nbt index 72139e0c..6fdbcb30 100644 --- a/data/minecraft/structure/shipwreck/sideways_backhalf_degraded.nbt +++ b/data/minecraft/structure/shipwreck/sideways_backhalf_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e22be9d1253d3d6d8bafe874abbf0ce545e0c7c95d0515f02776a6a8c767269f -size 2257 +oid sha256:fdccccb720f5fbad21c49729364f257dfdff23f29929cc612aab77783fe966e0 +size 2258 diff --git a/data/minecraft/structure/shipwreck/sideways_fronthalf.nbt b/data/minecraft/structure/shipwreck/sideways_fronthalf.nbt index 79be320c..94f311a3 100644 --- a/data/minecraft/structure/shipwreck/sideways_fronthalf.nbt +++ b/data/minecraft/structure/shipwreck/sideways_fronthalf.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7aad4bfedd8ae066cc79955f78ceb8ece04d37de71746b89b5f96c7b90df0788 -size 2202 +oid sha256:9b0ccc016f518954d13ff5213a1dccb29659e32a47a572905c4de49417b3e272 +size 2203 diff --git a/data/minecraft/structure/shipwreck/sideways_fronthalf_degraded.nbt b/data/minecraft/structure/shipwreck/sideways_fronthalf_degraded.nbt index 58809f49..56a2f7c7 100644 --- a/data/minecraft/structure/shipwreck/sideways_fronthalf_degraded.nbt +++ b/data/minecraft/structure/shipwreck/sideways_fronthalf_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ef92c72f488afd1b0ced326e0abd687b085917e202ad4b058656282bcb4215e +oid sha256:5dace99c13adaf7f24ba2ecd1ccb3424a7c7db52f54101769d07dfcb78b2be8a size 1912 diff --git a/data/minecraft/structure/shipwreck/sideways_full.nbt b/data/minecraft/structure/shipwreck/sideways_full.nbt index c2f023ad..ca8e12ea 100644 --- a/data/minecraft/structure/shipwreck/sideways_full.nbt +++ b/data/minecraft/structure/shipwreck/sideways_full.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9477414e6788d38525ec43976012f05eb0c5ae54b8642628f5a75515f15a8683 +oid sha256:c5e1ddb414d3f6f1af3fa18928953ee7d26bcdf37ed744ad77d8388e54ddf8b5 size 3510 diff --git a/data/minecraft/structure/shipwreck/sideways_full_degraded.nbt b/data/minecraft/structure/shipwreck/sideways_full_degraded.nbt index 3381d646..80a7dff6 100644 --- a/data/minecraft/structure/shipwreck/sideways_full_degraded.nbt +++ b/data/minecraft/structure/shipwreck/sideways_full_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6dfea38083fae1a4e08ef37f3c0e8c6ea3dcb0853c773486bb79a88664590588 +oid sha256:728c02c1ac95eca0f847cef84c07de8019589594f76be5c28f82159e608f95f4 size 3306 diff --git a/data/minecraft/structure/shipwreck/upsidedown_backhalf.nbt b/data/minecraft/structure/shipwreck/upsidedown_backhalf.nbt index 118be812..c5ca5dba 100644 --- a/data/minecraft/structure/shipwreck/upsidedown_backhalf.nbt +++ b/data/minecraft/structure/shipwreck/upsidedown_backhalf.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44cbd7e8a0cf5f656b8d12fddbeeb77a765716d16fae9ef339ed0284d9da8ef5 +oid sha256:d18161b793a544d358a40529c496cc9a51b513c506f40c0e1733384b1a18e0e1 size 2516 diff --git a/data/minecraft/structure/shipwreck/upsidedown_backhalf_degraded.nbt b/data/minecraft/structure/shipwreck/upsidedown_backhalf_degraded.nbt index fe35089b..1d1ef495 100644 --- a/data/minecraft/structure/shipwreck/upsidedown_backhalf_degraded.nbt +++ b/data/minecraft/structure/shipwreck/upsidedown_backhalf_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3f975179f838b250f2d8aa23682486681cc542ae434aef36c06ef453d827502 -size 2386 +oid sha256:0445c0c80be0c5b0a86349590c883e1b2564b2a4f90be5196811a00437da3b7f +size 2387 diff --git a/data/minecraft/structure/shipwreck/upsidedown_fronthalf.nbt b/data/minecraft/structure/shipwreck/upsidedown_fronthalf.nbt index c735d109..b4dbfdb2 100644 --- a/data/minecraft/structure/shipwreck/upsidedown_fronthalf.nbt +++ b/data/minecraft/structure/shipwreck/upsidedown_fronthalf.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2522ee7b8a555237e3e48e3acf1b3f5230e9861d6787613fd8abe180d47681fb -size 2322 +oid sha256:14ac3ff9b5c51d84e3c62dcfc46ce64800927f62712366289a730cd7125e883f +size 2323 diff --git a/data/minecraft/structure/shipwreck/upsidedown_fronthalf_degraded.nbt b/data/minecraft/structure/shipwreck/upsidedown_fronthalf_degraded.nbt index 357a1d6f..11b0a8bf 100644 --- a/data/minecraft/structure/shipwreck/upsidedown_fronthalf_degraded.nbt +++ b/data/minecraft/structure/shipwreck/upsidedown_fronthalf_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19ac750889afaad5fb9b856d25be14a1bb6a9ca6f251c2910a981d906fb02342 -size 2208 +oid sha256:47a6ac5d334b2cbe883adf4aa29f6f22026e8e99dfe98b303b645eb007787ae3 +size 2209 diff --git a/data/minecraft/structure/shipwreck/upsidedown_full.nbt b/data/minecraft/structure/shipwreck/upsidedown_full.nbt index 90e71893..f28cfbae 100644 --- a/data/minecraft/structure/shipwreck/upsidedown_full.nbt +++ b/data/minecraft/structure/shipwreck/upsidedown_full.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3666b0aede1c2d4aa92305338ac191326c49454b8a296babca774b40a67be533 +oid sha256:c66dbfe8e8b5c2adaaf9615993280de0ce96752a8e7f0c8a6cc38394863744be size 3468 diff --git a/data/minecraft/structure/shipwreck/upsidedown_full_degraded.nbt b/data/minecraft/structure/shipwreck/upsidedown_full_degraded.nbt index 8e75d576..f2707efc 100644 --- a/data/minecraft/structure/shipwreck/upsidedown_full_degraded.nbt +++ b/data/minecraft/structure/shipwreck/upsidedown_full_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b362fd96683a412fa5f32582515615f852350ff1f33c276ca73e7112bafae2c8 -size 3297 +oid sha256:73a307930daceda08a5306ae8679439a3ec2c177b3e0844382f54a96ce91dfb0 +size 3298 diff --git a/data/minecraft/structure/shipwreck/with_mast.nbt b/data/minecraft/structure/shipwreck/with_mast.nbt index 02c6963d..2b1aa4d5 100644 --- a/data/minecraft/structure/shipwreck/with_mast.nbt +++ b/data/minecraft/structure/shipwreck/with_mast.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a20c1d86d1993ffe1211f0ec5b25264a4c1f405f0bac2a3882a0f775994486e -size 3958 +oid sha256:020b2a951e0e2844ae36ef540558e9b647b74e6960a7d5191c5852f8a5242562 +size 3959 diff --git a/data/minecraft/structure/shipwreck/with_mast_degraded.nbt b/data/minecraft/structure/shipwreck/with_mast_degraded.nbt index ffb24d12..89abb6df 100644 --- a/data/minecraft/structure/shipwreck/with_mast_degraded.nbt +++ b/data/minecraft/structure/shipwreck/with_mast_degraded.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e4cd1ff3944cb2e9e9441c843d2dc0a9694522e4593419dc80e43b96ede4083 -size 3683 +oid sha256:a6609f200e97034a722ac04c216ee6412a8c6e40aad5556d53671db0fe8eafaa +size 3684 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_full_1.nbt b/data/minecraft/structure/trail_ruins/buildings/group_full_1.nbt index f1578e08..1bea7b1d 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_full_1.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_full_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e609927bdfbff6d8512228704f9dfd160e4cfef129141a72781d073c1ae93f50 +oid sha256:f889f778deff4dae4c5c1cec7c200db1a29a1dcc492388769cfa92696a4404cc size 1339 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_full_2.nbt b/data/minecraft/structure/trail_ruins/buildings/group_full_2.nbt index 1bdcc153..069d0c9a 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_full_2.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_full_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed151bedcb63803b98a4d0350365f7a1a99a419be5df0faf5ce861bdb949f87b +oid sha256:e03a4d1680cf6293e2a6981b09fe9567c9b0f74b57c1a9b506806214c0104f59 size 1280 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_full_3.nbt b/data/minecraft/structure/trail_ruins/buildings/group_full_3.nbt index 52e351c7..f931606b 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_full_3.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_full_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eef58987c1eee24f5db20b4c9344d543d45a28580308b2fbadd198e7cc9fd08a +oid sha256:9a0c3037d4f1cb65a51fbe4b760004b4f0bdc83bd49bd58631e4f5617eacc813 size 1298 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_full_4.nbt b/data/minecraft/structure/trail_ruins/buildings/group_full_4.nbt index 35e76e3f..9c46a15d 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_full_4.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_full_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eaa3beb4f9feb7d9eac90ea6e40900f3e201f6b1d892923b8684c2650700ee37 +oid sha256:2aae84994ef410285f22df8a9aab0b3b1dbb7de2280229106ba84eb15b9e6e20 size 1263 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_full_5.nbt b/data/minecraft/structure/trail_ruins/buildings/group_full_5.nbt index d6e107e5..1dfac52f 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_full_5.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_full_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d09f9ed483146faa2e1320887dfad7a5a5a4c947fc5b69847c25ddc737a97a93 +oid sha256:0df8e7ea03f5bca4774ade6d58715afe90357c4eea8e9bbc6e063c1f01280ce3 size 1260 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_hall_1.nbt b/data/minecraft/structure/trail_ruins/buildings/group_hall_1.nbt index f1db7988..e864703e 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_hall_1.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_hall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5862348eded696789f0284251bc08e93870094f1a8b931fdfb15b6e71141bdd +oid sha256:87addff536642451ce777570a8e9c33cd77b71577ebe95c38ad38b6623f484bb size 1516 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_hall_2.nbt b/data/minecraft/structure/trail_ruins/buildings/group_hall_2.nbt index c6ae9041..00a19b64 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_hall_2.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_hall_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3881cdfeb78b14f97e5dcfa2344fb44ddc34452cbb1efb69f8f99366bcd767d +oid sha256:c89a56adc080f73b24dab7ba097f666c00fb8d1bbae468e2c6da94347f9922ab size 1615 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_hall_3.nbt b/data/minecraft/structure/trail_ruins/buildings/group_hall_3.nbt index e0b56ee3..7f430eb5 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_hall_3.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_hall_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e01f4acc05ee6d19172c5f0fc1ddee515a2f0b2609d74ed5100a8ae7a057cee9 +oid sha256:d452a89fd0a6123ac7d8f5b0ff3fd56aabc6d652e9a8dac6e8ef44b072548022 size 1716 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_hall_4.nbt b/data/minecraft/structure/trail_ruins/buildings/group_hall_4.nbt index ef3a87c2..14c97fb1 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_hall_4.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_hall_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d98657fb39597bc4ed4c916e9e3942f4cf466cd5984da1e0cedc38040f9232e1 -size 1639 +oid sha256:c8e176b8b76e847c0e4d3ef69bcc44b0b7a4b69f9b6d8358ad7bb150ea0fa83e +size 1640 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_hall_5.nbt b/data/minecraft/structure/trail_ruins/buildings/group_hall_5.nbt index 3ce8e57f..0a63ac81 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_hall_5.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_hall_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98cb6c424e237724dd28702edf586f2271170b2a69c14fa0a07433772b0322d4 -size 1525 +oid sha256:6718c25ae76679bad26fabe3640bab3974abc60734227a2830b9a40b58b976d1 +size 1526 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_lower_1.nbt b/data/minecraft/structure/trail_ruins/buildings/group_lower_1.nbt index cd557cb9..a4709aa3 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_lower_1.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_lower_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:adc1fee8075152bd16eb5cc9ddc8cd40764cf9cdd895697c4a21e56c663ff05f -size 1046 +oid sha256:e365be688ff4eb801397d1e9df1625b9eb285bd7318f713a951b1335881e7b9b +size 1047 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_lower_2.nbt b/data/minecraft/structure/trail_ruins/buildings/group_lower_2.nbt index 12b423eb..92dff0d1 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_lower_2.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_lower_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e161488ade81e5a9a276bcfff0ef8a7ff90a2d222549da84e178c737ebaa91c4 -size 1043 +oid sha256:03318389f608f43907427d12cfcc9f75d185b6bad5f9c203faf380a4130aabab +size 1044 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_lower_3.nbt b/data/minecraft/structure/trail_ruins/buildings/group_lower_3.nbt index 6aaf641c..826d609c 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_lower_3.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_lower_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ac1df822f9015854d80689b59e3f2ec5d7f86c710bf0caf41aa7e9810b721ac +oid sha256:85f7f03da7c7532e7cb6ed5569fef5287c4539d951136edddbcb98fd2ce47490 size 1046 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_lower_4.nbt b/data/minecraft/structure/trail_ruins/buildings/group_lower_4.nbt index 5e48919f..057b24b7 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_lower_4.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_lower_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6941b2678ca6bdbdc62fc413fda1e89e88011e80adf8d970bc122485ae4f710 +oid sha256:eeeb1a907e77c23de18dd38978a944fdf1e65f6e4a231a374a156c92cbb1a063 size 974 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_lower_5.nbt b/data/minecraft/structure/trail_ruins/buildings/group_lower_5.nbt index 4001f72b..9c464fdd 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_lower_5.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_lower_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:285896454acb0a8ca4a4e45ecf3547f4bceec7c000083105c43cbb8c0b7d93d4 +oid sha256:12741ce84f7669f1a8d436523311764dcca10bf534f44e5689aeb9da3d8193a1 size 972 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_room_1.nbt b/data/minecraft/structure/trail_ruins/buildings/group_room_1.nbt index a7030a08..17bd7d80 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_room_1.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_room_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b01a43617b2862154d344987827accf5d4ac9e91df6ab49f4e30afafa855f642 +oid sha256:c700bd5b083296b6a853e4a9d8e135757ece4b635972ad07e07f9030fd7da450 size 780 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_room_2.nbt b/data/minecraft/structure/trail_ruins/buildings/group_room_2.nbt index 63718adb..efafdff1 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_room_2.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_room_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cac58e3a689a4933b21b98af71ad76ca36e2cbd9ba01a0fc4fb7e94fcd1b3f69 +oid sha256:37575151564a08a347effadddb0f03162d48638eb7cb6e794c50238429a3ccbb size 863 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_room_3.nbt b/data/minecraft/structure/trail_ruins/buildings/group_room_3.nbt index 184962dd..d39aef87 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_room_3.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_room_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9794bb92108f4209f65fa195cfa21e88a12ceb82afc52426b2f36f1c184154c6 +oid sha256:17092c71e10441f89e849f55ab3562d798197cc25ca5641cc57c5a42e44df5a3 size 847 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_room_4.nbt b/data/minecraft/structure/trail_ruins/buildings/group_room_4.nbt index 07b2153c..15d410ea 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_room_4.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_room_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3870c42bde335c2eda5e4cbd8c37d154bf091597f2e2a9231e02d7a8442d76e2 +oid sha256:13b8e92951671613d37065b69ab7f184398f7ede907c2957ce86e6f94d252529 size 780 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_room_5.nbt b/data/minecraft/structure/trail_ruins/buildings/group_room_5.nbt index f88881c4..c40b976d 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_room_5.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_room_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48c0d98d70512d469e8afe5b9a3109be1ef4992a76f0dae8ead7e1a0ee11d4bd -size 778 +oid sha256:b599ecd5df9e07bfb0c1e96dd6bef58f142bc91fccb985b2bcce801a5c6239bf +size 779 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_upper_1.nbt b/data/minecraft/structure/trail_ruins/buildings/group_upper_1.nbt index c5b306fc..ae25350e 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_upper_1.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_upper_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3460f1fd6d7ebd567b53922a2573716733813a3dc644b328de18a0f3b565f174 +oid sha256:bc8843a6c444133d662e3d3185494d861e89a0a2738afdeb7f9b1098406401ca size 1269 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_upper_2.nbt b/data/minecraft/structure/trail_ruins/buildings/group_upper_2.nbt index a8ffed04..7ab385e5 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_upper_2.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_upper_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12d020cac5565a1b8f0eab3518de7557ac4d67e6e44540342bad19e6fbd1eb2a +oid sha256:ff906be9ab7f03607d9c74a77ce3c0d113570ebf03bc599d3efd6b9720016d29 size 1262 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_upper_3.nbt b/data/minecraft/structure/trail_ruins/buildings/group_upper_3.nbt index dd93c78e..b3f5b703 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_upper_3.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_upper_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3e386aa60312ca14c03961124f2b25df2b0188d8baf367a11819f362d8ab6cc +oid sha256:573ca202d4d8fa8ca9056ccf0873dad2ef0e80418b84a3b7cb8d4e992e502fe0 size 1273 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_upper_4.nbt b/data/minecraft/structure/trail_ruins/buildings/group_upper_4.nbt index 838745ee..10b6a3e4 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_upper_4.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_upper_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f8b73a9a43c96210a387b96b9a0ae3c4a274ccf1fd606e052c41a7ad8bd59d0 +oid sha256:e63e8ad0dbf7622cf9a8921d84545d14782b694a6bcda309b128711de8249552 size 1181 diff --git a/data/minecraft/structure/trail_ruins/buildings/group_upper_5.nbt b/data/minecraft/structure/trail_ruins/buildings/group_upper_5.nbt index c31e5d0f..f238c873 100644 --- a/data/minecraft/structure/trail_ruins/buildings/group_upper_5.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/group_upper_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c82f74da2e3715f7580ad411a6c304587826bd7ed0518adc5dc1a9c76696daa6 +oid sha256:f1b53250b73f2573ece1e09d423305268bbb0c5d9405ddba14000444fc91c456 size 1177 diff --git a/data/minecraft/structure/trail_ruins/buildings/large_room_1.nbt b/data/minecraft/structure/trail_ruins/buildings/large_room_1.nbt index eec2e2f5..4ed12b83 100644 --- a/data/minecraft/structure/trail_ruins/buildings/large_room_1.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/large_room_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c5f0631796ed844dcc3a120de76e3abd2d80092146dbd99771267dcea3032ad -size 1945 +oid sha256:190354397b373723f4edef2ce85171864615a63a41ec7089ef54f45feca8f487 +size 1944 diff --git a/data/minecraft/structure/trail_ruins/buildings/large_room_2.nbt b/data/minecraft/structure/trail_ruins/buildings/large_room_2.nbt index 0b5da116..983b2730 100644 --- a/data/minecraft/structure/trail_ruins/buildings/large_room_2.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/large_room_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7022f7b7339d133ef9c667c7f27db716aac119deee7e8ca46d033cfb4bd7268e -size 1657 +oid sha256:dd1687e3060bd1cc76882b0e0bc1df7e3921849b0cd3ba13026be4f7586532d4 +size 1656 diff --git a/data/minecraft/structure/trail_ruins/buildings/large_room_3.nbt b/data/minecraft/structure/trail_ruins/buildings/large_room_3.nbt index 4bb32432..0312fa14 100644 --- a/data/minecraft/structure/trail_ruins/buildings/large_room_3.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/large_room_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58bd8f803b2906ff8f4ce9561a72d67c4b4c6e6fbb905bbe6ad6191e8c635ec3 -size 2706 +oid sha256:8411d2874fa4093238da8045c857fe0c4a114f62d4508fd5b5c53590490f52b8 +size 2707 diff --git a/data/minecraft/structure/trail_ruins/buildings/large_room_4.nbt b/data/minecraft/structure/trail_ruins/buildings/large_room_4.nbt index 7a48fc32..31e1a9a9 100644 --- a/data/minecraft/structure/trail_ruins/buildings/large_room_4.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/large_room_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02ae203451824f96aa3ea05eec3435621dbbaaf3956659fa838b1b49f66a40c8 +oid sha256:13e2bcfe75036e1ef469528e6954c671fafb9887da76c0f966254540d9baba12 size 1563 diff --git a/data/minecraft/structure/trail_ruins/buildings/large_room_5.nbt b/data/minecraft/structure/trail_ruins/buildings/large_room_5.nbt index 8b4fad9c..724b2285 100644 --- a/data/minecraft/structure/trail_ruins/buildings/large_room_5.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/large_room_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2e5b618fd05f83b3fd6d7d3fe8a784675982d31a53358ad93ed50b409b53911 -size 3218 +oid sha256:43ca4b19fc8547c4d31414019e1e3d057601060a421bc874f37de887fcacb40d +size 3217 diff --git a/data/minecraft/structure/trail_ruins/buildings/one_room_1.nbt b/data/minecraft/structure/trail_ruins/buildings/one_room_1.nbt index bdad7248..05c5b317 100644 --- a/data/minecraft/structure/trail_ruins/buildings/one_room_1.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/one_room_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a77290682b2686ae214874f1d6ac26061f17368ae76a874f08c7ae3d176515d1 +oid sha256:e7dd9ea6b47c2426aa9464735254dab5cce02ad6fbd5eeae1e37a134450c83f3 size 1004 diff --git a/data/minecraft/structure/trail_ruins/buildings/one_room_2.nbt b/data/minecraft/structure/trail_ruins/buildings/one_room_2.nbt index bd6ebf33..cd6c8551 100644 --- a/data/minecraft/structure/trail_ruins/buildings/one_room_2.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/one_room_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7def33afca9755a3d063ed73cb8bb93d48dde53a9dc5f56df9fb551cf14ec5ef +oid sha256:6080fde15753ad90aa3e3f152e36e028c4cd413bf7a49ff2f6f63c7973a0223c size 1086 diff --git a/data/minecraft/structure/trail_ruins/buildings/one_room_3.nbt b/data/minecraft/structure/trail_ruins/buildings/one_room_3.nbt index f15088f8..78c2f11b 100644 --- a/data/minecraft/structure/trail_ruins/buildings/one_room_3.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/one_room_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5eac0de7c113eebe2ed3c95df0f2f966acc2ab96c2e26948b0dc3e6972485656 +oid sha256:d25cd57b460ccbf5576acf6e1b27563cfad1a961f3b63983d4d354cdf7f3a4f2 size 1105 diff --git a/data/minecraft/structure/trail_ruins/buildings/one_room_4.nbt b/data/minecraft/structure/trail_ruins/buildings/one_room_4.nbt index fcd33188..3b14c218 100644 --- a/data/minecraft/structure/trail_ruins/buildings/one_room_4.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/one_room_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7021159a3e94e84c894356c61c6b6d7f902df6916f9a1f75d26def9c48312a0 +oid sha256:feea881090ecc1e7202d153a059354b9c87d09f8af89efef026b2cc42946e018 size 1451 diff --git a/data/minecraft/structure/trail_ruins/buildings/one_room_5.nbt b/data/minecraft/structure/trail_ruins/buildings/one_room_5.nbt index 1a8ab28e..09ae7c52 100644 --- a/data/minecraft/structure/trail_ruins/buildings/one_room_5.nbt +++ b/data/minecraft/structure/trail_ruins/buildings/one_room_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5edd5a699a5d65c3e1f3789ed98431b06f6e39ba81dbae6b5a8e94ea07f87b8 +oid sha256:8600c7cbe9ba771944b73827325eaed322f8b8b6c4d2e97037332980be9d9bb9 size 973 diff --git a/data/minecraft/structure/trail_ruins/decor/decor_1.nbt b/data/minecraft/structure/trail_ruins/decor/decor_1.nbt index c4aff50d..9fca0ab7 100644 --- a/data/minecraft/structure/trail_ruins/decor/decor_1.nbt +++ b/data/minecraft/structure/trail_ruins/decor/decor_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b27f1e53b03dd29047eb9ce2a183f14de3b2e5495ea85cb2d55bdd2182bc98ca +oid sha256:5b36d666c4ae3bfeb905f0ee54b042592678ec82eb9f6e27a18a9d0c55478dfc size 488 diff --git a/data/minecraft/structure/trail_ruins/decor/decor_2.nbt b/data/minecraft/structure/trail_ruins/decor/decor_2.nbt index 35809218..f8d50c05 100644 --- a/data/minecraft/structure/trail_ruins/decor/decor_2.nbt +++ b/data/minecraft/structure/trail_ruins/decor/decor_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cbc46eb346a0c037ed7735e90ed16f77a3a9825374ac3ca33c74c1e1c85d3a5 +oid sha256:9f3784bb155429f7aab6ea0bfd0037d73f280eddb4c0284a6f17c69f4cd0750a size 470 diff --git a/data/minecraft/structure/trail_ruins/decor/decor_3.nbt b/data/minecraft/structure/trail_ruins/decor/decor_3.nbt index cdf75ac3..5b3171c8 100644 --- a/data/minecraft/structure/trail_ruins/decor/decor_3.nbt +++ b/data/minecraft/structure/trail_ruins/decor/decor_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b725e844f5ecd863d8bf9b1e485732d32d44e1f4021077bbe3d417dd71f69037 +oid sha256:d80b3f873d4d15f1b6eae1dbe7325b62ba95d45d6f33c07b72c9d3632126a83a size 376 diff --git a/data/minecraft/structure/trail_ruins/decor/decor_4.nbt b/data/minecraft/structure/trail_ruins/decor/decor_4.nbt index 083f994e..1fcf8a59 100644 --- a/data/minecraft/structure/trail_ruins/decor/decor_4.nbt +++ b/data/minecraft/structure/trail_ruins/decor/decor_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3320ddc0b234217156a95e9e0af1a3281862569ce20fed97d13a5629b6e5a34 +oid sha256:7c891c1d4fc7d2a64ead4eea1796f3e1da103b2c82ed1968953169374a1f823c size 416 diff --git a/data/minecraft/structure/trail_ruins/decor/decor_5.nbt b/data/minecraft/structure/trail_ruins/decor/decor_5.nbt index 37b1c765..7e834af7 100644 --- a/data/minecraft/structure/trail_ruins/decor/decor_5.nbt +++ b/data/minecraft/structure/trail_ruins/decor/decor_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5705ebb98821203f301e1efdc73e6c170b09ce757cc9e57b37a059ca21f62c64 +oid sha256:43093dfd2a659823228826e72f35c3b6406631944ad82a8e2b2991bf97bc32fe size 491 diff --git a/data/minecraft/structure/trail_ruins/decor/decor_6.nbt b/data/minecraft/structure/trail_ruins/decor/decor_6.nbt index e98e2e13..2ea23487 100644 --- a/data/minecraft/structure/trail_ruins/decor/decor_6.nbt +++ b/data/minecraft/structure/trail_ruins/decor/decor_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6aac738a191baa21bf274eced786371e659c89f410bc767b31784063fbe5851d +oid sha256:8a994a9c968c2fad7aac3507a7ead0fb2bdf637a94b1487a35194b6110ce719d size 506 diff --git a/data/minecraft/structure/trail_ruins/decor/decor_7.nbt b/data/minecraft/structure/trail_ruins/decor/decor_7.nbt index 474cc09d..83c9e40d 100644 --- a/data/minecraft/structure/trail_ruins/decor/decor_7.nbt +++ b/data/minecraft/structure/trail_ruins/decor/decor_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c99032cf4304c9de92cb4172763c54d30f7ea9ab8e3d8ff302a08c49f63dbfe +oid sha256:af41a15f3e86c31318d7aebf61522b2370d63ea83c5ff196f22bb3a338a3c792 size 630 diff --git a/data/minecraft/structure/trail_ruins/roads/long_road_end.nbt b/data/minecraft/structure/trail_ruins/roads/long_road_end.nbt index bba2774b..9034307e 100644 --- a/data/minecraft/structure/trail_ruins/roads/long_road_end.nbt +++ b/data/minecraft/structure/trail_ruins/roads/long_road_end.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:585d9e7927657c9b2aab926cf4e7636a2fc5abb0e20d876cbc50317e8dd2438d +oid sha256:e387c978fe331a5e03690f25200283ca471f11bea2cb04e0040449e23e60cbab size 858 diff --git a/data/minecraft/structure/trail_ruins/roads/road_end_1.nbt b/data/minecraft/structure/trail_ruins/roads/road_end_1.nbt index 4bd9a69c..35936ac8 100644 --- a/data/minecraft/structure/trail_ruins/roads/road_end_1.nbt +++ b/data/minecraft/structure/trail_ruins/roads/road_end_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd4b4dc3ad897249f126928ff711c63ca1546dae9a926db41d24899412a7332b -size 465 +oid sha256:c76e00b1af3091ec3c0b1bd1f4e99722c8d2d8c45f786eab410f87f7f5c64ffa +size 466 diff --git a/data/minecraft/structure/trail_ruins/roads/road_section_1.nbt b/data/minecraft/structure/trail_ruins/roads/road_section_1.nbt index 1b170c1c..d475698e 100644 --- a/data/minecraft/structure/trail_ruins/roads/road_section_1.nbt +++ b/data/minecraft/structure/trail_ruins/roads/road_section_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecca491fe11938492ce90062121c049dbadb2161a76c59a0e972c8c30b0d0fb4 +oid sha256:4f73495979fe6fb55d747e9dc92a8f165469afa040db574d8015b45c83d86a5e size 705 diff --git a/data/minecraft/structure/trail_ruins/roads/road_section_2.nbt b/data/minecraft/structure/trail_ruins/roads/road_section_2.nbt index 15a17ee3..ed27218a 100644 --- a/data/minecraft/structure/trail_ruins/roads/road_section_2.nbt +++ b/data/minecraft/structure/trail_ruins/roads/road_section_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:878593e21b0b9f97bcc180dafbec42e3060c61e0e8dbc9e2df323823e01b7e33 +oid sha256:20408b7460214266dceded721235650716c36b8e20f8b7efee4218924842d932 size 718 diff --git a/data/minecraft/structure/trail_ruins/roads/road_section_3.nbt b/data/minecraft/structure/trail_ruins/roads/road_section_3.nbt index 1dcad61e..966bc58d 100644 --- a/data/minecraft/structure/trail_ruins/roads/road_section_3.nbt +++ b/data/minecraft/structure/trail_ruins/roads/road_section_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e528b5f7966897e146f9b82654fb9d190cbaa42311061ba9265c58342650272f +oid sha256:ca1b0bed2973caa1b0a9c43ac282da09cdebdd18eae91ab04b5362b2695dd842 size 755 diff --git a/data/minecraft/structure/trail_ruins/roads/road_section_4.nbt b/data/minecraft/structure/trail_ruins/roads/road_section_4.nbt index 7ff96a18..5985f6c0 100644 --- a/data/minecraft/structure/trail_ruins/roads/road_section_4.nbt +++ b/data/minecraft/structure/trail_ruins/roads/road_section_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e32301605d51f6183202ced62ef1acb469c623053e5987ab1d042c68357d5312 +oid sha256:accd73dab8fc9553f5fcd3b8a53f83bc49e2e32283280e17e626b2a358ceb3c5 size 771 diff --git a/data/minecraft/structure/trail_ruins/roads/road_spacer_1.nbt b/data/minecraft/structure/trail_ruins/roads/road_spacer_1.nbt index 3d3da32b..90db92de 100644 --- a/data/minecraft/structure/trail_ruins/roads/road_spacer_1.nbt +++ b/data/minecraft/structure/trail_ruins/roads/road_spacer_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2991f82e845987d66ef5aa01ccd8be474d51682cd55d3377e3b11fb35e507d4a +oid sha256:d5850f2cbda17eaf6f849ad16d08ed302ee05dff2e8ffec2da53c935d84243e0 size 643 diff --git a/data/minecraft/structure/trail_ruins/tower/hall_1.nbt b/data/minecraft/structure/trail_ruins/tower/hall_1.nbt index b55d90e2..a1a4a461 100644 --- a/data/minecraft/structure/trail_ruins/tower/hall_1.nbt +++ b/data/minecraft/structure/trail_ruins/tower/hall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d1aed4070429dc9d467df19d25ca38e9bb2016044b5f422a218935ff256fb8b +oid sha256:3eb8474cb6341e520a60e14edb22666a420bd2926348ce2b0c8467de518dc5aa size 1518 diff --git a/data/minecraft/structure/trail_ruins/tower/hall_2.nbt b/data/minecraft/structure/trail_ruins/tower/hall_2.nbt index 55ee2b47..0d68b4e3 100644 --- a/data/minecraft/structure/trail_ruins/tower/hall_2.nbt +++ b/data/minecraft/structure/trail_ruins/tower/hall_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9140d00ff359871649b539947330c8fd54d237989caedc46b756da74b52fa0a4 -size 1892 +oid sha256:f0a7309dfec2311d3a83a8baa6832b007bffc44c4d9e5f8b31f347450742927b +size 1893 diff --git a/data/minecraft/structure/trail_ruins/tower/hall_3.nbt b/data/minecraft/structure/trail_ruins/tower/hall_3.nbt index 42b8f601..b736e207 100644 --- a/data/minecraft/structure/trail_ruins/tower/hall_3.nbt +++ b/data/minecraft/structure/trail_ruins/tower/hall_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:515b594dbc1b3ec12f48a4d9d8b1eaac8c4494c3bedc8da942bf9dc6fdcc76e1 +oid sha256:2616e832423900b1593d3325acbac6ec655f9b25ba8619fe00cbeffa05f96825 size 2139 diff --git a/data/minecraft/structure/trail_ruins/tower/hall_4.nbt b/data/minecraft/structure/trail_ruins/tower/hall_4.nbt index 27a159e7..9fdff350 100644 --- a/data/minecraft/structure/trail_ruins/tower/hall_4.nbt +++ b/data/minecraft/structure/trail_ruins/tower/hall_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4026b4c3ca091c840fc93d1a95cd404b9c97a3e0e9faf17e551466908a5b0730 +oid sha256:3b47df197b08e55e084a788926e6d7ba58435ec7003a3c5c3d7aa8d21d73d353 size 2030 diff --git a/data/minecraft/structure/trail_ruins/tower/hall_5.nbt b/data/minecraft/structure/trail_ruins/tower/hall_5.nbt index 9e7dfaee..18cbdbbb 100644 --- a/data/minecraft/structure/trail_ruins/tower/hall_5.nbt +++ b/data/minecraft/structure/trail_ruins/tower/hall_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bd9ad67be1bc95a69221a033895a727b45539816145b94420805d14aadccea7 +oid sha256:27032dfb32b04e7c1ba47f58e5a4f7a1f944557316459a320cc86b13ca96a9a4 size 1872 diff --git a/data/minecraft/structure/trail_ruins/tower/large_hall_1.nbt b/data/minecraft/structure/trail_ruins/tower/large_hall_1.nbt index bb0b561f..4d04bdb0 100644 --- a/data/minecraft/structure/trail_ruins/tower/large_hall_1.nbt +++ b/data/minecraft/structure/trail_ruins/tower/large_hall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:730c3c90697151366ba248d13cc8a6e5065752c880119f1f833ba7245202624a +oid sha256:7284e42f5d07f4f3a77c989b09d87798c94b56698f59e7565cd6d0b3da3e23e1 size 2023 diff --git a/data/minecraft/structure/trail_ruins/tower/large_hall_2.nbt b/data/minecraft/structure/trail_ruins/tower/large_hall_2.nbt index 0da34025..f4d09e75 100644 --- a/data/minecraft/structure/trail_ruins/tower/large_hall_2.nbt +++ b/data/minecraft/structure/trail_ruins/tower/large_hall_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ac0ba0f873f0a7fe9352e806828382e2a0fe178ffc66dedf6534381c9afa33d +oid sha256:5ec38e73ed99964786ed9494e530d0d7efaeed5eba1e285bf86699b487bb1d03 size 1965 diff --git a/data/minecraft/structure/trail_ruins/tower/large_hall_3.nbt b/data/minecraft/structure/trail_ruins/tower/large_hall_3.nbt index aec421f1..eb45d2a8 100644 --- a/data/minecraft/structure/trail_ruins/tower/large_hall_3.nbt +++ b/data/minecraft/structure/trail_ruins/tower/large_hall_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59e12f2d4632ef4d136a22513cd74b046b6c8e44254ae4b848d68c0e0663c9ef +oid sha256:0561de18580892f1b9bbaa692791a9d95fb3b59e82bdc8a08c70f9ceaced7be7 size 2023 diff --git a/data/minecraft/structure/trail_ruins/tower/large_hall_4.nbt b/data/minecraft/structure/trail_ruins/tower/large_hall_4.nbt index 2d38ff0f..639edf22 100644 --- a/data/minecraft/structure/trail_ruins/tower/large_hall_4.nbt +++ b/data/minecraft/structure/trail_ruins/tower/large_hall_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06e363e5a6deec50e731bcbc783838a2ef21fde0bbc9cb6223374589ecaf493b +oid sha256:b9075c3820c10c573f3ff301fb2caade4d3763a259c5b83236f7dfe78558dbe0 size 1807 diff --git a/data/minecraft/structure/trail_ruins/tower/large_hall_5.nbt b/data/minecraft/structure/trail_ruins/tower/large_hall_5.nbt index 6f995d60..4180813e 100644 --- a/data/minecraft/structure/trail_ruins/tower/large_hall_5.nbt +++ b/data/minecraft/structure/trail_ruins/tower/large_hall_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a30860bf0a3e8426eabea41ff4b4bdaed96338819614a2241c2d11a28bfba1c5 +oid sha256:3e64637511387092a34de64a2279dd153082cc4a21031f0d96baf3079ab2c53f size 2002 diff --git a/data/minecraft/structure/trail_ruins/tower/one_room_1.nbt b/data/minecraft/structure/trail_ruins/tower/one_room_1.nbt index 64dc4abc..beba6abb 100644 --- a/data/minecraft/structure/trail_ruins/tower/one_room_1.nbt +++ b/data/minecraft/structure/trail_ruins/tower/one_room_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5eb1bc29e2293ce3dd2ffa0de4f384bfc94907822eda89352af17110e1441ab5 -size 648 +oid sha256:38818c4a16f0c85b64bf24bf4f2454036ba46d0f9e94dad85cc742a6faaf037b +size 649 diff --git a/data/minecraft/structure/trail_ruins/tower/one_room_2.nbt b/data/minecraft/structure/trail_ruins/tower/one_room_2.nbt index dc1e82e0..6d476629 100644 --- a/data/minecraft/structure/trail_ruins/tower/one_room_2.nbt +++ b/data/minecraft/structure/trail_ruins/tower/one_room_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:218d1cb2ce2dc52706fc9ad464c389669dbfa5180a001463e1d30daa7d6264cc -size 717 +oid sha256:8305dd62a1792bf427d17762947803f63d64f6abecddb663a73424b257626f6c +size 718 diff --git a/data/minecraft/structure/trail_ruins/tower/one_room_3.nbt b/data/minecraft/structure/trail_ruins/tower/one_room_3.nbt index 9c3f173a..7a20d6f9 100644 --- a/data/minecraft/structure/trail_ruins/tower/one_room_3.nbt +++ b/data/minecraft/structure/trail_ruins/tower/one_room_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44a8e9c36dc8c9411b5408d23f07c3b91dc07987df74ffb772b940f3598dfcae +oid sha256:abddd13e3b6d4b830f18b3cbfdf236ae2cb33b4678d3745eb3d94b3d331c3c3c size 623 diff --git a/data/minecraft/structure/trail_ruins/tower/one_room_4.nbt b/data/minecraft/structure/trail_ruins/tower/one_room_4.nbt index 30ccbd32..5d0c93f8 100644 --- a/data/minecraft/structure/trail_ruins/tower/one_room_4.nbt +++ b/data/minecraft/structure/trail_ruins/tower/one_room_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2dc943181fb9aa94d64c996b199b32c4c004ea4f89aa5763026052bc87118c6 -size 614 +oid sha256:b7b6485e720e249d60f33ab449d1ea685f5146a630cba562c58fcb53d0594595 +size 615 diff --git a/data/minecraft/structure/trail_ruins/tower/one_room_5.nbt b/data/minecraft/structure/trail_ruins/tower/one_room_5.nbt index b666e4d8..e89a2e95 100644 --- a/data/minecraft/structure/trail_ruins/tower/one_room_5.nbt +++ b/data/minecraft/structure/trail_ruins/tower/one_room_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83872c9fb39e663351e07ef711b15888541a4271e1fc7030df755c5350b78eaa +oid sha256:0b87fb28aabd60deeba7bca95dee50110f764db427b27d73bc92b5d1a5c7f3a5 size 636 diff --git a/data/minecraft/structure/trail_ruins/tower/platform_1.nbt b/data/minecraft/structure/trail_ruins/tower/platform_1.nbt index 2e90dc39..c1526660 100644 --- a/data/minecraft/structure/trail_ruins/tower/platform_1.nbt +++ b/data/minecraft/structure/trail_ruins/tower/platform_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28a1e0b7f7627255bdde995c864cb28eb0cd4a118ae377fee966400d4d9441ad -size 1195 +oid sha256:55e1d05b1015437f408aa406b5e9d2b86baac4188079d7f68734a04b968b419b +size 1196 diff --git a/data/minecraft/structure/trail_ruins/tower/platform_2.nbt b/data/minecraft/structure/trail_ruins/tower/platform_2.nbt index af37bda8..cff97e7e 100644 --- a/data/minecraft/structure/trail_ruins/tower/platform_2.nbt +++ b/data/minecraft/structure/trail_ruins/tower/platform_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1a2b80061c46860cf53ca151b68c32806289d05f856948e2d22c2a91150e387 -size 1134 +oid sha256:93d43bce6dafc225721c72abc2c5e590f3e95df37f639c7f6b016c0afc7c6a39 +size 1135 diff --git a/data/minecraft/structure/trail_ruins/tower/platform_3.nbt b/data/minecraft/structure/trail_ruins/tower/platform_3.nbt index a2621ff0..951bad80 100644 --- a/data/minecraft/structure/trail_ruins/tower/platform_3.nbt +++ b/data/minecraft/structure/trail_ruins/tower/platform_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2b145fcd243bd603d17f7222ce1a2bcc712382e4d8b3d4ac3834ab8221eeeb5 +oid sha256:e4dc729d53a1d103175a4e92c5744eb14ff5aab8e01c6446e37e6852a1ec2c31 size 858 diff --git a/data/minecraft/structure/trail_ruins/tower/platform_4.nbt b/data/minecraft/structure/trail_ruins/tower/platform_4.nbt index 12676b0f..380805f5 100644 --- a/data/minecraft/structure/trail_ruins/tower/platform_4.nbt +++ b/data/minecraft/structure/trail_ruins/tower/platform_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1b52cb6aa6201a7bfc4768aa37ed609b2511794383366bf34883cc8a3021be2 +oid sha256:d49dced0e568dd979dc32c272a670c4870babe6ad035b2a576235027aacd9de7 size 1205 diff --git a/data/minecraft/structure/trail_ruins/tower/platform_5.nbt b/data/minecraft/structure/trail_ruins/tower/platform_5.nbt index 91299842..ea59560f 100644 --- a/data/minecraft/structure/trail_ruins/tower/platform_5.nbt +++ b/data/minecraft/structure/trail_ruins/tower/platform_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39cc13c31690abfa3b7fbdfd50091dec323e8ff55cbd4118b89194ea884ff8e8 -size 1146 +oid sha256:55cde94fc67dc01c158f9860db317e9aef88354fbb73c6a67522ab4a10cd17ad +size 1145 diff --git a/data/minecraft/structure/trail_ruins/tower/stable_1.nbt b/data/minecraft/structure/trail_ruins/tower/stable_1.nbt index 5f860a3e..002c2675 100644 --- a/data/minecraft/structure/trail_ruins/tower/stable_1.nbt +++ b/data/minecraft/structure/trail_ruins/tower/stable_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bfabcb9e8afe6ccf79ad9414e7c1f7490f2eec7090abfd45ea28ff94e7b2523c +oid sha256:639959e809402ea1b90a60d81c753ee8fb54a54488edc78e23c400b162a03696 size 1273 diff --git a/data/minecraft/structure/trail_ruins/tower/stable_2.nbt b/data/minecraft/structure/trail_ruins/tower/stable_2.nbt index 4dcff0b0..ea38411b 100644 --- a/data/minecraft/structure/trail_ruins/tower/stable_2.nbt +++ b/data/minecraft/structure/trail_ruins/tower/stable_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d56002013c5b0e20c32fc69754e5dd0361c228e05c670752df313ba1fa331850 +oid sha256:a036d6b5d4fa04959eeb81bd8130adc1fdaa37d28b00a35d9a17a0ab1437e942 size 1291 diff --git a/data/minecraft/structure/trail_ruins/tower/stable_3.nbt b/data/minecraft/structure/trail_ruins/tower/stable_3.nbt index 8566fba3..3c05f12c 100644 --- a/data/minecraft/structure/trail_ruins/tower/stable_3.nbt +++ b/data/minecraft/structure/trail_ruins/tower/stable_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d831cb8d3f7eaafb653b66eafe568ac811fc4b36f7e606d1e244a29ed0a93f4b -size 1255 +oid sha256:c80252ba3dd122834fcbb3fc6be2ba11a6a17c097908799bd6e39a0d4ccbb60d +size 1256 diff --git a/data/minecraft/structure/trail_ruins/tower/stable_4.nbt b/data/minecraft/structure/trail_ruins/tower/stable_4.nbt index 8bbdeaa5..58d2713e 100644 --- a/data/minecraft/structure/trail_ruins/tower/stable_4.nbt +++ b/data/minecraft/structure/trail_ruins/tower/stable_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8428ee593b2436cbc6a80f36a84d5046c5726fa72ff955a9eadc4afb00409d34 +oid sha256:0cc137eec72971d6526e1bd13d62d444244910e1d4526ecd8189d6286ad897ff size 1289 diff --git a/data/minecraft/structure/trail_ruins/tower/stable_5.nbt b/data/minecraft/structure/trail_ruins/tower/stable_5.nbt index c47f210f..7ea479a0 100644 --- a/data/minecraft/structure/trail_ruins/tower/stable_5.nbt +++ b/data/minecraft/structure/trail_ruins/tower/stable_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77e702c64bd02045537af97a21ebdd0ebdce15df6bb1d46f6661f7f380db2ee3 -size 1034 +oid sha256:3543f849e09d53bfa0db2631a7c4961dd35eb545d54d723c70d9dff2fefaf8ad +size 1035 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_1.nbt b/data/minecraft/structure/trail_ruins/tower/tower_1.nbt index 4fad01c8..a1a14770 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_1.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15d8d571802b699e024dae681b1af49cce8afcbe73c3caebe9353b9484337745 +oid sha256:d12fea9d8239d5a94cc6f81eb239f7081f05767fcd373fedbdf3414fc2003b41 size 1584 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_2.nbt b/data/minecraft/structure/trail_ruins/tower/tower_2.nbt index adfb2335..5b334495 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_2.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06cfec7aa606d5f7893e00ff5ef4aef8fefefe49aea27972e280ff0b3c7e1e9d +oid sha256:c3f8c33311c9be71ce1f5c839ba1b016bfdb00f48353d48c7a01ee420475f6f8 size 1617 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_3.nbt b/data/minecraft/structure/trail_ruins/tower/tower_3.nbt index fd275a36..7fada9cd 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_3.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89f240ab05b517ef4e182eaaf6a507b6fe1957a9bb841628432151b51707743c +oid sha256:d5916bf866b236b7eada7a9437aca5cc8ddcf5f9ae2b3f962bd8acba26fc9629 size 2228 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_4.nbt b/data/minecraft/structure/trail_ruins/tower/tower_4.nbt index 2b973ec0..a0903009 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_4.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc8cba36c0f66599981a9a7aa0992b61619b3912498f6b661cbaa21c533305af -size 2089 +oid sha256:974f6c86a328e44bc16529314d7097722a36d9b05a240d2553a672dcc35fd0f3 +size 2090 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_5.nbt b/data/minecraft/structure/trail_ruins/tower/tower_5.nbt index bf2e2031..b4281038 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_5.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5a43e953c78d06193762a4aa154a037ebdd81337a09b455072993ab0f98a613 +oid sha256:93e42e42d31185e3bb64b5ee1b0cdb60526410b56f19cbdc3c01e627ca737677 size 2061 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_top_1.nbt b/data/minecraft/structure/trail_ruins/tower/tower_top_1.nbt index 6d17c9d3..d0eb7684 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_top_1.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_top_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bba78bd4b3587d822d0d91b4049e3fdb6a2b75d294fd2af65c1869768855e4b3 +oid sha256:6eaf3ec7eae365ddffc8b861103b3746cf56173f37d6f9a0bd57b0671a521f1a size 504 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_top_2.nbt b/data/minecraft/structure/trail_ruins/tower/tower_top_2.nbt index 7e3350bc..ffbbbeba 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_top_2.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_top_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:965c4ba3b9ac7ae6b041307874d19d58f49f186a9f2f9fdb6155b041f1a6f599 +oid sha256:b10b780c87a366de273add809d665729ba04926e3a0df092c21935a4eccd5d5d size 521 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_top_3.nbt b/data/minecraft/structure/trail_ruins/tower/tower_top_3.nbt index 9baf0c8f..7557e9f9 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_top_3.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_top_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01f60ffb6ef69be3750e848194e63474eb92d7e37b8478afc4ca24ddcbb3528f +oid sha256:4b44c2d101f937b3725b0dd68bb62bd8c04bb4455731994fa5cb8458c02d2522 size 500 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_top_4.nbt b/data/minecraft/structure/trail_ruins/tower/tower_top_4.nbt index c432cb37..3fc5275e 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_top_4.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_top_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71687a70cad69cbdc0f24db2e48d014a387b14057fd05c3d3db7c7757ecb4dfc +oid sha256:c72fcfe984306ff2d9ebaa811d39a9cacea063b282f759cc6b8cd7e7f9d484a1 size 480 diff --git a/data/minecraft/structure/trail_ruins/tower/tower_top_5.nbt b/data/minecraft/structure/trail_ruins/tower/tower_top_5.nbt index 77912c5c..e12ddb59 100644 --- a/data/minecraft/structure/trail_ruins/tower/tower_top_5.nbt +++ b/data/minecraft/structure/trail_ruins/tower/tower_top_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b62193db01c99aa70f1c9c331c969b88fa461e803d94876e6d687788bf431cb -size 405 +oid sha256:cc33de03b1047cf3d0aae358e3a68dee518b3e933c3a92febab5065bb8d1d6eb +size 406 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/c1_breeze.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/c1_breeze.nbt index d04fb237..6727bad4 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/c1_breeze.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/c1_breeze.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1630df5d599515c5ec714bb90400c06d6f643daee3a353f71229397bb6ae9073 +oid sha256:75bd54cac3da41b4934f953af65f654f3de2e8efef897b6ad557af61e3bcf25b size 1694 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/full_corner_column.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/full_corner_column.nbt index 38376282..c197487e 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/full_corner_column.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/full_corner_column.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15491134e9587f28c8bd122f88152c6625c46794c9f8f616b7cc4e0ae7b0b1ee +oid sha256:1d50e71884da7121df4b1306c058d3e25d76ac362224ff148a65172a6936c37e size 4157 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/full_stacked_walkway.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/full_stacked_walkway.nbt index dfde2db1..d7d8711e 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/full_stacked_walkway.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/full_stacked_walkway.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3864c7c53c76a8a5cc4aa9a13ce79a1e462ef0440f9d647468b367a8c7b8c59c +oid sha256:acb6677938d28f2931d6e1cdca6dacdc95655507bf0f15fe3b16ae5c473eaf8c size 4336 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/full_stacked_walkway_2.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/full_stacked_walkway_2.nbt index 78bc3e4c..6fc8683e 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/full_stacked_walkway_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/full_stacked_walkway_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05954f36d5ee4ba49b1ff5fa39107f8d00a52d7f75d020473ea17c9f1743223f +oid sha256:803851aebd7ce4dbf0ad9d08db1c6f68c30a0d76ed5434e7edb60b1fb8f2eddb size 4280 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/grate_bridge.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/grate_bridge.nbt index 6a0e4443..a3bc2bf3 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/grate_bridge.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/grate_bridge.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:013d8769aa821b7e67ef66d0e1fb4f86fb26574ad54cb6b62cf7ca4f997b7e0a +oid sha256:61b96f4f019c442ed2c49abb4e505b3c3c25f2ea7cc8d282d6c6c34405b40b94 size 1753 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/hanging_platform.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/hanging_platform.nbt index 342b0cf5..de7be694 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/hanging_platform.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/hanging_platform.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0b93ca01917856a2fc14efa7e8e8fd65e4d6c11b8ba7dfe5b0b9f4dd53538e3 +oid sha256:302d2cefede8cd755494e4965a7b27c461ba393841e3cb74a7bf9e319f9e4f85 size 487 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/lower_staircase_down.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/lower_staircase_down.nbt index 24f1c9a3..be88fb96 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/lower_staircase_down.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/lower_staircase_down.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f40078a1325fccae7791415fba61b57fcaf3b0251ab2e082e6a85f727e70226 -size 428 +oid sha256:61369b54d956087402b5f5d16449f8ef5f64ca48aa79c3ae47bed1e6bf295e4d +size 429 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/short_grate_platform.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/short_grate_platform.nbt index 6aa71785..432239f4 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/short_grate_platform.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/short_grate_platform.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74f1ff6daf01d09a9d49c6f927e784bf6d88f3ef2ad2607f7db55117fc615eb8 -size 799 +oid sha256:4c3bfa42e2be8527377b6b51e2ab004d6a8f3df2c602c3c6bca7c35d6adce253 +size 800 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/short_platform.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/short_platform.nbt index 8f1cbe85..1a603475 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/short_platform.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/short_platform.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc272dbb01cda7af4f2e2104294332eb290f6e4e932799eb9502f5f7796ea8f6 -size 584 +oid sha256:0f11679d652d0369f03f0ca6bc36c66ee1c0b4b71f52823377f70579e25ce628 +size 583 diff --git a/data/minecraft/structure/trial_chambers/chamber/addon/walkway_with_bridge_1.nbt b/data/minecraft/structure/trial_chambers/chamber/addon/walkway_with_bridge_1.nbt index a39f5592..f00c63a6 100644 --- a/data/minecraft/structure/trial_chambers/chamber/addon/walkway_with_bridge_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/addon/walkway_with_bridge_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a49a9896760c9d5722381d86f80cebb50b7ad400ad0b3577b63419a1c37bc4e3 +oid sha256:6116b59f04dc75ddf80fbfc39f7b1d2ea48ee068ac0005ccf0f280aa6e11ada9 size 6220 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly.nbt index 383c21fc..f9e659e0 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42d8e367696c5e911d613b9bfb8fc56d23dea3b775fd8832c8e4098e09413c2d -size 54407 +oid sha256:0e80fed42a53b5c0c4fb332f4e7a7ad949fd75f38258c261de7fe26009c5506f +size 54408 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_1.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_1.nbt index cbdad26c..63879e0f 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efae318b4bf32102ee64ed73b1fc7ee329996764177ff8d3eec0d7a119844f0c -size 956 +oid sha256:511be2262ed434d5db4e097744fd36dc5e52490a03acdf636677a811a58ea20b +size 957 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_2.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_2.nbt index 4d7545ad..1ab124bf 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1975e482f46a273f2a3ce8e421e7be9125c2eb4ec6db17eb65ee09fd3f220af +oid sha256:802f5a1fb79a3b85358845e4b638b1943bc49f00c0b61becfd0d4ba3012030d6 size 949 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_3.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_3.nbt index 3254456d..cc887921 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3146f1c0974d323e3f3f5da98fc786b228ff4d6fff0706540e2664fece75c5dc -size 956 +oid sha256:98493d5ed4a7c336ab3316875325458602646340c20d5cf6af7451dc0584779e +size 957 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_4.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_4.nbt index 73c2818e..2ee392fb 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_4.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f4517f992d7969c5757955c434f7ad658a7bacdb602cff7a12507cba6ea8c19 +oid sha256:8d02afbda9735874f941ab86ffacc71cf54b5d8281aabcf246f2bb428740f8d5 size 952 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_5.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_5.nbt index 65dd0b5f..57b17453 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_5.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:599611e2f6d54879888ba8f4f687915527a4a0d9d639f893dce8f5ca2db02c34 +oid sha256:f0f91c18f28d2a59d493fe5c724f01e15bfc30802f96b561771b2122d88ac328 size 1024 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_6.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_6.nbt index dc9dc5b8..69191b7b 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_6.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d393f744a9fa16c0ba4d1c6a229c0aab4aab5aee1b2643bca619e0ffb0342274 -size 1021 +oid sha256:68e2de18326dd978e0d74826a8ae949a5889f56da90d17e7f5d466313220ec71 +size 1022 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_7.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_7.nbt index 9ed6fdf3..3c4bebad 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/cover_7.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/cover_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a86e1d6e3955c728a0a11936eee4c391b9bb4ce38f45a65d3343f687e7012956 -size 754 +oid sha256:933ce29d317814402e8a2f16bd7f75f2dbf407c70eb393b74f12b7c06c23f23a +size 755 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/full_column.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/full_column.nbt index a5e588a1..c7e3cf5e 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/full_column.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/full_column.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74e85f053af390ba548d6c8b4eaff696adf5183b427ec255302b79f6a7736d0e -size 660 +oid sha256:5c0d3a82b162be9a4b2d63c67e9c3b482d692415da8895c2f2fe15555935757a +size 661 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_1.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_1.nbt index 7bf6de67..07e3df63 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:200214127a9939985f07a5c4621bd6d1d8459a6c19a1ca30bbef6490c0d353cf +oid sha256:5df11b34e18cfe4458584d13349b3668ce87638dadf72c2e017c7a48143f412f size 586 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_2.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_2.nbt index 5c3c2659..9d4b1404 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd6c95485be2d97ca6ef6e23392de7ac1c37a2d31993d81683a0db4edef1d6df +oid sha256:b202ddd9206c045f4b0e6b41643a39715fd5a8434d6712a8406383a88d4ec750 size 868 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_3.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_3.nbt index 19826998..ede471ef 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d3844fc771508247be738e1ec2135efaa7ca2390e090d8f6e5e6e739cd51bc9 +oid sha256:6e64f818919bd30036ca777c12484a5f29bf833a88b9d8618a0a16a369c65738 size 536 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_4.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_4.nbt index 7e7ee52e..3040deb9 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_4.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac046c19bfd0aa9f7f239590faf935218cad5caa7df33a92de5c820c861afff9 +oid sha256:b27f4e2265075cd1e081a3e26033573a53b84012eb3cad55380693c564f2245a size 638 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_5.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_5.nbt index 7780f532..7a383888 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_5.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/hanging_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8564c2f5086763294b7407ce3282d61691c73b881ad8d6ce7c2ff8ddd960c4fe +oid sha256:423f5cb15d4f62082aff8b27d052ff6ef8cd14532db380d1ebe3a2f060c10dd8 size 339 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_1.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_1.nbt index 1459389d..a92f54e4 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09055c6ad26d65b71cbb6887fe240cc21e2cf8212ba13286f67b9be67321ae44 -size 2461 +oid sha256:21111b58afc10c1dce7f57df72b56fe3d26711a3575aec709d3e187533ebcca7 +size 2462 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_2.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_2.nbt index ed8da45e..aac33528 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:965e6f90b8d0ed1a0a84dcd0f47e76635c6349d74a977a53892b7a481c4b6952 +oid sha256:923e520ff92fa472b26a214447cdbc3fed6750820cd9db04c3c53ce1b95c4fb8 size 2494 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_3.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_3.nbt index 7c710b8d..dd39dfbd 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/left_staircase_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1320110b39f43dbb66b13c6bba3d6e441c7cf82913a96e21dcd75dc4ae90b621 +oid sha256:87ce7da1357dbb16292dea8b697b8a38457e53790bac213cb92cf0521dabde64 size 2510 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/platform_1.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/platform_1.nbt index cb3befa8..719619b9 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/platform_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/platform_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70bdd87ab8a3ac2ebf9ed4974758d5507e963255e2ff1ee57e6729ddabf2f23c +oid sha256:4aa659e188982f19c662d07d5fdbd0758c039cf2fb2b60b479e2f8aa0543d374 size 472 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_1.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_1.nbt index 896737de..9286643a 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a980079b76e33b9c3fcb7d210236651e402806d00691c0b7d6ebc263dc5c3a52 +oid sha256:c74e1c8e3cafce3ccd07254ae0a776f243557f21503d08f40685dfa97ce53d0e size 2423 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_2.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_2.nbt index a267a22b..b4348dad 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e95ccfdb64023dbc067480119dca00c7c01d81acc72bf8b1ab20f058dc5e632 +oid sha256:8843906713374b223496cd386033cb9e486ae2b5739259707892e66306f732db size 2550 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_3.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_3.nbt index f04f1fb1..ce6354a5 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/right_staircase_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99ea7ed72e320f82bf721da0c07bed95150501a54742cf9d1961f7c33ec7d973 +oid sha256:bf3ef449d7e4b33874db9a0e2b01496eabbb2c9e433272aa740990c62ed9fbf6 size 2557 diff --git a/data/minecraft/structure/trial_chambers/chamber/assembly/spawner_1.nbt b/data/minecraft/structure/trial_chambers/chamber/assembly/spawner_1.nbt index 7cbdd459..c927e210 100644 --- a/data/minecraft/structure/trial_chambers/chamber/assembly/spawner_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/assembly/spawner_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e935e1836f3d60cdfa4b35688a0aac83d4a6c03a79aaaa08d693c49787a5a733 -size 918 +oid sha256:2526a4dc37e5e4ad83fbcc46eb44b58d3f493f4b1a1cf433b99d0c707ae7a83e +size 919 diff --git a/data/minecraft/structure/trial_chambers/chamber/chamber_1.nbt b/data/minecraft/structure/trial_chambers/chamber/chamber_1.nbt index b4e5f2d0..8ac462b8 100644 --- a/data/minecraft/structure/trial_chambers/chamber/chamber_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/chamber_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5db6f38018d2de2b0c2bca4317543e383d74e6a2ba79235e1cbeecf2472877c3 +oid sha256:0fae88df818b8ca6d4bdba48ad3298b7852d0bc0ee66ae4402cb4192d3fc894d size 38588 diff --git a/data/minecraft/structure/trial_chambers/chamber/chamber_2.nbt b/data/minecraft/structure/trial_chambers/chamber/chamber_2.nbt index ed9db5a2..52262447 100644 --- a/data/minecraft/structure/trial_chambers/chamber/chamber_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/chamber_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cffa694ee29a00093768e135bbe5d47b361a63839e330c2adb24f14d09e35f31 +oid sha256:2728910e0348fe0fe5a1ffe161eb627e723407924de6b60651899efdaaba286f size 38937 diff --git a/data/minecraft/structure/trial_chambers/chamber/chamber_4.nbt b/data/minecraft/structure/trial_chambers/chamber/chamber_4.nbt index be01cf24..707ac74c 100644 --- a/data/minecraft/structure/trial_chambers/chamber/chamber_4.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/chamber_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cae48b1fbe87d9b1eac8b3158860c334ddea2542da88e6701d09046d1f24c62a +oid sha256:a446486c69c96d8ac622d25812eabe0df9fca550ad45081eecd1cef22eb03673 size 24478 diff --git a/data/minecraft/structure/trial_chambers/chamber/chamber_8.nbt b/data/minecraft/structure/trial_chambers/chamber/chamber_8.nbt index fd6bb981..0b590766 100644 --- a/data/minecraft/structure/trial_chambers/chamber/chamber_8.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/chamber_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:160a566fb01c0dd0f57de1ebb3c16cf92aab4d037a0b0cfde5b4ec0390235769 +oid sha256:938b7ed78b103b37f440c295c1a87aff31f43898527f85a36fb7eb29fb61aa85 size 19203 diff --git a/data/minecraft/structure/trial_chambers/chamber/entrance_cap.nbt b/data/minecraft/structure/trial_chambers/chamber/entrance_cap.nbt index 74fcb187..4592dbef 100644 --- a/data/minecraft/structure/trial_chambers/chamber/entrance_cap.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/entrance_cap.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2439b5921cc5319b1c30b544d7e23de34b031e13fd9faa04d5096df64b505648 +oid sha256:0e08c5c0a9275787848bedeef4c89164dc82cd48b0e8bfe6b25cd55f28d9dd6d size 383 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption.nbt index 027180d3..af8a3e02 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9af92b251983a57d8590be97913b9f073ff476633091e858d5eb1cd8ffe8f838 -size 31896 +oid sha256:950c6364da1e6619527cc155b8d1867944c16f50546eab5e10680b4d35622788 +size 31897 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/breeze_slice_1.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/breeze_slice_1.nbt index 4fc8dea5..c73fbb5a 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/breeze_slice_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/breeze_slice_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba3b095130b4a8dd8137c8aaff70bb79fbf4ad2ce2b0089da1461465fa464562 +oid sha256:538fad9e3de76fe77cb5fdfc7cb055bd7567a21ad40ab4ac53dd659a398d6387 size 2593 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/center_1.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/center_1.nbt index e8f5be80..22d69068 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/center_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/center_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:becf53cabc5a94e35942e092e19a14b31e53b576ade49c075a43f3bc3c6a04a8 -size 1536 +oid sha256:78e24dd361f4e16fc06b99a9ce9db098afecb7d4bc198ff73b0eb1368cae7579 +size 1535 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_1.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_1.nbt index b9d46203..2962a80e 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:513b521060dd86c762e61c10377942ad3c36f397dc4e0e74318bb0c486303669 +oid sha256:4a03bef4e8d11acde18a34f63199048d6d085ac5d9173a8e1338aad97ccb94d6 size 4437 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_2.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_2.nbt index ba672084..1817c039 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a74724b5250cd91a4034036ca843096d6ed65da62cbd050619a14af22a7493a +oid sha256:d74f175a6cad0555f77e4d1294fb271164967eeb4f8a92f4454728e99b74c5d1 size 4601 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_3.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_3.nbt index 8eb23ecb..d6c4b20b 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56370b4e7aa869c3a2d01482f73a56b87053cacead41ef9d3b4da6cea8146cd6 +oid sha256:c7326b5b82113971b31ca518be7c6736992230b2eecbd05fc53aa793ade5c49f size 4688 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_4.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_4.nbt index b9d99c48..ce5a6c15 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_4.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5f8fd928162a9805dc1d2cb9a37797d966548a434f7aab707f5f8dccc6895c0 +oid sha256:fa76be66f217ef3a2afc58f2b3da449f8d5269795dc05577de6f98dc5d215e8a size 4834 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_5.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_5.nbt index b436ff63..48a062d8 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_5.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/quadrant_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71779e0dce18a1231a68e681fd0547a96ec985a858998b7207dc1903da8cbae7 +oid sha256:b7463712792c795f2c9c026a796ec14eb90c92037f2bcb9d31f1f3bb08e2957a size 4786 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/slice_1.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/slice_1.nbt index c50585dc..be8fac4c 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/slice_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/slice_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e35fda33e7f5d3e99c119da960d6f1946ab8de5bd138053ca6a627d5d9ab7094 +oid sha256:1977bc7606f466ea522ee89d8c0b34c221e0d9a208f5f029adb324b1b315c0e6 size 2505 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/slice_2.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/slice_2.nbt index 62e2c8fb..6c27c621 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/slice_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/slice_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:adff2cbcab3f3879099376b10eea87203f9fec392f384f3c2d7b979e4ae3ae46 +oid sha256:1664b08bec6a3d783736092ae9752306218129a289a5ceb8c8b0ed4297bed80d size 2482 diff --git a/data/minecraft/structure/trial_chambers/chamber/eruption/slice_3.nbt b/data/minecraft/structure/trial_chambers/chamber/eruption/slice_3.nbt index 43675188..046d8bda 100644 --- a/data/minecraft/structure/trial_chambers/chamber/eruption/slice_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/eruption/slice_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfaccc1af0f31797239fa1c6012ac8ca306bb30c3acfcfc04083761f49cf7b74 +oid sha256:ebeab60caf93ba612ea65268f5074ee54d5b2c2c373d2b5b107f0a1fbb3d9990 size 2475 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal.nbt index 12edaf13..c35c6e69 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9290a7152941545acda47fafd9b95624dea692f9eadcf0398e938c7db148967 -size 47358 +oid sha256:bc0fe514f8b0705062fdb66e8a1f5a92d91e81e14630d78fdf8924dddc0ed91d +size 47359 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/center_1.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/center_1.nbt index 51e0d191..752c5cfb 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/center_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/center_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf99b09e36df1664344894096946a7bfd0e04839cac4c46436aa5a694bea3ca2 +oid sha256:31c60901f704239fdc3a57ec9f37dfde0f940bee9118bb57d250c9b5c9ec622a size 3677 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/ominous_slice_1.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/ominous_slice_1.nbt index 18ee3544..01b32eb8 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/ominous_slice_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/ominous_slice_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcc1922c064029a1d3e5b1edd12ac070b381c9d0581687bccf4f19e79496222d -size 1918 +oid sha256:01d7961decfaeba364e6ea93f064799db4d2a7971b97952352014b24c297ec4e +size 1919 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_1.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_1.nbt index 5199027f..ce021e6e 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5843765acf65fd4432d0e702087d235e4a6c14d242917d8bcf3194c61b09bb78 +oid sha256:4739d45bafa3ad7507230b8ae1c6398e1a3246d189f446b503efb86d4bbff7ae size 3461 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_2.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_2.nbt index 572cf820..89e8e6b0 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2e3ba4d5339a12da605330d9081042de73851a886d4d3b21f4a2fc8afa3c1c8 +oid sha256:bf196d9d614f099164c9965a55061a227951d9f4843562fdb3dc3c827259891c size 3325 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_3.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_3.nbt index 7edd13d6..b35f256e 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/quadrant_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4817a2d01dc9f7bbd94b6b47a4872323e55ce59d038a46a463e2f70009b53bed +oid sha256:a2b49b232b2e3eba4eae94bf5d4e90e63f023a2bcad551b5287c2b2735517ec9 size 3909 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_1.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_1.nbt index 407923e4..55e4f746 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2928c55198366987773e3b1ec7a139f35d9cbade0f75e2a7a2a0982dad9f8f63 +oid sha256:57210a6b6ecd46550b8b78099dc923d5b0c69a880f0ae5976becc36204752f1b size 1922 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_2.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_2.nbt index fb67afa1..9cc62b99 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6f3f9a1b2d9a32058579bfa4f0c3e4d29b616c1c4d91360e17cae8ab1c2ac2a +oid sha256:70ebdb3673ec83f75ac881f5e4ee7c477a2c4ecd57f7a18fdfec24eecc0092eb size 1964 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_3.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_3.nbt index 212cfed3..33904b43 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d0c3ae82ed3ba37d06552475c924806e39b5dc7f0546579f3e06608c9497d94 +oid sha256:8643a8426dabc4d5c8026d63f50681d80f1be664ec0256abab132f53ed6ac473 size 2010 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_4.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_4.nbt index e33b6e95..7d522053 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_4.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de492e1c25276ed0a0cf6a2dc89f2137ad11f68514f11b1502e77172f7940caf +oid sha256:c4377bc224525498983e4a49deed62f3737316be1f5b804b48464bf5a4029405 size 2018 diff --git a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_5.nbt b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_5.nbt index 49cac230..46fe31e4 100644 --- a/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_5.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/pedestal/slice_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbea8fe7cf7c3cdb86707450ed6f3ed6c9f48b2353851447042e7ef571d145ec +oid sha256:d101706d66278ba0ac1392c5334f4cf3bae6a1cd666f9ecd174f1d97a753c7c0 size 1970 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted.nbt index b0cfbd93..218a36a4 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32beb9f2a461df2ad3475c5cfb8a76b908b0c7c944a23125a14ac0274a3e65bd +oid sha256:a441ceab23cdf2b05d00346d3a93cfead1620f99d84097d672176eac51bd0876 size 34272 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/center.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/center.nbt index b295199b..ae2e665b 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/center.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/center.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8db5417237ecdc77d7f59b090e6fd3ad0f1e0df0dab71469958ecf1a022061d1 -size 1275 +oid sha256:a3e62d957291bd22f586c395f64ecf5b2e83cf12ae0c3b6ef0deb776a76e712a +size 1276 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_1.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_1.nbt index b422c1a7..3171e6ad 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c48749743b18ee762a3e4315b8a0c595892cd92f21856ea7cf4931e3eabb8893 -size 1007 +oid sha256:9de68a4d1887b930291b4ecd7ef751b3d027682e9ec5e5141ce135f4df53bd62 +size 1008 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_2.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_2.nbt index 3b887b04..2b20e0ef 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88e5f6469d3cd11d1135f43531bce783af6f96c5ef9fcea967f88161f075dfba +oid sha256:167c5978e10e35ef186bb9ba5484e2f067c8402b324fc25d563cf521bdcbe3e9 size 1132 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_3.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_3.nbt index 713b628a..620b70eb 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/hallway_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d63af54aec5c758528f87a4be33e55c5efc6da7504c79083d0272645bfded73 +oid sha256:7171f020160975d2bc93a8b415c5323a39ae26cdde99eeeea6987abb38a7ebb5 size 1059 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/ominous_upper_arm_1.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/ominous_upper_arm_1.nbt index 6bc0c28f..7bacb231 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/ominous_upper_arm_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/ominous_upper_arm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ebb64030b54e106475975a35e11386eefa9069e9e489e94b4f9e91b117da5cd +oid sha256:844b76cebe1f245e169d9d6fef93595cf22382021d4362f6fa9682c348b4c7e3 size 1343 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_1.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_1.nbt index e124fd39..a329d039 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae613327b4af797249e8cb4d37797abb75e7297c6ecca071fc11991d5d789712 -size 3430 +oid sha256:b177c3a914a92dcf66d66c8274b43749f47e22c5ae2a51730887b36713594d72 +size 3431 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_2.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_2.nbt index 84a51527..56c369ed 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55ccccb36f8f030cf409e186a6eb5e343be0c43f5cad20e78d1fbc88b40072aa +oid sha256:03e059eefcaf5e61a82002de52803d5f14fbb1ccbc80f0fb69c87e459a3a8437 size 3446 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_3.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_3.nbt index 24df5449..14da9dc4 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d68ebd8f2c699d459c3126b39f37f597c665c5f0642d4ffe900c0e92f5d4faa1 +oid sha256:1dd6e5bae1d037621281a08a4c6802d2a6c761d5ab79d276d73b161666b4260c size 3436 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_4.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_4.nbt index bb44d139..7af02a17 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_4.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/quadrant_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f74056fb0a615ae78120b3a8d23991e6af2d2bdc49731cfca92a4b4db92811bf +oid sha256:7a5056f9ce07e3eaca28fab053c2c9b05ef9bf5dd3cfeef15815cd01454dcaa0 size 4325 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_1.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_1.nbt index 93e194e5..9d7f262e 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_1.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e567faf3d24d388bde4d5ad18f6246db2b93d145a3afd1f35041f1921051002 -size 1323 +oid sha256:9725f08cba3f6c4d7e6d3ffc74b063352e3a439c03473eeae5f546d919403ab9 +size 1324 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_2.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_2.nbt index 6b772546..2fdf1695 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_2.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67c16ac165fbbade4ca7075ec7fca010619368923adbdb1cc3f7eb76552dba3e +oid sha256:e6c97bf70a54a616954e3981514fdc5f9cac864252f940d0a7065e8207f988c4 size 1317 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_3.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_3.nbt index 69a8d3b3..fc6491ef 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_3.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:800645ec3e877695d2350457fe7afb7b18abdfe9120375906b1076693fb23bb3 +oid sha256:79c6e6dab616d52b095db16942c98f0ef9eabe536742d34a694e8d045cd9c799 size 1451 diff --git a/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_4.nbt b/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_4.nbt index c09b8e70..11cce32d 100644 --- a/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_4.nbt +++ b/data/minecraft/structure/trial_chambers/chamber/slanted/ramp_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41e40f774c928ca5a107ec86e8402f9d4f4ac48c0b9085281906b0be243660bd +oid sha256:a782ec308cf495c54b2e8a0f2b833ea9c2f1491a0068456deb6ecc0365cb4d76 size 1231 diff --git a/data/minecraft/structure/trial_chambers/chests/connectors/supply.nbt b/data/minecraft/structure/trial_chambers/chests/connectors/supply.nbt index 3af963f1..f4163cca 100644 --- a/data/minecraft/structure/trial_chambers/chests/connectors/supply.nbt +++ b/data/minecraft/structure/trial_chambers/chests/connectors/supply.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb59550a518ff11d262639358a2a3b0d0989e562cc3b47239cc6305aa60e93ff +oid sha256:82b1b9ab362dc88f1e7517d385547458d3ef80fef81158e7517cfeee42d02b9a size 354 diff --git a/data/minecraft/structure/trial_chambers/chests/supply.nbt b/data/minecraft/structure/trial_chambers/chests/supply.nbt index 808db56b..bde33957 100644 --- a/data/minecraft/structure/trial_chambers/chests/supply.nbt +++ b/data/minecraft/structure/trial_chambers/chests/supply.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5626dcfad9bb49d3e466c9443ccbcdce095b51005e915dba088a6ea594a1a746 +oid sha256:75203742f80245dc447642b2f70f25c18e706f88ae0434ec2e85060d0e7b9056 size 439 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/arrow_dispenser.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/arrow_dispenser.nbt index 6c6f5074..c8a807d5 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/arrow_dispenser.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/arrow_dispenser.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffcc7ed8516bad06ebc780f944f5f17997992ca44a0559ce57e37e2c570fb69e +oid sha256:8b20f039aabdfde57cc24d2dc425f021f7d2969d28697690019fbe25063c41e9 size 834 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/bridge_lower.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/bridge_lower.nbt index eb2d7e63..815cd2ae 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/bridge_lower.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/bridge_lower.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cab9e29e9f1950571d128f3a22cfca1eda629868397babfb2bbb9ea65cabd00c -size 696 +oid sha256:cbbdd83e7b702cedbec7cf78ac7d5da96548a85ae6471c6daca9cce6a92f494c +size 697 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/chandelier_upper.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/chandelier_upper.nbt index 93dc8aba..44867494 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/chandelier_upper.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/chandelier_upper.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c705fa85de0a32eba1e4e6c673145051edd3625070274062630386980d334972 +oid sha256:b881cc141a2716bd772f154d60ed8a4ef7f07cfb3045f5ce8bf2c2ad9f69e4ca size 513 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/decoration_upper.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/decoration_upper.nbt index a78888ab..1943fe94 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/decoration_upper.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/decoration_upper.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2012e5d08a6bbccf16220f3036e0090c76e56242aeac82fa8909eda5fb683a82 +oid sha256:05843b8c9b8c8e0a08a185379c7104e05e4dab95ba7cc55c992bc071dc829ce7 size 513 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/display_1.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/display_1.nbt index bd256a45..19343dba 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/display_1.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/display_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ce0a2a207b66c5bdfd166380d987b16a49f101b3fa8a00fb050b7ad64f868f0 +oid sha256:f35eff787b1969c6eca94e142c2470dde226e428f54fbbcbe2a9c972faa4a95c size 899 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/display_2.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/display_2.nbt index 862b46d1..8672c2c6 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/display_2.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/display_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22e003ebd493fc384302901e1b77818124673c48fa03bb5e38745e9ca3b4aec8 +oid sha256:8de7f226e9e9662b7058cb09649c7404ceae20a6f1b353384d4b8c5359d51f6f size 1527 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/display_3.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/display_3.nbt index fc3c518c..2ac06632 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/display_3.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/display_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33971bb0cba62d125758ce0ba8358d60b972cf210fbbd83a09597f54c7c9d8ab +oid sha256:1e38cf8053f46aadec6f42bca587883ea1b1678b029e97b3760e8e05e8a2062d size 811 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/head_upper.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/head_upper.nbt index 202af1e5..fcccc81c 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/head_upper.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/head_upper.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d75386753106b027f62599b9c1f8ae80ae51a45bb2468e1693febf9d1041592 +oid sha256:162350f7e477d8d4260b8755fe8d9921c3bf9a76b408890498225eb6aade8590 size 525 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/ladder_to_middle.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/ladder_to_middle.nbt index 6fea3cf2..fb848586 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/ladder_to_middle.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/ladder_to_middle.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3ccd9e1a28ab3bd6c6263840b5f2cb485108fd318ccaa9e80b54fb0d6c3abf9 +oid sha256:6ce790afe6f47c5e6a7458f8f9baa8efc98beba4a988b07cec75107c2d7a2592 size 669 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/open_walkway.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/open_walkway.nbt index 7fefcdc5..38c78493 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/open_walkway.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/open_walkway.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b4a2ceb1f2dbbda5f81281de0d63b7eba692219230d30fe558d74191ab5e5e1 +oid sha256:8d6087b7d390fc6e3dad9e49efa6efca9b6c9022dc307415c514f2ecf5312a29 size 1160 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/open_walkway_upper.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/open_walkway_upper.nbt index ada0a828..c10d48bd 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/open_walkway_upper.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/open_walkway_upper.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37fcdfd93e29829a2122dcf0b52123f38e6f65dd136ca28a6804279cbc8df1e5 +oid sha256:6e42d1ceb5b32a0f5c87ed876ace2566f57ace17c651611aea5558043215059a size 586 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/reward_upper.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/reward_upper.nbt index d0b074df..7b9b530c 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/reward_upper.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/reward_upper.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69d3219fb00f5aa0f166187f1aa4bb0ed6c2d726cc78f283b5fb7f9edb2e8e5f +oid sha256:35d0ebf762aa0b687b5c42d381b1492e8b36a9b7b564a8b34fdffae22ca70ac5 size 588 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/staircase.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/staircase.nbt index b58321a2..001e173e 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/staircase.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/staircase.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:478fa40e51b248ac5422677039256ab2d01218e2b336a64c9baa90f7aa465ac2 +oid sha256:9ede6c93587379d3b6e6d1ef6b8a32ce93dc1017315a3f72a593bd37461b500d size 456 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/wall.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/wall.nbt index 23f101cf..47328da1 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/wall.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/wall.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2499526a7f0cb471ac0b9953d429fadea67aefe09f317384715b12e6a19516e8 +oid sha256:4a3b63e55b6f780409fa911fd009a3e25874a19c61ac2bbc50e2718dfc849e7e size 908 diff --git a/data/minecraft/structure/trial_chambers/corridor/addon/walled_walkway.nbt b/data/minecraft/structure/trial_chambers/corridor/addon/walled_walkway.nbt index 98994491..92e821cf 100644 --- a/data/minecraft/structure/trial_chambers/corridor/addon/walled_walkway.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/addon/walled_walkway.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca09e22ef1fd888c154030532848529775b685d4c70fecbd054bd3d7e97ad6d8 +oid sha256:4999de7a418c35d6f09d760019390dc4fcb5d269935b0b9d6b91d2e16930334a size 1186 diff --git a/data/minecraft/structure/trial_chambers/corridor/atrium/bogged_relief.nbt b/data/minecraft/structure/trial_chambers/corridor/atrium/bogged_relief.nbt index a998837f..fc11b40e 100644 --- a/data/minecraft/structure/trial_chambers/corridor/atrium/bogged_relief.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/atrium/bogged_relief.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ea39a9914b40015073bf2006313ac4567cb0346589cada790b93e06923294d2 +oid sha256:6477d27e9afbb946bd3a430309f79163195bf8d7a2a3f9c684a375e80c432486 size 3244 diff --git a/data/minecraft/structure/trial_chambers/corridor/atrium/breeze_relief.nbt b/data/minecraft/structure/trial_chambers/corridor/atrium/breeze_relief.nbt index cb4af8ab..ff4f34fe 100644 --- a/data/minecraft/structure/trial_chambers/corridor/atrium/breeze_relief.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/atrium/breeze_relief.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbc8fdbd5657c28bc0e5e108dbbe1be2f67d3e339fd4df50fd17fd7b13302111 +oid sha256:e114da5f2dd9f53321916e404ab8d2cea9fc285cbccf817f60c58efc2ac34106 size 3222 diff --git a/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_1.nbt b/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_1.nbt index 1db66499..722a3c08 100644 --- a/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_1.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:994daa030472025b26d64bede326f89e750051e4b46c2d00b98f3d4015950a91 +oid sha256:1a15e5d6a4c07ecac68c1768bfa32ae63323cbb4d5d69afc9074d3def52e9a04 size 2883 diff --git a/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_2.nbt b/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_2.nbt index e880d597..a06d4b22 100644 --- a/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_2.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb4e80d414eb86e1c8fccd89887825a1428be83f1d21d762c2b82fa2125a1239 -size 2819 +oid sha256:3d1e9fafa7f0a9f63c32ee159684727d74400e37069ff276b04d14de0537f693 +size 2820 diff --git a/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_3.nbt b/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_3.nbt index 6c0f781d..d793d65a 100644 --- a/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_3.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/atrium/grand_staircase_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c375c44a1378d7855825581984c763b2e10bdda5294351a5fbfa61cc026a7f3 +oid sha256:a907c15760045c5eb292f181544c5cfb68871bedde1dea1a24431e508821b2a4 size 2830 diff --git a/data/minecraft/structure/trial_chambers/corridor/atrium/spider_relief.nbt b/data/minecraft/structure/trial_chambers/corridor/atrium/spider_relief.nbt index 15efe5bf..59e8aa06 100644 --- a/data/minecraft/structure/trial_chambers/corridor/atrium/spider_relief.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/atrium/spider_relief.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d12864578112f61a7f4de503c6fccce9599a3fcce07e977cef53e88ac8e9748 -size 3848 +oid sha256:5713e78ee8ab8c8fe69b5958475c7ad764f59096e74de305b22c784cfca147b6 +size 3849 diff --git a/data/minecraft/structure/trial_chambers/corridor/atrium/spiral_relief.nbt b/data/minecraft/structure/trial_chambers/corridor/atrium/spiral_relief.nbt index 0828412a..0eca4393 100644 --- a/data/minecraft/structure/trial_chambers/corridor/atrium/spiral_relief.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/atrium/spiral_relief.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:853293cc42a152475b6d7e7ab45c307ce7377d631873a3022a626108a5b7058d +oid sha256:66759e09527dd44a2b0c6c71fb03288b0faec2d0ce9dc4ada452b226e131fb4f size 3316 diff --git a/data/minecraft/structure/trial_chambers/corridor/atrium_1.nbt b/data/minecraft/structure/trial_chambers/corridor/atrium_1.nbt index ce186976..fa52d4a7 100644 --- a/data/minecraft/structure/trial_chambers/corridor/atrium_1.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/atrium_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b41313ddafb04445c50b336f4ef267a46232594515858d79ddb566903ef1d40c +oid sha256:1ca6f4b9e2f1c9afa6deadbc58ac53b48d50e92b133f0a192e9cefda8c34d349 size 23426 diff --git a/data/minecraft/structure/trial_chambers/corridor/end_1.nbt b/data/minecraft/structure/trial_chambers/corridor/end_1.nbt index a06e7307..887c85a6 100644 --- a/data/minecraft/structure/trial_chambers/corridor/end_1.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/end_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0eee401026d4b643a9e829ae490971e37c324b815a389542faff808b9fa3929d +oid sha256:a230bfada0b2180884b66c39af3c1848d9647c79486d1728e97199b0ecfb8fb4 size 21445 diff --git a/data/minecraft/structure/trial_chambers/corridor/end_2.nbt b/data/minecraft/structure/trial_chambers/corridor/end_2.nbt index 477af335..12cf76d2 100644 --- a/data/minecraft/structure/trial_chambers/corridor/end_2.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/end_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfb7b21f848dfff73d58845925ff977e018da549f341fd9ca62209c62fb4ac84 -size 21888 +oid sha256:0c72ac13c36b63166da9ec3d66e1b5e9c8fec285b7c479d5f6b1d4659dfe4051 +size 21887 diff --git a/data/minecraft/structure/trial_chambers/corridor/entrance_1.nbt b/data/minecraft/structure/trial_chambers/corridor/entrance_1.nbt index 1abbfbdb..de84551c 100644 --- a/data/minecraft/structure/trial_chambers/corridor/entrance_1.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/entrance_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:932b0bf35d3aa8c38dad2cd3c5d010d5928594966ebe3b54c3d5bf2a257b1d7f -size 22025 +oid sha256:c60d3b6f4db27038f7c9f44ad0e1796a526ba092e3f65135cb86c96f518b3946 +size 22024 diff --git a/data/minecraft/structure/trial_chambers/corridor/entrance_2.nbt b/data/minecraft/structure/trial_chambers/corridor/entrance_2.nbt index 3eef28f5..5dc315f8 100644 --- a/data/minecraft/structure/trial_chambers/corridor/entrance_2.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/entrance_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:676b07b834e6d38b8fd5e3a3f479d9b3823aa3645a3093bfe06cbeb9b498e215 +oid sha256:1fffa95ed0a917deabe5f3586d82c0ae52836e50dd2d57928cc630a2284b3866 size 21599 diff --git a/data/minecraft/structure/trial_chambers/corridor/entrance_3.nbt b/data/minecraft/structure/trial_chambers/corridor/entrance_3.nbt index cb64073c..8aafab4b 100644 --- a/data/minecraft/structure/trial_chambers/corridor/entrance_3.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/entrance_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f06866685230f8a7c5df09f956e96de97d4b8384c3c8d76043826fbb548e5f8c -size 24030 +oid sha256:99f956c8e3de9c03fe219f4c03fe569dc270ab465d96672a5fd0640dfb013d18 +size 24029 diff --git a/data/minecraft/structure/trial_chambers/corridor/first_plate.nbt b/data/minecraft/structure/trial_chambers/corridor/first_plate.nbt index 88e06c1d..8b83f2b1 100644 --- a/data/minecraft/structure/trial_chambers/corridor/first_plate.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/first_plate.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f955c1d9b0a0a69ee0e1a182e7396788b170a85be82a5cdc9590d45ad1be9c0 +oid sha256:bbca06ee5f77daab8f4b633913eb44e751b7c3654bb8f38047a19bc848484dc6 size 1472 diff --git a/data/minecraft/structure/trial_chambers/corridor/second_plate.nbt b/data/minecraft/structure/trial_chambers/corridor/second_plate.nbt index abddf9a8..fa159250 100644 --- a/data/minecraft/structure/trial_chambers/corridor/second_plate.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/second_plate.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5bef5e0c4b7bd1fa1ceae7595028cc3e5b91cdfc3422580c34283f504bf80109 +oid sha256:a9d1a636f68dfc2c201f555128a95d8535b9a4c500c53abb1c8fe206f6bb1c67 size 1477 diff --git a/data/minecraft/structure/trial_chambers/corridor/straight_1.nbt b/data/minecraft/structure/trial_chambers/corridor/straight_1.nbt index 5be057d4..1c0c1d5b 100644 --- a/data/minecraft/structure/trial_chambers/corridor/straight_1.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/straight_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33e83aa9daf0ecaff21a93d1c5fa52bfbf394d57d5d777a83489f45cdc168ff7 -size 5671 +oid sha256:993a953506dc4e2a3712e3472e712dde07a8076f1eeb788d7e218bcb57330c10 +size 5672 diff --git a/data/minecraft/structure/trial_chambers/corridor/straight_2.nbt b/data/minecraft/structure/trial_chambers/corridor/straight_2.nbt index 924e9c46..30e1c09b 100644 --- a/data/minecraft/structure/trial_chambers/corridor/straight_2.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/straight_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f83ceb27483f1b48dfb301ffd052bd7892cd446a6cb895a74fa815dd6e0bce9 -size 5847 +oid sha256:ed82a53b01c910788a5c1844e2e79fd9789e33e7a95e77ef8f69c3f54ba74e86 +size 5848 diff --git a/data/minecraft/structure/trial_chambers/corridor/straight_3.nbt b/data/minecraft/structure/trial_chambers/corridor/straight_3.nbt index 4b377cb6..56f6f4a4 100644 --- a/data/minecraft/structure/trial_chambers/corridor/straight_3.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/straight_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:675ed1f30e16200b408cc49df47cba45c480ce749caaa1c25384c0d9877e402d +oid sha256:99a00e1437a6b2db6eca263475a6dfb97498895ffe09a5b4d5ed0678f0b56ed6 size 5820 diff --git a/data/minecraft/structure/trial_chambers/corridor/straight_4.nbt b/data/minecraft/structure/trial_chambers/corridor/straight_4.nbt index 6a719713..dd20b8e0 100644 --- a/data/minecraft/structure/trial_chambers/corridor/straight_4.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/straight_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ebbe15a98e04fa1649ff007a8d2b1e4ee42c1d6bb97f2288eedf7e6a3a0688b2 +oid sha256:240005f5c9d7cb32696c23dc728dba1f0715d9e477357074346be713db10ebf7 size 5814 diff --git a/data/minecraft/structure/trial_chambers/corridor/straight_5.nbt b/data/minecraft/structure/trial_chambers/corridor/straight_5.nbt index 894091a8..d6e152d6 100644 --- a/data/minecraft/structure/trial_chambers/corridor/straight_5.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/straight_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f5a335c671172237b601849a1674824e5028f5b26cc1dd91aa0a32759601c09 +oid sha256:1daa98529930310eaf982588152b32736b1d13c4e679ab8702ced977f7871b3b size 5821 diff --git a/data/minecraft/structure/trial_chambers/corridor/straight_6.nbt b/data/minecraft/structure/trial_chambers/corridor/straight_6.nbt index 92399a9e..c1b47e1c 100644 --- a/data/minecraft/structure/trial_chambers/corridor/straight_6.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/straight_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82565ffe9c9ec6e2113e96d144558fb07638c6eb517be52fe0890edb9492c35b -size 5786 +oid sha256:3ab43d8e9155d54f96927c7a495537ff2365d75d9cb0a0f944bef34512201cee +size 5787 diff --git a/data/minecraft/structure/trial_chambers/corridor/straight_7.nbt b/data/minecraft/structure/trial_chambers/corridor/straight_7.nbt index c87ef867..ed3a85f7 100644 --- a/data/minecraft/structure/trial_chambers/corridor/straight_7.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/straight_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e6c0a0a2dff071c3dd22e334061723647c21eacdb3bad725d71e0ab3fe958cd +oid sha256:e746f44e796baf13ec5e67350d0dd4b257e5e0c5afc03c239a6f5d51070afa04 size 5776 diff --git a/data/minecraft/structure/trial_chambers/corridor/straight_8.nbt b/data/minecraft/structure/trial_chambers/corridor/straight_8.nbt index e7c138bd..ce6485f2 100644 --- a/data/minecraft/structure/trial_chambers/corridor/straight_8.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/straight_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56393fcfb027a420d18a9748c434652ff16532306bedadb9efc33e9e56836d57 -size 5561 +oid sha256:b8b4915795ea66d5db5761d0caee00b2a243946a33cdcedb168a39d0d45f128e +size 5562 diff --git a/data/minecraft/structure/trial_chambers/decor/barrel.nbt b/data/minecraft/structure/trial_chambers/decor/barrel.nbt index c26cd959..3c6ccb8a 100644 --- a/data/minecraft/structure/trial_chambers/decor/barrel.nbt +++ b/data/minecraft/structure/trial_chambers/decor/barrel.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52ec1993d86019db6c91a33aeadb2a89cc971a2d97c959a10db783766501a72f +oid sha256:39a95415f502f7be4324286f43c5f464b756abc53c06d1f75931bd696e49a71d size 336 diff --git a/data/minecraft/structure/trial_chambers/decor/black_bed.nbt b/data/minecraft/structure/trial_chambers/decor/black_bed.nbt index ee8486be..93f35b4d 100644 --- a/data/minecraft/structure/trial_chambers/decor/black_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/black_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e8ff4609ddd364727bb97f9f64022d948313590bc768348104be004601f98e6 -size 325 +oid sha256:07f5276c014c4e98d6386da0061fa08e943e4ec1437e058b0f7dc68f85d1cb05 +size 326 diff --git a/data/minecraft/structure/trial_chambers/decor/blue_bed.nbt b/data/minecraft/structure/trial_chambers/decor/blue_bed.nbt index 837c173d..70439d3d 100644 --- a/data/minecraft/structure/trial_chambers/decor/blue_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/blue_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64467682877451061e2975507b4fd6a7b2e123d2d0feaba5ae169b365a20105e +oid sha256:ff2573abc22075eb4f80cda9d081ca9274e6d12874b780fa8ff15458f1257461 size 324 diff --git a/data/minecraft/structure/trial_chambers/decor/brown_bed.nbt b/data/minecraft/structure/trial_chambers/decor/brown_bed.nbt index b27bcf2d..7aeeb44c 100644 --- a/data/minecraft/structure/trial_chambers/decor/brown_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/brown_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5294290ffa614f4b1f43d3bfb0437f0fcb495ec03b168ef59c1cf5b325727af +oid sha256:026db297c9dc1552430e239c7d25f72366920700ffab970bea8e42a194ca743a size 326 diff --git a/data/minecraft/structure/trial_chambers/decor/candle_1.nbt b/data/minecraft/structure/trial_chambers/decor/candle_1.nbt index 5e12fe80..9c2a9379 100644 --- a/data/minecraft/structure/trial_chambers/decor/candle_1.nbt +++ b/data/minecraft/structure/trial_chambers/decor/candle_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f83ef0da89a7244b460ffb968e1478e5151574b3d52d21a050cf48de197fa1b -size 306 +oid sha256:9bca9a33fbfd78f0a17215078eff4ec834fa632d1201e5062fc57d878f00697d +size 307 diff --git a/data/minecraft/structure/trial_chambers/decor/candle_2.nbt b/data/minecraft/structure/trial_chambers/decor/candle_2.nbt index 70c480d8..7f43acff 100644 --- a/data/minecraft/structure/trial_chambers/decor/candle_2.nbt +++ b/data/minecraft/structure/trial_chambers/decor/candle_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c0149aec8113e3b5f2f515083052a1f01200a1ec7f6caf8a75e5bb40d3c6d54 -size 306 +oid sha256:f3110cdd2d2392ca2f24c760106649a8f52ff523e2a104cce40bf8a5528e24aa +size 307 diff --git a/data/minecraft/structure/trial_chambers/decor/candle_3.nbt b/data/minecraft/structure/trial_chambers/decor/candle_3.nbt index 10f4b5e6..b48396b1 100644 --- a/data/minecraft/structure/trial_chambers/decor/candle_3.nbt +++ b/data/minecraft/structure/trial_chambers/decor/candle_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66a46a5cf880e864f60d21cf6df1c081cc6e9eb64b6d1cc7b4aa238fa44e975d -size 306 +oid sha256:1916770407069e3ec883c5ef216b9759024ce792fa6dbbfc56082a5c6bc54f7d +size 307 diff --git a/data/minecraft/structure/trial_chambers/decor/candle_4.nbt b/data/minecraft/structure/trial_chambers/decor/candle_4.nbt index 1ee194a9..4dd403c0 100644 --- a/data/minecraft/structure/trial_chambers/decor/candle_4.nbt +++ b/data/minecraft/structure/trial_chambers/decor/candle_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6abe9e3622d6af6105f8b3c72141b1d570cecf11aceeba36de0dedbdcec5fc3 -size 306 +oid sha256:6651df879477d0124974912ba6fd13193224c61d0817c5c6bf471955ea135073 +size 307 diff --git a/data/minecraft/structure/trial_chambers/decor/cyan_bed.nbt b/data/minecraft/structure/trial_chambers/decor/cyan_bed.nbt index 30023c92..8bec7d58 100644 --- a/data/minecraft/structure/trial_chambers/decor/cyan_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/cyan_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e4b28be25b076f3902b9b0b1fcb5db061cac36a4284f9f85e46b703f645559c +oid sha256:453f4b451961abb7c1d6c3669acce43102418b411de668449bbaf14574843223 size 324 diff --git a/data/minecraft/structure/trial_chambers/decor/dead_bush_pot.nbt b/data/minecraft/structure/trial_chambers/decor/dead_bush_pot.nbt index 5d84d523..787c3cb4 100644 --- a/data/minecraft/structure/trial_chambers/decor/dead_bush_pot.nbt +++ b/data/minecraft/structure/trial_chambers/decor/dead_bush_pot.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a661d27157b9989ef5cac0b1c78bf0f8969e5c525f50eef564324d455aecd762 +oid sha256:058fc94d4e701acdb2711c7a0fe1269e555e7d779dd82e8c8de9eae176cfc7ff size 289 diff --git a/data/minecraft/structure/trial_chambers/decor/disposal.nbt b/data/minecraft/structure/trial_chambers/decor/disposal.nbt index 34885cf3..54321f6a 100644 --- a/data/minecraft/structure/trial_chambers/decor/disposal.nbt +++ b/data/minecraft/structure/trial_chambers/decor/disposal.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61738cb10e3a754b6bfe2a20296453f507b04e585078d51b46b566af9fb1fd47 -size 515 +oid sha256:31fff3c1699babc9aa5094a5392515318b9773660440dea592b065e6093c0fc2 +size 514 diff --git a/data/minecraft/structure/trial_chambers/decor/empty_pot.nbt b/data/minecraft/structure/trial_chambers/decor/empty_pot.nbt index 37be74ef..425bdd64 100644 --- a/data/minecraft/structure/trial_chambers/decor/empty_pot.nbt +++ b/data/minecraft/structure/trial_chambers/decor/empty_pot.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2e4a542165299dd50313f1ed07dd082fc3712142b28040b8f3c0bd822a21e21 +oid sha256:a7a0562cee09cb77d9de2ebfe94fa7374b5f8f4cd31e80d798a85bb6f7ed558f size 285 diff --git a/data/minecraft/structure/trial_chambers/decor/flow_pot.nbt b/data/minecraft/structure/trial_chambers/decor/flow_pot.nbt index d5ae380b..e6b5e2e8 100644 --- a/data/minecraft/structure/trial_chambers/decor/flow_pot.nbt +++ b/data/minecraft/structure/trial_chambers/decor/flow_pot.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:777a29573405505d1ee39719e698f7fc8978ccdaf698858303afdef5903e9a75 +oid sha256:1e0e1e327cdb6aeebd856af1e5f32dbf95139057ea97db0489cdc6fd2c367577 size 387 diff --git a/data/minecraft/structure/trial_chambers/decor/gray_bed.nbt b/data/minecraft/structure/trial_chambers/decor/gray_bed.nbt index 50209add..9378800d 100644 --- a/data/minecraft/structure/trial_chambers/decor/gray_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/gray_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e310d728731c14fff3467dcfca01549ed5d53d536a7b7543422d7839df105887 +oid sha256:01edffee64e6122a1205b2e96c29516683e57344d6e5aaf931d96db01a95f920 size 325 diff --git a/data/minecraft/structure/trial_chambers/decor/green_bed.nbt b/data/minecraft/structure/trial_chambers/decor/green_bed.nbt index 7ea59703..daeb4135 100644 --- a/data/minecraft/structure/trial_chambers/decor/green_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/green_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a75faa0dd4ac28628d7e7c667a06ce8ea46728e3e32e41a79fc42a160a0e85da +oid sha256:ed829072f01964b96e57a36afc2327ad09d8a86abcb8d02d9272a539575ffed2 size 326 diff --git a/data/minecraft/structure/trial_chambers/decor/guster_pot.nbt b/data/minecraft/structure/trial_chambers/decor/guster_pot.nbt index f8cb1fef..fd35ae7a 100644 --- a/data/minecraft/structure/trial_chambers/decor/guster_pot.nbt +++ b/data/minecraft/structure/trial_chambers/decor/guster_pot.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb6c81493a03331a6add5a1940ff6c57d846c89470369f04294970faefcb5fc9 +oid sha256:58fb3422257bdfc7a55faab78549d54c8c56e5b913d522636ba924cace52e100 size 384 diff --git a/data/minecraft/structure/trial_chambers/decor/light_blue_bed.nbt b/data/minecraft/structure/trial_chambers/decor/light_blue_bed.nbt index 5373e660..78564fbc 100644 --- a/data/minecraft/structure/trial_chambers/decor/light_blue_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/light_blue_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83607b108c4f467227b3e6c2d877927fb95457f4b2e4c1ebe64415189d8fea26 +oid sha256:1f64bfd8fbd9058cbd15d637ad18b4077cfdc961490380390a450adb206aca14 size 331 diff --git a/data/minecraft/structure/trial_chambers/decor/light_gray_bed.nbt b/data/minecraft/structure/trial_chambers/decor/light_gray_bed.nbt index 752fc9fd..da1e1b23 100644 --- a/data/minecraft/structure/trial_chambers/decor/light_gray_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/light_gray_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:741602ce10971fda49bdf36dfd11fa4c754d9b233ebf9ce28a95353554ec1479 +oid sha256:e81769cf077be6241b69cfd42720aa0834ca0af4e06fa0d3d3eb6cf3c7e29494 size 331 diff --git a/data/minecraft/structure/trial_chambers/decor/lime_bed.nbt b/data/minecraft/structure/trial_chambers/decor/lime_bed.nbt index 21ca3e1b..8c264174 100644 --- a/data/minecraft/structure/trial_chambers/decor/lime_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/lime_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd31f8bad5c348af2399e8c551f2f19dbce6c0667c52786c98b2f51b11e74d44 +oid sha256:b2be62da0f17e09f63225a1cca75fa2aa4d79427c214a217c47818925da472e2 size 324 diff --git a/data/minecraft/structure/trial_chambers/decor/magenta_bed.nbt b/data/minecraft/structure/trial_chambers/decor/magenta_bed.nbt index b1733edb..6c0e3bb2 100644 --- a/data/minecraft/structure/trial_chambers/decor/magenta_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/magenta_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee293dc340fe75724b53f02792a62a2cae7e73af33287bc12d9f6b882e8334cd +oid sha256:33a2710a87fe518657d9dda56393490bc09ed10a8a56130d00941ee9338fc467 size 327 diff --git a/data/minecraft/structure/trial_chambers/decor/orange_bed.nbt b/data/minecraft/structure/trial_chambers/decor/orange_bed.nbt index 4675749c..1a0868e9 100644 --- a/data/minecraft/structure/trial_chambers/decor/orange_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/orange_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6dc9deaa14ec9c3d45b1669b88aa7e952636fdceeec7a094805c1449a37004fc +oid sha256:d6251c7d02200b4abca32073d6a54c908810d64642f33b7051fd537ecdc95052 size 327 diff --git a/data/minecraft/structure/trial_chambers/decor/pink_bed.nbt b/data/minecraft/structure/trial_chambers/decor/pink_bed.nbt index cf40d076..8c16ac27 100644 --- a/data/minecraft/structure/trial_chambers/decor/pink_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/pink_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:517dc7c26884a33d8d4301ffa0dfdc60672ada8e0ec8253238eede39b0c79573 -size 324 +oid sha256:750a34522bcace2b980014bd4971283e08e1ac8ed7bceafba4515140a7807442 +size 325 diff --git a/data/minecraft/structure/trial_chambers/decor/purple_bed.nbt b/data/minecraft/structure/trial_chambers/decor/purple_bed.nbt index 4346ef03..16f06635 100644 --- a/data/minecraft/structure/trial_chambers/decor/purple_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/purple_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc4c3dd9c27215945270f2bfff435c1f7e3742bb6d3c3ec162cd0e8c747a5fdb +oid sha256:c8a0b65778fb984783a1d947fc343cd2f5e8c21040931bc14cf07d8c7d332cc5 size 327 diff --git a/data/minecraft/structure/trial_chambers/decor/red_bed.nbt b/data/minecraft/structure/trial_chambers/decor/red_bed.nbt index cef05dd3..b153d3cb 100644 --- a/data/minecraft/structure/trial_chambers/decor/red_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/red_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a2ff010275dafbb511b35a0c3c61e3ace7978d218d3ef80abf945922181af32 +oid sha256:211c123a0104a5515ced9136766794d935bb82ecbf9356fb0f46e428f9269118 size 323 diff --git a/data/minecraft/structure/trial_chambers/decor/scrape_pot.nbt b/data/minecraft/structure/trial_chambers/decor/scrape_pot.nbt index 1af8a21c..1414cc31 100644 --- a/data/minecraft/structure/trial_chambers/decor/scrape_pot.nbt +++ b/data/minecraft/structure/trial_chambers/decor/scrape_pot.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8ff2ff688138078e19f834f74686a44256e7272578a84b4da9a38c73072f831 -size 384 +oid sha256:741906b573213a9ad26a2b0204376a5293e5de83185c54ef1596a79940688ed9 +size 383 diff --git a/data/minecraft/structure/trial_chambers/decor/undecorated_pot.nbt b/data/minecraft/structure/trial_chambers/decor/undecorated_pot.nbt index c3e4d284..03608516 100644 --- a/data/minecraft/structure/trial_chambers/decor/undecorated_pot.nbt +++ b/data/minecraft/structure/trial_chambers/decor/undecorated_pot.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:391eff72a94b8c78bed0b6af8d522ac6699b85412fae5229a4a9ff192eb0a3ce +oid sha256:94f6599bde4ca5d2e34a4afcbc5d0250f77681e2f4715c8f6e514f64de55639e size 352 diff --git a/data/minecraft/structure/trial_chambers/decor/white_bed.nbt b/data/minecraft/structure/trial_chambers/decor/white_bed.nbt index c6341856..e0c81874 100644 --- a/data/minecraft/structure/trial_chambers/decor/white_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/white_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9de90efba94d9451fd9e7846d824b5a2778c1e6c249b753241d48f49788e4ae1 +oid sha256:ad5b2d4f9fae5b9e7166f5b0e2f672a8c2987eb6d9adef947a7e7ccda878b39f size 326 diff --git a/data/minecraft/structure/trial_chambers/decor/yellow_bed.nbt b/data/minecraft/structure/trial_chambers/decor/yellow_bed.nbt index 99395b48..ee346338 100644 --- a/data/minecraft/structure/trial_chambers/decor/yellow_bed.nbt +++ b/data/minecraft/structure/trial_chambers/decor/yellow_bed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82bf60ee977a24756dfb3effaa83a9d935a9b6f6b1985ab40ac09a682725e7f1 +oid sha256:eb45d0482bddfa04065f55f060c14bbb21e382c94097186895ab297bd91c5c79 size 328 diff --git a/data/minecraft/structure/trial_chambers/dispensers/chamber.nbt b/data/minecraft/structure/trial_chambers/dispensers/chamber.nbt index 8136c123..f1c401e8 100644 --- a/data/minecraft/structure/trial_chambers/dispensers/chamber.nbt +++ b/data/minecraft/structure/trial_chambers/dispensers/chamber.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5cb1e9121e49074f133b3624fd4e78ef6676e9086c35dc3949af87a0fa0f5776 -size 383 +oid sha256:d3c5221cdd96622972c0dabe3eedaf438e1fa6773287a63f4d49538b28b4f86d +size 382 diff --git a/data/minecraft/structure/trial_chambers/dispensers/floor_dispenser.nbt b/data/minecraft/structure/trial_chambers/dispensers/floor_dispenser.nbt index 95e32ced..32534540 100644 --- a/data/minecraft/structure/trial_chambers/dispensers/floor_dispenser.nbt +++ b/data/minecraft/structure/trial_chambers/dispensers/floor_dispenser.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e412b67dbbd827e9cb26ee6829f9c33fb97d53275b960ff76bfe531baa6856d3 -size 357 +oid sha256:81e1231306e5db709a569790c38489c9223f9d8af247b3628b841392618fe8e5 +size 356 diff --git a/data/minecraft/structure/trial_chambers/dispensers/wall_dispenser.nbt b/data/minecraft/structure/trial_chambers/dispensers/wall_dispenser.nbt index 79b05d0f..19682431 100644 --- a/data/minecraft/structure/trial_chambers/dispensers/wall_dispenser.nbt +++ b/data/minecraft/structure/trial_chambers/dispensers/wall_dispenser.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f99f4d57ed333d27d7e6e7397bfb69810e4ede1ddddba0d5998621d91ecaf35b -size 414 +oid sha256:130ab99d6ee96c8782784dbf3c392a8c33e1db2ff90665b3c780fa0066828736 +size 413 diff --git a/data/minecraft/structure/trial_chambers/hallway/cache_1.nbt b/data/minecraft/structure/trial_chambers/hallway/cache_1.nbt index 76d685e1..1d2b8bd9 100644 --- a/data/minecraft/structure/trial_chambers/hallway/cache_1.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/cache_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4134df736d6ebcb749331281d9432db5e86a7e7ff416a8d061c8ce26627e12c7 +oid sha256:344096518a4f194ec67c8a986cf610a7fb05a0e89ba76156307f43d582d22e01 size 2708 diff --git a/data/minecraft/structure/trial_chambers/hallway/corner_staircase.nbt b/data/minecraft/structure/trial_chambers/hallway/corner_staircase.nbt index b07e2f2d..a3e892b7 100644 --- a/data/minecraft/structure/trial_chambers/hallway/corner_staircase.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/corner_staircase.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7aefa63746e3721a887fbad851394de68ab1747e3803f6be6d33c0dded1c1d3 +oid sha256:5d8cb99b757f163bb72813f2482e215efe409cba057bd4baafce3959dde9370b size 1434 diff --git a/data/minecraft/structure/trial_chambers/hallway/corner_staircase_down.nbt b/data/minecraft/structure/trial_chambers/hallway/corner_staircase_down.nbt index 7ed78f00..5c04661e 100644 --- a/data/minecraft/structure/trial_chambers/hallway/corner_staircase_down.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/corner_staircase_down.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fee1b9ac96f6be40e0baa550f006b032f24a49be35a9ab386634c9a2eb46277 +oid sha256:1c1309e05a513d2aefcea6c3b39c8b4f4f2ab944ca847f4de33a2c05ae62d7d9 size 1437 diff --git a/data/minecraft/structure/trial_chambers/hallway/corridor_connector_1.nbt b/data/minecraft/structure/trial_chambers/hallway/corridor_connector_1.nbt index 9216ecba..b0c2c560 100644 --- a/data/minecraft/structure/trial_chambers/hallway/corridor_connector_1.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/corridor_connector_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8b04356f89acbee2d222bf1023ebcf49179e31d1e693aa292b236eeeb41035e -size 688 +oid sha256:5afc3cc5fda5f8a49dca9096d3ede1e8924eeecbbed9c59288cfdee8dc969c68 +size 689 diff --git a/data/minecraft/structure/trial_chambers/hallway/encounter_1.nbt b/data/minecraft/structure/trial_chambers/hallway/encounter_1.nbt index 2fa4c4cb..ff092690 100644 --- a/data/minecraft/structure/trial_chambers/hallway/encounter_1.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/encounter_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a7f610b772e9c80939bfa58daefbb72c67a9c57e1e2f1cadd6a169d8da494b7 +oid sha256:91b9dacfff444b664af6c15ed5f1dc71efcb456f8469de64ee045d08b19019c5 size 7350 diff --git a/data/minecraft/structure/trial_chambers/hallway/encounter_2.nbt b/data/minecraft/structure/trial_chambers/hallway/encounter_2.nbt index 54ae3809..44b5bc9f 100644 --- a/data/minecraft/structure/trial_chambers/hallway/encounter_2.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/encounter_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64bbd95deb9f6cc309e73c668653f628f12458b49d8216433e5eff48ab56d59e -size 6704 +oid sha256:e308ef9abaa992e83ec5c513062e26455ed77efecf9cea09160f8f19dde3c2db +size 6705 diff --git a/data/minecraft/structure/trial_chambers/hallway/encounter_3.nbt b/data/minecraft/structure/trial_chambers/hallway/encounter_3.nbt index 48763a9b..2f215380 100644 --- a/data/minecraft/structure/trial_chambers/hallway/encounter_3.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/encounter_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74912de9226babeeeb58cb71d09e377f7e8de8908aff5ed197a5636b66a8c5b9 +oid sha256:b9ace406cf85f754dfe5a18e1beeed671a1eaf216a6a356ec36350a54b9ff49f size 5627 diff --git a/data/minecraft/structure/trial_chambers/hallway/encounter_4.nbt b/data/minecraft/structure/trial_chambers/hallway/encounter_4.nbt index 9725d548..b28bb15c 100644 --- a/data/minecraft/structure/trial_chambers/hallway/encounter_4.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/encounter_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7cb8e2d139948cb7f222fac191faeee6ab9ceb8c1b09df1ee3a15f1f78ba3d2 +oid sha256:d20e7a1dd1b2bdf124e8f516ba7931a407f4c1bd897a6c6e82d21522c525c91d size 17905 diff --git a/data/minecraft/structure/trial_chambers/hallway/encounter_5.nbt b/data/minecraft/structure/trial_chambers/hallway/encounter_5.nbt index c2047d0e..233ef801 100644 --- a/data/minecraft/structure/trial_chambers/hallway/encounter_5.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/encounter_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1edc7480e4cd3b2048fe77f7ec7c3b2459bb295d12d531c8f5cbbb5bbe2066f7 -size 14322 +oid sha256:af2a57f1aedc268711eb87c35a1d58ab72150d555a80a742faa46dedc4436296 +size 14323 diff --git a/data/minecraft/structure/trial_chambers/hallway/left_corner.nbt b/data/minecraft/structure/trial_chambers/hallway/left_corner.nbt index 9b5bae34..dbcf717c 100644 --- a/data/minecraft/structure/trial_chambers/hallway/left_corner.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/left_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfe4df9eb80c696c1f9d055070d8db76172241d0582a4a69876a2cf011f2b225 +oid sha256:62b73eb5835baa1e5e83a8d9707e8f082627e4a438447e550544b5da6c40a851 size 938 diff --git a/data/minecraft/structure/trial_chambers/hallway/long_straight_staircase.nbt b/data/minecraft/structure/trial_chambers/hallway/long_straight_staircase.nbt index cd6a6380..eb77f5d5 100644 --- a/data/minecraft/structure/trial_chambers/hallway/long_straight_staircase.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/long_straight_staircase.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58602924e13100e221de1be9758c2e7aecb42adbec0e12c282faabd6195fed90 +oid sha256:3c52a8c23ae071ec692401e7216d0fec78c6e4d08736cff58ccceaa71bc5cf8a size 2592 diff --git a/data/minecraft/structure/trial_chambers/hallway/long_straight_staircase_down.nbt b/data/minecraft/structure/trial_chambers/hallway/long_straight_staircase_down.nbt index dcaaa9b9..d90f0be4 100644 --- a/data/minecraft/structure/trial_chambers/hallway/long_straight_staircase_down.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/long_straight_staircase_down.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36118de22ab8b3931020602e12806e9ab80a4d153244ce6ccbba6aa24a58ebf1 +oid sha256:20251b4659567148298786e953bd849be24df32091cc3c8a606273cb510cd827 size 2593 diff --git a/data/minecraft/structure/trial_chambers/hallway/lower_hallway_connector.nbt b/data/minecraft/structure/trial_chambers/hallway/lower_hallway_connector.nbt index 7d58b698..bf6c1aa9 100644 --- a/data/minecraft/structure/trial_chambers/hallway/lower_hallway_connector.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/lower_hallway_connector.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb3a09705e173fad1c7e037299887dc2941e9c844d367d50a2af442e2a134eda +oid sha256:699597657d966e507e4048dcbd5961ccb6dfbf761f75ff4078c3e8f2c77e94df size 3185 diff --git a/data/minecraft/structure/trial_chambers/hallway/right_corner.nbt b/data/minecraft/structure/trial_chambers/hallway/right_corner.nbt index ac48cb52..4c75a427 100644 --- a/data/minecraft/structure/trial_chambers/hallway/right_corner.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/right_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20dcb1314358ed08192759565ac5505814b43f1184614f34fec3553fe1590327 +oid sha256:2272329d6af47eb3d530b72a2d9d395ae8e1c9c417897751829b1b26a06851ab size 945 diff --git a/data/minecraft/structure/trial_chambers/hallway/rubble.nbt b/data/minecraft/structure/trial_chambers/hallway/rubble.nbt index 7082da5c..be4c3663 100644 --- a/data/minecraft/structure/trial_chambers/hallway/rubble.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/rubble.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c136d877bc49076977edc149bdb32aa7ced631e724c5eda32759a820224e5592 +oid sha256:43156b36f1219a0ca94b340aaa5ceb48ac503e267d92e79ca662648baab33d06 size 935 diff --git a/data/minecraft/structure/trial_chambers/hallway/rubble_chamber.nbt b/data/minecraft/structure/trial_chambers/hallway/rubble_chamber.nbt index 8c96f717..ea572e9c 100644 --- a/data/minecraft/structure/trial_chambers/hallway/rubble_chamber.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/rubble_chamber.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19c07b695c32d7ffbc07ec89759944815920ca8ff7e8ab256f6d10617cedd0b5 +oid sha256:b85b7dfdcfa25c8478814d1a2c96a9d8ed59ec1b66d7063112842f6216afdfa9 size 925 diff --git a/data/minecraft/structure/trial_chambers/hallway/rubble_chamber_thin.nbt b/data/minecraft/structure/trial_chambers/hallway/rubble_chamber_thin.nbt index 2995fd80..dbb7a1f0 100644 --- a/data/minecraft/structure/trial_chambers/hallway/rubble_chamber_thin.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/rubble_chamber_thin.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c5f7b34ecb1b7f27ef26c6ce731ef2cde2520b9ea845262244dc00a2259cd75 +oid sha256:4065c6de864f3d38eaea5b91f7ab0966b34ac22cb3ba70e4999ca2db32fbda3b size 471 diff --git a/data/minecraft/structure/trial_chambers/hallway/rubble_thin.nbt b/data/minecraft/structure/trial_chambers/hallway/rubble_thin.nbt index 2995fd80..dbb7a1f0 100644 --- a/data/minecraft/structure/trial_chambers/hallway/rubble_thin.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/rubble_thin.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c5f7b34ecb1b7f27ef26c6ce731ef2cde2520b9ea845262244dc00a2259cd75 +oid sha256:4065c6de864f3d38eaea5b91f7ab0966b34ac22cb3ba70e4999ca2db32fbda3b size 471 diff --git a/data/minecraft/structure/trial_chambers/hallway/straight.nbt b/data/minecraft/structure/trial_chambers/hallway/straight.nbt index a07affc2..2ea307c8 100644 --- a/data/minecraft/structure/trial_chambers/hallway/straight.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/straight.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a96793326c8bd2a125dd5b7f4c192db9bd796cc99bffbb7ce89c57d85acb730 +oid sha256:ad2ff2a65bed2435d02de5ca961710d79bb586a3040e88c4d1a0b778b41ec62b size 932 diff --git a/data/minecraft/structure/trial_chambers/hallway/straight_staircase.nbt b/data/minecraft/structure/trial_chambers/hallway/straight_staircase.nbt index 39b4f5e2..6a5a6fee 100644 --- a/data/minecraft/structure/trial_chambers/hallway/straight_staircase.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/straight_staircase.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6885382e287827a0fca2e6da40f89b38313ec373a36bff6cf6bb094f51b0da9 +oid sha256:b1fcdf07730f9fd505330af2bf9b282a6cf71e62fef66163104643cc06fd93dc size 1177 diff --git a/data/minecraft/structure/trial_chambers/hallway/straight_staircase_down.nbt b/data/minecraft/structure/trial_chambers/hallway/straight_staircase_down.nbt index 8faf76ce..d01d460c 100644 --- a/data/minecraft/structure/trial_chambers/hallway/straight_staircase_down.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/straight_staircase_down.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89e49f9c0969ea801af47ce73c7679e93e69d28e4f5c2a3457eba07ec7aca806 +oid sha256:ac8c7110ed96faa443cc47ffc9e2aaaf750e4fe3864525dff09560994cfee9d7 size 1176 diff --git a/data/minecraft/structure/trial_chambers/hallway/trapped_staircase.nbt b/data/minecraft/structure/trial_chambers/hallway/trapped_staircase.nbt index 85d2ecc1..70d43c52 100644 --- a/data/minecraft/structure/trial_chambers/hallway/trapped_staircase.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/trapped_staircase.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c42073d31f4aac8ecde5ac5466a83a7f7bf64ffabcffac79ff367c6d62711a6 +oid sha256:7f961b46847b410a1df84080e25ff1e56b7d169e68dac84121ba9319d8c27085 size 3612 diff --git a/data/minecraft/structure/trial_chambers/hallway/upper_hallway_connector.nbt b/data/minecraft/structure/trial_chambers/hallway/upper_hallway_connector.nbt index 231f1576..a683d970 100644 --- a/data/minecraft/structure/trial_chambers/hallway/upper_hallway_connector.nbt +++ b/data/minecraft/structure/trial_chambers/hallway/upper_hallway_connector.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e922cf15faf0154032fe5e0748183c827825a2beef2e010620d0bd397f8eedd +oid sha256:1434e62f211ccb55b02724af98d8c9824ae60334c2a95fb433c36a586c7c5b58 size 2699 diff --git a/data/minecraft/structure/trial_chambers/intersection/intersection_1.nbt b/data/minecraft/structure/trial_chambers/intersection/intersection_1.nbt index c0017d42..3df81bfa 100644 --- a/data/minecraft/structure/trial_chambers/intersection/intersection_1.nbt +++ b/data/minecraft/structure/trial_chambers/intersection/intersection_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff5b5a9fda5c0362614deb97df380b0540016186d315398bad1f18238f0a4fed +oid sha256:66c6fd724fcea8c8d2452d54475dd038dcd223e57dbc44ebb27cdbad9c0d0c91 size 29421 diff --git a/data/minecraft/structure/trial_chambers/intersection/intersection_2.nbt b/data/minecraft/structure/trial_chambers/intersection/intersection_2.nbt index 02397fbf..3f202ace 100644 --- a/data/minecraft/structure/trial_chambers/intersection/intersection_2.nbt +++ b/data/minecraft/structure/trial_chambers/intersection/intersection_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1c10256f182937ee16d1ed924beb46ee85c161da49a0192921686fe227830b4 -size 30343 +oid sha256:852618569d72ccf25465b89f15cf47cd3fd7346d1ba2f6bffb1d456218f13ce0 +size 30342 diff --git a/data/minecraft/structure/trial_chambers/intersection/intersection_3.nbt b/data/minecraft/structure/trial_chambers/intersection/intersection_3.nbt index 41b62720..14f9d562 100644 --- a/data/minecraft/structure/trial_chambers/intersection/intersection_3.nbt +++ b/data/minecraft/structure/trial_chambers/intersection/intersection_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f27ae0c30caabbb022da12b8c208d979b7b555f5bbc89cb2bd8f3613ca7e31c -size 49355 +oid sha256:a7e0a259140e1dbe6296ee0826ab6f6d03b07d93926e971db3a08d3387cd0255 +size 49354 diff --git a/data/minecraft/structure/trial_chambers/reward/ominous_vault.nbt b/data/minecraft/structure/trial_chambers/reward/ominous_vault.nbt index 5f74fcf3..86c55a31 100644 --- a/data/minecraft/structure/trial_chambers/reward/ominous_vault.nbt +++ b/data/minecraft/structure/trial_chambers/reward/ominous_vault.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccd9b5cae4d4a147742f9219db5534de16696ef7ff06e4eb1a37a7150d8fbbab +oid sha256:c5309e93bc7a36d655c929eb451a4ce0440a4d9088ae19f84e0b58a0033e0e64 size 689 diff --git a/data/minecraft/structure/trial_chambers/reward/vault.nbt b/data/minecraft/structure/trial_chambers/reward/vault.nbt index c90bdbea..21c7197f 100644 --- a/data/minecraft/structure/trial_chambers/reward/vault.nbt +++ b/data/minecraft/structure/trial_chambers/reward/vault.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecece75bbcba2cc04af08f9482c2bd47e0759f44b969321843b7cf511db78b6f -size 503 +oid sha256:19e96b429729880a8f8f270e0188979e2c45ea2b68b4bcca1115f6bf582550f4 +size 504 diff --git a/data/minecraft/structure/trial_chambers/spawner/breeze/breeze.nbt b/data/minecraft/structure/trial_chambers/spawner/breeze/breeze.nbt index 78c1ef26..e46bb4af 100644 --- a/data/minecraft/structure/trial_chambers/spawner/breeze/breeze.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/breeze/breeze.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15126c46f1c0b1fd024789c4227be7f578aea667bec85ca99281444e60fe4c5f +oid sha256:2d259632db8f7b4b80419091f1ed99869b3897ece098d29edce441e89122799b size 468 diff --git a/data/minecraft/structure/trial_chambers/spawner/connectors/breeze.nbt b/data/minecraft/structure/trial_chambers/spawner/connectors/breeze.nbt index 29dab29a..d9c042ed 100644 --- a/data/minecraft/structure/trial_chambers/spawner/connectors/breeze.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/connectors/breeze.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2d380c78eaa96fa04173aa5da80b42c2b52a5a69c304c862a3a0431d21cc1b7 +oid sha256:254d11fae715b074c06975b4df71541ce8eab6f82681ab13fce8ab9c962198fe size 327 diff --git a/data/minecraft/structure/trial_chambers/spawner/connectors/melee.nbt b/data/minecraft/structure/trial_chambers/spawner/connectors/melee.nbt index f6f95dea..4bf71813 100644 --- a/data/minecraft/structure/trial_chambers/spawner/connectors/melee.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/connectors/melee.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:268c32b710322ffc13a5e38effc07eaad7e1242e0180381747901fd320d11690 +oid sha256:edab2f92ee4a5454121d4f2bf96471b66ec75a4a9f8a1c6c66be980f970b4fc3 size 326 diff --git a/data/minecraft/structure/trial_chambers/spawner/connectors/ranged.nbt b/data/minecraft/structure/trial_chambers/spawner/connectors/ranged.nbt index 06343459..887c7e2f 100644 --- a/data/minecraft/structure/trial_chambers/spawner/connectors/ranged.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/connectors/ranged.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29169fb7fcc75fa8f46bfcc64e7e16fb7ac2baf4bcd691a6b6c57f39f9671d4f +oid sha256:a7320c47bf84a447c4edcdff1f8a5110537d2c72ea25f2be97653268ffea605a size 326 diff --git a/data/minecraft/structure/trial_chambers/spawner/connectors/slow_ranged.nbt b/data/minecraft/structure/trial_chambers/spawner/connectors/slow_ranged.nbt index 8246b231..bdc30e2c 100644 --- a/data/minecraft/structure/trial_chambers/spawner/connectors/slow_ranged.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/connectors/slow_ranged.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00eca32a346470f5eafb9e831994bd73f6fcbb0b20376728f1719dbccca8f35f +oid sha256:17c1b7bf88c5d30a1066b6e8eed608852e77a26361bd235a594bef83f901b27c size 330 diff --git a/data/minecraft/structure/trial_chambers/spawner/connectors/small_melee.nbt b/data/minecraft/structure/trial_chambers/spawner/connectors/small_melee.nbt index 20a26cbf..35c56c8c 100644 --- a/data/minecraft/structure/trial_chambers/spawner/connectors/small_melee.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/connectors/small_melee.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce03bda0b7ecb5172391e6a7aed5868e5c64f6efbc858f15afb858b521456ad1 +oid sha256:8b40d2e6c5086694239eec29e894c7a8b122db7c6d8dc6b523c8056d9c663310 size 329 diff --git a/data/minecraft/structure/trial_chambers/spawner/melee/husk.nbt b/data/minecraft/structure/trial_chambers/spawner/melee/husk.nbt index b75256ad..01af0bad 100644 --- a/data/minecraft/structure/trial_chambers/spawner/melee/husk.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/melee/husk.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28f88a1f3247004a41c1ca2bb768366d3b43a18435826448dd905106b449e167 +oid sha256:3ca5536f399f109033f9a5e2c48c9dc8148db90e0900d2623582a9727c84a6de size 472 diff --git a/data/minecraft/structure/trial_chambers/spawner/melee/spider.nbt b/data/minecraft/structure/trial_chambers/spawner/melee/spider.nbt index 925c1343..9cffa4dd 100644 --- a/data/minecraft/structure/trial_chambers/spawner/melee/spider.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/melee/spider.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e363ed4c9d80fa496a2a96954e49bffb24d7e7fa84c9350c7b2bfe421f6ff00b -size 479 +oid sha256:5d7248d23aa800b2f9759ed5dbe3e7b1536bdcadcb5846b638a88f5076fd6a77 +size 480 diff --git a/data/minecraft/structure/trial_chambers/spawner/melee/zombie.nbt b/data/minecraft/structure/trial_chambers/spawner/melee/zombie.nbt index d3094cda..342bca46 100644 --- a/data/minecraft/structure/trial_chambers/spawner/melee/zombie.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/melee/zombie.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c52c482f989a13ce45ea3e3bb7b5b11b2a934cdd2467e6acd6a7628a4dffa756 -size 478 +oid sha256:e64cbb393fdd370faaaa905611e1c48e649913902b8f6fa0bbb94a9672076dc2 +size 479 diff --git a/data/minecraft/structure/trial_chambers/spawner/ranged/poison_skeleton.nbt b/data/minecraft/structure/trial_chambers/spawner/ranged/poison_skeleton.nbt index 2a5c04a8..3ee5c86e 100644 --- a/data/minecraft/structure/trial_chambers/spawner/ranged/poison_skeleton.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/ranged/poison_skeleton.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b9c6ab28a065fca3bcbe8a0ffab7a96317f61f9c8cd9a7d27292f4d9fbcd21f -size 523 +oid sha256:8ed2deffe5014617ad8487e04426baadc0c37c7e57f829f751e6cd7308a0098a +size 524 diff --git a/data/minecraft/structure/trial_chambers/spawner/ranged/skeleton.nbt b/data/minecraft/structure/trial_chambers/spawner/ranged/skeleton.nbt index 15ead1e1..6028bdb6 100644 --- a/data/minecraft/structure/trial_chambers/spawner/ranged/skeleton.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/ranged/skeleton.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd9b876bf8d9357ece313630201c54ae68e07abcc09860559c1cd757004a19a3 -size 478 +oid sha256:571a594bd68b69f8e64a6e39cefb2e7b1932145b0030f2f496023ff51dd685d0 +size 479 diff --git a/data/minecraft/structure/trial_chambers/spawner/ranged/stray.nbt b/data/minecraft/structure/trial_chambers/spawner/ranged/stray.nbt index 751a8d2b..a87b7c06 100644 --- a/data/minecraft/structure/trial_chambers/spawner/ranged/stray.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/ranged/stray.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ae251a1ae496448b7e4a43a15166331bbf4f8f9d90b559264c9dac095e894bf +oid sha256:20cf0f4e195d8e51bbb3c4d69b707a598c883cffb7820a709db726d7891c83d9 size 475 diff --git a/data/minecraft/structure/trial_chambers/spawner/slow_ranged/poison_skeleton.nbt b/data/minecraft/structure/trial_chambers/spawner/slow_ranged/poison_skeleton.nbt index 06030797..6379ab24 100644 --- a/data/minecraft/structure/trial_chambers/spawner/slow_ranged/poison_skeleton.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/slow_ranged/poison_skeleton.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82f6db49dc620e263cb0275ee9d2c2402d8250a32009c54d0ed1bb4a24f0e3e5 +oid sha256:250a7e2a6bf8236b280c93e07d913c0e0397a1de1d2ba4d96ff8a275bf30b97e size 526 diff --git a/data/minecraft/structure/trial_chambers/spawner/slow_ranged/skeleton.nbt b/data/minecraft/structure/trial_chambers/spawner/slow_ranged/skeleton.nbt index 6a7874ba..10295fa0 100644 --- a/data/minecraft/structure/trial_chambers/spawner/slow_ranged/skeleton.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/slow_ranged/skeleton.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26696224255656b373c5cfa6b67b80659025c941fe71bf0c48b259d91a760fee +oid sha256:dd98063ac4e23d4303be65568a61788685f42d00dead7588e0399d6328222c42 size 484 diff --git a/data/minecraft/structure/trial_chambers/spawner/slow_ranged/stray.nbt b/data/minecraft/structure/trial_chambers/spawner/slow_ranged/stray.nbt index 9efe2efc..a46b68e0 100644 --- a/data/minecraft/structure/trial_chambers/spawner/slow_ranged/stray.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/slow_ranged/stray.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95f0b17fbac738e864b01c8c39b7eab0f1be79483389e71d03ae8a92bea16e94 +oid sha256:b5233306a81c1a4667fcae5d257d968084fb9433c6a0e28e35b7c260b4134329 size 477 diff --git a/data/minecraft/structure/trial_chambers/spawner/small_melee/baby_zombie.nbt b/data/minecraft/structure/trial_chambers/spawner/small_melee/baby_zombie.nbt index f722f392..43065c8f 100644 --- a/data/minecraft/structure/trial_chambers/spawner/small_melee/baby_zombie.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/small_melee/baby_zombie.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:928b7e7e46de7292ddfa954aacd781a336d4c35f8d0039ee3df571b7dede1d5a +oid sha256:5bb8995ec96a65a8488936969f741f509a4cbd91ea15b6c5220013c9ee5f354a size 498 diff --git a/data/minecraft/structure/trial_chambers/spawner/small_melee/cave_spider.nbt b/data/minecraft/structure/trial_chambers/spawner/small_melee/cave_spider.nbt index 65721323..2f14faa5 100644 --- a/data/minecraft/structure/trial_chambers/spawner/small_melee/cave_spider.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/small_melee/cave_spider.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58a06b67c4d62aceeee677b4fb1091396084f3078820ef92a2e545b6f5d0c095 -size 521 +oid sha256:8b513a8d436c14cb63a0ae908db3383e55f1382e168a280d616d062e69cba526 +size 522 diff --git a/data/minecraft/structure/trial_chambers/spawner/small_melee/silverfish.nbt b/data/minecraft/structure/trial_chambers/spawner/small_melee/silverfish.nbt index bea73306..8a1a8d9a 100644 --- a/data/minecraft/structure/trial_chambers/spawner/small_melee/silverfish.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/small_melee/silverfish.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:add20fa9de3c726006260ba12863239f5db78e2bf1db07101140bc1447a9fc65 +oid sha256:1490328f95dff2ee696cccc2a94548e28cfeed69af3636e3934c771526b9ecc9 size 482 diff --git a/data/minecraft/structure/trial_chambers/spawner/small_melee/slime.nbt b/data/minecraft/structure/trial_chambers/spawner/small_melee/slime.nbt index 8c3d9784..6c3685cb 100644 --- a/data/minecraft/structure/trial_chambers/spawner/small_melee/slime.nbt +++ b/data/minecraft/structure/trial_chambers/spawner/small_melee/slime.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75ca1d53cae05220e03f94435b01329935fc3084fb3cb496d106bfbc66081e97 -size 472 +oid sha256:5824af46e94719a8f416137e47caef5a22e23449523f499e331510db57119920 +size 473 diff --git a/data/minecraft/structure/underwater_ruin/big_brick_1.nbt b/data/minecraft/structure/underwater_ruin/big_brick_1.nbt index f6edc987..b45ea244 100644 --- a/data/minecraft/structure/underwater_ruin/big_brick_1.nbt +++ b/data/minecraft/structure/underwater_ruin/big_brick_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3cecd2549fe9881bd27c20807d094b1e57a5821c3daff04f2d4a7731a66adfe3 -size 11112 +oid sha256:d884a8791a58646fb35020609c505254aa78647c61d95898e022c20b1df0ebd9 +size 11113 diff --git a/data/minecraft/structure/underwater_ruin/big_brick_2.nbt b/data/minecraft/structure/underwater_ruin/big_brick_2.nbt index ec6818dd..982fb4ea 100644 --- a/data/minecraft/structure/underwater_ruin/big_brick_2.nbt +++ b/data/minecraft/structure/underwater_ruin/big_brick_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5839fc482fc84d1d34c476392a5b08515b8bc25d3ae0eed8f40a4bac127b8162 -size 11460 +oid sha256:ec62e19e01a2936f28af21a31dae89b9462553fab41bcda5b89ed38d50309d4c +size 11461 diff --git a/data/minecraft/structure/underwater_ruin/big_brick_3.nbt b/data/minecraft/structure/underwater_ruin/big_brick_3.nbt index 59d18195..9842fc7b 100644 --- a/data/minecraft/structure/underwater_ruin/big_brick_3.nbt +++ b/data/minecraft/structure/underwater_ruin/big_brick_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65e04e35a5dbacb03232f8c3157a11a60cb608245b607f43016cd88b548d59e5 +oid sha256:7cdd910c000388989ddcbf4985becb82c6a4d5effe5e85d568412eeea18e10ec size 11631 diff --git a/data/minecraft/structure/underwater_ruin/big_brick_8.nbt b/data/minecraft/structure/underwater_ruin/big_brick_8.nbt index 67ad8bad..250e1e11 100644 --- a/data/minecraft/structure/underwater_ruin/big_brick_8.nbt +++ b/data/minecraft/structure/underwater_ruin/big_brick_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2024f279b1d955b3f1c3aaa9ac8b63ce89b38a134c6511375be480ac71d8cee1 -size 11013 +oid sha256:f7a1bd37fb483d7351ff68d3704bd936ede9a89a9300647b987ad2e994534fac +size 11014 diff --git a/data/minecraft/structure/underwater_ruin/big_cracked_1.nbt b/data/minecraft/structure/underwater_ruin/big_cracked_1.nbt index d80f613e..61745939 100644 --- a/data/minecraft/structure/underwater_ruin/big_cracked_1.nbt +++ b/data/minecraft/structure/underwater_ruin/big_cracked_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:675263032b91a89791b59100b67f92c4722d230e81d098fe317cba8038f668f3 -size 11096 +oid sha256:faf5e20c0c7b4986279f7f18caa1f765e581928de49754694a13aee30890be08 +size 11097 diff --git a/data/minecraft/structure/underwater_ruin/big_cracked_2.nbt b/data/minecraft/structure/underwater_ruin/big_cracked_2.nbt index 0fea6dbc..affb7e7c 100644 --- a/data/minecraft/structure/underwater_ruin/big_cracked_2.nbt +++ b/data/minecraft/structure/underwater_ruin/big_cracked_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d03292a881a2cd08f9883ffe84a7806e36e07ee770a7e5e864f59e76f6b2b942 -size 11503 +oid sha256:ef31a716b8b325af68e2400fbb25754a11b0b19e2e4d97b1e15cd1e6cd39ee64 +size 11504 diff --git a/data/minecraft/structure/underwater_ruin/big_cracked_3.nbt b/data/minecraft/structure/underwater_ruin/big_cracked_3.nbt index e19ce3bd..14212127 100644 --- a/data/minecraft/structure/underwater_ruin/big_cracked_3.nbt +++ b/data/minecraft/structure/underwater_ruin/big_cracked_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfc7f13482a415c316e7eb6f96e5c96f47670dcacd279812ac12c7d7e5e10781 -size 11620 +oid sha256:b99cdf8fb8b42c2ef0205c118e930d9dfa2da430d8238073399fba9fbd8e04ad +size 11621 diff --git a/data/minecraft/structure/underwater_ruin/big_cracked_8.nbt b/data/minecraft/structure/underwater_ruin/big_cracked_8.nbt index b6a5efeb..c5cfe0a4 100644 --- a/data/minecraft/structure/underwater_ruin/big_cracked_8.nbt +++ b/data/minecraft/structure/underwater_ruin/big_cracked_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36d0cd1cc3fc29c2947ffbda6a6b59e9151f54eb997a7cfb49a96264155a2667 -size 11022 +oid sha256:4b4342746904a8a72feeb6e4f62a0aa0420ca6846bddcf2982d3dda76299242c +size 11023 diff --git a/data/minecraft/structure/underwater_ruin/big_mossy_1.nbt b/data/minecraft/structure/underwater_ruin/big_mossy_1.nbt index 108c52d8..828dced2 100644 --- a/data/minecraft/structure/underwater_ruin/big_mossy_1.nbt +++ b/data/minecraft/structure/underwater_ruin/big_mossy_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08017b926f46ef6168e8d34a8833f22d45a118013815e9f9b131b212fbe70ac0 -size 11094 +oid sha256:6722af2b600d526c2bf8b7cd9d38b3098de9b9a90c1161634294d69ad9337d3c +size 11095 diff --git a/data/minecraft/structure/underwater_ruin/big_mossy_2.nbt b/data/minecraft/structure/underwater_ruin/big_mossy_2.nbt index 2c199339..7f3d3a20 100644 --- a/data/minecraft/structure/underwater_ruin/big_mossy_2.nbt +++ b/data/minecraft/structure/underwater_ruin/big_mossy_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9293cdd8ba8e46420446b5de71c7f3623606ead29b6d06d6ad4046663006fe3a +oid sha256:7182854f3d0a90210c7f7c622bd2145c4d1edfccc9e30616888f6e829a1f20e4 size 11503 diff --git a/data/minecraft/structure/underwater_ruin/big_mossy_3.nbt b/data/minecraft/structure/underwater_ruin/big_mossy_3.nbt index b78e2f65..7df60ce9 100644 --- a/data/minecraft/structure/underwater_ruin/big_mossy_3.nbt +++ b/data/minecraft/structure/underwater_ruin/big_mossy_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6b714658c68c6c6014d2aab56f4b7885900af097624c06a867aaf11485409c7 +oid sha256:4cdb3e166c2a16f8538381d426ddffa2a05bba361f283eedf1076217be6e14fa size 11631 diff --git a/data/minecraft/structure/underwater_ruin/big_mossy_8.nbt b/data/minecraft/structure/underwater_ruin/big_mossy_8.nbt index da592d3e..e4e51379 100644 --- a/data/minecraft/structure/underwater_ruin/big_mossy_8.nbt +++ b/data/minecraft/structure/underwater_ruin/big_mossy_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1f5430e055df7b75f9c02c42b59662f0cae7777e44ac36f044dd5e63667ac98 +oid sha256:e79f5121f71f45e0a040762e949a5dc197b116b985a0aae64547b87c2b082af7 size 11044 diff --git a/data/minecraft/structure/underwater_ruin/big_warm_4.nbt b/data/minecraft/structure/underwater_ruin/big_warm_4.nbt index f9ffc061..d3cc0892 100644 --- a/data/minecraft/structure/underwater_ruin/big_warm_4.nbt +++ b/data/minecraft/structure/underwater_ruin/big_warm_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:820fe1b4e02f537aa7986c25a1ca3359bd889427c6cd3d97d102b1b0a010eb98 +oid sha256:225bd4c2a66f7336a96a6c5ab221e0c63a1f56b72d87ccf41d2ec7320640bf89 size 11265 diff --git a/data/minecraft/structure/underwater_ruin/big_warm_5.nbt b/data/minecraft/structure/underwater_ruin/big_warm_5.nbt index 52f3a74e..e55a20ce 100644 --- a/data/minecraft/structure/underwater_ruin/big_warm_5.nbt +++ b/data/minecraft/structure/underwater_ruin/big_warm_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7e9e123a390ce4cd4419438638336d390c9404750542a33089b807b3307f505 +oid sha256:3ce6b416bb60706a98967f26bbcaa308e6319994ec3c0f044b5796717995ff6f size 11032 diff --git a/data/minecraft/structure/underwater_ruin/big_warm_6.nbt b/data/minecraft/structure/underwater_ruin/big_warm_6.nbt index 86d6b8e2..56bb9675 100644 --- a/data/minecraft/structure/underwater_ruin/big_warm_6.nbt +++ b/data/minecraft/structure/underwater_ruin/big_warm_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c33e96dd5cf77593632fe4a21b550380fd7520189fdeb270e63b2cdfd0a6258 +oid sha256:eb7923d460c4a7a6d2ac4a1c71856a0aadd2eb8c7b7f813c1e06ac74c8221aba size 11106 diff --git a/data/minecraft/structure/underwater_ruin/big_warm_7.nbt b/data/minecraft/structure/underwater_ruin/big_warm_7.nbt index 4a7f3430..329d6fde 100644 --- a/data/minecraft/structure/underwater_ruin/big_warm_7.nbt +++ b/data/minecraft/structure/underwater_ruin/big_warm_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:135da58558854211b9c509d64f9f8222aee90d50dd5d134928deabeb437bd120 +oid sha256:668fbd2a52ebea5a0685a51b2db09e1eef7975d2b9c6715adfd0e836938c30eb size 11139 diff --git a/data/minecraft/structure/underwater_ruin/brick_1.nbt b/data/minecraft/structure/underwater_ruin/brick_1.nbt index efa33395..a7d0d6da 100644 --- a/data/minecraft/structure/underwater_ruin/brick_1.nbt +++ b/data/minecraft/structure/underwater_ruin/brick_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b5ff572831885260ca587224cd6d189ccf3a25779a754900f6403bb2124c6c5 -size 1268 +oid sha256:e12b8da29ed3ec354e6d48c904a8912bbad522c2694bbaa22eda06e6a006228c +size 1269 diff --git a/data/minecraft/structure/underwater_ruin/brick_2.nbt b/data/minecraft/structure/underwater_ruin/brick_2.nbt index 81096103..1c290a73 100644 --- a/data/minecraft/structure/underwater_ruin/brick_2.nbt +++ b/data/minecraft/structure/underwater_ruin/brick_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4476eeafb0d3bc73da7e61315bc71e001c6ffda69af41f0a1359cfd438b3477d +oid sha256:61bf377dc4e0765cdb1bd83fb87f780e10eeda3c6e5d234fa04fa1804b3ee2ab size 1259 diff --git a/data/minecraft/structure/underwater_ruin/brick_3.nbt b/data/minecraft/structure/underwater_ruin/brick_3.nbt index 89df480a..f4196ec5 100644 --- a/data/minecraft/structure/underwater_ruin/brick_3.nbt +++ b/data/minecraft/structure/underwater_ruin/brick_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f928b4eb56588d11988e04149c809985e6cbfeb9484a34578267dcc1057ffadc +oid sha256:652c7ae56749b9c1de939bfaa0cf520b0cb8e68c3a2ce292bfac94325a69a96f size 1318 diff --git a/data/minecraft/structure/underwater_ruin/brick_4.nbt b/data/minecraft/structure/underwater_ruin/brick_4.nbt index f86ec0a4..6419e09a 100644 --- a/data/minecraft/structure/underwater_ruin/brick_4.nbt +++ b/data/minecraft/structure/underwater_ruin/brick_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be263399eec21de0bff336546c0f68d491f1e06f1002fd7f7998b3d6ff890b75 +oid sha256:bec9f906601004ec4e9ef142c0401a29fc99c7adbb6e07941c062a5061ed862c size 1295 diff --git a/data/minecraft/structure/underwater_ruin/brick_5.nbt b/data/minecraft/structure/underwater_ruin/brick_5.nbt index e5372a07..12b97750 100644 --- a/data/minecraft/structure/underwater_ruin/brick_5.nbt +++ b/data/minecraft/structure/underwater_ruin/brick_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d8e41f809c728e58e66e8155a877172da30e63c0bba03042bf1154f9a0fea9c -size 1275 +oid sha256:cf8d78beec3aeb4b824b84f2b79a1000e93ddb4bcf53f64fb8667629bcd9ac59 +size 1276 diff --git a/data/minecraft/structure/underwater_ruin/brick_6.nbt b/data/minecraft/structure/underwater_ruin/brick_6.nbt index 926c809b..04383d6e 100644 --- a/data/minecraft/structure/underwater_ruin/brick_6.nbt +++ b/data/minecraft/structure/underwater_ruin/brick_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9a3c9cd89bd6e5f9714dc480c43e42cc3d13760cb68de62bbb3c9a0ccdde567 +oid sha256:8bb905b766c68440d983385ea13240f10749c3e40dd479e7b6fb3dc8d88273f5 size 1467 diff --git a/data/minecraft/structure/underwater_ruin/brick_7.nbt b/data/minecraft/structure/underwater_ruin/brick_7.nbt index 95da0c31..cc2f2b33 100644 --- a/data/minecraft/structure/underwater_ruin/brick_7.nbt +++ b/data/minecraft/structure/underwater_ruin/brick_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf5d077c6c35bc1d3efcfde7d4d485df5833adf2274b37b7c7120d86e95223a5 +oid sha256:15353a32e97614c8a3efb8717eaa83bc8a50c279c8c5772676cff11098d7e2ed size 1292 diff --git a/data/minecraft/structure/underwater_ruin/brick_8.nbt b/data/minecraft/structure/underwater_ruin/brick_8.nbt index 11ab4cb7..a3cf8620 100644 --- a/data/minecraft/structure/underwater_ruin/brick_8.nbt +++ b/data/minecraft/structure/underwater_ruin/brick_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82e2a4f8d324293e8d9733b4943faa38fb30a47f067d656548eaeaf3e270c0c3 -size 1304 +oid sha256:038d11bb7c449de7b5bdb09ad74b9a631d6899327a8b8c1a0ce7c4b5c723ab40 +size 1305 diff --git a/data/minecraft/structure/underwater_ruin/cracked_1.nbt b/data/minecraft/structure/underwater_ruin/cracked_1.nbt index 06c5b98c..4e6aa6b3 100644 --- a/data/minecraft/structure/underwater_ruin/cracked_1.nbt +++ b/data/minecraft/structure/underwater_ruin/cracked_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d11d4c5fac5c5dc0906a463f8edb8f941d970f2edfbf299a5876596ace90d3b9 -size 1264 +oid sha256:98491b37961fc78b7d41fe846bacaaebbac755674e7975c3aaa2db8f8513fc37 +size 1265 diff --git a/data/minecraft/structure/underwater_ruin/cracked_2.nbt b/data/minecraft/structure/underwater_ruin/cracked_2.nbt index b218b9c7..86495a41 100644 --- a/data/minecraft/structure/underwater_ruin/cracked_2.nbt +++ b/data/minecraft/structure/underwater_ruin/cracked_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f68efd02940bd163f1e6f6a47c799c958992f3227244b0d26d8f0581b898b73 -size 1257 +oid sha256:46a1a51a959b3df00066674b182d9e23d23565bf086f860aa079817f1f5b26b9 +size 1258 diff --git a/data/minecraft/structure/underwater_ruin/cracked_3.nbt b/data/minecraft/structure/underwater_ruin/cracked_3.nbt index 538cdb67..f563d562 100644 --- a/data/minecraft/structure/underwater_ruin/cracked_3.nbt +++ b/data/minecraft/structure/underwater_ruin/cracked_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:035ba7474fcb4c1c3ed2a2f1305cc4490923eec0de97daeafd33e146c45bd8bb +oid sha256:e647c62f56adcefb8c01f23619471592575c8c4b6300f225ff241faba111e404 size 1346 diff --git a/data/minecraft/structure/underwater_ruin/cracked_4.nbt b/data/minecraft/structure/underwater_ruin/cracked_4.nbt index 88de94a8..2a7e82d0 100644 --- a/data/minecraft/structure/underwater_ruin/cracked_4.nbt +++ b/data/minecraft/structure/underwater_ruin/cracked_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be35a5e5f5c6af7f5bee62de9254f50c2bed07777fbacac58e44a8f6b38c3459 -size 1255 +oid sha256:3f57142224bf38adb966d26fd03aead0a5b76f9d009dc74943d35f7115af75bd +size 1256 diff --git a/data/minecraft/structure/underwater_ruin/cracked_5.nbt b/data/minecraft/structure/underwater_ruin/cracked_5.nbt index 9e4568f9..3e5ccb1e 100644 --- a/data/minecraft/structure/underwater_ruin/cracked_5.nbt +++ b/data/minecraft/structure/underwater_ruin/cracked_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10bc3c63233c21a8c3d5b178a6be2f4b024e43c8ddb1142b7bacaba30044645b +oid sha256:fa651c0258a49bfac897c27d7cf29d304adadfa611f4c761c13c70bc28a2d09a size 1280 diff --git a/data/minecraft/structure/underwater_ruin/cracked_6.nbt b/data/minecraft/structure/underwater_ruin/cracked_6.nbt index 1e188e6f..e30d2619 100644 --- a/data/minecraft/structure/underwater_ruin/cracked_6.nbt +++ b/data/minecraft/structure/underwater_ruin/cracked_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af1756004d4560464e4b62a0d41f06069601cb588cadfd70de4374597bbb5a24 +oid sha256:277f57deb4f5e58735335eac0a0d58c3ec76a7e5218a49e62bff06bdecaae3a4 size 1408 diff --git a/data/minecraft/structure/underwater_ruin/cracked_7.nbt b/data/minecraft/structure/underwater_ruin/cracked_7.nbt index 01526f87..db51e6be 100644 --- a/data/minecraft/structure/underwater_ruin/cracked_7.nbt +++ b/data/minecraft/structure/underwater_ruin/cracked_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c19aaeea67e9fe651c8705fb9034011bcc762b488442357a16d2962cfc63bc8a +oid sha256:8a8c93650e148af5191383091b00b5536d66e0d808247213ab626dcebca12d1d size 1313 diff --git a/data/minecraft/structure/underwater_ruin/cracked_8.nbt b/data/minecraft/structure/underwater_ruin/cracked_8.nbt index bacb3f0f..6fb3c2d4 100644 --- a/data/minecraft/structure/underwater_ruin/cracked_8.nbt +++ b/data/minecraft/structure/underwater_ruin/cracked_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f9c93d3f2630eccee34683836b564e2f1d1e2673c09ab38f4c95683bb91c37d -size 1292 +oid sha256:ea2ed5cf54500d01d54af95bb0c6dbb01dc4d24e38a55d69ee3f5bdfe7c6863a +size 1293 diff --git a/data/minecraft/structure/underwater_ruin/mossy_1.nbt b/data/minecraft/structure/underwater_ruin/mossy_1.nbt index bf7e948e..96153e27 100644 --- a/data/minecraft/structure/underwater_ruin/mossy_1.nbt +++ b/data/minecraft/structure/underwater_ruin/mossy_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed08be6cc04db1ff507dd1f65693b992c67839c9bcc38fb86839c212475d9812 -size 1277 +oid sha256:820284b25307d2fccaca343828fec76334a38ac712c61840b7369ead5d28f8cb +size 1278 diff --git a/data/minecraft/structure/underwater_ruin/mossy_2.nbt b/data/minecraft/structure/underwater_ruin/mossy_2.nbt index 4fc07882..f3b6f7a4 100644 --- a/data/minecraft/structure/underwater_ruin/mossy_2.nbt +++ b/data/minecraft/structure/underwater_ruin/mossy_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:835bf45ededc96121eba9d451df0cef790e43e9d5492896e7f2893f3d6f4f6be +oid sha256:9193f08626d69ee7daccf8341dd2a9ebb04684933b7b64692e485e4f636a8545 size 1232 diff --git a/data/minecraft/structure/underwater_ruin/mossy_3.nbt b/data/minecraft/structure/underwater_ruin/mossy_3.nbt index 2ea8ce81..5c7b60b7 100644 --- a/data/minecraft/structure/underwater_ruin/mossy_3.nbt +++ b/data/minecraft/structure/underwater_ruin/mossy_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0988fb9585048b94386b41b175a188366b39a40befddd8435db5faf7bfadbf8f +oid sha256:18d453a65672e3be50d807beca6c958e897fe3d457582df702928ce9ee17308a size 1322 diff --git a/data/minecraft/structure/underwater_ruin/mossy_4.nbt b/data/minecraft/structure/underwater_ruin/mossy_4.nbt index a194e801..7fc781e8 100644 --- a/data/minecraft/structure/underwater_ruin/mossy_4.nbt +++ b/data/minecraft/structure/underwater_ruin/mossy_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90f14b6f81a30ef492daec8d4ca7ff1bcfec602b328aa11616d720d4933fc1fe +oid sha256:8ae642ef589da547b0a0aed420b9f5ae380e6f290a32e398ca67e9dba1c94be7 size 1281 diff --git a/data/minecraft/structure/underwater_ruin/mossy_5.nbt b/data/minecraft/structure/underwater_ruin/mossy_5.nbt index 165cec64..fcf41ced 100644 --- a/data/minecraft/structure/underwater_ruin/mossy_5.nbt +++ b/data/minecraft/structure/underwater_ruin/mossy_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20800ab665bfb3938b80407be8e2eab64ea1b8160143bbd3f77f386ce311a812 +oid sha256:7fa3ac5958f704555fb27531e7d689fc1fa059824e998a4463022486598a5b76 size 1298 diff --git a/data/minecraft/structure/underwater_ruin/mossy_6.nbt b/data/minecraft/structure/underwater_ruin/mossy_6.nbt index 37ad0320..c10167d3 100644 --- a/data/minecraft/structure/underwater_ruin/mossy_6.nbt +++ b/data/minecraft/structure/underwater_ruin/mossy_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9025db0d9aeb4e568961b5a7454c5bbd7de7c98c020c79c5d7b29bceeb19b602 +oid sha256:a7914a2e7e0e1c67b3d337dc06a76f76eab1b23ef14add5b0eea57d7026c2bea size 1451 diff --git a/data/minecraft/structure/underwater_ruin/mossy_7.nbt b/data/minecraft/structure/underwater_ruin/mossy_7.nbt index c0bf4e7d..6378dd21 100644 --- a/data/minecraft/structure/underwater_ruin/mossy_7.nbt +++ b/data/minecraft/structure/underwater_ruin/mossy_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5e28071344074f7a87641562835c2617d6c1bd2b046528f12efac7064a4a175 -size 1309 +oid sha256:397971656eff147c990fe1827a8238059189eac016f5e8148107c13d25a2727b +size 1308 diff --git a/data/minecraft/structure/underwater_ruin/mossy_8.nbt b/data/minecraft/structure/underwater_ruin/mossy_8.nbt index 19da9da7..be712925 100644 --- a/data/minecraft/structure/underwater_ruin/mossy_8.nbt +++ b/data/minecraft/structure/underwater_ruin/mossy_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:481f604e99ccc484e3f69826f49df0c60afb718be7a42129522592c0a393ef63 +oid sha256:5833b99634ec6d721f860d60d6f0c171d163b98cdc10e14e2e313d228b1616fa size 1320 diff --git a/data/minecraft/structure/underwater_ruin/warm_1.nbt b/data/minecraft/structure/underwater_ruin/warm_1.nbt index 7da1900a..abd92e89 100644 --- a/data/minecraft/structure/underwater_ruin/warm_1.nbt +++ b/data/minecraft/structure/underwater_ruin/warm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0b86b551df5218aa5b5dd008bb899eda2fd33613ef3a3fa5e8922a02059b62f +oid sha256:ad55559f56e218e6d6a59e2a805b1a7d4f1aacdbdcc35d1b94043a761779c4b5 size 1268 diff --git a/data/minecraft/structure/underwater_ruin/warm_2.nbt b/data/minecraft/structure/underwater_ruin/warm_2.nbt index 62067053..f6b83870 100644 --- a/data/minecraft/structure/underwater_ruin/warm_2.nbt +++ b/data/minecraft/structure/underwater_ruin/warm_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e8f138e6c1715a3517fcce2612877463913edfac415961b0767d9b76dc52c33 -size 1297 +oid sha256:04d1220a76a8ec70cb0080835c5634fcbcc15a445baeebcda00441ffecc671d4 +size 1298 diff --git a/data/minecraft/structure/underwater_ruin/warm_3.nbt b/data/minecraft/structure/underwater_ruin/warm_3.nbt index 3151b975..20e8d2cd 100644 --- a/data/minecraft/structure/underwater_ruin/warm_3.nbt +++ b/data/minecraft/structure/underwater_ruin/warm_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b97e9b064bae03fbbb2f4a9e75dfd3fe44d9ba62f2c239080345edaf23e0c3a +oid sha256:220566420e60bef3b024b419f2df88212f426beb13862ee10e52dffa040ef842 size 1271 diff --git a/data/minecraft/structure/underwater_ruin/warm_4.nbt b/data/minecraft/structure/underwater_ruin/warm_4.nbt index 32f2f2ed..15c8088b 100644 --- a/data/minecraft/structure/underwater_ruin/warm_4.nbt +++ b/data/minecraft/structure/underwater_ruin/warm_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cd89227b624dc9c2dc93efdc1ed810c1d7477738744298f2bdfcbb4abe7314e +oid sha256:7c041bbac6711aae128aec269a743fa4a78fa12d32970ff640249e12f389878b size 1347 diff --git a/data/minecraft/structure/underwater_ruin/warm_5.nbt b/data/minecraft/structure/underwater_ruin/warm_5.nbt index 2cd2fece..d006ad3a 100644 --- a/data/minecraft/structure/underwater_ruin/warm_5.nbt +++ b/data/minecraft/structure/underwater_ruin/warm_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3f1139ee01dce4312eb467e46f00167c9ec53d73b3ceee25e534910f24044bc -size 1225 +oid sha256:6fedbcb5dac89409d308af0cb7d675570a0060824eb51568f11ae223efe8cea0 +size 1226 diff --git a/data/minecraft/structure/underwater_ruin/warm_6.nbt b/data/minecraft/structure/underwater_ruin/warm_6.nbt index 5e93bafa..becdbf03 100644 --- a/data/minecraft/structure/underwater_ruin/warm_6.nbt +++ b/data/minecraft/structure/underwater_ruin/warm_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a117e098135c08c68ce2f01ed78b7932ef0524feb9f4443b64f39f5a3d2a486b +oid sha256:1eaf160a0c7cd9cb5bf049646043b428ffdbe59c28b114b6b634d0d8c483ff12 size 1270 diff --git a/data/minecraft/structure/underwater_ruin/warm_7.nbt b/data/minecraft/structure/underwater_ruin/warm_7.nbt index a9539468..0fb286bc 100644 --- a/data/minecraft/structure/underwater_ruin/warm_7.nbt +++ b/data/minecraft/structure/underwater_ruin/warm_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da13acbc10d90ebf8c77790b9c4908fac0500a800130258a6ef5060e6fdbc06b -size 1209 +oid sha256:7b6c95b51f9a62d6e0768e41d2edbcc438b80675602f6a549d91cf5fc6b5485d +size 1210 diff --git a/data/minecraft/structure/underwater_ruin/warm_8.nbt b/data/minecraft/structure/underwater_ruin/warm_8.nbt index 785d54f5..06fde8ce 100644 --- a/data/minecraft/structure/underwater_ruin/warm_8.nbt +++ b/data/minecraft/structure/underwater_ruin/warm_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2eaf67e7df2c20f9d2db86eba3cc9cbddadf7c79b34235d43a5e2fced5de9c3 +oid sha256:5e1d02683d86fe90868787e15ab509f5ab07c4194e5f6fdd615d84da2c903e2f size 1339 diff --git a/data/minecraft/structure/village/common/animals/cat_black.nbt b/data/minecraft/structure/village/common/animals/cat_black.nbt index f301ea73..12e86b66 100644 --- a/data/minecraft/structure/village/common/animals/cat_black.nbt +++ b/data/minecraft/structure/village/common/animals/cat_black.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f715ef7ddb8a21eea701373e0bb2245b665ba3f31adba1f6e9e687e56f654060 +oid sha256:57a9eb22916c977253dfffc7ab50f76f5a0d75ef1429cf09fe627ddbefda8318 size 892 diff --git a/data/minecraft/structure/village/common/animals/cat_british.nbt b/data/minecraft/structure/village/common/animals/cat_british.nbt index 09808273..58c996d1 100644 --- a/data/minecraft/structure/village/common/animals/cat_british.nbt +++ b/data/minecraft/structure/village/common/animals/cat_british.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e67ac6ec46972ee097cc7cf6c49edfd324a15ba9c0bbf19aac00afd32970fc8 +oid sha256:7c5b66eb2c10f8e9fd609e64a5329117dd7f89fae97da8ef3243a7d5cda2ffa6 size 901 diff --git a/data/minecraft/structure/village/common/animals/cat_calico.nbt b/data/minecraft/structure/village/common/animals/cat_calico.nbt index c5fc6443..530e982f 100644 --- a/data/minecraft/structure/village/common/animals/cat_calico.nbt +++ b/data/minecraft/structure/village/common/animals/cat_calico.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36473690474e5faa6383dae48ba29267d6dbc7963f31fea9106d6bcc2efed144 -size 826 +oid sha256:2c267f0ea94069b5094f20cd4542cf342605025fbf05ae95fdbd561689e9511c +size 825 diff --git a/data/minecraft/structure/village/common/animals/cat_jellie.nbt b/data/minecraft/structure/village/common/animals/cat_jellie.nbt index 2629d978..4ffb71bf 100644 --- a/data/minecraft/structure/village/common/animals/cat_jellie.nbt +++ b/data/minecraft/structure/village/common/animals/cat_jellie.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96c58751c4ec5da8fcbfc230ba1dc632d21f7e8bd3075df29e432922e53be176 +oid sha256:34779b87582a853af29435ec6f7f5963c0cfb42da89ecffe60fe7d4d227ac006 size 897 diff --git a/data/minecraft/structure/village/common/animals/cat_persian.nbt b/data/minecraft/structure/village/common/animals/cat_persian.nbt index 51686093..4a941e1a 100644 --- a/data/minecraft/structure/village/common/animals/cat_persian.nbt +++ b/data/minecraft/structure/village/common/animals/cat_persian.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d556e357c7547926f5db0b78c17cc24b286adb1d89044c204dfcd80acdc4439e +oid sha256:e624d1c24120d6cd26b50ff28ee41435931ed298fa422492f2a92e9c1e3e84c7 size 828 diff --git a/data/minecraft/structure/village/common/animals/cat_ragdoll.nbt b/data/minecraft/structure/village/common/animals/cat_ragdoll.nbt index eba4a11a..2f3b1227 100644 --- a/data/minecraft/structure/village/common/animals/cat_ragdoll.nbt +++ b/data/minecraft/structure/village/common/animals/cat_ragdoll.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40639f5de44a0456a52c0c87817184885e1b453840a7cc3fb0688184529948d2 -size 891 +oid sha256:8b469b32b843a37fc0ec010466ef9b2417e25a907b9df4b92f58af3ddbd532dd +size 890 diff --git a/data/minecraft/structure/village/common/animals/cat_red.nbt b/data/minecraft/structure/village/common/animals/cat_red.nbt index f44a170b..a0716078 100644 --- a/data/minecraft/structure/village/common/animals/cat_red.nbt +++ b/data/minecraft/structure/village/common/animals/cat_red.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7da2592124e77c444de4f3dcbc769b29a789ade8f55aba7596b223c0e924a9a -size 810 +oid sha256:f4fb26604382b504c3be91a5eb154493db699017c154b39c47e1f0c9d8070e47 +size 808 diff --git a/data/minecraft/structure/village/common/animals/cat_siamese.nbt b/data/minecraft/structure/village/common/animals/cat_siamese.nbt index a44a2a40..ba7f914f 100644 --- a/data/minecraft/structure/village/common/animals/cat_siamese.nbt +++ b/data/minecraft/structure/village/common/animals/cat_siamese.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f90a2ab6d565c5fdf28e13043ab5239bb4ee9cb4eb12db9583c0b5186b37bdaf -size 818 +oid sha256:87fb268952ef722c960a0fdd7a8a2f28bedb3042711dd97c122a406410f7e486 +size 817 diff --git a/data/minecraft/structure/village/common/animals/cat_tabby.nbt b/data/minecraft/structure/village/common/animals/cat_tabby.nbt index ec770aff..ea2fc473 100644 --- a/data/minecraft/structure/village/common/animals/cat_tabby.nbt +++ b/data/minecraft/structure/village/common/animals/cat_tabby.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e5317274c0fccc79c8d74203aa5acbabbe66a3979398ee4fd1c1278744d68b5 +oid sha256:7969b0272d7081b4cf6e6990594c7d59cf0a6052603a2c6cc67675b65cdc58b9 size 888 diff --git a/data/minecraft/structure/village/common/animals/cat_white.nbt b/data/minecraft/structure/village/common/animals/cat_white.nbt index 87d70876..24fb482b 100644 --- a/data/minecraft/structure/village/common/animals/cat_white.nbt +++ b/data/minecraft/structure/village/common/animals/cat_white.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1970f7c54afe5a0cd7feaad0b97387dce91aa96a6333727aa9fe9aa03f99a297 -size 886 +oid sha256:63745951eef3401a1cead23f0dfd452650cb7655eaacb8ce11fa106dd9736c8f +size 885 diff --git a/data/minecraft/structure/village/common/animals/cows_1.nbt b/data/minecraft/structure/village/common/animals/cows_1.nbt index 487a87c2..07f8c607 100644 --- a/data/minecraft/structure/village/common/animals/cows_1.nbt +++ b/data/minecraft/structure/village/common/animals/cows_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f53b6229c40bbc5a9b49f7cdda92138c9423701962fcffa7ca3727c360d35b8 +oid sha256:a33887c55216d1e31aab0b8481e00c135c56bf517f91a3eec27736095485ef28 size 929 diff --git a/data/minecraft/structure/village/common/animals/horses_1.nbt b/data/minecraft/structure/village/common/animals/horses_1.nbt index d7deded3..feb1bd3e 100644 --- a/data/minecraft/structure/village/common/animals/horses_1.nbt +++ b/data/minecraft/structure/village/common/animals/horses_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed996b882cb06407dc3fc1f2e1c6148665ce9e04e0586c32d0e14082b769a68a +oid sha256:9cbf3120e5bacc05e811969ce4410bdc72d87aeb9ab050fd1e1097e620e3aa64 size 894 diff --git a/data/minecraft/structure/village/common/animals/horses_2.nbt b/data/minecraft/structure/village/common/animals/horses_2.nbt index cab8814e..9114377b 100644 --- a/data/minecraft/structure/village/common/animals/horses_2.nbt +++ b/data/minecraft/structure/village/common/animals/horses_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0af1507be5f348eb8522ab1ff3d8f0c6746c328de6940268e671d5747cca38c7 -size 1005 +oid sha256:13ca899ff38db26de3947639b3f46c67e19b0937a52aa11c96a35c3b0808e894 +size 1004 diff --git a/data/minecraft/structure/village/common/animals/horses_3.nbt b/data/minecraft/structure/village/common/animals/horses_3.nbt index 00d79888..eb884846 100644 --- a/data/minecraft/structure/village/common/animals/horses_3.nbt +++ b/data/minecraft/structure/village/common/animals/horses_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff324329e24cd9177b66d34c48000bf5a83b43b8598a8c5798ba6bb7f01f6247 -size 1012 +oid sha256:db3cb2420feb61912153c8900646cbfc12d110aa0e35a7b951e0dfcc08979a72 +size 1013 diff --git a/data/minecraft/structure/village/common/animals/horses_4.nbt b/data/minecraft/structure/village/common/animals/horses_4.nbt index d6f0f612..fa98343e 100644 --- a/data/minecraft/structure/village/common/animals/horses_4.nbt +++ b/data/minecraft/structure/village/common/animals/horses_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ee25a504925b8f912fa21475687667e2379c3474de814d6f746df951253a5fc -size 885 +oid sha256:91108d646442cadb9fefd15dc3d4f0bf139435957131ff6967d452bdec85d73a +size 884 diff --git a/data/minecraft/structure/village/common/animals/horses_5.nbt b/data/minecraft/structure/village/common/animals/horses_5.nbt index 4f91a20b..b3fa9686 100644 --- a/data/minecraft/structure/village/common/animals/horses_5.nbt +++ b/data/minecraft/structure/village/common/animals/horses_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3d7c30eb362e4db1988f5dc9cb86bed0387464aed8ab53b16dc2d785ead23a1 +oid sha256:bef5c6c0d1594a5318a7769914997b15bc8fcb17378f41329405c46a9481bf59 size 907 diff --git a/data/minecraft/structure/village/common/animals/pigs_1.nbt b/data/minecraft/structure/village/common/animals/pigs_1.nbt index 80f5010b..c59fd110 100644 --- a/data/minecraft/structure/village/common/animals/pigs_1.nbt +++ b/data/minecraft/structure/village/common/animals/pigs_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a55b812db2d97744394bb3a5b5e6eb14a43e0b12ff61892bc405d5d855ebc8af +oid sha256:a72c5cad2b059922642fab4238d85dab0f2b4458181f2dd2656f8ffcf96a8fbd size 931 diff --git a/data/minecraft/structure/village/common/animals/sheep_1.nbt b/data/minecraft/structure/village/common/animals/sheep_1.nbt index 46fa0efe..6da31ead 100644 --- a/data/minecraft/structure/village/common/animals/sheep_1.nbt +++ b/data/minecraft/structure/village/common/animals/sheep_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e903df88c3d914734cbc0374d26e1b7d3b549a96d7ea869e74e78586675f71d -size 951 +oid sha256:6abda9b49ca17d1bfa5345e5db8b968a2650ddc720bf7f0179a92db7a5e577b5 +size 950 diff --git a/data/minecraft/structure/village/common/animals/sheep_2.nbt b/data/minecraft/structure/village/common/animals/sheep_2.nbt index 4a1bf311..026c657c 100644 --- a/data/minecraft/structure/village/common/animals/sheep_2.nbt +++ b/data/minecraft/structure/village/common/animals/sheep_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bf61e84e6439b710db3ac735e800ec5fbe645a2b398f9e8f28695cd8a40f105 -size 952 +oid sha256:475931a64fd4b6035273e069bfa9e4beee726e0c3c297edba9787369b453bfbc +size 951 diff --git a/data/minecraft/structure/village/common/iron_golem.nbt b/data/minecraft/structure/village/common/iron_golem.nbt index e0e6505a..db95ee3c 100644 --- a/data/minecraft/structure/village/common/iron_golem.nbt +++ b/data/minecraft/structure/village/common/iron_golem.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3a4e26ee7fd588b926ea1b1214aa6088ef9f2623e8ab9924168835d4a0a3e6f -size 822 +oid sha256:3422020731b408fc6a228c7e4225363f300006119c08e4d19e10aede72bd982c +size 823 diff --git a/data/minecraft/structure/village/common/well_bottom.nbt b/data/minecraft/structure/village/common/well_bottom.nbt index 2ffe0097..31213e3b 100644 --- a/data/minecraft/structure/village/common/well_bottom.nbt +++ b/data/minecraft/structure/village/common/well_bottom.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:748c89da1774c17967367e2c6d9c5fd4cb38f20b7519f5a54031ef286ec84f6f +oid sha256:aedd356076b3cb7ed3e7b9097112e36e8f6ac0270b4e25b2019eee65f9f65476 size 427 diff --git a/data/minecraft/structure/village/decays/grass_11x13.nbt b/data/minecraft/structure/village/decays/grass_11x13.nbt index a4618eb8..c819f90a 100644 --- a/data/minecraft/structure/village/decays/grass_11x13.nbt +++ b/data/minecraft/structure/village/decays/grass_11x13.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e0be2933e7125ce9bf51b3f4267fb0a8408a72278f70aa1948036bb5c5ca05b +oid sha256:8f13ef72ba37a94be0e1536f6574d50c3727ef1cb584f302309ab02d06a765e2 size 557 diff --git a/data/minecraft/structure/village/decays/grass_16x16.nbt b/data/minecraft/structure/village/decays/grass_16x16.nbt index d8390510..8a5dd6aa 100644 --- a/data/minecraft/structure/village/decays/grass_16x16.nbt +++ b/data/minecraft/structure/village/decays/grass_16x16.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a316ca7af316f94a6cd34f08eb921625f66352eefb352d7950d036477e4a439 +oid sha256:dc299c9c9a8ba0b58fc9bed851544b1a61aa3f26ad6eb8be226d2873c8d961fb size 874 diff --git a/data/minecraft/structure/village/decays/grass_9x9.nbt b/data/minecraft/structure/village/decays/grass_9x9.nbt index 6cfb3827..94006f9d 100644 --- a/data/minecraft/structure/village/decays/grass_9x9.nbt +++ b/data/minecraft/structure/village/decays/grass_9x9.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:910fef3c42351041ad7eb338b86b61ffcae7dca526f2a39d3cc83fb2dd62b6d0 +oid sha256:3bc50d9d5e730af0d216112c1bf585009896db2121313aaee9cb64cc9b1b1e44 size 393 diff --git a/data/minecraft/structure/village/desert/camel_spawn.nbt b/data/minecraft/structure/village/desert/camel_spawn.nbt index b34e3bf3..942fc237 100644 --- a/data/minecraft/structure/village/desert/camel_spawn.nbt +++ b/data/minecraft/structure/village/desert/camel_spawn.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b65f8944c6af18772af148d1cfac02725af964793a93aacb445124bd800140f +oid sha256:4a4557aa382b5852b82e47355d8d232f69b94575b6171b337f68128696c15b1c size 283 diff --git a/data/minecraft/structure/village/desert/desert_lamp_1.nbt b/data/minecraft/structure/village/desert/desert_lamp_1.nbt index af4b2db8..ee1173fc 100644 --- a/data/minecraft/structure/village/desert/desert_lamp_1.nbt +++ b/data/minecraft/structure/village/desert/desert_lamp_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9af47253a996e6f1af1eb65eff63f69ad01f4344a42807a44373f8b90ab6cba9 +oid sha256:88b25589fd1865a97d731e408e6f7f159c4428d91074e7a80b57625eb4207d69 size 278 diff --git a/data/minecraft/structure/village/desert/houses/desert_animal_pen_1.nbt b/data/minecraft/structure/village/desert/houses/desert_animal_pen_1.nbt index 7b8f24c6..807bd776 100644 --- a/data/minecraft/structure/village/desert/houses/desert_animal_pen_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_animal_pen_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46e3e21e960aa02e3b60fe611329340fb2d95ee4fc882906ff8238b525fbcc05 +oid sha256:089f85e5bff24a81f7a188ef160e64c41a98ecfeb3f5e06395d3a0d2530e31f8 size 1687 diff --git a/data/minecraft/structure/village/desert/houses/desert_animal_pen_2.nbt b/data/minecraft/structure/village/desert/houses/desert_animal_pen_2.nbt index 511ce480..f208f64b 100644 --- a/data/minecraft/structure/village/desert/houses/desert_animal_pen_2.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_animal_pen_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5f070b21f015190b9354bfcba873f2dd4498adfe9c870dd2d1c1228b44397b1 +oid sha256:812728dafd87d6b779d0355aa11e8dac411d7613d966b1c6677913c4efbf0b62 size 1863 diff --git a/data/minecraft/structure/village/desert/houses/desert_armorer_1.nbt b/data/minecraft/structure/village/desert/houses/desert_armorer_1.nbt index 687a1118..603a3ca0 100644 --- a/data/minecraft/structure/village/desert/houses/desert_armorer_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_armorer_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25e1e3cc2c5662aab9f85a18ac30ad58a9e36410da316bcec3be5f769042718b -size 1764 +oid sha256:5ea026a42d249b32dd76f84f14100eebed90fa399a87386d1628df55bb4bb176 +size 1762 diff --git a/data/minecraft/structure/village/desert/houses/desert_butcher_shop_1.nbt b/data/minecraft/structure/village/desert/houses/desert_butcher_shop_1.nbt index c2d62cd5..7e7edc2e 100644 --- a/data/minecraft/structure/village/desert/houses/desert_butcher_shop_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_butcher_shop_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c2fc8bd2b5249bf7262c8d96357e409d4208bb17b576aa5e82c01ab79fd90d3 -size 1795 +oid sha256:55d0d852e3d42e4dc90e2d7f8005f7d5454e095f003bc3e3d946210c5f63a3e2 +size 1794 diff --git a/data/minecraft/structure/village/desert/houses/desert_cartographer_house_1.nbt b/data/minecraft/structure/village/desert/houses/desert_cartographer_house_1.nbt index 3eb1fade..886ee7b6 100644 --- a/data/minecraft/structure/village/desert/houses/desert_cartographer_house_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_cartographer_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02b547d41a5a03b0e1b916e000a6f5642d270665112d252c9e1faadbce0830c2 +oid sha256:8386ab3f517fb5dde652c7f0ce28b4398554e8fc8d10bda3976628affd394854 size 1676 diff --git a/data/minecraft/structure/village/desert/houses/desert_farm_1.nbt b/data/minecraft/structure/village/desert/houses/desert_farm_1.nbt index 05094866..760c3b4a 100644 --- a/data/minecraft/structure/village/desert/houses/desert_farm_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_farm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e231fd39fda43915972f58d3322a7cc1112f7c2e0bca1fa0daca23d001ff3778 +oid sha256:a1661d4e98ff89885a16d079e4bf103b2ebcb268fcf08ac80694c1ff0dc1271c size 713 diff --git a/data/minecraft/structure/village/desert/houses/desert_farm_2.nbt b/data/minecraft/structure/village/desert/houses/desert_farm_2.nbt index 97f0f6d9..4536ca75 100644 --- a/data/minecraft/structure/village/desert/houses/desert_farm_2.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_farm_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d302f694dcc117d1fa5700e4cc40acc9edfd6058605b800c8f22534d616582b -size 885 +oid sha256:6e7df0c1c7217226c5272ff46cbfbdf4fe066c8f1514d0358a6b7b5a2d4994c6 +size 886 diff --git a/data/minecraft/structure/village/desert/houses/desert_fisher_1.nbt b/data/minecraft/structure/village/desert/houses/desert_fisher_1.nbt index d0a3d089..fe5a4a2a 100644 --- a/data/minecraft/structure/village/desert/houses/desert_fisher_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_fisher_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed6496683f51c1e2eab77d8e6cb286d6371e3779e0e62293aba3ac2e41e37fdd -size 2284 +oid sha256:415259c431aa4232bdbeb82c22d62d62cbf88d9402e0866c5b8c0bb09627bdf6 +size 2285 diff --git a/data/minecraft/structure/village/desert/houses/desert_fletcher_house_1.nbt b/data/minecraft/structure/village/desert/houses/desert_fletcher_house_1.nbt index f75e245c..1101390f 100644 --- a/data/minecraft/structure/village/desert/houses/desert_fletcher_house_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_fletcher_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba11ddf59a3093cb008c8e20bf537d53ae66779d743a5ffe3684fb810707e27a +oid sha256:09ae4a3aed291a5340570ae559c3a2f3275a746129ad92cf69fa5cc50968be69 size 3094 diff --git a/data/minecraft/structure/village/desert/houses/desert_large_farm_1.nbt b/data/minecraft/structure/village/desert/houses/desert_large_farm_1.nbt index 5c777e1a..086afe8e 100644 --- a/data/minecraft/structure/village/desert/houses/desert_large_farm_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_large_farm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92ab8d88d46a556db412214ae46bc3d8c6493d7d0541bdf3aa4efa133a64d538 +oid sha256:6616e0f5247d64268542bf0ca29cd925d4cff8eed8399eb9f9c4e812d827fa94 size 1620 diff --git a/data/minecraft/structure/village/desert/houses/desert_library_1.nbt b/data/minecraft/structure/village/desert/houses/desert_library_1.nbt index 2612e705..e5713452 100644 --- a/data/minecraft/structure/village/desert/houses/desert_library_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_library_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfd2315cef9651cb7efb89d49868525dab7030b4fe9f4c454c6bd5448e2a59d5 +oid sha256:66c428146544fffc8df4b8f0d6201eec0b652d7c04c6b8770ec11e34e87d67e1 size 1538 diff --git a/data/minecraft/structure/village/desert/houses/desert_mason_1.nbt b/data/minecraft/structure/village/desert/houses/desert_mason_1.nbt index bb363681..7b0c7f40 100644 --- a/data/minecraft/structure/village/desert/houses/desert_mason_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_mason_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:544fa324ba8a6e4a884d4d1d3fa4cd9f6cfeedd25c2797b0579f39d27ca271c1 +oid sha256:89d2a14fe3c4916123ea4d9e7dc781e940c31f16ce8179db1ac32534525d8c94 size 1441 diff --git a/data/minecraft/structure/village/desert/houses/desert_medium_house_1.nbt b/data/minecraft/structure/village/desert/houses/desert_medium_house_1.nbt index aba685a5..1afd4c27 100644 --- a/data/minecraft/structure/village/desert/houses/desert_medium_house_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:525239218172e1f3f5bf564985fa0f0200291105dbb8d4677a9df4a64e106b27 -size 1440 +oid sha256:5ce60a3c531e67c48d53dde38502ec213c4da74d2e677850039360b18917c15f +size 1439 diff --git a/data/minecraft/structure/village/desert/houses/desert_medium_house_2.nbt b/data/minecraft/structure/village/desert/houses/desert_medium_house_2.nbt index 780b2d52..e6cea989 100644 --- a/data/minecraft/structure/village/desert/houses/desert_medium_house_2.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5ec3f9d167127482b15236d0349a35e65d2bc378fb161be8d550a78155bdf02 -size 2837 +oid sha256:6a896d3135395b138fca37b6fc48311ba02cc4010f92e32c1dcb6641e2408b64 +size 2836 diff --git a/data/minecraft/structure/village/desert/houses/desert_shepherd_house_1.nbt b/data/minecraft/structure/village/desert/houses/desert_shepherd_house_1.nbt index 039c3620..fd5c1ff5 100644 --- a/data/minecraft/structure/village/desert/houses/desert_shepherd_house_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_shepherd_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4228d6d6ca8ac6dd67d409ddb4a6ba6fb948dda82293ed3fe241f51fa40a8cf1 +oid sha256:9d44b1c7ec774f9bf65e0abc759cd5e7ee2768e0318f695bf867caa711033575 size 1565 diff --git a/data/minecraft/structure/village/desert/houses/desert_small_house_1.nbt b/data/minecraft/structure/village/desert/houses/desert_small_house_1.nbt index 1ae2d0c9..dcfaaa4b 100644 --- a/data/minecraft/structure/village/desert/houses/desert_small_house_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b306694b3cb824f07fc5a63dd69807ae743448008b56af95f52906f01a90b182 -size 1178 +oid sha256:9a1aa88a67bcf580c4c3158bba4f3a839c7174b4f7c137ab77396713acc5b343 +size 1179 diff --git a/data/minecraft/structure/village/desert/houses/desert_small_house_2.nbt b/data/minecraft/structure/village/desert/houses/desert_small_house_2.nbt index aa7a40d9..f3371327 100644 --- a/data/minecraft/structure/village/desert/houses/desert_small_house_2.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c139d74cdca18895a231768eda028768c06780b2ec5b6ab7934d623e72873de +oid sha256:219a6fd46a26a7d089eb65a0092351b0351a0aa64f653201e12ea75f1b0bc1bf size 1312 diff --git a/data/minecraft/structure/village/desert/houses/desert_small_house_3.nbt b/data/minecraft/structure/village/desert/houses/desert_small_house_3.nbt index 6edffbdd..4bc2286c 100644 --- a/data/minecraft/structure/village/desert/houses/desert_small_house_3.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7294ad7aed13b44300e852e3561731d9df838e6c33528c34e66fc78516bc822 +oid sha256:991032f1aad95b8e3cff202ca94684d6ec967e7124fa609226f9b675323b0960 size 1130 diff --git a/data/minecraft/structure/village/desert/houses/desert_small_house_4.nbt b/data/minecraft/structure/village/desert/houses/desert_small_house_4.nbt index c83a3da4..27f7be53 100644 --- a/data/minecraft/structure/village/desert/houses/desert_small_house_4.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1d99ad43bd1046226b1ef6ab19ba7d748a0007343b47331178f57e90a192f89 -size 1053 +oid sha256:e316a03c54102eb1eef050fffd4c053fcaa6253317f71f8baf6d6c8bf286b9e5 +size 1052 diff --git a/data/minecraft/structure/village/desert/houses/desert_small_house_5.nbt b/data/minecraft/structure/village/desert/houses/desert_small_house_5.nbt index e6387d86..6208d0bc 100644 --- a/data/minecraft/structure/village/desert/houses/desert_small_house_5.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ec6a6c3c60c51f8e3c3c4ed2e39397f71aa17c9994c8e0043918e25a56ed178 +oid sha256:f8e7173595eb889e13235216723e27ea162cb3023469847463d2162170086a83 size 1107 diff --git a/data/minecraft/structure/village/desert/houses/desert_small_house_6.nbt b/data/minecraft/structure/village/desert/houses/desert_small_house_6.nbt index dc77d4e9..78ec2e9d 100644 --- a/data/minecraft/structure/village/desert/houses/desert_small_house_6.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_small_house_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8e1555028d6ca988ba1dbf08fc17e8434146b66031fbac0ba566ce1e488ce45 +oid sha256:f7231a97936cb990f2a129038b2d5cec0563232c07eedbc2a8963c3ee6248c2a size 2292 diff --git a/data/minecraft/structure/village/desert/houses/desert_small_house_7.nbt b/data/minecraft/structure/village/desert/houses/desert_small_house_7.nbt index 8d5f0e49..de19ef2f 100644 --- a/data/minecraft/structure/village/desert/houses/desert_small_house_7.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_small_house_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f997370a7db008a3477d5dabcb167373e940c7b00a17b2a28c16d33aa473cb0 +oid sha256:89f921ad34c64fd4ac51664ecc948ae5a695fea53268dd906651e1c996b8f1ed size 1598 diff --git a/data/minecraft/structure/village/desert/houses/desert_small_house_8.nbt b/data/minecraft/structure/village/desert/houses/desert_small_house_8.nbt index dea4d4ae..c3b5e106 100644 --- a/data/minecraft/structure/village/desert/houses/desert_small_house_8.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_small_house_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b13e4355d6155efa265dbf809531191815e3144a74db77dc110fe149f522a543 +oid sha256:77555fac9d22e2f48f2125f9f72548edcf17bd9b73ad69abd1589f8479e178e6 size 1024 diff --git a/data/minecraft/structure/village/desert/houses/desert_tannery_1.nbt b/data/minecraft/structure/village/desert/houses/desert_tannery_1.nbt index 3c4ee26a..2bbcadeb 100644 --- a/data/minecraft/structure/village/desert/houses/desert_tannery_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_tannery_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddcfc9a218544792753e478a971c47fa99ae96e9ca91b377851ec1afcdbd324a +oid sha256:bf9e0fd832182d1221f72046b11ca52862f942382719c5d77f961e5df2a05533 size 1835 diff --git a/data/minecraft/structure/village/desert/houses/desert_temple_1.nbt b/data/minecraft/structure/village/desert/houses/desert_temple_1.nbt index 325b53bb..e82a33f3 100644 --- a/data/minecraft/structure/village/desert/houses/desert_temple_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_temple_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e4de806bb8c411d32381b1a3c242cfb1cd07d8ea663004206a67848138af61c +oid sha256:cdd28e94d565fb4008a97903d94e5c559d37ad316c3c854f37380e8159b6179b size 2998 diff --git a/data/minecraft/structure/village/desert/houses/desert_temple_2.nbt b/data/minecraft/structure/village/desert/houses/desert_temple_2.nbt index 4dfbb610..dc9e96b8 100644 --- a/data/minecraft/structure/village/desert/houses/desert_temple_2.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_temple_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:452ae7d084b33fcb2a7174c99bc4bea352663bda728e3730b05ffea9613e5fff -size 2879 +oid sha256:aaa34167bcec7b5f22e10226e471f949ebac903c334565134e6e5872494cae88 +size 2878 diff --git a/data/minecraft/structure/village/desert/houses/desert_tool_smith_1.nbt b/data/minecraft/structure/village/desert/houses/desert_tool_smith_1.nbt index 0859af1a..4df14c7b 100644 --- a/data/minecraft/structure/village/desert/houses/desert_tool_smith_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_tool_smith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bfd70831ca258d2649ca7025f8cfe674ff5bdb6db7f7d8bb04c13ca1245d07b2 +oid sha256:d0886eb68ae29943f68f20f465ed0e06a85018d4187026c76b0d3e3d7299b38b size 2960 diff --git a/data/minecraft/structure/village/desert/houses/desert_weaponsmith_1.nbt b/data/minecraft/structure/village/desert/houses/desert_weaponsmith_1.nbt index 389e8b59..9746dcb3 100644 --- a/data/minecraft/structure/village/desert/houses/desert_weaponsmith_1.nbt +++ b/data/minecraft/structure/village/desert/houses/desert_weaponsmith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:262590b687b8be45f0c8297ca3b6de79078510e0a19506ccfb217d04c618ddac -size 2081 +oid sha256:44935361c646c0170183dec2bad82dbe6aabca809e16885eb86b1d1f124da0f3 +size 2080 diff --git a/data/minecraft/structure/village/desert/streets/corner_01.nbt b/data/minecraft/structure/village/desert/streets/corner_01.nbt index 3aec4e0e..819ed2f5 100644 --- a/data/minecraft/structure/village/desert/streets/corner_01.nbt +++ b/data/minecraft/structure/village/desert/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a9cab825cd681cd8203c7591f96f8c2686b6c41711b1e33c66c84443868eee4 -size 748 +oid sha256:5ce48889ca17142b34c666042713765bac856de5f5b13340890948bbd9b85008 +size 749 diff --git a/data/minecraft/structure/village/desert/streets/corner_02.nbt b/data/minecraft/structure/village/desert/streets/corner_02.nbt index 3c9111d9..73ff548f 100644 --- a/data/minecraft/structure/village/desert/streets/corner_02.nbt +++ b/data/minecraft/structure/village/desert/streets/corner_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:344ffa68ef149aba787e2aa3acfea55ad52f2d46609056a0c335db0babcf59d6 -size 468 +oid sha256:7fd1f2f425c0a1ea7399e67baf2b383c1066374aae16b75de0f429124d0184cc +size 469 diff --git a/data/minecraft/structure/village/desert/streets/crossroad_01.nbt b/data/minecraft/structure/village/desert/streets/crossroad_01.nbt index f940212e..e3a739bb 100644 --- a/data/minecraft/structure/village/desert/streets/crossroad_01.nbt +++ b/data/minecraft/structure/village/desert/streets/crossroad_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a8898777f58c0146cd4df538c8e17c88d5db47e739141c2987b08b5a590d790 +oid sha256:1e35d27114c96f9a7147d7d80ed1f7565fa6c7f31e81dd7d014fbe601465bb31 size 1272 diff --git a/data/minecraft/structure/village/desert/streets/crossroad_02.nbt b/data/minecraft/structure/village/desert/streets/crossroad_02.nbt index 3a44a4ed..13135c17 100644 --- a/data/minecraft/structure/village/desert/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/desert/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ebfe28e74a4e5394136d409f5d309cd5cdd59b1d8e3ae1d9fb7dc0ac20645458 +oid sha256:4e583e60a584ff11e48b7894093e6bf4ec5c5f18ebd5cc661b9f0fdf19ed538a size 782 diff --git a/data/minecraft/structure/village/desert/streets/crossroad_03.nbt b/data/minecraft/structure/village/desert/streets/crossroad_03.nbt index 13c81bf5..d8dfbfd1 100644 --- a/data/minecraft/structure/village/desert/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/desert/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf8b025452be597191b55e71ff98dda22cb96dde3fce9c363c1860f7ab35a1dd +oid sha256:2cca29272385798f91a3a5f09415e26ffb536682338bdaf2b4e2991ffb948984 size 443 diff --git a/data/minecraft/structure/village/desert/streets/square_01.nbt b/data/minecraft/structure/village/desert/streets/square_01.nbt index e41cd7c8..832043b7 100644 --- a/data/minecraft/structure/village/desert/streets/square_01.nbt +++ b/data/minecraft/structure/village/desert/streets/square_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b5859c8b4b3e50d7b05e15d4d002a751416ec2e9da6b705da23ede7d1e4d75d +oid sha256:eb95488d7ddac1d439f79b31d36bfcf56aff7d9290eb0ab8d067916712101fc5 size 1581 diff --git a/data/minecraft/structure/village/desert/streets/square_02.nbt b/data/minecraft/structure/village/desert/streets/square_02.nbt index f2a0934b..e30730e9 100644 --- a/data/minecraft/structure/village/desert/streets/square_02.nbt +++ b/data/minecraft/structure/village/desert/streets/square_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0cf354073d582b5ee65ae66122c299d6f1105454e9753ce52aeab46766ee07a +oid sha256:c34a79827d60aad4169d9fdad673c6a4f02b35813258eae7e6926cb972ea83f3 size 1310 diff --git a/data/minecraft/structure/village/desert/streets/straight_01.nbt b/data/minecraft/structure/village/desert/streets/straight_01.nbt index 37696432..313f40fd 100644 --- a/data/minecraft/structure/village/desert/streets/straight_01.nbt +++ b/data/minecraft/structure/village/desert/streets/straight_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c2f18f88ffc03b2a6764626a60b0a70eb8ef980aa2d239d7858b444c0bca22e +oid sha256:9c7c07c899598356f5e18f03e7d2c363f7123b8b10ca3d8498be3b036429b904 size 984 diff --git a/data/minecraft/structure/village/desert/streets/straight_02.nbt b/data/minecraft/structure/village/desert/streets/straight_02.nbt index 0a2cf92e..04e3f95d 100644 --- a/data/minecraft/structure/village/desert/streets/straight_02.nbt +++ b/data/minecraft/structure/village/desert/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3b79945ea352005fb227fea555aee48a0a50c8e6818c232ed3b5b616090c6c9 +oid sha256:98ba04c44abe137af22e1b283dfb788848ea73914eaf9e0b69218740ce7fe1e2 size 1229 diff --git a/data/minecraft/structure/village/desert/streets/straight_03.nbt b/data/minecraft/structure/village/desert/streets/straight_03.nbt index c8869b38..f97516ca 100644 --- a/data/minecraft/structure/village/desert/streets/straight_03.nbt +++ b/data/minecraft/structure/village/desert/streets/straight_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41e94b6f464cc7d1a47c4f68bdd19f6eb9652b49ee97469c8cf3f9ebce7e9114 +oid sha256:50207330758a6394dabede63b8533d7edd678045ecf4c1eecb8e7b4a565eae6d size 322 diff --git a/data/minecraft/structure/village/desert/streets/turn_01.nbt b/data/minecraft/structure/village/desert/streets/turn_01.nbt index 059d06d3..df053c66 100644 --- a/data/minecraft/structure/village/desert/streets/turn_01.nbt +++ b/data/minecraft/structure/village/desert/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bdc46ec3b3baf40fdccf0f71e85ff837a476d6fe3685b8f58df2c4b33656a842 +oid sha256:4ce8c5b50ba4553271eeb9769a2fc1175aaa50d2e89c7141c3896c78c915059f size 400 diff --git a/data/minecraft/structure/village/desert/terminators/terminator_01.nbt b/data/minecraft/structure/village/desert/terminators/terminator_01.nbt index 8a942086..7bddf6c5 100644 --- a/data/minecraft/structure/village/desert/terminators/terminator_01.nbt +++ b/data/minecraft/structure/village/desert/terminators/terminator_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:910f5d969f233e15cfbf0484c298ab9ce9f65e8912fc2b9c186a407d2c06ed45 +oid sha256:08614100a50fa37e9089cecebacec7b90d954f43e44e83f377043a470d4397f7 size 293 diff --git a/data/minecraft/structure/village/desert/terminators/terminator_02.nbt b/data/minecraft/structure/village/desert/terminators/terminator_02.nbt index 0b05c9a1..2d3e8d42 100644 --- a/data/minecraft/structure/village/desert/terminators/terminator_02.nbt +++ b/data/minecraft/structure/village/desert/terminators/terminator_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a21536978c7125a150a4c15747aade9382d048106133d2cc9ac3275f9930ca79 +oid sha256:7509beb478cba3f6d149b8893121e0050efd486358128cc1b4be6e0db30769e2 size 372 diff --git a/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_1.nbt b/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_1.nbt index 96cef0fd..906f4268 100644 --- a/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_1.nbt +++ b/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9d9335f9a9a41d9cf93c5240cbffc9b7cca4caa505c3101191177796e90cae5 +oid sha256:bb63352da9ba01698fc6e6a87ca8ae53240471efa62a7e2b64756d41979166a8 size 1015 diff --git a/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_2.nbt b/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_2.nbt index 53279e1b..cc64235d 100644 --- a/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_2.nbt +++ b/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee78393b07ee4cb9e968e930717e765c79f57c5c39c0511c52db484f255ee341 -size 1834 +oid sha256:a9c5f29de56059ec240ee3f0d727bbec4bda33386a4539e5c9fa09802456a049 +size 1835 diff --git a/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_3.nbt b/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_3.nbt index 299d96a9..67627085 100644 --- a/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_3.nbt +++ b/data/minecraft/structure/village/desert/town_centers/desert_meeting_point_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6f2c6be039bc031e8ed8314c21dc9e977e8eda7073eaa0fefaf96576cf62b69 +oid sha256:da7ca605b9753bcc363b5965d676e9118f73299bfab7a634d6239eae616b690b size 1898 diff --git a/data/minecraft/structure/village/desert/villagers/baby.nbt b/data/minecraft/structure/village/desert/villagers/baby.nbt index aa0e89dc..4a2ebfd2 100644 --- a/data/minecraft/structure/village/desert/villagers/baby.nbt +++ b/data/minecraft/structure/village/desert/villagers/baby.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1252f2b84e6be1898c8b88359c3e31bdc274f72fcddc4179f931663db1e1473 +oid sha256:b4afbd5172aceddfb65f141f1554e29d0116fe39079c5ac407a00cf6968f19fa size 720 diff --git a/data/minecraft/structure/village/desert/villagers/nitwit.nbt b/data/minecraft/structure/village/desert/villagers/nitwit.nbt index 8b1dfca5..aea3f716 100644 --- a/data/minecraft/structure/village/desert/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/desert/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6479fa8dc18bcdd053726014d53c1c448ec17bb5fbedb90226a1b8efb4f6d8d6 +oid sha256:31d8864c8144146b398e46c5eba7277b1f7e3cac6b5d9d78b21e3f7749b3035d size 715 diff --git a/data/minecraft/structure/village/desert/villagers/unemployed.nbt b/data/minecraft/structure/village/desert/villagers/unemployed.nbt index bb5b90d8..bea1ad0b 100644 --- a/data/minecraft/structure/village/desert/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/desert/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdf766a26b8bd3ed76e9b03653179e9f1ceb4c31f9a226538aa5248f503d90af +oid sha256:4c9401ee959b66b7e3e4ba3a9c436f5fa480dff43bdc897a418cac3ba971cfc7 size 715 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_medium_house_1.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_medium_house_1.nbt index 6569cce9..b3ed1df1 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_medium_house_1.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c17d4c748000b557e15e8b55a97cd4f21aa1019de68ea006369d47ca28792f33 +oid sha256:7eb9682900ea023ba1ecf02eb243186e7b95843921697ec61f1d3c30d485d5cb size 1448 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_medium_house_2.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_medium_house_2.nbt index 2d717f0d..f978efe6 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_medium_house_2.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b9db9247b6492e3b884ff61bb68ae125919f1723c79c190a107076568ffb460 -size 2844 +oid sha256:1f3ae0dfbe9313dab82523727e0945105ee2aba89e7858a5b462100396ef82fc +size 2843 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_1.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_1.nbt index 0c880450..5e8577a9 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_1.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1b411aef1c6f1b1636b27c993e5f96224c61f283e5ee953bc2813fe1d350e4e +oid sha256:505ad270efb8fa6a555adb3cd921a4c83e1f5504b9919d5331fca281853d5f6f size 1184 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_2.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_2.nbt index 5a17eaaa..dcf42199 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_2.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce0da688e04f3787da69e76b8e1ce5fa773d8dea345699f3191654ca000ec032 +oid sha256:33d66ca844011871e69e6803473aa2148018a1d4262703bb16113bede63197aa size 1318 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_3.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_3.nbt index 6005585d..ea94d305 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_3.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:934b5fb3680d0e5b41a297919d501f8bb94ee03d489f46fce86bfb5526569c44 +oid sha256:b21de303bdc84a4c794d58f3553534656b0f03bb507b9b1a81826546a0a86b53 size 1137 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_4.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_4.nbt index 8540172e..51277b20 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_4.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:203944607e0102cd1030eeeaf0c8a6c40a32afcb807564de5c8eb698f09f5bec -size 1060 +oid sha256:d89e070b877afe50333b6772bad2ae880f337819628b4ff07c3e8c2757dea746 +size 1059 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_5.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_5.nbt index c6ba3bbf..2938fdfc 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_5.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e5bcc8957660a8384241edb61a2ea82dc6d9a9458248684b452c32cb0fb5c14 +oid sha256:fe47040611a9e1ca9fc4857164d0f77e8721573234002ab0bae13a7eb409ce46 size 1113 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_6.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_6.nbt index 48369838..818e739e 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_6.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef6d2038c54923e63320a457c7a068f99fbc8d07d0e0d9a47032379911b616cc -size 1963 +oid sha256:f7aaffc788b1cb74f0f603976d6b79680f020799b9df25b075c4a1576eb2bf14 +size 1962 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_7.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_7.nbt index 414061fb..b4f8d7eb 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_7.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6364abed6d65af20a3a0f721ec7d51b18a6e888a63f63278b7bb5e64cb49789c +oid sha256:c9f9d8e927af311ddd62e7ddaf5de37e78902da857417b553efc9faf3135baa2 size 1604 diff --git a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_8.nbt b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_8.nbt index 47ff08bb..8686ab1e 100644 --- a/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_8.nbt +++ b/data/minecraft/structure/village/desert/zombie/houses/desert_small_house_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:097e89fd0b8b506f4b8cd924ebc9222f4dd12f93567643a4cb39f1d9089306d1 +oid sha256:b9ad18626260ef873965dcd5858dfd3e7d68c269499f378a7ed9b372d24546bc size 1029 diff --git a/data/minecraft/structure/village/desert/zombie/streets/corner_01.nbt b/data/minecraft/structure/village/desert/zombie/streets/corner_01.nbt index 539ab682..108b8587 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/corner_01.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7af31c6b9a9bd2596dc878e15e0d967724a048e06ca8379148e9ab484b0a01a6 -size 753 +oid sha256:c1b4c9f6cd334b242aba8c39f55ada6d6638bd3b7891610b5857b4e770f4193d +size 754 diff --git a/data/minecraft/structure/village/desert/zombie/streets/corner_02.nbt b/data/minecraft/structure/village/desert/zombie/streets/corner_02.nbt index 8f5a21b7..4ccc899c 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/corner_02.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/corner_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e62099c8c782f924b5eb69ea0696fb41e0db1f4ad19936b042d00726bf3c3d3c +oid sha256:b4de249b38503f003a758c49f3ddf63798c6b399c5911077e765d4d2ab90b145 size 472 diff --git a/data/minecraft/structure/village/desert/zombie/streets/crossroad_01.nbt b/data/minecraft/structure/village/desert/zombie/streets/crossroad_01.nbt index 3fd18c1d..0e2933da 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/crossroad_01.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/crossroad_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5da13b9ebc2fad1d354e8ef029c31709ae8f532f1993905d031f76a0e6b77bf6 +oid sha256:b17a2085481a20854a5638cde6d7bc0b7d2d7595e8c091bb5f555dc1c7f24dd9 size 1278 diff --git a/data/minecraft/structure/village/desert/zombie/streets/crossroad_02.nbt b/data/minecraft/structure/village/desert/zombie/streets/crossroad_02.nbt index ae8cfbd3..fd559a4f 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbcad8f24aaaca891f572cf794a5d46fe45da6410cdbe4c323594dd174eda1b6 +oid sha256:3f1b350301a4d9aceba6e62cff7f041b4e4164f009136d9e9d56936b51297d3b size 786 diff --git a/data/minecraft/structure/village/desert/zombie/streets/crossroad_03.nbt b/data/minecraft/structure/village/desert/zombie/streets/crossroad_03.nbt index 2549a5ee..ca21e343 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7d2faea231da3380daa8465eb396b05637edde27426def00042ae7b2291c0bc +oid sha256:9ed976da307fd24e9103d56d1411e44b55844a2b6d2363d9f7506cf506015eaa size 449 diff --git a/data/minecraft/structure/village/desert/zombie/streets/square_01.nbt b/data/minecraft/structure/village/desert/zombie/streets/square_01.nbt index 48c90893..0986510b 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/square_01.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/square_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:675a2084e68c9ab3f41fbfcf11f57bab99704b47701f971edc0361ba598be3e5 +oid sha256:369c05dae961d66b234a1eb6b7dada56b2a501ee397faf0612f533431ada35bc size 1586 diff --git a/data/minecraft/structure/village/desert/zombie/streets/square_02.nbt b/data/minecraft/structure/village/desert/zombie/streets/square_02.nbt index 9175cbda..85280bf3 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/square_02.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/square_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fb15d8fa9d739a700174ad08528cb4f7550dc4f6d1ac681232603e366a194cd +oid sha256:90c2ab39184b7bdd2e19f786866af424ae33183bc6a51d55e5df8339e5921647 size 1314 diff --git a/data/minecraft/structure/village/desert/zombie/streets/straight_01.nbt b/data/minecraft/structure/village/desert/zombie/streets/straight_01.nbt index 340a1892..741c2bb7 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/straight_01.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/straight_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d45ccafa9f0f442a837a633b9d6c24dda06e1fef779662dc0a1d31dd0f2af46 +oid sha256:a244b01b5d0b7dbe9bc638151a0b021abc1643c3ab3f0066d5963506e3945211 size 989 diff --git a/data/minecraft/structure/village/desert/zombie/streets/straight_02.nbt b/data/minecraft/structure/village/desert/zombie/streets/straight_02.nbt index 4872fae5..b9e553f4 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/straight_02.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:014c56dac61666427959c5c66637ab0319f2292d96a89c500621c289b8d3785f +oid sha256:840a9192e225ba150d5ff0466b7ab73cab418648c5e091b1517a150890910118 size 1234 diff --git a/data/minecraft/structure/village/desert/zombie/streets/straight_03.nbt b/data/minecraft/structure/village/desert/zombie/streets/straight_03.nbt index 9e0b9e33..ef4fcbdb 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/straight_03.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/straight_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6d92992ea1e48693016dd25e29710d376785917afc122fe593d2d603af8f531 -size 327 +oid sha256:2b0b6646b9a5bd306e2d8edfc958f3ee1828a0c6a8af5f147bc9b94d5277885c +size 328 diff --git a/data/minecraft/structure/village/desert/zombie/streets/turn_01.nbt b/data/minecraft/structure/village/desert/zombie/streets/turn_01.nbt index 8836ee4c..926eca57 100644 --- a/data/minecraft/structure/village/desert/zombie/streets/turn_01.nbt +++ b/data/minecraft/structure/village/desert/zombie/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e76b07967a538fcb9b67543dc0c138ca405c7c6a7a7b60ead1b1c94336f062d -size 404 +oid sha256:ae1f72fbd63ed2ae4fcf9c65e232743a92db0e81fd6dc98f919865091e29f825 +size 405 diff --git a/data/minecraft/structure/village/desert/zombie/terminators/terminator_02.nbt b/data/minecraft/structure/village/desert/zombie/terminators/terminator_02.nbt index f4a5d0cd..e7a5ecb6 100644 --- a/data/minecraft/structure/village/desert/zombie/terminators/terminator_02.nbt +++ b/data/minecraft/structure/village/desert/zombie/terminators/terminator_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23bbcfbd8052ed257ecb0e280c74f7279f95bed649a703775bf0f1c086efa4e1 +oid sha256:f942bf911af6652702119952007fe81ce8bce9446ec144a80e2e6f5ae51d8956 size 376 diff --git a/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_1.nbt b/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_1.nbt index 84aef8ee..eddbb617 100644 --- a/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_1.nbt +++ b/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d37524fefd1f173fe602ff08cdec159154a84a450d8a6323c2d74ec536a88c24 +oid sha256:d9383360626fd62391a6e28dfa516fcbddd90059d0eccf6c197b69a3e77da25f size 1127 diff --git a/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_2.nbt b/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_2.nbt index c74226ee..aca96160 100644 --- a/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_2.nbt +++ b/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad36e07d4967ed1c9dbbd62aa12d1a79f79608052af746e9687b9742a25858bc -size 2312 +oid sha256:ba6ac85696af49301515b546fc8286f6b93eb773117601f9f0ccabe169527d55 +size 2311 diff --git a/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_3.nbt b/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_3.nbt index ba982682..022de5e9 100644 --- a/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_3.nbt +++ b/data/minecraft/structure/village/desert/zombie/town_centers/desert_meeting_point_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea59d133541c761fb12c48cdfac410692f1c75369cee26ca33cb1547b1f46ee6 +oid sha256:d09ed5fae2ded0f8b7fefc283cab4d17189099dc970378993016c94f27936ced size 4579 diff --git a/data/minecraft/structure/village/desert/zombie/villagers/nitwit.nbt b/data/minecraft/structure/village/desert/zombie/villagers/nitwit.nbt index ccf09cac..b53ce471 100644 --- a/data/minecraft/structure/village/desert/zombie/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/desert/zombie/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df4ef435df6d1c741c26acb813b184f858724f8080813e8b814b97eb36c201d9 +oid sha256:4a4c03bfac69ddd217eaaf731dee6a21c94a6bd32ad0d876a281e83ddf268aa8 size 722 diff --git a/data/minecraft/structure/village/desert/zombie/villagers/unemployed.nbt b/data/minecraft/structure/village/desert/zombie/villagers/unemployed.nbt index e85a4b2b..fe7f11c4 100644 --- a/data/minecraft/structure/village/desert/zombie/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/desert/zombie/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e9865c6d13bbb895e6a18805a4d600c2faae6e2aae78526d478d301543ce4e9 +oid sha256:0dbac1526fd515b9675bd1ff2a3777db3f0d7517107030f0f712492e3cad3d16 size 721 diff --git a/data/minecraft/structure/village/plains/houses/plains_accessory_1.nbt b/data/minecraft/structure/village/plains/houses/plains_accessory_1.nbt index c72fd9bd..efdfe953 100644 --- a/data/minecraft/structure/village/plains/houses/plains_accessory_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_accessory_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a94192f187127469d2cea87662f504d6062ad28899b19dc84152fa42457c1454 -size 522 +oid sha256:a36549d0e5aac6931eb0cb9c4fe459f33521a15eea9273ef5f9872d6f6867455 +size 523 diff --git a/data/minecraft/structure/village/plains/houses/plains_animal_pen_1.nbt b/data/minecraft/structure/village/plains/houses/plains_animal_pen_1.nbt index 13f51d05..660789c4 100644 --- a/data/minecraft/structure/village/plains/houses/plains_animal_pen_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_animal_pen_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3afe2df51058bf81e0f9580eac10642782a9a99467a3dc5942e383e732f227e +oid sha256:ba21b0ec4d2e87e4f68d3a4b7feebf181b782f10db3df411a868506ec291f6a9 size 724 diff --git a/data/minecraft/structure/village/plains/houses/plains_animal_pen_2.nbt b/data/minecraft/structure/village/plains/houses/plains_animal_pen_2.nbt index 7755122d..c0949b07 100644 --- a/data/minecraft/structure/village/plains/houses/plains_animal_pen_2.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_animal_pen_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14c50bbe0c8be6d8b60c82f0049f10d26e9933e762d10d114359a980dca895f8 +oid sha256:3ea00d00908de654804bf71bd78317bf5d407ddb22d0f53410ad8c4701c05729 size 1011 diff --git a/data/minecraft/structure/village/plains/houses/plains_animal_pen_3.nbt b/data/minecraft/structure/village/plains/houses/plains_animal_pen_3.nbt index f1e578d0..5dfd07b4 100644 --- a/data/minecraft/structure/village/plains/houses/plains_animal_pen_3.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_animal_pen_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:137dd9342ecdc064465c9d97709715bb77ca1c1ebd9d37f316fb67e4687b6425 +oid sha256:02a57cdcdb548d949d75469a549bd4bb6345ac2be6d9efd8e1aa017b0b36cb98 size 1353 diff --git a/data/minecraft/structure/village/plains/houses/plains_armorer_house_1.nbt b/data/minecraft/structure/village/plains/houses/plains_armorer_house_1.nbt index f4c4392d..787815ef 100644 --- a/data/minecraft/structure/village/plains/houses/plains_armorer_house_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_armorer_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:960b42fb8b3acccbc69a18fd2a7966a3d135421cd9894b69a282187f9a1e1778 -size 2630 +oid sha256:a705d6e16caca2d740b948dc799a8ac13f40967adf24865c480114bf2c1d1fa8 +size 2629 diff --git a/data/minecraft/structure/village/plains/houses/plains_big_house_1.nbt b/data/minecraft/structure/village/plains/houses/plains_big_house_1.nbt index 28979aef..6539296d 100644 --- a/data/minecraft/structure/village/plains/houses/plains_big_house_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_big_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bbbb34b79c4e14d90bab5f7026620cbf90253b1ebf611fe08d51e6f5c644b4c -size 3263 +oid sha256:1e04ab05d7408a2968b3830334a0d830c2db8b1bd4be1aee326bd60caf45b3a1 +size 3262 diff --git a/data/minecraft/structure/village/plains/houses/plains_butcher_shop_1.nbt b/data/minecraft/structure/village/plains/houses/plains_butcher_shop_1.nbt index ece116d6..e4323698 100644 --- a/data/minecraft/structure/village/plains/houses/plains_butcher_shop_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_butcher_shop_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cea4f0d4dc5bc4fc5578b9fd224765082c3c44a6f3a6ef064915cea73d9637d +oid sha256:97c0c6a9ce5315b30b723ba7af0a6f20414b295a4d60878df3c11b159b172aed size 4181 diff --git a/data/minecraft/structure/village/plains/houses/plains_butcher_shop_2.nbt b/data/minecraft/structure/village/plains/houses/plains_butcher_shop_2.nbt index d3961d3e..ebb9de22 100644 --- a/data/minecraft/structure/village/plains/houses/plains_butcher_shop_2.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_butcher_shop_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8949b271158031052dce501cdf60a73eb68fadc03075e26349932f060e78bd2 -size 4579 +oid sha256:a1c37038036e63471a2b0c6866dde64edfa3275200ba99f6344dfbeafa5ec9af +size 4578 diff --git a/data/minecraft/structure/village/plains/houses/plains_cartographer_1.nbt b/data/minecraft/structure/village/plains/houses/plains_cartographer_1.nbt index c347f905..1ccd5050 100644 --- a/data/minecraft/structure/village/plains/houses/plains_cartographer_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_cartographer_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efeea33c5ff08b24a28752ff5cc93754f7eadd8cbe8541b65a208a61ab0222a1 -size 2392 +oid sha256:00e202cd07fe6f6cb4aac19c26bd33febd5ecb1c3a994512b826757e38f94df1 +size 2391 diff --git a/data/minecraft/structure/village/plains/houses/plains_fisher_cottage_1.nbt b/data/minecraft/structure/village/plains/houses/plains_fisher_cottage_1.nbt index 1817c0e4..326313b4 100644 --- a/data/minecraft/structure/village/plains/houses/plains_fisher_cottage_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_fisher_cottage_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad03a8d73e0fc24faf478c784c781889db8e234b1e1fda613b7f99f6b0756657 -size 3526 +oid sha256:2306e9806e8fc864d4392d8b22ae1587b6f09847d61366fb13548d359f439325 +size 3525 diff --git a/data/minecraft/structure/village/plains/houses/plains_fletcher_house_1.nbt b/data/minecraft/structure/village/plains/houses/plains_fletcher_house_1.nbt index 6fe1ed9a..da96d887 100644 --- a/data/minecraft/structure/village/plains/houses/plains_fletcher_house_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_fletcher_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:233d2160faa2b3d8dcbfec1c1846dffe89bac1c3979861b800d2a6c5c879c6e7 -size 2912 +oid sha256:bd42cae2c89c24cfa003a13af4394b49eda38dd34ccf56123fbf3e44de2dc620 +size 2913 diff --git a/data/minecraft/structure/village/plains/houses/plains_large_farm_1.nbt b/data/minecraft/structure/village/plains/houses/plains_large_farm_1.nbt index c4f87b78..30c3eee7 100644 --- a/data/minecraft/structure/village/plains/houses/plains_large_farm_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_large_farm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8395bc3cdf8c655692daf75bc9d7cb1eaa8f71631a1253359b3c895b74ae8e0 -size 1156 +oid sha256:01eb8c82bafac0e11ff5823fac6f1b2e99dfe9c46b61964eeea6f1951c264d3e +size 1157 diff --git a/data/minecraft/structure/village/plains/houses/plains_library_1.nbt b/data/minecraft/structure/village/plains/houses/plains_library_1.nbt index af3fac19..e8f6cc71 100644 --- a/data/minecraft/structure/village/plains/houses/plains_library_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_library_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61aa78d11a77d811fcaf9351b1916b165f69787ecb105647996997da51c35a5f -size 6513 +oid sha256:9e266386a2c37d37e7ad5b546b4d2aec5939f5d2824c0bd73006e06b1e7384bc +size 6514 diff --git a/data/minecraft/structure/village/plains/houses/plains_library_2.nbt b/data/minecraft/structure/village/plains/houses/plains_library_2.nbt index e1193dc6..582d5f08 100644 --- a/data/minecraft/structure/village/plains/houses/plains_library_2.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_library_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:394b0ae8171a5cbde5289b891b742747b747f749bfab8d94241acb6defaf166a -size 2916 +oid sha256:0bb465336be22b377e79ebb78e8614c33cc46fa85880fe459b48afdf5a3d5bd2 +size 2917 diff --git a/data/minecraft/structure/village/plains/houses/plains_masons_house_1.nbt b/data/minecraft/structure/village/plains/houses/plains_masons_house_1.nbt index 59ded71a..8d8892b4 100644 --- a/data/minecraft/structure/village/plains/houses/plains_masons_house_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_masons_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f98926e17645efc4c60ca330a892bd33d501cc96170dbfba17ab6f0118cb5309 -size 2295 +oid sha256:27eb6adc93e2dcc0d32003e5f0f3f55cdc34667f261dfb6b5e7e61a8050f78cf +size 2296 diff --git a/data/minecraft/structure/village/plains/houses/plains_medium_house_1.nbt b/data/minecraft/structure/village/plains/houses/plains_medium_house_1.nbt index c0294b87..77a3b78d 100644 --- a/data/minecraft/structure/village/plains/houses/plains_medium_house_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a7f37c040aecab5ff9f2d9338fb64be33921e5765ab5dcf09070b8312516eaa -size 4239 +oid sha256:9264bcb46375f11699608f6d4e88ecc96ddd8da097591edb063433f2a0c41234 +size 4240 diff --git a/data/minecraft/structure/village/plains/houses/plains_medium_house_2.nbt b/data/minecraft/structure/village/plains/houses/plains_medium_house_2.nbt index 56ee1d21..9267e317 100644 --- a/data/minecraft/structure/village/plains/houses/plains_medium_house_2.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:709faad4a2d03f9084479bc5a9256bb192052f6cf499f413ebb0b52b59744262 +oid sha256:b1f573b79e5e435c312fae55c03c1e0c8b3cade33fd2577be6adb3c51315ee54 size 2542 diff --git a/data/minecraft/structure/village/plains/houses/plains_meeting_point_4.nbt b/data/minecraft/structure/village/plains/houses/plains_meeting_point_4.nbt index 88ed090e..1557bad1 100644 --- a/data/minecraft/structure/village/plains/houses/plains_meeting_point_4.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_meeting_point_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0c7454f56fcf2ff10f61752c157de2a0fea6241e0e89a6ff71174b0ec1dab4e +oid sha256:ff0f1431323e891f970cdda5cdd2f472f0a666772b68bbccaf1529f1ae17dc78 size 3905 diff --git a/data/minecraft/structure/village/plains/houses/plains_meeting_point_5.nbt b/data/minecraft/structure/village/plains/houses/plains_meeting_point_5.nbt index 3c4476f6..8ba51cab 100644 --- a/data/minecraft/structure/village/plains/houses/plains_meeting_point_5.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_meeting_point_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9daef2b0767c3e337b3f3ef9c5ef9fca2d1d029e464df7b3ec1652e87caa606 +oid sha256:b1acc1c65b6ffab362771430c46b12f9696afe1589bbd0e5e8f275e8a63a6b68 size 2651 diff --git a/data/minecraft/structure/village/plains/houses/plains_shepherds_house_1.nbt b/data/minecraft/structure/village/plains/houses/plains_shepherds_house_1.nbt index 6c2dec68..9f152dda 100644 --- a/data/minecraft/structure/village/plains/houses/plains_shepherds_house_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_shepherds_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64a80c8d5a9314307d1285603415e42591a1801f4e0ce7289158aa1dca69c208 -size 2914 +oid sha256:5e8794711064d5ed8846126fee12b0942e77d8e9051f0209a54106eddbdfe832 +size 2915 diff --git a/data/minecraft/structure/village/plains/houses/plains_small_farm_1.nbt b/data/minecraft/structure/village/plains/houses/plains_small_farm_1.nbt index 368afcb6..25f77c9d 100644 --- a/data/minecraft/structure/village/plains/houses/plains_small_farm_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_small_farm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8727a0c7bac890a94316c635a9656a3db1000774fd3727fb55c16459a05bb37d -size 772 +oid sha256:39429a84df4aedfa6f2d9cbec098f8aafb941cad511cc4f425c0271e174b5d88 +size 773 diff --git a/data/minecraft/structure/village/plains/houses/plains_small_house_1.nbt b/data/minecraft/structure/village/plains/houses/plains_small_house_1.nbt index 64f9ac70..8a33b0a0 100644 --- a/data/minecraft/structure/village/plains/houses/plains_small_house_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59191f3e6319933662e438e88696340fd33da8dfa08c786aaa886afb20619ed2 -size 1807 +oid sha256:b90e21408dc8a6fd7b5be040b28d4665287b8e30d96b104a3d8ccbdd6f1737f6 +size 1808 diff --git a/data/minecraft/structure/village/plains/houses/plains_small_house_2.nbt b/data/minecraft/structure/village/plains/houses/plains_small_house_2.nbt index 48335ab2..dbe1b2b6 100644 --- a/data/minecraft/structure/village/plains/houses/plains_small_house_2.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:871c5191c245febe6dd844966ef0ffa087e10937985279f4fda60faae35adf1c +oid sha256:08cfcb8349f6fa44db2fd18e9229ee9bfd77183b7f3845f294cc0f54773def53 size 1699 diff --git a/data/minecraft/structure/village/plains/houses/plains_small_house_3.nbt b/data/minecraft/structure/village/plains/houses/plains_small_house_3.nbt index 6b21c423..6ae05c82 100644 --- a/data/minecraft/structure/village/plains/houses/plains_small_house_3.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7eef5bad3fe7c7bd985ccff2109cc27a00305451a9e40a022549cc8ebe789ca8 -size 1801 +oid sha256:0e037fca0f0bd5af919b7b624196ca06d874de91e8491bf5c6576cfa11ff668d +size 1802 diff --git a/data/minecraft/structure/village/plains/houses/plains_small_house_4.nbt b/data/minecraft/structure/village/plains/houses/plains_small_house_4.nbt index 660af0d9..91705ce9 100644 --- a/data/minecraft/structure/village/plains/houses/plains_small_house_4.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:072147736c8f28a800970dced3d2bd0ab236fe3bc06d35858742c4c753ae771d -size 1724 +oid sha256:87b61e6ad485b2c2118fdab77ede6318b0dc9ce23206d46e221530b851bd71c3 +size 1725 diff --git a/data/minecraft/structure/village/plains/houses/plains_small_house_5.nbt b/data/minecraft/structure/village/plains/houses/plains_small_house_5.nbt index 8b433bb1..3d95eba0 100644 --- a/data/minecraft/structure/village/plains/houses/plains_small_house_5.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db3031a130c526fa9c5d0797754ab37141a1ba70e547af13f03027063328789e -size 3490 +oid sha256:45260a17cce83e1e9383c858fc8b0baa9a6adb6763f201c5dc39b79e9a957fec +size 3491 diff --git a/data/minecraft/structure/village/plains/houses/plains_small_house_6.nbt b/data/minecraft/structure/village/plains/houses/plains_small_house_6.nbt index 37c3ac20..fef302d1 100644 --- a/data/minecraft/structure/village/plains/houses/plains_small_house_6.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_small_house_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10f63f8cec2ce4d4c6f5cca4f362f8b33a79cf527901384177a4fbbdff940a75 -size 1773 +oid sha256:adecefaa2b57655fe0b6a8f91bcfca310ab26adbb987c3f0a661d9c57352f928 +size 1774 diff --git a/data/minecraft/structure/village/plains/houses/plains_small_house_7.nbt b/data/minecraft/structure/village/plains/houses/plains_small_house_7.nbt index c1ed1d68..f35ee9e2 100644 --- a/data/minecraft/structure/village/plains/houses/plains_small_house_7.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_small_house_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5b842167c9da23b5215c7fd0ff6b05d05588dd808d55b1961e9da5e08b17161 -size 2035 +oid sha256:549865bcca138d26dd4172d4e9739f31a696177cdb35e9bc9e6ebb351ccac8a3 +size 2034 diff --git a/data/minecraft/structure/village/plains/houses/plains_small_house_8.nbt b/data/minecraft/structure/village/plains/houses/plains_small_house_8.nbt index 338853f8..d35df5f7 100644 --- a/data/minecraft/structure/village/plains/houses/plains_small_house_8.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_small_house_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02c112b5f35ff1a52b1070e7d574229d61a6936cabde3b0470d86d3e0da5ca11 +oid sha256:4b0fbcd0c88588b96a7d547495b64ec42f0503c5cdf4fe3da0fa73f4484f7488 size 2682 diff --git a/data/minecraft/structure/village/plains/houses/plains_stable_1.nbt b/data/minecraft/structure/village/plains/houses/plains_stable_1.nbt index f34400e8..683a783d 100644 --- a/data/minecraft/structure/village/plains/houses/plains_stable_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_stable_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6605b1d1a8801022082d223d9592470cb620428e12d1f57b2c530c9df507df0c -size 3778 +oid sha256:e67a76efb3b86b24f707dd8e090c764471a97ff27b924ecc41ebe92e2de38198 +size 3779 diff --git a/data/minecraft/structure/village/plains/houses/plains_stable_2.nbt b/data/minecraft/structure/village/plains/houses/plains_stable_2.nbt index 5af5b179..8096e6b8 100644 --- a/data/minecraft/structure/village/plains/houses/plains_stable_2.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_stable_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30e8eaeb8ad1b493ce90a1549efd58cdcce6461cc4cc788c0b45264a9d9877e9 +oid sha256:9c1cbad5a65c9e542dcd74b21d4e1a23167462ccc6bd2b00d0cd0ac8f559b4bb size 3071 diff --git a/data/minecraft/structure/village/plains/houses/plains_tannery_1.nbt b/data/minecraft/structure/village/plains/houses/plains_tannery_1.nbt index 10005778..33ae9a8d 100644 --- a/data/minecraft/structure/village/plains/houses/plains_tannery_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_tannery_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a063117eeac136262877910a9f789e35087c7e3c66711cbbd0b883c3908e8be2 -size 2502 +oid sha256:0ca0f350a12da1143eb9fbb5890f03a10b2b92f60dbec97e6ff5e1fb8358bc59 +size 2501 diff --git a/data/minecraft/structure/village/plains/houses/plains_temple_3.nbt b/data/minecraft/structure/village/plains/houses/plains_temple_3.nbt index 0784a049..21aee845 100644 --- a/data/minecraft/structure/village/plains/houses/plains_temple_3.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_temple_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d331bd24e299e299fa07da75f073964325c8855ca577e3fc1e6f164334a38ab +oid sha256:4043777acc6ab0b3616d2f74aa5c9420da7595573c45b40d1eb29c37cc8f231d size 2491 diff --git a/data/minecraft/structure/village/plains/houses/plains_temple_4.nbt b/data/minecraft/structure/village/plains/houses/plains_temple_4.nbt index 611a7b46..d25f282e 100644 --- a/data/minecraft/structure/village/plains/houses/plains_temple_4.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_temple_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90e84b25cc5c51d9b772abc6d87fd70a1309eb72f09706f9bf6c45e5cf535a6b +oid sha256:10ed43917a85b19f5b2f7a6c8d8177a15ed9f2f58e53ef56d2b90235b917402a size 3210 diff --git a/data/minecraft/structure/village/plains/houses/plains_tool_smith_1.nbt b/data/minecraft/structure/village/plains/houses/plains_tool_smith_1.nbt index b3cbe6df..cf89c57f 100644 --- a/data/minecraft/structure/village/plains/houses/plains_tool_smith_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_tool_smith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f19b7f9c83ecedeb8a1117b0e4993ab7337a03a930554bb2807d676b2b4b2f0 +oid sha256:e3a9a52abeb10f97d5912664c85597dcfa15c7e20ccb68a79922a3e8ba714fb3 size 2674 diff --git a/data/minecraft/structure/village/plains/houses/plains_weaponsmith_1.nbt b/data/minecraft/structure/village/plains/houses/plains_weaponsmith_1.nbt index 77dd52a2..b468816a 100644 --- a/data/minecraft/structure/village/plains/houses/plains_weaponsmith_1.nbt +++ b/data/minecraft/structure/village/plains/houses/plains_weaponsmith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b10355684eb4972e4f4ee655a60ddb58c3f2a647d638dda01dae1be855e34e4 -size 3363 +oid sha256:0646d5bcd350c86ff15b0ed252f7c6bf1383454c2b6aaa471d44928071e0f8b4 +size 3362 diff --git a/data/minecraft/structure/village/plains/plains_lamp_1.nbt b/data/minecraft/structure/village/plains/plains_lamp_1.nbt index 2f124414..2b3596d8 100644 --- a/data/minecraft/structure/village/plains/plains_lamp_1.nbt +++ b/data/minecraft/structure/village/plains/plains_lamp_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b8eb2e72dce8c03f51f0b67a25468a8ff7e763e20c6dbecdce89f53320ae23f +oid sha256:0f0541f31dca3fc9e12d2745e86fb1e0ee49b19e48b73ddf5e1f4e89b36bd9eb size 469 diff --git a/data/minecraft/structure/village/plains/streets/corner_01.nbt b/data/minecraft/structure/village/plains/streets/corner_01.nbt index a2ac4e80..f56fe63d 100644 --- a/data/minecraft/structure/village/plains/streets/corner_01.nbt +++ b/data/minecraft/structure/village/plains/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0afe7652e16a8da7285543451ca620d165b9360ac0c7fedee2930cb6e39d289 +oid sha256:c42f4c67791fe62500e26c6340aee9bba1ce7dcb5e707ae8490245c130c12775 size 1182 diff --git a/data/minecraft/structure/village/plains/streets/corner_02.nbt b/data/minecraft/structure/village/plains/streets/corner_02.nbt index 79cd12a3..c5e4fdda 100644 --- a/data/minecraft/structure/village/plains/streets/corner_02.nbt +++ b/data/minecraft/structure/village/plains/streets/corner_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:263501fe5eda79291063921aad3511c02c83acfc275a6882b904867ec305090f -size 1108 +oid sha256:69e9768ad5d6ebe056f40c4ae2506b2681cd33f06115441f24cb624f8d9be141 +size 1109 diff --git a/data/minecraft/structure/village/plains/streets/corner_03.nbt b/data/minecraft/structure/village/plains/streets/corner_03.nbt index daff6212..04889360 100644 --- a/data/minecraft/structure/village/plains/streets/corner_03.nbt +++ b/data/minecraft/structure/village/plains/streets/corner_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a73c5f8939d3e02e85aab478855981dd6acd3bccc64496eda8d369f66175ada3 -size 350 +oid sha256:9fd19ce9436b3c1c9b7a6ed3663711a022b7e98ba6c03689947f2b98fce90728 +size 351 diff --git a/data/minecraft/structure/village/plains/streets/crossroad_01.nbt b/data/minecraft/structure/village/plains/streets/crossroad_01.nbt index a2ccccec..8bd4f95e 100644 --- a/data/minecraft/structure/village/plains/streets/crossroad_01.nbt +++ b/data/minecraft/structure/village/plains/streets/crossroad_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:826d6eeccc4bd6c4f8bd8213800b67aedec6d612fe9bfcc1e851d6b8cba506e6 +oid sha256:024569a46fe43e3e94163e7b2533d78fed550fa0253cb165ac6345f43dce0c36 size 1215 diff --git a/data/minecraft/structure/village/plains/streets/crossroad_02.nbt b/data/minecraft/structure/village/plains/streets/crossroad_02.nbt index 8d7dec0e..536b1f60 100644 --- a/data/minecraft/structure/village/plains/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/plains/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1622e4e9eb2bdaedff72f52337abe8b2d15d465e85be3ffbac5986b55e21d874 +oid sha256:63ddf3eb2f8604fd2c8bf062a462be4237ccae7e7f7887e7c0242d3dc8157828 size 1160 diff --git a/data/minecraft/structure/village/plains/streets/crossroad_03.nbt b/data/minecraft/structure/village/plains/streets/crossroad_03.nbt index 3412b817..89d942d0 100644 --- a/data/minecraft/structure/village/plains/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/plains/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbe528cccf1f3e4a6da6f07ad77b147d6aa3347d37696d18f8d5347f8c3c1cad +oid sha256:89264cdc554fdc01246d5786ebb0bfb4f874d674baa4d0f6698773ada7c7f062 size 1204 diff --git a/data/minecraft/structure/village/plains/streets/crossroad_04.nbt b/data/minecraft/structure/village/plains/streets/crossroad_04.nbt index f6e1c53b..9f55d138 100644 --- a/data/minecraft/structure/village/plains/streets/crossroad_04.nbt +++ b/data/minecraft/structure/village/plains/streets/crossroad_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e359a44a12b7a7f113c362b04f540e55448c63fc0304bb120482b882770cab51 +oid sha256:9e685b587cd2ae7ed1f13ad95550ef34c12aa48fd3b0e5ea750704023cd5ddc0 size 377 diff --git a/data/minecraft/structure/village/plains/streets/crossroad_05.nbt b/data/minecraft/structure/village/plains/streets/crossroad_05.nbt index 511b5b74..88e204b7 100644 --- a/data/minecraft/structure/village/plains/streets/crossroad_05.nbt +++ b/data/minecraft/structure/village/plains/streets/crossroad_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:beebb81edbe3e87e027a7f5c7a73cb79686398eb839059fb384683b21cb588c6 +oid sha256:5f119b7e20e65938b1e1b7bb63520f108aa528e872c0ef4a3f15dd44e0e1ba9d size 409 diff --git a/data/minecraft/structure/village/plains/streets/crossroad_06.nbt b/data/minecraft/structure/village/plains/streets/crossroad_06.nbt index f72e87a3..c2e5cb53 100644 --- a/data/minecraft/structure/village/plains/streets/crossroad_06.nbt +++ b/data/minecraft/structure/village/plains/streets/crossroad_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a94dc103d95e7ee2fe05366c234f751b079d7e1f33275bded19dc508316ea47b -size 470 +oid sha256:a8f95276fc7ed9401566d47c13a657cbb7560821a91df0bdc8bb2c2776b7cbf8 +size 471 diff --git a/data/minecraft/structure/village/plains/streets/straight_01.nbt b/data/minecraft/structure/village/plains/streets/straight_01.nbt index 241674a7..c7599a96 100644 --- a/data/minecraft/structure/village/plains/streets/straight_01.nbt +++ b/data/minecraft/structure/village/plains/streets/straight_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d28209be43ab16f972c3702f3b2f70942ce214634c66ba3c00f7319bcfcc648 -size 1131 +oid sha256:fe5c2f98a1dda6e0d28569dbd8597d09530ba04ad69ba23037e868fcea19bf25 +size 1132 diff --git a/data/minecraft/structure/village/plains/streets/straight_02.nbt b/data/minecraft/structure/village/plains/streets/straight_02.nbt index 28874336..8c966faf 100644 --- a/data/minecraft/structure/village/plains/streets/straight_02.nbt +++ b/data/minecraft/structure/village/plains/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:426d1a107c3fed06630773efbd99942afedad3a14e77e15562f6465dcb4f29a8 +oid sha256:85f049bbfbbf5cba060197d89f9c13d10ddc9cfabb99aad16ae7b241303758ca size 1084 diff --git a/data/minecraft/structure/village/plains/streets/straight_03.nbt b/data/minecraft/structure/village/plains/streets/straight_03.nbt index 748bf0f8..0a1bbe44 100644 --- a/data/minecraft/structure/village/plains/streets/straight_03.nbt +++ b/data/minecraft/structure/village/plains/streets/straight_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6f7de9046c2a56985a56f8657e0bee16d34e536134638e542b36ffcce3105d6 +oid sha256:c9aad8c9cd22005f84d809025d05939e06c95dd223192fc597511ff71ee5e565 size 777 diff --git a/data/minecraft/structure/village/plains/streets/straight_04.nbt b/data/minecraft/structure/village/plains/streets/straight_04.nbt index dc3fa4c4..4e82c380 100644 --- a/data/minecraft/structure/village/plains/streets/straight_04.nbt +++ b/data/minecraft/structure/village/plains/streets/straight_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3099c8206ef45bbe88a13b54b2846526346e550bf7a04071ad3e9559cda0ede9 +oid sha256:a62544cd6a15fcc5cf22f7e564e9497736efc159982e926ad844f244346733bd size 634 diff --git a/data/minecraft/structure/village/plains/streets/straight_05.nbt b/data/minecraft/structure/village/plains/streets/straight_05.nbt index 4cdd2ad2..eef85307 100644 --- a/data/minecraft/structure/village/plains/streets/straight_05.nbt +++ b/data/minecraft/structure/village/plains/streets/straight_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31680fbe2d2eb53b3735df85c0ccfd195057afca02b133391bfe815a70850959 -size 1327 +oid sha256:d89b7e040669e25d5697a118639fd72fc58f2ab1e471b45f7cc0cc0e1cb1061c +size 1328 diff --git a/data/minecraft/structure/village/plains/streets/straight_06.nbt b/data/minecraft/structure/village/plains/streets/straight_06.nbt index f3f1ee34..48a48cc2 100644 --- a/data/minecraft/structure/village/plains/streets/straight_06.nbt +++ b/data/minecraft/structure/village/plains/streets/straight_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:344c229315abeeb48c0f9655478369864d47e51c64bfed87a797ccac07631676 +oid sha256:808f834aa1228d858886bf867481cb067a2e16e0f752f55db1e1cfd8d3d7f2cf size 1703 diff --git a/data/minecraft/structure/village/plains/streets/turn_01.nbt b/data/minecraft/structure/village/plains/streets/turn_01.nbt index db91dedc..c8427cf7 100644 --- a/data/minecraft/structure/village/plains/streets/turn_01.nbt +++ b/data/minecraft/structure/village/plains/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e07c7ae59c6f1679d14de8a35e9f193658dcf5280aa505acf4b88842ac7cc5dc +oid sha256:35fdd1c0c82115f9f03a515b652d3255de88de64c30d03e9b6173d6d669befcb size 789 diff --git a/data/minecraft/structure/village/plains/terminators/terminator_01.nbt b/data/minecraft/structure/village/plains/terminators/terminator_01.nbt index acf68735..c1b3ae3e 100644 --- a/data/minecraft/structure/village/plains/terminators/terminator_01.nbt +++ b/data/minecraft/structure/village/plains/terminators/terminator_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6b62487da8cdde7750b919e967fbe61bbaf48103ce4209a76c57168a092cff4 -size 283 +oid sha256:274aa73a42978454d4dc9e4b61f2919ed2cb9fcd90899f3efeaef0857802505d +size 284 diff --git a/data/minecraft/structure/village/plains/terminators/terminator_02.nbt b/data/minecraft/structure/village/plains/terminators/terminator_02.nbt index e86607f5..7648a568 100644 --- a/data/minecraft/structure/village/plains/terminators/terminator_02.nbt +++ b/data/minecraft/structure/village/plains/terminators/terminator_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4453651ef113c3e3c81d7db6c0c0e80f9ca4caa9816c08729cccabc2c4ae3d68 +oid sha256:9aed2acffa049dc80bd3e7b1c1ce9ac3fba960e63b84ab6cbc5b6833dbf58499 size 250 diff --git a/data/minecraft/structure/village/plains/terminators/terminator_03.nbt b/data/minecraft/structure/village/plains/terminators/terminator_03.nbt index 3b3ad4c1..02e523f5 100644 --- a/data/minecraft/structure/village/plains/terminators/terminator_03.nbt +++ b/data/minecraft/structure/village/plains/terminators/terminator_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb2eba8f6393f601048cd13b70e48b36f5b43f05bb96f37368e7715c6a8da40b +oid sha256:2d3398a06c6c117e822070c56da943809bdac11437c1f43e8d420f26742f4fb3 size 291 diff --git a/data/minecraft/structure/village/plains/terminators/terminator_04.nbt b/data/minecraft/structure/village/plains/terminators/terminator_04.nbt index d42f7f13..eb4808af 100644 --- a/data/minecraft/structure/village/plains/terminators/terminator_04.nbt +++ b/data/minecraft/structure/village/plains/terminators/terminator_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:506f4774fc488d8eda3d53cd082cc679ce4d8929206f65754d0c94c6e61d43df -size 320 +oid sha256:6a75e849f13a00d26ccd136cda000105e437f85828b1f5605aa775e5001a5507 +size 321 diff --git a/data/minecraft/structure/village/plains/town_centers/plains_fountain_01.nbt b/data/minecraft/structure/village/plains/town_centers/plains_fountain_01.nbt index 6c4908f1..41ac2dd6 100644 --- a/data/minecraft/structure/village/plains/town_centers/plains_fountain_01.nbt +++ b/data/minecraft/structure/village/plains/town_centers/plains_fountain_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9d3e1a41750804fac4dc302ed3de9314e6b65b89e18279b9e529e91262008b5 +oid sha256:54558442bfaec17317986d7df724894ed55b02f0cc3eec727a52154c182ad363 size 956 diff --git a/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_1.nbt b/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_1.nbt index 148091da..40ee7425 100644 --- a/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_1.nbt +++ b/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e517af4c250c29d751de00ba221e2433c96f9defce33fa8952dbe5d6c49c9d33 +oid sha256:a0a4ffb4a4ca18cd02ec0d95c77e437f5252580949c151b131f6065ff2e0ba5a size 1051 diff --git a/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_2.nbt b/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_2.nbt index 0b9f835b..5b87a508 100644 --- a/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_2.nbt +++ b/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:125f7d36f325f9440cc557ac7c63d9b60370d4137e41cc4dbba13b2e165b7a25 -size 2537 +oid sha256:b92eeda8234e1db7fc8ced9a0db34eba8e5cdf4fc5f9a6b8c8e41078f58ead4a +size 2538 diff --git a/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_3.nbt b/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_3.nbt index efc6758c..4cc4feee 100644 --- a/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_3.nbt +++ b/data/minecraft/structure/village/plains/town_centers/plains_meeting_point_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34a6f6a3faff20c834ef9fd205ffd7d43a970613c80fbfa7aa5bace447110d46 +oid sha256:90e90b32dde02bdb58329778c1862699863be75a7e98fc09782170e53278cc3e size 1586 diff --git a/data/minecraft/structure/village/plains/villagers/baby.nbt b/data/minecraft/structure/village/plains/villagers/baby.nbt index 376431fe..24f21ecd 100644 --- a/data/minecraft/structure/village/plains/villagers/baby.nbt +++ b/data/minecraft/structure/village/plains/villagers/baby.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86317fcc169b01bbde902a4747bb85b28c63bd062203af20972ad6046b8229cc +oid sha256:6dc3ba7283b2aa9aae829d8b3d0761bfbf759c89eb0fe5bd73706e355ac813ce size 718 diff --git a/data/minecraft/structure/village/plains/villagers/nitwit.nbt b/data/minecraft/structure/village/plains/villagers/nitwit.nbt index 52c9e016..9f2391c8 100644 --- a/data/minecraft/structure/village/plains/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/plains/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d86c2f1810d6e6da82129fff86281eba9df9b35e6679b16d3bbf1ab84c96dc2 +oid sha256:a8f1edb8dcc3e8cd0e7e38575a3f75ce5647cc56ffaaac24cd30f52bb68d0998 size 715 diff --git a/data/minecraft/structure/village/plains/villagers/unemployed.nbt b/data/minecraft/structure/village/plains/villagers/unemployed.nbt index 964792f9..55bb2c6f 100644 --- a/data/minecraft/structure/village/plains/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/plains/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88ad8328332e61fe10afe24cee919cd31879d755ae7601f986999c3d0485225a +oid sha256:7db025d2aa9e6ff9a3a837c29f9244f98359a60f4bdc64abd45d67a20400bb92 size 714 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_animal_pen_3.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_animal_pen_3.nbt index 28bfd856..f7143e8c 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_animal_pen_3.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_animal_pen_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ed36b62e7a39de7bd87ab05a38e1072142fa880b5bbe6b2b45cfcff279029d4 +oid sha256:bad11192fab92d18a7a4ef568432dd55446665eed1c0c22a95c41ee7fe2a3e53 size 1361 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_big_house_1.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_big_house_1.nbt index 16c9f4a2..6e47ddc6 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_big_house_1.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_big_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66c770c229098f739eef7f78928045c4b5e5e3923dc5d62c96de33ecd2c004f1 +oid sha256:ad42877cd11fe8c10da76b56f51bb3d691b506a410dee21eda0e2d23503c08f2 size 3271 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_butcher_shop_2.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_butcher_shop_2.nbt index 2316427e..b84b05d2 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_butcher_shop_2.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_butcher_shop_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99adf5d5f5e018e260e32ff29395d8f64425b459fa595b43429efb3c83ef87fa -size 4661 +oid sha256:aedb905ea68a7f26d6a75b6377e8adc5a3db8fa1984d461c714b1c1cf8680d23 +size 4660 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_fletcher_house_1.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_fletcher_house_1.nbt index 95eeffc1..19303cea 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_fletcher_house_1.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_fletcher_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41a221440e7a591a5d76a0b3f4f2f36904e91fabe0eaa738866976ef8cc5f43f -size 2905 +oid sha256:5e27c2890a7973555746e05879270ad4f0196c79767c89bd1a2c6c587fbf3a4d +size 2906 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_medium_house_1.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_medium_house_1.nbt index 0b5f53f2..9b2f8702 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_medium_house_1.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:223ead83b55cab5af7bfb383f57f002949a39f962c7e905a2fd05eb1119ae99c -size 4247 +oid sha256:f74760dc66df5a6acd9c89658d14afd42c86dceffd619ded1b7255bec15858f8 +size 4248 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_medium_house_2.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_medium_house_2.nbt index e31d4f00..d13fe5f9 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_medium_house_2.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b3de620019eaaa5572f51267a74c7e5036b0062488e5919127500d51d072e2e +oid sha256:231e97f651d0978ff1b31c953d09983249ea344435a2c0fafa2ffa941490683a size 2541 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_meeting_point_4.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_meeting_point_4.nbt index fd537f9d..411a1a69 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_meeting_point_4.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_meeting_point_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b228bffcc465ec3f4b1c2ade36f08a1edb599812c33c6627815ffd7cd2d6116 +oid sha256:7c3cbc2acec77651384f5ce1845bc7273e68766f546d4d3292b3771399991eae size 3918 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_meeting_point_5.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_meeting_point_5.nbt index 5f2bd7cf..667559f9 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_meeting_point_5.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_meeting_point_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b1e7029cae207f4cfc101faf8523a89cfbfbc49fe3d40ce2368e2dbafb9f6d9 +oid sha256:a5a9574d6bca598f58d147935510b9e44e99d1d8349ac5aaef54acdc831e8146 size 2597 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_shepherds_house_1.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_shepherds_house_1.nbt index b221c028..e81ce63b 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_shepherds_house_1.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_shepherds_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13995b34c94e97bfeab6c70930ff3db977061e4e4cd07a0bfbb027588b4290b5 -size 2924 +oid sha256:12ec801f3e9d99830778867a04c2de37b1e2edc24dd0b38afb26b1c19de82bd9 +size 2925 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_1.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_1.nbt index 8945a453..57934c40 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_1.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4075fa87cdec0d5990be7fa3ea573f2fac98975d7a9dcf0ff6b209478ffcaa5 -size 1807 +oid sha256:f53a543f7f6763bff1239e9b80b3f8ec5bd585002fc8db6825ed377f138ca367 +size 1808 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_2.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_2.nbt index a6a6fc83..43e3ec16 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_2.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f20e4101b7fc0390f473a67a40c57f708a5e063b9ff57d9230938a9f2d9ab0e +oid sha256:9e2bb4526bc8d0c6e75a07aecab17b340c7d54c01e3558f672e28e53755a4c35 size 1706 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_3.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_3.nbt index 606e4fc1..d39c4f40 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_3.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:822ec15a3204ad3576f2efb9caa132a5d7c3cee5c75c5574b63e60419209b7a7 -size 1808 +oid sha256:f28c4b051065ec9874159d87a5445b6b9f0da37942f20f2ccd7ab025641bc592 +size 1809 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_4.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_4.nbt index c3bf3f20..356f5a80 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_4.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d1803222872ff4188428efd5a914864e9daa225dc9890669fcf02cd8007f8ce -size 1781 +oid sha256:f9d2194b13e31a88f745a8a39bcd0a688fe4cb1c75007cbdf549729179e632ec +size 1782 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_5.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_5.nbt index 92767143..5b41f3a3 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_5.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:020486dabc4a109969bc8ca3e686352cb442c05ebf8614800f9f21d6cfff91c9 +oid sha256:39d52e36df34e733acdde6ca3d547840bb640a03ca5e09a928827edda51a97fd size 3495 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_6.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_6.nbt index b3aa9a27..de6ce7b8 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_6.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e40ec421e92d59a9a6d97b4d5323f3b9b136811cdc34d84a27aef10c8f4488b0 +oid sha256:e01d4dc74578d796b25a8052f942e512f0201e4e4224b5878e1350856651e7d3 size 1766 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_7.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_7.nbt index cddbbd40..add3da1f 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_7.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9019de5b2aa6bc55e311c6223e1873c40b003df8f58bb7c1bf2cae949dacf876 -size 2033 +oid sha256:ae8248d6b5a9eb80c5941266f322eedf6092dff4acf9952615d577bf1c378a29 +size 2032 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_8.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_8.nbt index 9c1a5018..10229783 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_8.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_small_house_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe5b4dd432daaa7f5db7a8546ce4eaf9bfa35d2e065b8d2d447982dffa32250b +oid sha256:1e6727fc45e7913a75e4bfefb9624bd80a519220215d07167324f897791e047e size 2690 diff --git a/data/minecraft/structure/village/plains/zombie/houses/plains_stable_1.nbt b/data/minecraft/structure/village/plains/zombie/houses/plains_stable_1.nbt index 54362039..8b35d7cf 100644 --- a/data/minecraft/structure/village/plains/zombie/houses/plains_stable_1.nbt +++ b/data/minecraft/structure/village/plains/zombie/houses/plains_stable_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:091c681dc65eb645efb46be271a3cd42a95ef1100f13e743557b01726f49e49c +oid sha256:b9f6958e7b6e09976a85c8a5e11d46fd71de7e66ec05f104ad3010fda0ffae41 size 3861 diff --git a/data/minecraft/structure/village/plains/zombie/streets/corner_01.nbt b/data/minecraft/structure/village/plains/zombie/streets/corner_01.nbt index 916cc1a7..2ca45542 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/corner_01.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a3e3b8f403cc8cc0f83aaf30f3813321370fc689fc01a86f2c40ae57192e500 +oid sha256:ea5bea56de978a9df79afa86ba745d35ab7774c436e9e4df8bf7563a85f30fae size 1187 diff --git a/data/minecraft/structure/village/plains/zombie/streets/corner_02.nbt b/data/minecraft/structure/village/plains/zombie/streets/corner_02.nbt index b2ce7583..bbb8df9f 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/corner_02.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/corner_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5dd3175bd2e87d7fbed93ab479b454a80739f8a2273b61481ee71bbe5af068b7 -size 1114 +oid sha256:a2da2aeaf64c3d8e2462b1990c9280e5ee9f5d82a6080e222a94e91cbbd7b5f2 +size 1115 diff --git a/data/minecraft/structure/village/plains/zombie/streets/corner_03.nbt b/data/minecraft/structure/village/plains/zombie/streets/corner_03.nbt index c2354fa5..bf93f59d 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/corner_03.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/corner_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c18ed0a6357f170bd3171499ab0f012ddd7ee7dff3f46f3fc148d86b34dfbce +oid sha256:61a2113f567da71c330da9a4be9b1b11c338780b581dbcb229dd28f2abda8f35 size 356 diff --git a/data/minecraft/structure/village/plains/zombie/streets/crossroad_01.nbt b/data/minecraft/structure/village/plains/zombie/streets/crossroad_01.nbt index 040e7c61..e0ac1d7e 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/crossroad_01.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/crossroad_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca75e14328ae45139a08e50f6631bcac35e43b376e4636456ac27184afa6b054 +oid sha256:2ca7693bdf0e16ca0cc6cb9a2c24f5c49be694d6efb31237f56debbbec2357a3 size 1220 diff --git a/data/minecraft/structure/village/plains/zombie/streets/crossroad_02.nbt b/data/minecraft/structure/village/plains/zombie/streets/crossroad_02.nbt index 357ca222..2f9feeba 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a07f4551a1eb9e7f4394982993e0cabd5354f2599a477a62b0d016720d05f1d8 +oid sha256:9af6cf372adf6710e89cea613b150224ca1ac032c5ee264e7e0e3b753b31a765 size 1165 diff --git a/data/minecraft/structure/village/plains/zombie/streets/crossroad_03.nbt b/data/minecraft/structure/village/plains/zombie/streets/crossroad_03.nbt index 5be8c437..bac36ae5 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f8ea0154054c31c5f932b2b66343d3c6c0d7491d9ff3310ef1cf5653dc507e7 +oid sha256:3dcaf4ef911125121b9ffb52402726088d09f1821597b3a6187d163fbe2c3d50 size 1208 diff --git a/data/minecraft/structure/village/plains/zombie/streets/crossroad_04.nbt b/data/minecraft/structure/village/plains/zombie/streets/crossroad_04.nbt index e7b3f6cc..31a8f2a0 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/crossroad_04.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/crossroad_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68a6a00a9a9c823f13cf86d04419891b8ea973d690add45e347c566551d9bedf -size 383 +oid sha256:f0f066a7615fc9829c080f8ab9793557b03f27849b628dccc63c555672514b8b +size 384 diff --git a/data/minecraft/structure/village/plains/zombie/streets/crossroad_05.nbt b/data/minecraft/structure/village/plains/zombie/streets/crossroad_05.nbt index e8bfb3da..9427a576 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/crossroad_05.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/crossroad_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e84b83659486c381e4feea692070f4e2cd536dc54a0a84701ad209cea25c8f47 +oid sha256:5047f2c25d4938b5897d1516eedc9ced5e73825386131b70f7413513087276e8 size 414 diff --git a/data/minecraft/structure/village/plains/zombie/streets/crossroad_06.nbt b/data/minecraft/structure/village/plains/zombie/streets/crossroad_06.nbt index f61a78f3..86ff20e6 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/crossroad_06.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/crossroad_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2993221f30949c4c9a3abe820bda79332a15d3e087b62bcf3c31e65c940bcb66 +oid sha256:1462db130f8e6c5511144945043486546a50531b118f1ea82aaa9bb25e008361 size 475 diff --git a/data/minecraft/structure/village/plains/zombie/streets/straight_01.nbt b/data/minecraft/structure/village/plains/zombie/streets/straight_01.nbt index df784fa4..ec18f66f 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/straight_01.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/straight_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1306cc2477a11ab60d36a1dad364a63d3ccf66a5bdd75cc0e8aa6554a25f043 +oid sha256:eac88e1aabfd3b0e0734ff557cc39b1a88b9bb5967e1c0a62b973747ba7921d7 size 1136 diff --git a/data/minecraft/structure/village/plains/zombie/streets/straight_02.nbt b/data/minecraft/structure/village/plains/zombie/streets/straight_02.nbt index 6264b4ca..b9e0dcce 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/straight_02.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8caa10855acf076cab3ead29d0f8d1c1efcaab68c3f6183381b5ef35717ebfbd +oid sha256:ba403a0cef39185bc8448bcd952ff0b67c9f73959d4b33709d323ddbec6bfbad size 1090 diff --git a/data/minecraft/structure/village/plains/zombie/streets/straight_03.nbt b/data/minecraft/structure/village/plains/zombie/streets/straight_03.nbt index 19a3c8a3..1c168134 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/straight_03.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/straight_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bfa99c6324559eb47421adde8fbc051d7dcdd650afd59a7ab014c0e3cbe6e8c -size 781 +oid sha256:54feef8c9a25e64bc43855bfa80592f1ca2349354cbc08dd010416d206105008 +size 782 diff --git a/data/minecraft/structure/village/plains/zombie/streets/straight_04.nbt b/data/minecraft/structure/village/plains/zombie/streets/straight_04.nbt index 22562896..3934f519 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/straight_04.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/straight_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a706e2d42e558b37ff0184d2eaf4a2e88649b00e5960c1caada8d907bc038dc5 +oid sha256:04e7ab06954c4b5c2a84801edfff447bd6c76b1d76e720b4b267fd3076eea400 size 639 diff --git a/data/minecraft/structure/village/plains/zombie/streets/straight_05.nbt b/data/minecraft/structure/village/plains/zombie/streets/straight_05.nbt index 6f71955e..b0553d9c 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/straight_05.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/straight_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d57f55cfa8daa0b848791019549fd3f63320d184e3c52338bee2449f882cb055 +oid sha256:b4114cd3dfa6dd2a0358eb24f44601ecec2ecebdd70a8ab09b0d55d47cafa8fa size 1333 diff --git a/data/minecraft/structure/village/plains/zombie/streets/straight_06.nbt b/data/minecraft/structure/village/plains/zombie/streets/straight_06.nbt index a4ec11f0..50a177e3 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/straight_06.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/straight_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8092949cff3e31530b5819245c1b8a161312e73b307e6161e8e11347f697f4e +oid sha256:9d6387876cf939ba6249067236de8a30c5677e157a32cab9ea47a5bee8d06f15 size 1708 diff --git a/data/minecraft/structure/village/plains/zombie/streets/turn_01.nbt b/data/minecraft/structure/village/plains/zombie/streets/turn_01.nbt index ecf06166..f2afac29 100644 --- a/data/minecraft/structure/village/plains/zombie/streets/turn_01.nbt +++ b/data/minecraft/structure/village/plains/zombie/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b394f3fd3a45ad89dc4692eceff2d44da4d5bf9dd12f407c0e7f013fd027a614 +oid sha256:eed031dbd0a88c78712bd61b807b4180a7e88dc03a27a248429142b837d89806 size 794 diff --git a/data/minecraft/structure/village/plains/zombie/town_centers/plains_fountain_01.nbt b/data/minecraft/structure/village/plains/zombie/town_centers/plains_fountain_01.nbt index ddb1ebe4..014175e9 100644 --- a/data/minecraft/structure/village/plains/zombie/town_centers/plains_fountain_01.nbt +++ b/data/minecraft/structure/village/plains/zombie/town_centers/plains_fountain_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5beeb3d2c1a854017b72cb8d95d6b8a3400cf72329e1e7fb1cdc39c52c51216 +oid sha256:d9c6a0636ea9af56fb234b4557e5a5ee072e10dd587cc489a2ea3c4a6e51e9b3 size 932 diff --git a/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_1.nbt b/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_1.nbt index 6efeef37..5ec66985 100644 --- a/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_1.nbt +++ b/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c87758ce286d29fbb3a7648bc24e9518c11d8dd322fa2e3a243d2fb4e40c038 +oid sha256:886e9e5763dfefaee05b4311aee76c0dad06647972d4022497f55f45f4f04ff0 size 993 diff --git a/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_2.nbt b/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_2.nbt index 4a4977b2..d05da482 100644 --- a/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_2.nbt +++ b/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b402f54bef790ca8de312a7488b358b0da054840bc654aaedce207259eccdbba -size 2482 +oid sha256:52c577185f9ac3fafa245dddf3f17e31b64625cd722010719c7f6a43085030ba +size 2484 diff --git a/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_3.nbt b/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_3.nbt index 1c0c7111..48c51c4b 100644 --- a/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_3.nbt +++ b/data/minecraft/structure/village/plains/zombie/town_centers/plains_meeting_point_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4088c84672942e7de1f11563062d7806bdeca0d88105450c3ecc4a2f60055849 +oid sha256:5857eb1125c9992245346620412e796af699ec5474ae4b581a6e0ba74c509291 size 1527 diff --git a/data/minecraft/structure/village/plains/zombie/villagers/nitwit.nbt b/data/minecraft/structure/village/plains/zombie/villagers/nitwit.nbt index 3db6995b..5794ea31 100644 --- a/data/minecraft/structure/village/plains/zombie/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/plains/zombie/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:092b2d05cf0951bab9a0a77e2f40a127c5b35f049f5e1c988042d3ce6ab232b7 +oid sha256:e7cc8301b20784ad49d87f23bed752dd77f2fef4f965ba231c4c41bdedf8cd2d size 722 diff --git a/data/minecraft/structure/village/plains/zombie/villagers/unemployed.nbt b/data/minecraft/structure/village/plains/zombie/villagers/unemployed.nbt index 0221f914..6a8f3296 100644 --- a/data/minecraft/structure/village/plains/zombie/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/plains/zombie/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:def390bed46c69b2a08e174814c5a025d6c0319e1625b4a67d21839a6e2f6673 +oid sha256:68bdbc6bc7be17937628de8e88e5d57479fb17296f9c165efe64c476786f66d9 size 720 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_1.nbt index c6fcf500..3b261539 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1862ad11106edf492e8b028e0b5bad8e6a262b5bbfa160a83ad4e39355bfa32a +oid sha256:80ce7d561324f39acecccb407cada528d777572a61da7f05587a7df038385da1 size 1859 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_2.nbt index ef78269e..1f6769a9 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_2.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e514c33f3a24ba505c8c6cae12ac6821e491fc07a1750453ee7a6ad32aa47b90 +oid sha256:1cd1629514334af8dfd17397f2e5daf9f6e53d1af54897478379e63f0d6ad482 size 3474 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_3.nbt b/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_3.nbt index 7a1e8400..1ae730e8 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_3.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39260d157796a196cde5429a25efad86435f8ab9403e7a4739e7ecab26dbe31c +oid sha256:79076c30a2c780f2cb8fd3020e09b87e1768752238d8131c55f27dea42dc20c2 size 1659 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_armorer_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_armorer_1.nbt index cfdd4c05..fc8211d2 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_armorer_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_armorer_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbad48fd553e4d309282ee3805635bb47b7fb781f10adfa4573f49c6655417fe +oid sha256:a47b5e78789a45ed253af620e5df7ab945dc3303d440818fb2220101b0f9aee8 size 1721 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_1.nbt index afae56df..a5b02519 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2128ead7012a5f3ccf81f5196da8e3912f0d5380676ec310f50ab0fbd03d9aac -size 3938 +oid sha256:91f4ad5dc73d7093b1cf0f05d29fedae25b3ae9d03dc31812ca9eff8dfb52d1a +size 3937 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_2.nbt index 27c26dcf..6c387301 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_2.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecca5c293a72d8656067358abe7708ed0ccf59fbefb4949b5b71ff2ea715e134 -size 2084 +oid sha256:902d37e92d4de5b506e302a1030d30561ed135a83507fd5d2cdd233fa3537a53 +size 2083 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_cartographer_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_cartographer_1.nbt index 305bd0ea..64f9ddc1 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_cartographer_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_cartographer_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:deb0965601953bedea08a2a34012f1b843acd9867a431f4626bc78de2079fdff -size 2643 +oid sha256:e2052bc8a26346c5f169d2164590d3bc21f010c6c57e448223985b7cff775f32 +size 2642 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_fisher_cottage_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_fisher_cottage_1.nbt index 776ea4d9..adba13ce 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_fisher_cottage_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_fisher_cottage_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49dd68d468d0798601043e5b7041b0d0b451d812159a2a01dd8dc5ebda7dc448 -size 3177 +oid sha256:331aa192eb08b3d47d31f267a16a2a31b4308a07878c95cefcb70c5b22aa0260 +size 3178 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_fletcher_house_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_fletcher_house_1.nbt index a4ac957b..d156886f 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_fletcher_house_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_fletcher_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9685872ddd5fe05dd2c1acd84e3d6e728c657e2768c7abb24b0984e1e30097c -size 3034 +oid sha256:4d0a8cf84a02d6126ed7061854d2c34561d5233bad951336872350a15d43abe3 +size 3035 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_large_farm_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_large_farm_1.nbt index 13f433b3..b252c3fa 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_large_farm_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_large_farm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99c9acede43051952295f0e2a8a319597c0021ed2a5b7de2af05890f4edb082c +oid sha256:3207e82847ac6bc1b9522ae144f936b44cbb9d573d594ff6c3bba496379bd9f1 size 1245 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_large_farm_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_large_farm_2.nbt index 072aa5c9..eab3d2eb 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_large_farm_2.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_large_farm_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b84e9d8708f24a2d74452d284156ba04c0026ba415c04d953c26fe1a3258ea2d -size 2151 +oid sha256:eb6a1028f011bdc137d12458359368bba4546fa90897aa2de2fb32ae9c8706a0 +size 2152 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_library_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_library_1.nbt index 73e3977e..26316b55 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_library_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_library_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:320b5e9ff9613af36f5d9346bc648663364891476938a1e75d081d5068bc1de0 +oid sha256:6f3ec23a07fee93360d24fbfe998ff7405045215b4048c3d614c15118af2b4ba size 2768 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_mason_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_mason_1.nbt index 1ddc3bc6..41bbde63 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_mason_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_mason_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1aaa28d33fd4313b69d5f7d0534e5efedcf6d1ee9bf4e04649c876c9e819d4ab -size 2519 +oid sha256:b4aa40b28eee07b1fe04372bfb9d1fe4401a9ba6d70f42c273b71a963786cb95 +size 2518 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_medium_house_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_medium_house_1.nbt index f944cdb5..459e6082 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_medium_house_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37c462a65836977381f330efe923101776728b62e94051b18aed48aad62685bc +oid sha256:31a180812c414684e6fa249f4ee4cca0cd54a8d5d2f62461bad3a92810ef7a2b size 3640 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_medium_house_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_medium_house_2.nbt index 8fac9c8b..81da05b2 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_medium_house_2.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:424b5666e91b1701c5c955e052b9093881c2546b30888889e58925864a805778 +oid sha256:609c3c21f0c15278219fd1acafec1dcec1574ff6a62974a5ddc7d6b55d987773 size 1857 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_shepherd_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_shepherd_1.nbt index 62878f90..73b679df 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_shepherd_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_shepherd_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd697afda9ab822b4dfe04238a7bd07fae3c6b351e9569aa93e2aac7dc4c365c +oid sha256:53b18a913f7d718e016ecf6201fb7931a435fe4e044e99463c85dd64c5389a5e size 6326 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_farm.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_farm.nbt index a2869212..45e808ef 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_small_farm.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_small_farm.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:209b9cda12a889a70469ddf1bef5e7db482bf4857cd915d06d264637b563ac05 +oid sha256:5ba218e7f971b697bee84a07531ce8335cea105a30b0111a5d2b5c7d62cacfd4 size 1137 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_1.nbt index ab5eb832..36ce0bb5 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_small_house_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d9e49341fda55f423eb9eb8ad04ffcb9cf105b313b5804a5b0385182c73968f -size 1849 +oid sha256:866c4b3527a9c2527e7bd691bfc54cb1293b0d819b1ebbe2106216ab38c69c39 +size 1850 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_2.nbt index 556bcaa9..5e622ecf 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_small_house_2.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f1a00eeec3d40b2229bdf286a869945e2bff1a7017f0fdc154a3949787a70ea +oid sha256:57a54feeeb5dd7e184fc449a71a2302e4bb94e339518eed5b5c7bcfc600db9c4 size 1858 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_3.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_3.nbt index bc53062e..a4379f74 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_small_house_3.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7f455c741cc5ea1ab203e42805bd7ebd3b1ca03668385c6445bd8875e2f5a16 -size 1811 +oid sha256:11515c459ba9777380cd66a709511818d7726c6c648afe708a7820c35997e944 +size 1812 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_4.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_4.nbt index eff30223..30829628 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_small_house_4.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57dbcc916c40aeb1ce7d34e86f38651078613f5e57cbf7482807ccde93465f83 -size 2705 +oid sha256:ad15c909baa18527e8bfa6ae937c8baeb4810b1f0784507c59b4798334a177fc +size 2704 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_5.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_5.nbt index 67f997e6..5a509ef6 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_small_house_5.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b53b63db6a877073f226672a6f3c0cc3317dae51efb8b901f0fa63072fb340e -size 2372 +oid sha256:eff388a85cae1baf6a8f310dec947d12127654fd8ca2c232e15b3236c5f51b60 +size 2373 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_6.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_6.nbt index 9677484b..fe1d8d63 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_small_house_6.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_small_house_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16e83a30f63a8f6450c00563c1c737837fbbe52da4fc3dec3297f5c433030add -size 1785 +oid sha256:5ab46f09bc7830264fd855aa4e013a85a87911878f3c2d947ca90a5f4e9bdc66 +size 1786 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_7.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_7.nbt index f3c92c59..3744b6b5 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_small_house_7.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_small_house_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45013ca41f15f94dd6aed959152fdb628c718fe06609983e664dc5b28c6e3833 +oid sha256:a3545b0c7b5da8840006bda22c4e4bfcabba21f417fd3f10c232393a2ce05857 size 1881 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_8.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_8.nbt index 4f3925e8..5734a9fb 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_small_house_8.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_small_house_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:acdd26608133a135d3f6afaaa3e4c9ce8e6aa4fb98c0a1bbf813ac48456e7134 +oid sha256:e54af89ea6046c79e06437bf10ba05576f19594eedbf75efdc15fb6d40417f55 size 1545 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_tannery_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_tannery_1.nbt index f872d31c..40408d88 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_tannery_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_tannery_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b42edcba6e2ec49dca4ce3f93d2a7a96f04d620c1f5911adef2f1fb64ee87f97 -size 2131 +oid sha256:3ba769a41da0b1ca6def9202a345bdb114c863f797c3277ab835ebda905538ec +size 2130 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_temple_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_temple_1.nbt index dc599d88..c2362600 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_temple_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_temple_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b95781a8bee2fa5c22065f3643614e9b29b135947c0e3f6f5a1359ac97adf309 -size 3628 +oid sha256:23c2db18c96db68b7b096b87c7400db6f613fe18be5d9a671a7e76a6996799f8 +size 3627 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_temple_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_temple_2.nbt index 06df10da..885d801d 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_temple_2.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_temple_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfd344fb0add9a44bb46c42c5f6677b04da0eaf2cda28dff37556ca973fb4af9 -size 2024 +oid sha256:d3ef9ea83ef09eac40cb52c6ce5729e3afbaf903eab6fabd36ecfbbc39a4d987 +size 2023 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_tool_smith_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_tool_smith_1.nbt index 023a1aa5..c32de342 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_tool_smith_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_tool_smith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:175334a481fa7b761ad5d897305a1de6a02af5e0f10f247b918fcf02a4ad5a1f +oid sha256:3ad60f7911eb2d7b6cb8e9314584c8d37596046bcdef1b2835b9b3c3bf2548bd size 2461 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_1.nbt index 1983f86c..cd1f3eae 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_1.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98449cea1486f4bb8db414c7a19e361093c1fadb0a369bf690f6a8d22c0f5e6f +oid sha256:8f8ec01156867a6c0b707e3c2ca7bda67a77e486bf2c6feb84567ec1270dd048 size 2079 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_2.nbt index cf89b098..9fcadb69 100644 --- a/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_2.nbt +++ b/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4dd30c1f511a491bfed1108737bd701d19ca5f0a992a4a1cba910b98b4c1a035 +oid sha256:b512272516ee26b874c845933bc5201977e9e8ab2098505f44948a4f480333bf size 2196 diff --git a/data/minecraft/structure/village/savanna/savanna_lamp_post_01.nbt b/data/minecraft/structure/village/savanna/savanna_lamp_post_01.nbt index 09f9b32a..32176b28 100644 --- a/data/minecraft/structure/village/savanna/savanna_lamp_post_01.nbt +++ b/data/minecraft/structure/village/savanna/savanna_lamp_post_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a6705c5593defad71d5e8bd71a25ad88ebcd76f73828ecf3d3a22ab8629ce47 -size 282 +oid sha256:4bcbd938f7a3e2c16d35c43129b50ce7cec12b9d7f89537dc18dae3f59335c62 +size 283 diff --git a/data/minecraft/structure/village/savanna/streets/corner_01.nbt b/data/minecraft/structure/village/savanna/streets/corner_01.nbt index 6e55751b..0cabf786 100644 --- a/data/minecraft/structure/village/savanna/streets/corner_01.nbt +++ b/data/minecraft/structure/village/savanna/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00492fcfe4b04fc89bda583f74eab7e68d50d327e1c073ebbcb8461c4757fcbd +oid sha256:31325ef0ce0588de3d9879699410528f51cb672cf3fdd63b7cbb3f6553decd7c size 1197 diff --git a/data/minecraft/structure/village/savanna/streets/corner_03.nbt b/data/minecraft/structure/village/savanna/streets/corner_03.nbt index 2425a531..dbf5dbe9 100644 --- a/data/minecraft/structure/village/savanna/streets/corner_03.nbt +++ b/data/minecraft/structure/village/savanna/streets/corner_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecaa08e72570b8c1372c4aea10496d95621519c74918fab3d8501e73b337316e +oid sha256:f229cf58e19207074017d003dd6a484239a059702cc1606ceaab393a0f973d17 size 351 diff --git a/data/minecraft/structure/village/savanna/streets/crossroad_02.nbt b/data/minecraft/structure/village/savanna/streets/crossroad_02.nbt index 3567dc8f..7d93c2f8 100644 --- a/data/minecraft/structure/village/savanna/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/savanna/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3c683c5af683a5b7c6d80baca96cfdbd1dbc6d334fc2787d0ab0ec0c7099678 +oid sha256:e038b7230c74f96f2456b5c0fb34b54b5c371758005416d38be654ba201fe7b1 size 626 diff --git a/data/minecraft/structure/village/savanna/streets/crossroad_03.nbt b/data/minecraft/structure/village/savanna/streets/crossroad_03.nbt index 1caa87a3..ef813545 100644 --- a/data/minecraft/structure/village/savanna/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/savanna/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf84d45263489bc86d2f97690754121f3fe8145ed4917fc2858cfbefc8d8b40c +oid sha256:0fed39a51a08e2efb615592085941639f971ed302ddc8338112faa7de9bf6bb4 size 1226 diff --git a/data/minecraft/structure/village/savanna/streets/crossroad_04.nbt b/data/minecraft/structure/village/savanna/streets/crossroad_04.nbt index 92574337..ca35dcd7 100644 --- a/data/minecraft/structure/village/savanna/streets/crossroad_04.nbt +++ b/data/minecraft/structure/village/savanna/streets/crossroad_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ba5c96319d0be306e9c2ea9ca716468b5c0b4c4c45ec435e074430f45a76c95 +oid sha256:22be4071c960681f563029079edea841dd904d57be0c1071325e08f0d76b0507 size 379 diff --git a/data/minecraft/structure/village/savanna/streets/crossroad_05.nbt b/data/minecraft/structure/village/savanna/streets/crossroad_05.nbt index 4ca11744..529ba69b 100644 --- a/data/minecraft/structure/village/savanna/streets/crossroad_05.nbt +++ b/data/minecraft/structure/village/savanna/streets/crossroad_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3073f9a251b3ae67dea694836863eb5acb1b39d1416f9de7607a68e2c23907e +oid sha256:a3e057ea34cdd72cb52bc255f9aa0504432f979ea2eae0b8185e1df4bdd2757b size 410 diff --git a/data/minecraft/structure/village/savanna/streets/crossroad_06.nbt b/data/minecraft/structure/village/savanna/streets/crossroad_06.nbt index c968edd4..2ffe1321 100644 --- a/data/minecraft/structure/village/savanna/streets/crossroad_06.nbt +++ b/data/minecraft/structure/village/savanna/streets/crossroad_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e5f3d03bda74b3e969b9570585be6aba3db7811b068a06c1003bad90910a376 +oid sha256:57da70fe7332cd65ae631c6ca5ae8da4e441abdaa62d4114aa405ddeaf9e6927 size 467 diff --git a/data/minecraft/structure/village/savanna/streets/crossroad_07.nbt b/data/minecraft/structure/village/savanna/streets/crossroad_07.nbt index ffaba23e..1fbf3fcc 100644 --- a/data/minecraft/structure/village/savanna/streets/crossroad_07.nbt +++ b/data/minecraft/structure/village/savanna/streets/crossroad_07.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0f07016235036a2b4fdc12ad25f50d11e8455e9678337bac74804a48e9fe6e9 +oid sha256:89b06c0e0ed8896c2bf34c74e6207b736fecd39afcd240e0502b7cd5f3657f6f size 1381 diff --git a/data/minecraft/structure/village/savanna/streets/split_01.nbt b/data/minecraft/structure/village/savanna/streets/split_01.nbt index 4938c0e6..84fcc7ae 100644 --- a/data/minecraft/structure/village/savanna/streets/split_01.nbt +++ b/data/minecraft/structure/village/savanna/streets/split_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fc056d802888c4ac62d22a87a90144bccbff5f7806273d2ae4d8ade2591b7a6 +oid sha256:40702f5dcd0c6ddc449340452c7da9d7fcdd77a7eb43684cbe407194748e3ff7 size 524 diff --git a/data/minecraft/structure/village/savanna/streets/split_02.nbt b/data/minecraft/structure/village/savanna/streets/split_02.nbt index 19d55448..26ffdebc 100644 --- a/data/minecraft/structure/village/savanna/streets/split_02.nbt +++ b/data/minecraft/structure/village/savanna/streets/split_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f4b1391fa7215124d8b9d51f59663f1ed8b717fffe360ff5231aa75125ec0b0 +oid sha256:cbd6d831808a1fdb24a944870decd13fdcc23ebaed8e728b59adbfba108d38a1 size 736 diff --git a/data/minecraft/structure/village/savanna/streets/straight_02.nbt b/data/minecraft/structure/village/savanna/streets/straight_02.nbt index 0ef6da4f..6ded6807 100644 --- a/data/minecraft/structure/village/savanna/streets/straight_02.nbt +++ b/data/minecraft/structure/village/savanna/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80b95909de6bc3907b01f50717e1f7442d0da9a464039d6f23b379d103784d26 +oid sha256:eea59d84ea8236c388063abddef913f23fa4653fafc6a07bb10514ae940c702e size 1124 diff --git a/data/minecraft/structure/village/savanna/streets/straight_04.nbt b/data/minecraft/structure/village/savanna/streets/straight_04.nbt index c96c8c6a..f9ffbeb2 100644 --- a/data/minecraft/structure/village/savanna/streets/straight_04.nbt +++ b/data/minecraft/structure/village/savanna/streets/straight_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:274f70e3adbad3fc7f8c25803fbb39960d08399e770c889f3d7e5f8350e8bf9a +oid sha256:34c67517c27519975e977882e1e9adb7c0cf50e513dd1875cf12a4418fcbfe94 size 640 diff --git a/data/minecraft/structure/village/savanna/streets/straight_05.nbt b/data/minecraft/structure/village/savanna/streets/straight_05.nbt index 02e9a0a1..e7e6e380 100644 --- a/data/minecraft/structure/village/savanna/streets/straight_05.nbt +++ b/data/minecraft/structure/village/savanna/streets/straight_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e142d0f3cb4bb7ddb1a9b7a2d238c140fa816c5e9ce87fd2c2e1292c512f71b8 +oid sha256:5297533de719b3ac8b34f4931eeb33503328b4f5c522cb2bcddc436c6775a0be size 1929 diff --git a/data/minecraft/structure/village/savanna/streets/straight_06.nbt b/data/minecraft/structure/village/savanna/streets/straight_06.nbt index 6e476733..c2634259 100644 --- a/data/minecraft/structure/village/savanna/streets/straight_06.nbt +++ b/data/minecraft/structure/village/savanna/streets/straight_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6865a86cad8329b6214228707728dbcecd7106be0811485730c8080edf07c9d0 +oid sha256:57d0c614297d11d4489c196488213035cb014f75dd298ebe2c65ba8119b21207 size 1087 diff --git a/data/minecraft/structure/village/savanna/streets/straight_08.nbt b/data/minecraft/structure/village/savanna/streets/straight_08.nbt index bef4aaa1..25db2817 100644 --- a/data/minecraft/structure/village/savanna/streets/straight_08.nbt +++ b/data/minecraft/structure/village/savanna/streets/straight_08.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:425e69d75f3f6c49cf8cba96ec372a324019a3e66d0b94b681cc5a7be7bc93ba +oid sha256:51780711f1e93814593d8b5eabc813ce75a2782125fdebc98eb0c273adf27029 size 939 diff --git a/data/minecraft/structure/village/savanna/streets/straight_09.nbt b/data/minecraft/structure/village/savanna/streets/straight_09.nbt index 7e9e5d20..fcc2a598 100644 --- a/data/minecraft/structure/village/savanna/streets/straight_09.nbt +++ b/data/minecraft/structure/village/savanna/streets/straight_09.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0785c349958cc54e95ccc1c1173d65c0d2d85e961c59b88c3fb67af222f05b42 +oid sha256:0343e1729e7462aae866b323e07a4b88408a5eaa2e4fb6126fc4aa3f7e980979 size 1522 diff --git a/data/minecraft/structure/village/savanna/streets/straight_10.nbt b/data/minecraft/structure/village/savanna/streets/straight_10.nbt index e7bfeb86..19657ed5 100644 --- a/data/minecraft/structure/village/savanna/streets/straight_10.nbt +++ b/data/minecraft/structure/village/savanna/streets/straight_10.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d589c7a71c31bc9ab771e6a1c6bf25b9bbc2ec152bca03ab4de0acf7392c43d +oid sha256:11353298a6b58dc878d6c358a62b21408dd2e8a818c25f6faae036b94bf37aa5 size 523 diff --git a/data/minecraft/structure/village/savanna/streets/straight_11.nbt b/data/minecraft/structure/village/savanna/streets/straight_11.nbt index 08cec265..82c67f47 100644 --- a/data/minecraft/structure/village/savanna/streets/straight_11.nbt +++ b/data/minecraft/structure/village/savanna/streets/straight_11.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f08759e8f9a33f7a38977ebd18e16a57ec31c2fda16e0cc482f2412204eacc65 +oid sha256:7ac8fa594a48f53ac1abeb402d785761690ef4c6c3bc690be1981f2a42a80b4f size 1560 diff --git a/data/minecraft/structure/village/savanna/streets/turn_01.nbt b/data/minecraft/structure/village/savanna/streets/turn_01.nbt index b711a130..91b0e53f 100644 --- a/data/minecraft/structure/village/savanna/streets/turn_01.nbt +++ b/data/minecraft/structure/village/savanna/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d89e710bce15e32214c5afa38ffff5d9a23b89be85b8b934796ff09dad1d353f +oid sha256:36ae6af3d3cac15e1699c700ca5edb21246c94a90c00bbd433d58582b4af3501 size 1158 diff --git a/data/minecraft/structure/village/savanna/terminators/terminator_05.nbt b/data/minecraft/structure/village/savanna/terminators/terminator_05.nbt index 16962ec8..1f56c261 100644 --- a/data/minecraft/structure/village/savanna/terminators/terminator_05.nbt +++ b/data/minecraft/structure/village/savanna/terminators/terminator_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:acbc71d72067c0e5b5eed2cc8b2ce4e57e293e39c446e42610387d80dcecad61 +oid sha256:6ae3080714e1f7eaec8e31b4d4ecb45ce59547e6ba31042acd500d07b382d592 size 1190 diff --git a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_1.nbt b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_1.nbt index 355c6802..5c01a5d6 100644 --- a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_1.nbt +++ b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7dc4f5e0a86af073c7d65a8c7565a71d75aad5bf7cc96f1a66c6c9e506e8f837 -size 3285 +oid sha256:ad810e1d73be9065dd07358784a4d6efa50fea3566553a3739e02e85be21b0dd +size 3286 diff --git a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_2.nbt b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_2.nbt index 6cda4512..1c154103 100644 --- a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_2.nbt +++ b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3eb97f8c93b2f965ecf4980df88e98b7f20f7f4c0129b73ef785467f877c6748 +oid sha256:0ed0f4e79be0bf7c4e75e63424f4d3c79b0c4829c660411628cb7a1f25192c29 size 1117 diff --git a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_3.nbt b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_3.nbt index 73cff82d..c34ba72c 100644 --- a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_3.nbt +++ b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d603a02f2a1ca59cfb51f18e60df3c07ab5f2fd2077bbe1f6248d629689b0e92 -size 980 +oid sha256:4c527a0f23c1b26a2ed38415122aeb07b490c54bee6d0c5dd0a81c474db47fe6 +size 981 diff --git a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_4.nbt b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_4.nbt index 6f3749ca..61c49d3c 100644 --- a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_4.nbt +++ b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93900145435bd210ac368f09ec7783d7d4d3eb31eefdacdf5f9ced1773d0e7b5 -size 1185 +oid sha256:e8a107ba18555d83d86a6718403ccd7f166713d7e94e773090475011df6775d2 +size 1186 diff --git a/data/minecraft/structure/village/savanna/villagers/baby.nbt b/data/minecraft/structure/village/savanna/villagers/baby.nbt index 7dd6f6a8..c80db10c 100644 --- a/data/minecraft/structure/village/savanna/villagers/baby.nbt +++ b/data/minecraft/structure/village/savanna/villagers/baby.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:178da9b8f5f1c00f1ae79066af7be89380e01efd050672c658088b741082e2c8 +oid sha256:14e8c388eef5dbd170c3a2d27e00993bc723afcdda41ad132f60836189ed2614 size 719 diff --git a/data/minecraft/structure/village/savanna/villagers/nitwit.nbt b/data/minecraft/structure/village/savanna/villagers/nitwit.nbt index c92d2f21..598ee1bd 100644 --- a/data/minecraft/structure/village/savanna/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/savanna/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:646252ab3976816908fd574a988be28c0fa68903e2d5baab7d87edf05e01fe67 +oid sha256:91830493795fcce2d3c65bb8dee5b8e1b23546f22f0538333f127ded770c6e90 size 718 diff --git a/data/minecraft/structure/village/savanna/villagers/unemployed.nbt b/data/minecraft/structure/village/savanna/villagers/unemployed.nbt index 91138a70..cf3fbb50 100644 --- a/data/minecraft/structure/village/savanna/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/savanna/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e70482e6ae41d7545fc5b5c81ab0b7f85da59a46d0aa6ff9b26269f222b77992 +oid sha256:d836c861a68a77797a341b4a2d23df0c5b7dbdc6069bcf78e83762ed5feaed11 size 715 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_animal_pen_2.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_animal_pen_2.nbt index 47c00424..d71edf56 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_animal_pen_2.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_animal_pen_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:172205924926cf14011f1307c01e84f2ddda592fae9066d53531d208a43bebab +oid sha256:610cdd76f3b97f0f456b02945ebabfa4f3b1521cb24a7976d3303c0de55e1a71 size 3481 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_animal_pen_3.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_animal_pen_3.nbt index 905324e0..2c508b08 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_animal_pen_3.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_animal_pen_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fbd91e3074a9c07627c35b1bcc382efabb53f3b80d5581b113b04b96861352b +oid sha256:dff0f082614026782a6bf3476a38c6950a3bf96afc6724e379ed4341851c5db4 size 1666 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_large_farm_2.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_large_farm_2.nbt index 4d16f2a3..670ab839 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_large_farm_2.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_large_farm_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81fdedd252d8d46e6612e968c9a7ad87f35ac6b21f6faf5819886bf429554059 +oid sha256:ed8f99ac2b0673203ecc86abe91bbd118946fad2030ca11b504475af57ef82c0 size 2160 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_medium_house_1.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_medium_house_1.nbt index 602440d8..bb4cb2a0 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_medium_house_1.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3f0c8654044d31aa17ae33f6690a52145f87f098dc033b345de06a9f7828e62 -size 3644 +oid sha256:c540e6e69f2e0d89c06f43a195203779efebaf3a33845db39139e07167be4917 +size 3643 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_medium_house_2.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_medium_house_2.nbt index e93347a1..5fe51060 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_medium_house_2.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb8760f0d57c0d55a86d0ee76d65b2d5474a235b5c92832b8a4618e7f0891922 +oid sha256:e394a3e8d337451153a02cc83b5ddbfea89006404782b40433af5a60ea4bbfbd size 1864 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_1.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_1.nbt index 8fbf5220..1c43eb0c 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_1.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a260cfc93b2c36da58c7c33f88d206e9cb6383b75929b02fc313bd8df11b39a9 -size 1879 +oid sha256:6b01c69893dd2f5b53eebb8c2366e810c825046a057037d8107d62eedb65f5bc +size 1880 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_2.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_2.nbt index f59d57e4..cfa923ac 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_2.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab6e647942af1377c2acd864669832b628f3faa64055edd07687dcf827472a09 +oid sha256:3ac526ddd9a18b6f6e663f3deeec7cdb047b6b52821ebb0cc33f39e13ee8f6b7 size 1875 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_3.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_3.nbt index bffcf545..a87ab83d 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_3.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e7fca06b6f60fa90c69ad80d16f55f453a236ddcf7285756716bfef26052538 -size 1828 +oid sha256:8466921a227571474bc7ed7b097a08bb652702620eec088c4e360bbe100d788d +size 1829 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_4.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_4.nbt index 8c8bbff3..7acc5889 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_4.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c5d09e55982949a10548ea1ba6cd69eea6720bcfc8c9b888e233264361ba4ac -size 2708 +oid sha256:0d8634e748b37c1e0cff78ae6a37a1ba492a9e1329e989908d2d2de6a6378e13 +size 2707 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_5.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_5.nbt index f4b2644c..7ebc72e3 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_5.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58f15600f871ff930d1b24dae4b9f10fd5ac14f6ce65868b6b20ae346dd5576b +oid sha256:5555ffd4b07c2d9424ea484acf3ffcaa18ee4def8e58b728c9908dce9fe52af2 size 2394 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_6.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_6.nbt index e53ee32a..2a28a221 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_6.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4308d7b5a37da4ade97d82e0aa28ef7e04a62685ba80fe82b8d04adb0643f5c +oid sha256:277f77e2ce777be81037c099a08c969db079724545409f39360400f961c25886 size 1792 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_7.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_7.nbt index 8fd3aaf7..3ac71176 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_7.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92f860ddcb2a60d91747be60f4ff6a5eba18f295182346f872dee88996ff6516 -size 1907 +oid sha256:67bf2b635930f14a0cd3932b446c995ae8d7928d52102f408aeb457b5312d07d +size 1908 diff --git a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_8.nbt b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_8.nbt index a1a96ff8..51aee34c 100644 --- a/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_8.nbt +++ b/data/minecraft/structure/village/savanna/zombie/houses/savanna_small_house_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a25fcba815ad51c8af615e5b12e1ec64c35e711081f4323afcb0a59e06be8f5f +oid sha256:16b35bb4e9c0716db5177d1e0e4f5465d2ee5b57ac2698d809dde87311b43079 size 1551 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/corner_01.nbt b/data/minecraft/structure/village/savanna/zombie/streets/corner_01.nbt index c8c7abef..8d370212 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/corner_01.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cdb95097c13dd1dcf4b3d8c2019b2903da5510ec45bf81dbc7397e786f3e670 +oid sha256:c32e2e63584fb9d91e5ae89028ddc0d1e7c0a519873f4fe6e1bdf109ec5539c2 size 1203 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/corner_03.nbt b/data/minecraft/structure/village/savanna/zombie/streets/corner_03.nbt index 4d612c43..c35547f6 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/corner_03.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/corner_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a9624f9e71fc6945257bcb790ad75069976be0c859d41f9c32bb1e5f725ad82 +oid sha256:e1ae054ee890108ee785a81853cbe0788b96765513e8f15dddb747e8ad955205 size 357 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_02.nbt b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_02.nbt index 8cc350b4..93f6f215 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1c7a121c7b7dc5f7a8d6a0c72b38e2adce8c0f62e4bc3dec5b495217208f250 +oid sha256:edb7e1b1728d464bb23b0a6576837ba9ce2942d60fbded95cc13e572b7032450 size 631 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_03.nbt b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_03.nbt index 238f0063..b653c870 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb34d1d3a35e8bc519f41d639b371aae4168e13bbe355d046998ca7be627c0fe -size 1229 +oid sha256:aeb0848915c7a20bb1b27571481d5b96b033898490d134dc882b24ec7cbdc158 +size 1230 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_04.nbt b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_04.nbt index 650b68de..d981b76c 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_04.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40fdc20d5db5676fb9c9f299b5ade2c29eb29fa116a91cf70a72964fb8f59859 -size 383 +oid sha256:2d2b8cc6e95aa923621b8035f7412a01ac200172ce9c4d9d6deb2fa16dcc4aff +size 384 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_05.nbt b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_05.nbt index bbce4e9e..5fc14983 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_05.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0b9538261f9b70621c04f5677393df5d1f8380a7b1d7fc036fc094bad19c8ac +oid sha256:9f32b11ffa8df38230440e07d1167453415ecb37aa3b1681a4449cdbf93a4585 size 415 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_06.nbt b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_06.nbt index c9a9f82f..34cb8bd8 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_06.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ede0eafe2042dbc9dae765c28a80d520bd0a067a68f117b15c7f8a09156c0974 +oid sha256:4ce7e825bf89a75824bf2d447a6779419b44b8afb37cb3ced9b92062de4c6602 size 472 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_07.nbt b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_07.nbt index b0236587..8cfcdaa9 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/crossroad_07.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/crossroad_07.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97f7ec4f1e3557bd3ea10c1c019a1e631a9b85cd6bbb83ec4db57463371f39cf +oid sha256:9149bffc7d3d456e612a2114d4d5942c1f2cc70387f5109c5bacc2ea628cae5e size 1385 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/split_01.nbt b/data/minecraft/structure/village/savanna/zombie/streets/split_01.nbt index 51ca8369..c78deebe 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/split_01.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/split_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:172ccb6f4898c907134754a512efaf61cf14e217da0d4eb6e86410be443d414b -size 529 +oid sha256:3d572ebc3853320f462141b72c7a3e74114e4005e4096374c428be19d614c585 +size 530 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/split_02.nbt b/data/minecraft/structure/village/savanna/zombie/streets/split_02.nbt index da15e4f2..f076a432 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/split_02.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/split_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96a1d7c9c88423d613e252d927a95baa201250bf524211a144a3b8a76b639214 +oid sha256:c8c2ee52e3072b36b25237f11fea1e700d8a1cdccd9f5cc0733e6782f61bf5cc size 743 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/straight_02.nbt b/data/minecraft/structure/village/savanna/zombie/streets/straight_02.nbt index 3d46eb7a..79508f27 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/straight_02.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e13b3220c08869b3f0b9f6aaa62ffcbec9ffd12c701e46c26c7eaed19adf6ed +oid sha256:4f0106a1b0f0744484799e8b6ef32eb043e40f92f5c0478996dff3d460bf6117 size 1130 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/straight_04.nbt b/data/minecraft/structure/village/savanna/zombie/streets/straight_04.nbt index 7cb0ab69..5d55592c 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/straight_04.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/straight_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d435778af8d010470e05b14ca67d95ebd52dff7ec9c337db45a8feb417e6ea1 -size 646 +oid sha256:c7b141af3a0698756090b46db677a356cca0474fde67ba846b617decaaca3bac +size 647 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/straight_05.nbt b/data/minecraft/structure/village/savanna/zombie/streets/straight_05.nbt index c430e9c2..dce00aef 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/straight_05.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/straight_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7a2d5ec32ea3f99659993d8ee9dd844ba547cefce9fa64786a82432bdeb4dbe -size 1936 +oid sha256:bec930d22fd3bab70eafaf08194c52a9f8970f26ada95680fd7213900af4ab6f +size 1937 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/straight_06.nbt b/data/minecraft/structure/village/savanna/zombie/streets/straight_06.nbt index 89217c55..f974ff6f 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/straight_06.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/straight_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68298e62d1f280a126b71914248d0a2c499d878b2636c08c78fbadea4423329e +oid sha256:a6acc1230d4ee06f66521e78581168c08c9f7828eca7669c8e99ad54887e23ef size 1092 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/straight_08.nbt b/data/minecraft/structure/village/savanna/zombie/streets/straight_08.nbt index ff0ff845..befd054c 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/straight_08.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/straight_08.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24cecca3b96fb0c1600eafdd1d21818f5067f1ded17c727622fd4d8e412092de +oid sha256:3e7cdab48209c5f46bb68090f90176f07d0c8139bc7bb512a7788bff7400fba9 size 944 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/straight_09.nbt b/data/minecraft/structure/village/savanna/zombie/streets/straight_09.nbt index 36ec7b7a..135d500b 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/straight_09.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/straight_09.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae74958dc53ba8e22eea0a959736ee49fbaddf5d1f0ef9f7590a10fc744f89f4 -size 1526 +oid sha256:2e1a6ac1880b9e2b1ce94216fa65861fab032f6ed1f7f0bdb25fa7ddc37a98f5 +size 1527 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/straight_10.nbt b/data/minecraft/structure/village/savanna/zombie/streets/straight_10.nbt index 9d822286..74a7c290 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/straight_10.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/straight_10.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88cf353c6c58074a674a45e956bc2a1b7479ce7df3b2d6e3c9ce6d08da8fe222 +oid sha256:990093e77df878fd088fb7d1a93f7a135b8b2c2d7a815a4b6b7e379a4513a46e size 529 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/straight_11.nbt b/data/minecraft/structure/village/savanna/zombie/streets/straight_11.nbt index d9fc6801..fa39bcdb 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/straight_11.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/straight_11.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24f102740cacb7e5a8fdfc82cb6b6ec529bc8bcf06c9dc19a5863ba70f515719 +oid sha256:a720135cd8f0625869e2dc575c8d188bed6044af3ef3e3ea8d3a2d91ef70ab5c size 1567 diff --git a/data/minecraft/structure/village/savanna/zombie/streets/turn_01.nbt b/data/minecraft/structure/village/savanna/zombie/streets/turn_01.nbt index 6814b42c..1aefa414 100644 --- a/data/minecraft/structure/village/savanna/zombie/streets/turn_01.nbt +++ b/data/minecraft/structure/village/savanna/zombie/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94bb6e74d51904f0159cce4d2ecbc279e59646aab921207d24fccc8d156a4cd0 -size 1165 +oid sha256:ed8c9eefef311eb2cca22067e604b249ba22fe138d345a63087dfbfcbb005e5d +size 1166 diff --git a/data/minecraft/structure/village/savanna/zombie/terminators/terminator_05.nbt b/data/minecraft/structure/village/savanna/zombie/terminators/terminator_05.nbt index 797b3fa6..6f03a121 100644 --- a/data/minecraft/structure/village/savanna/zombie/terminators/terminator_05.nbt +++ b/data/minecraft/structure/village/savanna/zombie/terminators/terminator_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc277f2acc8876edbcb87081b467e901ea201567e926f8ae3ca64fcb58fa7e7e -size 1192 +oid sha256:a155d76b12b5bf3409eb8f356812f1ce4e81b36c44707cb76617ea7445ff19e2 +size 1193 diff --git a/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_1.nbt b/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_1.nbt index 58e86935..a7d3ee37 100644 --- a/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_1.nbt +++ b/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8ce4d77c7bb97a13e78fe32973776ad0db87349333782c3ad794a5aedce1c10 -size 3183 +oid sha256:cc9c621be55261c90902d3a4a25b434ce0f6fa6479adab9bce4526ab2d7c60a4 +size 3184 diff --git a/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_2.nbt b/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_2.nbt index cdfe66ea..f581ac27 100644 --- a/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_2.nbt +++ b/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d279a5d69a032b7748e330356fa8f08eea9b157895fd5ea14de833ed284dea8 +oid sha256:fbcdb9eeefc9b99702e4fc32a0c5f9049e9c302c205b2657c33f32d2100290cc size 2712 diff --git a/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_3.nbt b/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_3.nbt index 8bd5ea2d..83e04083 100644 --- a/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_3.nbt +++ b/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e64e1cc9d0817cbeb1f722cf09e2de9ab44496e96ec7b203ef5a80a73cd8e8f0 -size 917 +oid sha256:992010ecc0bdbbd4b33b5a0864b1bbcfe3c99b2e2d440c37ee31454739108337 +size 918 diff --git a/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_4.nbt b/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_4.nbt index 7993860e..df5053cb 100644 --- a/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_4.nbt +++ b/data/minecraft/structure/village/savanna/zombie/town_centers/savanna_meeting_point_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d1a25e1e09c5f6339a21c3b892733546ee38eb5f8de32caf738aa785536dc2c -size 1145 +oid sha256:d4852efc2a15198f7bc89e67211c220bbe529952bf4b8cc7b09d3fd01b696e1e +size 1146 diff --git a/data/minecraft/structure/village/savanna/zombie/villagers/nitwit.nbt b/data/minecraft/structure/village/savanna/zombie/villagers/nitwit.nbt index 2508d564..858018c9 100644 --- a/data/minecraft/structure/village/savanna/zombie/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/savanna/zombie/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c821ed4de846aca1358c38f98131da3066eee2a4e4ee9d610a560214ccfc4aa2 +oid sha256:22865d9dda0303f3b341db18723419c5fc1a254ae57bd4650cdbe269789a2a6c size 723 diff --git a/data/minecraft/structure/village/savanna/zombie/villagers/unemployed.nbt b/data/minecraft/structure/village/savanna/zombie/villagers/unemployed.nbt index aa5e5deb..24042b0f 100644 --- a/data/minecraft/structure/village/savanna/zombie/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/savanna/zombie/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2333ec32e70b10de92b1b81e08d43c2ea3a9765441a5c8d25ca3d89dcc17c217 +oid sha256:b23d6c33f41281a26e2b9f20ec5fb241db07cb614964b2b7ec1dd3755d3e3872 size 722 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_animal_pen_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_animal_pen_1.nbt index f26ef9ca..37f632f2 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_animal_pen_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_animal_pen_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6a29488fea4d94346e64deda9515d1f7041ae1984ab5b8ec3c9caf6aefd164f +oid sha256:88e7f895ab422f7f20ad8434f3d332280ad9f9164e5faf41f4a71e21b0b615eb size 1620 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_animal_pen_2.nbt b/data/minecraft/structure/village/snowy/houses/snowy_animal_pen_2.nbt index 79a19963..0c625aed 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_animal_pen_2.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_animal_pen_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9c5ef0754bb822977c9d8eb088d883b70846cffa3da763489027c17ca271f09 +oid sha256:221b989e994d25780e8c07acc10ab9423aca3c001975e973e10ec5de102f1938 size 1260 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_armorer_house_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_armorer_house_1.nbt index 7e28b931..5db469fb 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_armorer_house_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_armorer_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db9ecc79fb13a96732b134476aa6c7a19ee7c7dfccd12cb9284d52ea37f75ca8 -size 2191 +oid sha256:b01c2baaf98713b2a2fbb83a3b5f23daac1b3e3a8784521057eee6abe66af75f +size 2190 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_armorer_house_2.nbt b/data/minecraft/structure/village/snowy/houses/snowy_armorer_house_2.nbt index 1c0876a1..d8c345dc 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_armorer_house_2.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_armorer_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4ba838597dd6fa211fbe8dc27445edf81957c667392a30eb48bba4e7b7091ba +oid sha256:abf41bd498493af3da2d131da09f56e799ad4ab68ab42a3f7196bef375239e7c size 2069 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_butchers_shop_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_butchers_shop_1.nbt index 42a80e33..1359eb4d 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_butchers_shop_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_butchers_shop_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c0035a9b4663c6540c231939d18fddba85d8b6c0dea6461f48d8874d724956f +oid sha256:4aaaca98388958dea10a42dc50d6d765eb208ea8d46dfcb04c0882095b2942ba size 2566 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_butchers_shop_2.nbt b/data/minecraft/structure/village/snowy/houses/snowy_butchers_shop_2.nbt index 4d4ef339..d5d6664a 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_butchers_shop_2.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_butchers_shop_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89bd33da9f0a73211c78090aff908bac9f8f6543a339056c88c6f1aee54462b0 -size 1463 +oid sha256:6ea6c961a3131257325c39ab382b8fe08278f2fb0bde1776251af910f7fdac3d +size 1462 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_cartographer_house_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_cartographer_house_1.nbt index a1c69981..ad2afdee 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_cartographer_house_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_cartographer_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:061aaffa21d6c31bc0000f68b4139abb68e6f24319e1f9e5574fafce64cab8e3 -size 2361 +oid sha256:6f28f5759b59737ee573b26bc8545ed197ad56cb3c0a9f63b19ce170c22cb5b4 +size 2360 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_farm_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_farm_1.nbt index 48c578b0..23290a1e 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_farm_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_farm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0165a58848141564343b53cc7b39e6e61a6ffd1df72d0156b2672bdb3562e90 +oid sha256:473d2f073e05e04774f4dc512cbeb140d643388ff36cc5189db2b31800ba3382 size 1253 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_farm_2.nbt b/data/minecraft/structure/village/snowy/houses/snowy_farm_2.nbt index 294fdcd4..5cac9ccd 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_farm_2.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_farm_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:117ddb9d6aebb57e0a0b03bc5a897c17fdab51ec5b1977626c5137185330ba05 +oid sha256:62aef92eeeb07af1239c00a29fa32632a60ab0638756bbaba9a3819d3a9ca17b size 1075 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_fisher_cottage.nbt b/data/minecraft/structure/village/snowy/houses/snowy_fisher_cottage.nbt index 04d5ba3b..b9c8bf81 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_fisher_cottage.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_fisher_cottage.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2efeeede81e3558daecda3edd2900079df0bfd2750acbfdc0561ff75541593b1 +oid sha256:6e35ef53e8147de7d7b7eae95c9b033ecbe4302c7e8195a79cd2328891f59353 size 2236 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_fletcher_house_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_fletcher_house_1.nbt index 7a198e75..98d27ecc 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_fletcher_house_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_fletcher_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3e84aa14d83390f477e4cb4254287902a2eb3e1c40fff907895c62daadb19ec -size 2120 +oid sha256:3717cc1f7e7dd19daf147e5b5b12471ea76b51715fead2c29dbaa387fc198747 +size 2121 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_library_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_library_1.nbt index fc3fb1ae..2b12dca7 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_library_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_library_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b79735491ae36ac91d10a2a3bfc36f7a048901dd081fbbfb515fe9382bedbbcb +oid sha256:42d3aa5b8c06234825d5c1d2ab71423c79b4def00f751dad7ad62f343f0c39d1 size 3446 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_masons_house_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_masons_house_1.nbt index c7b1373c..1c598f54 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_masons_house_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_masons_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b7d0436a828851f25e08f3e2773de18db18b63cf4003539cdc936e4ad4126bc +oid sha256:09c69dc5f143d7cf31b50f1716f3100a1757c6ffcff69e2a8dbc23d66933df87 size 2997 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_masons_house_2.nbt b/data/minecraft/structure/village/snowy/houses/snowy_masons_house_2.nbt index 901a91cf..74602b1b 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_masons_house_2.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_masons_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7a16a8ab1c7975249c1ffffe918b447e97f4dd7e80dde849fd3b5d5fa6c2515 +oid sha256:d415f40ff5670a531e075c91bbe301b111c489a016168b2258d958cabeae2db1 size 3184 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_medium_house_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_medium_house_1.nbt index 41a67b5b..50a2b8b5 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_medium_house_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f776d5c155b09831e034afd07c94e763c6570ea7df6534122d4eab1893e860f6 -size 1593 +oid sha256:6855ca467669ac7df91cee492a8ce6711423b8d428879efcc87dc4f9fbee78a3 +size 1594 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_medium_house_2.nbt b/data/minecraft/structure/village/snowy/houses/snowy_medium_house_2.nbt index efa24c59..7f97012e 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_medium_house_2.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:767cda57e23171444e78ab4afb037c41525c3ea02a76b52fab7b7af878d787d8 -size 3531 +oid sha256:43f166f2891b8f5fcab547f049d1e209250866652d57d6e22eaf5f685cdd1dfe +size 3530 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_medium_house_3.nbt b/data/minecraft/structure/village/snowy/houses/snowy_medium_house_3.nbt index 26ddb760..62d8e0d1 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_medium_house_3.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_medium_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:657d93553062a4fca4ba64908f3ddb09b3a6e8cb65b481939579d98765d212f4 -size 1205 +oid sha256:64e983fbe8239357f2b89c6b1b3dc140aeb77510684b9d9aa313ab3c0296a526 +size 1204 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_shepherds_house_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_shepherds_house_1.nbt index 340df146..1ffefd49 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_shepherds_house_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_shepherds_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3058c12710372e2358bc783261ff73901f0f52602c4ab78aac297994cbef163 +oid sha256:5db103faa5ad6f20a4101c6c72da2bd4ae589bc46da638f2f531497d0e210403 size 2166 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_small_house_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_small_house_1.nbt index 81385de7..3efe702a 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_small_house_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9ef521b0b8b0882720a6b758196c4c4a53148ec95eed01f04bca69222595dd6 +oid sha256:b7b6732033a93468c2889f5bb7b58b457f24bc7f87929afe7fee08a2003c345e size 1316 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_small_house_2.nbt b/data/minecraft/structure/village/snowy/houses/snowy_small_house_2.nbt index 07a31674..941dc325 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_small_house_2.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e25e15c932e2b5da07ae8dfa20d3d2272cf91d32808a64c9d97520a200c9ebea +oid sha256:a5311762f667325ca96f139319b97110dc46e5f3a74eea560068cb353cc13d77 size 2121 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_small_house_3.nbt b/data/minecraft/structure/village/snowy/houses/snowy_small_house_3.nbt index ea6198d4..f357d533 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_small_house_3.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:386dc94e5ede9ecfad2803b4847ce6a5211cf68eca32e64a3d962f7cfd82d371 -size 1755 +oid sha256:3c948d5a119ec75ac7bc25c8d0455dba3a831c1409fce682e2bafcea592d8a32 +size 1754 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_small_house_4.nbt b/data/minecraft/structure/village/snowy/houses/snowy_small_house_4.nbt index 3e22e535..f7006340 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_small_house_4.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce4befcb377da38f0217b070dd439c46d22cbeae6aff83cb16c3f30666b4d14d -size 1601 +oid sha256:b6693936a24f9adcf98f3c02395ccff9e113cdd667e8721fa0e3035fb53f19a5 +size 1600 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_small_house_5.nbt b/data/minecraft/structure/village/snowy/houses/snowy_small_house_5.nbt index e4ffbc91..3a225c38 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_small_house_5.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b774e4d009eb99ffa29f164101d1f571817a951f6a7498e4de9475d8fc12851 +oid sha256:b7070ba787c96454e1d8421a249867958b9de0c2eb57b16e41a498b915ddddbe size 1140 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_small_house_6.nbt b/data/minecraft/structure/village/snowy/houses/snowy_small_house_6.nbt index 3345693e..b9f1f6ca 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_small_house_6.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_small_house_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef0039cd80cc9d4f6df830ae48f8e7b987fc0576f77d1a738696587230cbc272 -size 2214 +oid sha256:dde8eea78df54434781121a51cb19bf16bf7609fe66e2ac39434755747fd1d32 +size 2213 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_small_house_7.nbt b/data/minecraft/structure/village/snowy/houses/snowy_small_house_7.nbt index 61823517..5ac58dfa 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_small_house_7.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_small_house_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6197bb1aeb2b9fce9f9fb054d2a1fe397dc8f1b9969ebf4f770f3d8509a55c1d -size 1617 +oid sha256:914bbbd485566430912d27002c64941b2ca38031fc1ce9c69a87d70004d182ef +size 1618 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_small_house_8.nbt b/data/minecraft/structure/village/snowy/houses/snowy_small_house_8.nbt index 77a9efcc..2938a856 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_small_house_8.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_small_house_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc7395e943d16ab7d6a3911346e20fd8470d6cdfbecbac7712f53e19da13dec5 +oid sha256:24003e5fe20d37569cbff4959c51f8f861b044a14d45f72d462910f14eaf481b size 1020 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_tannery_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_tannery_1.nbt index 0c966dde..25ef58e0 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_tannery_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_tannery_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b90da6ce559af84486a05546aca6febd92fc0a9853a09a5ef8b902f0405df63 -size 2973 +oid sha256:33333fc062481258f785b3650de565077fad34f75bc6369ad65a5722d5af231e +size 2972 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_temple_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_temple_1.nbt index b4a324fa..4bfbd062 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_temple_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_temple_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75e30025086e570bd519eab13959ba3c09bc3a0d457646cc5e537e9270a8248b +oid sha256:7f050aac041859755efe89ca95b7fc18eda5280c08ce505e91053ead4f310878 size 3573 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_tool_smith_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_tool_smith_1.nbt index 387e40d2..e632ba51 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_tool_smith_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_tool_smith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:862e1b94060c332f46c6da6ed94a9c3cf0b3f656325dd784d562325ff3927bca +oid sha256:3408b7e65231345b6dcd9c06667c0ff9756752fbadbc70fedb34d0d46921d7f1 size 1914 diff --git a/data/minecraft/structure/village/snowy/houses/snowy_weapon_smith_1.nbt b/data/minecraft/structure/village/snowy/houses/snowy_weapon_smith_1.nbt index 8fbfe4d1..a91effef 100644 --- a/data/minecraft/structure/village/snowy/houses/snowy_weapon_smith_1.nbt +++ b/data/minecraft/structure/village/snowy/houses/snowy_weapon_smith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cdaae97327a9c259931631af64afcf53ebde3ff0bc76ba0cd50164d0f7fa6fd -size 2756 +oid sha256:e3004c4ddc07d01e613f4f0864a8af9269a215474ee6422ae99d8dfafbd71845 +size 2755 diff --git a/data/minecraft/structure/village/snowy/snowy_lamp_post_01.nbt b/data/minecraft/structure/village/snowy/snowy_lamp_post_01.nbt index ae1288ef..cd87ada3 100644 --- a/data/minecraft/structure/village/snowy/snowy_lamp_post_01.nbt +++ b/data/minecraft/structure/village/snowy/snowy_lamp_post_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03d8035591e4c0c4b7d4c7b0806001609daea467cea348417142ea5df3727515 +oid sha256:5d74eceb14c80737d4528d1faf03d062b51d92ff50485725b0dfd2146ffbe81a size 378 diff --git a/data/minecraft/structure/village/snowy/snowy_lamp_post_02.nbt b/data/minecraft/structure/village/snowy/snowy_lamp_post_02.nbt index bebbac71..0062b557 100644 --- a/data/minecraft/structure/village/snowy/snowy_lamp_post_02.nbt +++ b/data/minecraft/structure/village/snowy/snowy_lamp_post_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eeb5f67ca07200d0e9d44fcf48d65b525f514c34616be959fca8e180ee7a29dd +oid sha256:ffde8c5e64237eacbb63348d7c0dffaf22bafefde85c1d9a75795404a855d5ef size 356 diff --git a/data/minecraft/structure/village/snowy/snowy_lamp_post_03.nbt b/data/minecraft/structure/village/snowy/snowy_lamp_post_03.nbt index d7155062..bf710a07 100644 --- a/data/minecraft/structure/village/snowy/snowy_lamp_post_03.nbt +++ b/data/minecraft/structure/village/snowy/snowy_lamp_post_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f76bd46452815bea606e254161f9dd494d776457416f9b94bc426dc93ba1083a -size 502 +oid sha256:d55db83c4ce4ace902ebf3cca41168d631109d7a54113d35daca880745884944 +size 503 diff --git a/data/minecraft/structure/village/snowy/streets/corner_01.nbt b/data/minecraft/structure/village/snowy/streets/corner_01.nbt index 41c85aff..da6bb44e 100644 --- a/data/minecraft/structure/village/snowy/streets/corner_01.nbt +++ b/data/minecraft/structure/village/snowy/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6208792170301de134eba62ed6b39545535f33ea1863eb1e86caa18f65a99476 +oid sha256:960cc5696556b5d81e6ab999071a86f6752f529b7688a599d13741a1b86873ef size 1097 diff --git a/data/minecraft/structure/village/snowy/streets/corner_02.nbt b/data/minecraft/structure/village/snowy/streets/corner_02.nbt index aea22974..189f12ca 100644 --- a/data/minecraft/structure/village/snowy/streets/corner_02.nbt +++ b/data/minecraft/structure/village/snowy/streets/corner_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f48851258c642a34347f3934c19910e029aee2c7b65855bc879bd6b6f9000422 +oid sha256:62d1a7db8733f4a2c87fd256bf04c7227ab1f4a5f22e1ac5d00ffe3b3ed67583 size 1808 diff --git a/data/minecraft/structure/village/snowy/streets/corner_03.nbt b/data/minecraft/structure/village/snowy/streets/corner_03.nbt index c8870488..96a0ab98 100644 --- a/data/minecraft/structure/village/snowy/streets/corner_03.nbt +++ b/data/minecraft/structure/village/snowy/streets/corner_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c0901e04f18b900f2a2cf61940876af635d31cbf63a5894aad1ff610c9295a0 +oid sha256:fb23eee621ac6b414fb4c2e47cc771d96b3c214ad13c5db320346f851a25e04f size 394 diff --git a/data/minecraft/structure/village/snowy/streets/crossroad_01.nbt b/data/minecraft/structure/village/snowy/streets/crossroad_01.nbt index 01e2ca17..7b046716 100644 --- a/data/minecraft/structure/village/snowy/streets/crossroad_01.nbt +++ b/data/minecraft/structure/village/snowy/streets/crossroad_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0deb6802c25d49354fffe3b3dd71b385bf6c9c3cd90459aebf97559e717070ca +oid sha256:336365f9c5069ad69f9a7079accfb5b35c703c8dba1163f7f80e43dc59ac9674 size 1920 diff --git a/data/minecraft/structure/village/snowy/streets/crossroad_02.nbt b/data/minecraft/structure/village/snowy/streets/crossroad_02.nbt index 4bcfcd96..a6e8acfe 100644 --- a/data/minecraft/structure/village/snowy/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/snowy/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e42adecb4cbe119cf80d80561aac91e285cd256de4d05b31c08b4ffc459f9243 -size 1958 +oid sha256:447af9d92dd219bbcd367d7c28862ebf493539f9b366f42d610d2d5a3c7ce63c +size 1959 diff --git a/data/minecraft/structure/village/snowy/streets/crossroad_03.nbt b/data/minecraft/structure/village/snowy/streets/crossroad_03.nbt index 013452d5..0991544f 100644 --- a/data/minecraft/structure/village/snowy/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/snowy/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1323133457d0ac31e90c1acd98fe1dbbfc57888a4c590ae8f5fcb94e48ef22c9 +oid sha256:58865fbb1741ad19dbb50f8a739922f4c90d441a9fa12e41e85924c1dcde8f62 size 2023 diff --git a/data/minecraft/structure/village/snowy/streets/crossroad_04.nbt b/data/minecraft/structure/village/snowy/streets/crossroad_04.nbt index 821c5cc7..58357bf3 100644 --- a/data/minecraft/structure/village/snowy/streets/crossroad_04.nbt +++ b/data/minecraft/structure/village/snowy/streets/crossroad_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3c40b89c90e62da342df10e310942b909f6847410577210613cc2f2010f62d3 +oid sha256:e112e6723f737dae72a3f9727c117613fd0e679e296aa50f86bf0d5cdba1e38b size 430 diff --git a/data/minecraft/structure/village/snowy/streets/crossroad_05.nbt b/data/minecraft/structure/village/snowy/streets/crossroad_05.nbt index 12255de8..4ae4cb8b 100644 --- a/data/minecraft/structure/village/snowy/streets/crossroad_05.nbt +++ b/data/minecraft/structure/village/snowy/streets/crossroad_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8aa187bda2a72b8f16bba8e60897e33eaf6d99334e3145f8cf716614ceffe25 +oid sha256:b7550faaf55a01863389ed27734c436241c45725e13efa216f834eb3787797e3 size 473 diff --git a/data/minecraft/structure/village/snowy/streets/crossroad_06.nbt b/data/minecraft/structure/village/snowy/streets/crossroad_06.nbt index b80477f7..5cb0db3f 100644 --- a/data/minecraft/structure/village/snowy/streets/crossroad_06.nbt +++ b/data/minecraft/structure/village/snowy/streets/crossroad_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fed69ab5cbd5d1f2555ae01b0fdd2fefa08e704639c93090a073f7bebf053d92 +oid sha256:37d02587dac6aad8ca8f9a57c33b5b654ddf1023e458f3605377d6b320d68d9e size 528 diff --git a/data/minecraft/structure/village/snowy/streets/square_01.nbt b/data/minecraft/structure/village/snowy/streets/square_01.nbt index adeceec6..76c07d48 100644 --- a/data/minecraft/structure/village/snowy/streets/square_01.nbt +++ b/data/minecraft/structure/village/snowy/streets/square_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94bd08beee92456950d6f796b8531e8c599102f93255c7e2b3e52b507e1538b0 +oid sha256:bf5fb475edf2593584b0111c35331987762a9d50c08d210afe59a56e2f3ace9c size 1510 diff --git a/data/minecraft/structure/village/snowy/streets/straight_01.nbt b/data/minecraft/structure/village/snowy/streets/straight_01.nbt index fd57dfe0..6ce40364 100644 --- a/data/minecraft/structure/village/snowy/streets/straight_01.nbt +++ b/data/minecraft/structure/village/snowy/streets/straight_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d2ba493fb454f6e8affeb131686d954df0d0bc8dfbc19d0517afe0c96959f20 -size 1851 +oid sha256:ed4de19018476d7d876a409874f75c72b23502429ba2fb5536ee34027368a213 +size 1852 diff --git a/data/minecraft/structure/village/snowy/streets/straight_02.nbt b/data/minecraft/structure/village/snowy/streets/straight_02.nbt index 65f10cc0..9d1338ad 100644 --- a/data/minecraft/structure/village/snowy/streets/straight_02.nbt +++ b/data/minecraft/structure/village/snowy/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26ca3326410675e6ae9a70fe71b3dfa2a025572163516ee1955ca6a9cc7c0f0c -size 1774 +oid sha256:be6d41d9ed9487c927897552f802e9676d47dd82c8ec86785eeb14d8effd94c9 +size 1775 diff --git a/data/minecraft/structure/village/snowy/streets/straight_03.nbt b/data/minecraft/structure/village/snowy/streets/straight_03.nbt index 1cc0f2c7..d02e6b71 100644 --- a/data/minecraft/structure/village/snowy/streets/straight_03.nbt +++ b/data/minecraft/structure/village/snowy/streets/straight_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82e9784c04200afba58dd3fe450ae784e5f8f0bc1827921e630f4c32567d7eb5 +oid sha256:6db06efe57f33a43f7f1ccffd53d131d2ba4d0f9469943666f51c3da3fa0853c size 1218 diff --git a/data/minecraft/structure/village/snowy/streets/straight_04.nbt b/data/minecraft/structure/village/snowy/streets/straight_04.nbt index 730d19d8..43bfed0d 100644 --- a/data/minecraft/structure/village/snowy/streets/straight_04.nbt +++ b/data/minecraft/structure/village/snowy/streets/straight_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:023b7e919dadaf4bf03bd267c2b278c006e5a13ef003d701ea768cc25139cae7 +oid sha256:6ff402b4973a02edbe008df05daf9e4e00d6f06bfe48a870c6f169822205d37d size 709 diff --git a/data/minecraft/structure/village/snowy/streets/straight_06.nbt b/data/minecraft/structure/village/snowy/streets/straight_06.nbt index fb15afd5..17e1d070 100644 --- a/data/minecraft/structure/village/snowy/streets/straight_06.nbt +++ b/data/minecraft/structure/village/snowy/streets/straight_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c4cb9f23c109ddd0e20f5fd66faa5c9a8e2b64a4b704bac532b9706fb43bd17 +oid sha256:1c4de816f14c8d9676f7c92a2720c8cf1be953f0e05dafdcbd475ac5a169d14b size 2618 diff --git a/data/minecraft/structure/village/snowy/streets/straight_08.nbt b/data/minecraft/structure/village/snowy/streets/straight_08.nbt index 03a5e90e..9b14f7c9 100644 --- a/data/minecraft/structure/village/snowy/streets/straight_08.nbt +++ b/data/minecraft/structure/village/snowy/streets/straight_08.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51b9847f2fe7b600638ac3b201db10b30299a511c43be286cbf83325ba3d3d24 +oid sha256:24a778c72bbd9231613c5d76a75ba40912ac404035a9ec2441f7b1b15f20f2d1 size 1942 diff --git a/data/minecraft/structure/village/snowy/streets/turn_01.nbt b/data/minecraft/structure/village/snowy/streets/turn_01.nbt index f626b20d..ab035f32 100644 --- a/data/minecraft/structure/village/snowy/streets/turn_01.nbt +++ b/data/minecraft/structure/village/snowy/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af995dff4e8052af1f59e97faf081530075015ec344f1b9e92b888e3f89519eb +oid sha256:91836865fdaf8cf670fd44f553845ad9fa7d7abe7b7a5b01db47200fdc0a1bf7 size 1233 diff --git a/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_1.nbt b/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_1.nbt index 14ac7116..e2d1bc6a 100644 --- a/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_1.nbt +++ b/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6afa4dc6ea8c07fa7110db94323cb78ffd0d78a7ff144147aea54d0ae842e7d +oid sha256:f334dedbc72d4b6f27e04d926ab6120d0350c69ec5c220ecad9bf2d55d83db5e size 2734 diff --git a/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_2.nbt b/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_2.nbt index 15416779..88b2dc29 100644 --- a/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_2.nbt +++ b/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:506c19b30c42b56676aadd042fcbffbb5b31d3a7a927340c32ada72ff719aebc -size 1034 +oid sha256:fab39ab72b6bb363742c338da3d84508184ef1d7c9e5ed212d1d0122b8a994a9 +size 1035 diff --git a/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_3.nbt b/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_3.nbt index 11880681..5daeb07d 100644 --- a/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_3.nbt +++ b/data/minecraft/structure/village/snowy/town_centers/snowy_meeting_point_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c67c46ce5bde2f7f05de67aee85de3fd6570e3a01c9e4797e1be182b569fec15 +oid sha256:b75d7a85c32a9957afb03aed14b0d56afd2455a982c115afd59ed8485ad0ffed size 851 diff --git a/data/minecraft/structure/village/snowy/villagers/baby.nbt b/data/minecraft/structure/village/snowy/villagers/baby.nbt index cbd5ff34..3cbcce32 100644 --- a/data/minecraft/structure/village/snowy/villagers/baby.nbt +++ b/data/minecraft/structure/village/snowy/villagers/baby.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e997c5e9fb70d730d9c8204210dfb84af0db5356f1841926585233f353543bf +oid sha256:0015033cb9dbd3a6f841151762587c67a02b0826b979c6a87be043877033cccd size 718 diff --git a/data/minecraft/structure/village/snowy/villagers/nitwit.nbt b/data/minecraft/structure/village/snowy/villagers/nitwit.nbt index 66a2f23b..d0f58718 100644 --- a/data/minecraft/structure/village/snowy/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/snowy/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2c9d45fc20a94ed589f8089e91d938dd32ca386108beb6984be60f250e1ed85 +oid sha256:395e5c8190286484dfac4748e0f29b7d42b7247e0c7d4731ef9da97d0e72cf89 size 715 diff --git a/data/minecraft/structure/village/snowy/villagers/unemployed.nbt b/data/minecraft/structure/village/snowy/villagers/unemployed.nbt index aa5a294e..8561ac5f 100644 --- a/data/minecraft/structure/village/snowy/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/snowy/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c03f13095a9967c0f38142ae841a19408eaba8601d6145bcf377437b74d65ba8 +oid sha256:cd0065571f242e618d2daa3b572c291d90a3d1a27bb474537549dfda3d22d04f size 712 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_1.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_1.nbt index 9a168b07..8ed81b82 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_1.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b2637bf001c6f3d4b7cd0901602f713f6c137679fec0ec3f46c6fee37dca176 +oid sha256:614faa296f7762d2caa31313024bec99f41519bddf19beaae166c132ad49ea80 size 1600 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_2.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_2.nbt index 29f65ec5..5fff802c 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_2.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:386f1f5b4173cd89fa03f3942f47398079ec478fd6b6b58dafc7545f6a43ed39 -size 3577 +oid sha256:2137a575b766200204c8b13b66aa16f3fb87522fb56c1602a9b1085b6e9d1b2d +size 3576 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_3.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_3.nbt index c23d0aa4..f93aae9a 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_3.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_medium_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64c996dbf6f9a80841caf38fe81c6398e36225531a09812fccfe0edc6d47343c -size 1210 +oid sha256:e8aa9864d2f9e020eafc894c0e683ffb25a271e36c9f72ae5b7b889025236a06 +size 1209 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_1.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_1.nbt index 7f858f33..f2488964 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_1.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:798d2049c72695203c1e16ffb494cb07e933cc4a7efd0befd1dd96c816eaa939 -size 1321 +oid sha256:11fa3ed0034d1691fb94528558958f0d925719b433aea121e45018bb7c3bd861 +size 1322 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_2.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_2.nbt index 9659a66a..528a3015 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_2.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e427c60bccfd5b125c880cbb82beabaa0e838969a81f3d58e70891c873b9c429 +oid sha256:5d6c1738b7e8f90ac1ccfe393d12e0b6797742d2213dfbdebc4ffbb985fe9274 size 2139 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_3.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_3.nbt index ba74871b..11e422df 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_3.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4dd214cf8f5a738845f9b2acc9d0ee04f5551c85ea66d76376d88639f32ca275 -size 1812 +oid sha256:75c33cde299d5f35294e515e2b497e627f99d60a47af96cc93d1acc95742aa8d +size 1811 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_4.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_4.nbt index 30d4839b..199a4e56 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_4.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be63aa91df2ec40646dcebcafa5d0b738d5e03bb6951e2a58f3fd75f5f7fc194 -size 1608 +oid sha256:b5a3a55119e943d78913efa393c4be14de1ffa23c8c2cb085721356d4d83fe5a +size 1607 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_5.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_5.nbt index 9f7596bc..a8a5fa2b 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_5.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e5b35e76c5d597823dc230150e877f6c02730a2b89a7c744195a94fabce874c -size 1148 +oid sha256:f4ec4ccdf2697b93c23a32d660ca4880a7fc428b4ae57cec5348cc3e46a942f5 +size 1147 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_6.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_6.nbt index d7da9abe..b6545013 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_6.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bad3d82ea4a912a368e1ddd77194b2d41d01e463064ffe77c2d90d5eee9991c5 +oid sha256:6b5991dcf07362ae8b0b5683bcd45239e0afa325ba73af3d4affed4d90fe9dcb size 2221 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_7.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_7.nbt index 950c42aa..b1e3420d 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_7.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8eb73364bcef644fb254e67f2d5269d6e7a83176057d945aac82b33a9322f263 +oid sha256:05ba2b34b2fefbc0a7bed274041f207ba3e49a9c530d6216a25a462c0d23334f size 1624 diff --git a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_8.nbt b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_8.nbt index 922a7483..123de338 100644 --- a/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_8.nbt +++ b/data/minecraft/structure/village/snowy/zombie/houses/snowy_small_house_8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23aabf456d9b9c6323e150c4a9fd8ed15c339f3571c7a3f8c213d8aac181af5b +oid sha256:70a12ff02f197c28aa905fa10e3d89db39e37f029ef489eff956d62c6e41841c size 858 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/corner_01.nbt b/data/minecraft/structure/village/snowy/zombie/streets/corner_01.nbt index 1c9a19a0..695076ee 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/corner_01.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef47dcfc4888464127bcf53f6b50369266ec688f60a9bf0f8e58e46c96d56463 +oid sha256:0360d0678bf5033796e8b22584fef9c9749e13be7f44f6944db5d2761dcd3d57 size 1107 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/corner_02.nbt b/data/minecraft/structure/village/snowy/zombie/streets/corner_02.nbt index 5ff5c51d..614a836f 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/corner_02.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/corner_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:610864c95ff96a0984e181d8c421499ca34dbd1a92343149d097271671cc9ddd +oid sha256:94fe4cfc5a177db526427888a97b2dc54ae80d8fe569a66db0981b24ceb526f0 size 1814 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/corner_03.nbt b/data/minecraft/structure/village/snowy/zombie/streets/corner_03.nbt index 61bedd8d..1912deb6 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/corner_03.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/corner_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62dc8a4a82419727c008a98b8f719bb4a9160ad18b4bfe75fa251e8f78eee13f -size 399 +oid sha256:58ab77f011c09ba9b6fdc4a7d347db6e85c351c0297f81b3436f344e22b45167 +size 400 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_01.nbt b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_01.nbt index a14852f6..7d24244c 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_01.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb1335b391d8711f1b5d2a2f8ac925c2df2f38b69965713d1e4ff20ef30b8c66 -size 1924 +oid sha256:a4e11328e0985e009c0f79a790d3a17b3113413581dbfc4581ea11a1e09b4614 +size 1925 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_02.nbt b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_02.nbt index 738f3dc8..cbd45190 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:560ea963a629a10cb2a5f36e96973bd2ce8d327fbb06c26cdede14312aae4871 -size 1962 +oid sha256:ceecd6d07b450554425baf9e44dcf5422fbe41595e9c58e8daeda3fed414a49e +size 1963 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_03.nbt b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_03.nbt index c383b48f..3d4e35d8 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8509a30ca8149d434d1a6a9380b6f97c2470b613a126fe62775b132d9971502 +oid sha256:d34d685c08ef7d8357d4cecbfe36a2ede23a5871fc3adda89e9c8c1a08f557db size 2029 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_04.nbt b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_04.nbt index 0d92be44..04b62501 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_04.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bdc0b2363d3f720a51fa997bb8e239df48ceb1684f35a02fe74cfdc9bc954668 -size 435 +oid sha256:290384a3a36cd9eba4a0de73a8955d1634848f2d06b1528bd7bb0286c51dd440 +size 436 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_05.nbt b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_05.nbt index 3a3c8652..2b84cf62 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_05.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d258bd7be8a5ee28a81ee4dd783ba909f3b873db48c59c7bb614c354f91192e9 +oid sha256:4fc08fbfb39d16318c69fadc85a9bd86821a161791c49f402239429b90264e2e size 477 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_06.nbt b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_06.nbt index 6503217a..4c6cd569 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/crossroad_06.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/crossroad_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f2e34c4282da87d18e41b740dc579a7ac8000ed6f5a40e053944d79159d4161 +oid sha256:886af8a7ae525e53df132e5d509082ff760b69daaec9dfc8a3a75535b4991df8 size 532 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/square_01.nbt b/data/minecraft/structure/village/snowy/zombie/streets/square_01.nbt index 76c40219..f123df10 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/square_01.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/square_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a90674655b4372fc0f4129edfbc617af46018f9fc6dc19687611766ab6d4b5a -size 1515 +oid sha256:7738329656895f76a8f0194dcf8e03a5f2ecbbeff5e4973e19a9321f1be8ee8c +size 1516 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/straight_01.nbt b/data/minecraft/structure/village/snowy/zombie/streets/straight_01.nbt index 0537bf84..b7032e1d 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/straight_01.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/straight_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12fdf0596fcf9ed0a3b9fd29ab5adb1efda8ee358b8aa606a469276538e338e4 +oid sha256:3b26ee2558a3fa316c6d884afcc1046867d96eb4adc780fbe09180c67ebd79c0 size 1856 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/straight_02.nbt b/data/minecraft/structure/village/snowy/zombie/streets/straight_02.nbt index 7948730c..4a1defad 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/straight_02.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea16b8d9cb389c3430028da6fefd4fa96c59ce836782db6423865968b9738169 +oid sha256:85c78ae78ba8f84abd87afabfbe6a6788443846b9b83bcff40177324a7c31084 size 1781 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/straight_03.nbt b/data/minecraft/structure/village/snowy/zombie/streets/straight_03.nbt index 9606ade6..89fff1ba 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/straight_03.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/straight_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fee96a6083bb10e36d35a0c4e296227b891c6d9ddb84b3aa2412616c1ae6c93 +oid sha256:b1d9c27bc9c256bb2021aae28db8ed1f17ffe9d910b589b3cf6417cb10d12d6f size 1224 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/straight_04.nbt b/data/minecraft/structure/village/snowy/zombie/streets/straight_04.nbt index e2211510..b1981356 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/straight_04.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/straight_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91b203f6468a86757f36b62f307af0a15ed511d861e83ee95aeb13f13f8a66ad +oid sha256:3d4908afa7ac9f19e7023c46581d8066af0265a2f8d2271675cbf7416650d3d3 size 718 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/straight_06.nbt b/data/minecraft/structure/village/snowy/zombie/streets/straight_06.nbt index 49380fa6..1303c193 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/straight_06.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/straight_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a293963bbf83dea8448e7f556788e6217cf9527328f2531b1c29db86444bad2a +oid sha256:15e3d563d5a5c7472c6da3ea067164fecd35a304b7b0457c052e3f8130c26138 size 2623 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/straight_08.nbt b/data/minecraft/structure/village/snowy/zombie/streets/straight_08.nbt index d008f039..3969facb 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/straight_08.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/straight_08.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94b7839e879fea63b80a21e5dc98588aa1d6edffefa0f7ef9e99a9cc1934261a +oid sha256:f5aa04426cbd68c9a37bc90373c0002c9408947f64cfdb44b9344cc9b5823d77 size 1947 diff --git a/data/minecraft/structure/village/snowy/zombie/streets/turn_01.nbt b/data/minecraft/structure/village/snowy/zombie/streets/turn_01.nbt index 79b29465..f9c38b0e 100644 --- a/data/minecraft/structure/village/snowy/zombie/streets/turn_01.nbt +++ b/data/minecraft/structure/village/snowy/zombie/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcf49da876fcc98cf8069fddc11ce8e9b073a7fac1b149837b1a48db1c432320 -size 1237 +oid sha256:48557d6aecd8da8d48f8ecb0eab3ea7d48b353b025ebf573635b3fed870e0fca +size 1238 diff --git a/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_1.nbt b/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_1.nbt index 3af72872..81adb38a 100644 --- a/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_1.nbt +++ b/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b896156c74959088267b5e61aaa95e70a7530921097f66ded691fee3457277cf +oid sha256:8106a3adf2afe620d6864ce6f81a99c21d696fc50e13802c9cda36233332d3d3 size 2694 diff --git a/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_2.nbt b/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_2.nbt index 344221f9..24e95c75 100644 --- a/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_2.nbt +++ b/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9be7255e2918b2b1217b82649832fbcf90575e10b55083891f01a2a28b5cc017 -size 990 +oid sha256:b4db0890074d35091ded2fbe63941d830789f035084311aa854256c6e1c4c13f +size 991 diff --git a/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_3.nbt b/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_3.nbt index 548cade0..a19f8d60 100644 --- a/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_3.nbt +++ b/data/minecraft/structure/village/snowy/zombie/town_centers/snowy_meeting_point_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f2b598b5286701c2eae71864d1fb6f3935b7c799a82aa632094b3be6ed87290 +oid sha256:4e93364532b81f4fe4ecf6a5e49ae8f1d49fa871dfbf0d6f5e6f025c6e9fe750 size 816 diff --git a/data/minecraft/structure/village/snowy/zombie/villagers/nitwit.nbt b/data/minecraft/structure/village/snowy/zombie/villagers/nitwit.nbt index cf3bee0e..b26bb485 100644 --- a/data/minecraft/structure/village/snowy/zombie/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/snowy/zombie/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417177f1a102ea34a9a702fe849549afe29abb1ef13bd67f3281faaa60a1485a +oid sha256:cd1324db50b9a3a7a99bb5bcf37777289de9661d1d88c5f9b072a0454c2dfe2b size 721 diff --git a/data/minecraft/structure/village/snowy/zombie/villagers/unemployed.nbt b/data/minecraft/structure/village/snowy/zombie/villagers/unemployed.nbt index 710d9d3e..9f2157e2 100644 --- a/data/minecraft/structure/village/snowy/zombie/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/snowy/zombie/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f7ce16482d57969a34fec2a0d65fe3d3d5558bdf95845a8b85b063c8a88a311 +oid sha256:904f6ade8a2b062d5b7280f8cafa39cfe893a964baa94fc26419019f924dbec6 size 719 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_animal_pen_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_animal_pen_1.nbt index 3f2bba61..cfb68699 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_animal_pen_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_animal_pen_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b85dbef27a030e855a051a84ffbddff3a5a2df73ff851a7ee67e7e8b8598fd4b +oid sha256:89dea7d0a0098d98d48ce2eefaf3def754fb09cb9904ac2d065da8db2849ccd7 size 2090 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_armorer_2.nbt b/data/minecraft/structure/village/taiga/houses/taiga_armorer_2.nbt index 44186138..265e6649 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_armorer_2.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_armorer_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ded7996c485b246d64fc35d3fc6c900ea75ebc17e6cfc852ac128cc6722ff836 -size 2579 +oid sha256:23282446623dab2e83624cbe2ddb0944adcc99e1333aca621f9f21642d8ae4ab +size 2578 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_armorer_house_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_armorer_house_1.nbt index 14bccdb6..08272a96 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_armorer_house_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_armorer_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2dc942fa007a0c13b122b45a49c305dd7a9763a231aab60ecfce563035a5fec -size 2072 +oid sha256:5c93cb6cf5fd3ce3b5ae202aeaf2e01c62acaa9b48105968879cc35d05116570 +size 2071 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_butcher_shop_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_butcher_shop_1.nbt index c0074dcc..88aa51a1 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_butcher_shop_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_butcher_shop_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cae750176bb88e1111073dcad80513e2bc196484363828d24de5cc56c1948eb5 -size 3295 +oid sha256:7a753f6c146b96c1f6201de71e7c409c7321ada2f8a01542fd25d1e3cc666c41 +size 3294 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_cartographer_house_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_cartographer_house_1.nbt index c92c6425..76f9d000 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_cartographer_house_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_cartographer_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0bd117ccab5f6d26156466d1484168f7102cb27a67d8cc93ef9a9bb1a71fa27 +oid sha256:2cc31f5a8eeed7979d112d6e926eaafb855d579c5aaab0742a35754055c1eade size 2606 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_fisher_cottage_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_fisher_cottage_1.nbt index 2244c038..fa1446bc 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_fisher_cottage_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_fisher_cottage_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed659dae3844b09081176adee04d41bf4f4632884d2fc7d43ff4b9c16395b3d0 -size 3653 +oid sha256:632d19f9078ee37e7c2c80e11564778ec6ada87dadb4bf7ff96ed2822da2cf12 +size 3654 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_fletcher_house_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_fletcher_house_1.nbt index 3cb123b1..9dbf531c 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_fletcher_house_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_fletcher_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b413e7460e1454f0553d9fcbd0a3612864b422c1af437a67f41fdc681f58343 -size 2767 +oid sha256:fb37c191e1192a2a8377178bc491b64330f9bc9e6bc5b425b07c1f6c14ee52c3 +size 2766 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_large_farm_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_large_farm_1.nbt index 149cfccf..bbc3792d 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_large_farm_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_large_farm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b93b6172b9babf936e095ff8c6ba534142285107e4b91d07aedf5a33860be6f +oid sha256:a1656d935deb700ea294567ec7425938d7902e90df8a9a4d74335ad848f67527 size 2212 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_large_farm_2.nbt b/data/minecraft/structure/village/taiga/houses/taiga_large_farm_2.nbt index 503ea51c..2c129970 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_large_farm_2.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_large_farm_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e4a45ebd8d71541c44760a18a7f1107c96dcde4ff9c954954f694886a7c192f -size 1599 +oid sha256:7db8cd07679af6cd59a36b03745c29e3621bbb314df5e1f5349997670b51ae71 +size 1600 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_library_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_library_1.nbt index 31a69eec..439c3336 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_library_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_library_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9db6ac2f92b04cfaa98ae8b4d7ab82bcbced4adce219ecba57600a995cee6a4e -size 3447 +oid sha256:3d7cc85448c944fc799c05e68cec8248c7240eb9ae56218c922d8eb2329e671d +size 3448 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_masons_house_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_masons_house_1.nbt index eba69e27..8f101a39 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_masons_house_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_masons_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72c9b04271d6f689aa0d2f017fbb1b560a81b3c0c0326f482c81defce4fa91c6 -size 2189 +oid sha256:5bddd4802f3503286058b3a64555d23f0b91e91156e2c275fb79f137b9f57a97 +size 2190 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_medium_house_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_medium_house_1.nbt index 7e946f84..bcb4421e 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_medium_house_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07bbc8d880dc35b017f8d8951450300ae473ee12c8759ef572bf2eb4c1ab1f75 +oid sha256:63cee817896e2b22efe0fb64d2a4579f47eeeb2d8a778a9fefbd03ff661e9c5c size 2835 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_medium_house_2.nbt b/data/minecraft/structure/village/taiga/houses/taiga_medium_house_2.nbt index 594b2444..b0bd2905 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_medium_house_2.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bdf510ae0657724a13b496e2615e884f6f9f18a0ee5b32cec0c05dd0d2d3c0f -size 2609 +oid sha256:fa96c49963528e43e7ee9d4d36c0d225405f36f9a92aac59bb55eff992b82b5c +size 2608 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_medium_house_3.nbt b/data/minecraft/structure/village/taiga/houses/taiga_medium_house_3.nbt index 571028b7..345f5c8f 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_medium_house_3.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_medium_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e513cb10ab2d053ad4bc7c1f6b0eb1d38a6e37432da53fc23417ec5486cff2d +oid sha256:e4fb94a39037d01c6bf28f38123ac8f222ca5d88a23dfe73d425b757afad57ae size 3065 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_medium_house_4.nbt b/data/minecraft/structure/village/taiga/houses/taiga_medium_house_4.nbt index a1ad1ac4..8f8c7f0f 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_medium_house_4.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_medium_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:243b9a7357de0117c3a9ce2e6958d23b1232e55089485df7c4187f01aa48193c -size 2771 +oid sha256:43025aa92b2ca6ed7606dc287e725a172b774e250028bb6a52dcac37e97401fe +size 2770 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_shepherds_house_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_shepherds_house_1.nbt index 2380e4fb..aa9232f0 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_shepherds_house_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_shepherds_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16245f23d8f31220959d69b10ea4f3950be33df8a5ece86100b37fb28932ec50 +oid sha256:14f86fcd14348c02d6569f4457f9f430da3cb88b7bdb644fddd661e941d13094 size 3016 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_small_farm_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_small_farm_1.nbt index 32e605c0..2b8b6ce8 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_small_farm_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_small_farm_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7bb8de8c51dee57ddb67b3a449791a0d27bfd91ff4db5368cfec6b0864d0cb6 -size 1256 +oid sha256:beb69cac85ae842a7b69fdf682feae46093abe806e600c62550a6c8cf57d34e9 +size 1257 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_small_house_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_small_house_1.nbt index 1f94a5f4..eaf00579 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_small_house_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21eaa0659d09bf2ea8f15c8f8d884ab507679a0c22ae8528f42aa1fba3080a1d -size 2374 +oid sha256:c92491ed46d5fbe90f6ac8d97276adc4f2b697c4d52ae85197f573bfc0a2fcfb +size 2375 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_small_house_2.nbt b/data/minecraft/structure/village/taiga/houses/taiga_small_house_2.nbt index ff3b666b..a7acb50a 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_small_house_2.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45bfcd643558eb79afc76a169d5288d9fd7aca1a16c79e517083557984cad03e -size 1775 +oid sha256:693589ee70b057d47420e9d718c04c847a75ec4b93ea7e1665b52d38a1b9e6a3 +size 1776 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_small_house_3.nbt b/data/minecraft/structure/village/taiga/houses/taiga_small_house_3.nbt index 913575a9..9573d0b0 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_small_house_3.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69c8ecd2bd485b7e4505a74c824f1a0a589b268252e687809d19472ce5558c76 +oid sha256:84b8eb38f8ace2d0b3cbe1305680ca6733043ee75203035ea3cafd4e3aa8f8ea size 1870 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_small_house_4.nbt b/data/minecraft/structure/village/taiga/houses/taiga_small_house_4.nbt index b0812ee4..363a8e22 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_small_house_4.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ce1d0cfa803c8fdaa183150a566291a85dd6489ab52ce9103661a57f8122602 +oid sha256:3012c78bd7528abb657615733fa79b8866958d275c430fb345f1e3293dfcc532 size 1607 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_small_house_5.nbt b/data/minecraft/structure/village/taiga/houses/taiga_small_house_5.nbt index 4b6badb1..b09806f8 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_small_house_5.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb40842444330027733a93c8bee905b17ab9fe0960938dbbab53f23f76dc9093 -size 2042 +oid sha256:3825a7ba54ed808a05fd585349b539f8b6283dafc62ef6a7c51c06f2f2259a4c +size 2041 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_tannery_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_tannery_1.nbt index 7a56085c..8b8a22f0 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_tannery_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_tannery_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f78d4c4b21b495106ac8bf42fac4244fde9eb78a865bd3fee1b9fc4da2035de +oid sha256:32462025d37ccff2e56e696da7137a816cbddfe4fe0fbff2cf5402202553b6e7 size 2156 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_temple_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_temple_1.nbt index 449b9a98..d5b8c724 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_temple_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_temple_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76dcdb12604539231fe8389db31100bc6b32b449aaa4d50d8211e95e89c48b5d +oid sha256:cfe8d58537f8b3acfb1d26a982212881df5f73fda5975533e8d9afc027238d95 size 6643 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_tool_smith_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_tool_smith_1.nbt index 204beb72..74325ad6 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_tool_smith_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_tool_smith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4ca8168ec78463c56f3595157c85e2a1cc4ae9ee038eb645cdeca150a4a9c04 +oid sha256:598af4ee9e6e51d0a79aae6acba3ce29c2952f0eaf58cd05346aebb54ae483b1 size 2164 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_weaponsmith_1.nbt b/data/minecraft/structure/village/taiga/houses/taiga_weaponsmith_1.nbt index 5ccb6407..213f08cb 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_weaponsmith_1.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_weaponsmith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56ccead54119d8d890f2b4178717a4458421e1606a22ab399e69bfdb66cc70d4 -size 2076 +oid sha256:8d0b797687b7f77c6b5255259f1bd389c60ab68cd605b20cf44431d6539e9b65 +size 2075 diff --git a/data/minecraft/structure/village/taiga/houses/taiga_weaponsmith_2.nbt b/data/minecraft/structure/village/taiga/houses/taiga_weaponsmith_2.nbt index efb96e1e..c5e7d201 100644 --- a/data/minecraft/structure/village/taiga/houses/taiga_weaponsmith_2.nbt +++ b/data/minecraft/structure/village/taiga/houses/taiga_weaponsmith_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:290955afda9a77e784e7e641f985d0732ad869d11751044c55e0cef025a89bfa +oid sha256:04656c4fb17e7049a3d9fbb39df78afe834ce36a1c3444619f708da14d58f5eb size 1187 diff --git a/data/minecraft/structure/village/taiga/streets/corner_01.nbt b/data/minecraft/structure/village/taiga/streets/corner_01.nbt index b73a7f16..b7c82832 100644 --- a/data/minecraft/structure/village/taiga/streets/corner_01.nbt +++ b/data/minecraft/structure/village/taiga/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5aa7765586fda6b1b9d3c919014fbbec9009ad3f0d1a7e7af4994add6a24204 -size 1181 +oid sha256:39acedd7c2d1063eebcd8f4443af8bb6ff9a67eec50702a5f1834937e9709282 +size 1182 diff --git a/data/minecraft/structure/village/taiga/streets/corner_02.nbt b/data/minecraft/structure/village/taiga/streets/corner_02.nbt index c555e96d..05ef4a77 100644 --- a/data/minecraft/structure/village/taiga/streets/corner_02.nbt +++ b/data/minecraft/structure/village/taiga/streets/corner_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd12cfce13c315db4dbdf1c266feb90e09121d335d0a3acef3cc249ad0f7a709 +oid sha256:f1bc74ad6fc172e167075583c0531a10a9977da534131cae84eb07f37ae441fe size 1183 diff --git a/data/minecraft/structure/village/taiga/streets/corner_03.nbt b/data/minecraft/structure/village/taiga/streets/corner_03.nbt index 43ffa9a4..7779a2b8 100644 --- a/data/minecraft/structure/village/taiga/streets/corner_03.nbt +++ b/data/minecraft/structure/village/taiga/streets/corner_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85677f0780752057ec853085dcbb0bb655e3322a48ba5db48d758f67b59c6dc9 +oid sha256:89bf5a35fa907ba63245b56bb6e08d38e98819255fa4d123bf2322fe17ec0138 size 350 diff --git a/data/minecraft/structure/village/taiga/streets/crossroad_01.nbt b/data/minecraft/structure/village/taiga/streets/crossroad_01.nbt index 8b7b2a78..6efb0e67 100644 --- a/data/minecraft/structure/village/taiga/streets/crossroad_01.nbt +++ b/data/minecraft/structure/village/taiga/streets/crossroad_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:549fd47f6c53984e77fffa1f725cab2aaeb78c3e6d90be36e8afec3ea9174dd3 -size 1213 +oid sha256:d2ea02707e46b848e2da9e9d56951d47307748aa464c51ead242a7eb2f4134b3 +size 1214 diff --git a/data/minecraft/structure/village/taiga/streets/crossroad_02.nbt b/data/minecraft/structure/village/taiga/streets/crossroad_02.nbt index 061feff5..ce6d8803 100644 --- a/data/minecraft/structure/village/taiga/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/taiga/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:237a708229eae8849aeb0c61801e0121057def8c9711d4dc3d18221a68f30334 -size 1159 +oid sha256:397fc73c968ac15b5719c035ba8b042491a2bb8137fc491c9f3e01808558e537 +size 1160 diff --git a/data/minecraft/structure/village/taiga/streets/crossroad_03.nbt b/data/minecraft/structure/village/taiga/streets/crossroad_03.nbt index 016214f0..44bb066b 100644 --- a/data/minecraft/structure/village/taiga/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/taiga/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a10b47189c6139dc6adc875d3f580879c55333b934c9d8487f3df30dc82bd5de +oid sha256:b8400c5f3d71c91e9e7ac68df48a79017a46b9da5c2f8c613d64dee9f7bcdd3d size 1202 diff --git a/data/minecraft/structure/village/taiga/streets/crossroad_04.nbt b/data/minecraft/structure/village/taiga/streets/crossroad_04.nbt index 4ec886c3..5a82f932 100644 --- a/data/minecraft/structure/village/taiga/streets/crossroad_04.nbt +++ b/data/minecraft/structure/village/taiga/streets/crossroad_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:831b5c94a59c673ae7452e4f16f20cd1a2b0a98587114b5641234a0b29cd75a7 +oid sha256:9bfcc102751006c31d2977db5e2017f2542433ff79e75432adf80a52e37a2732 size 435 diff --git a/data/minecraft/structure/village/taiga/streets/crossroad_05.nbt b/data/minecraft/structure/village/taiga/streets/crossroad_05.nbt index 71407aa9..c308a72b 100644 --- a/data/minecraft/structure/village/taiga/streets/crossroad_05.nbt +++ b/data/minecraft/structure/village/taiga/streets/crossroad_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a5b7c9b5c6bbbfd9b6d5016fcd6948f1b4e8f86a1aa390957f8e17922ecbee2 +oid sha256:779b42986c0d54ad0c20350e72c071a46f3df0564cd630c9e7f0a851abbefe04 size 409 diff --git a/data/minecraft/structure/village/taiga/streets/crossroad_06.nbt b/data/minecraft/structure/village/taiga/streets/crossroad_06.nbt index 04b43d43..c46d6ae1 100644 --- a/data/minecraft/structure/village/taiga/streets/crossroad_06.nbt +++ b/data/minecraft/structure/village/taiga/streets/crossroad_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e7d31e44d5836bc9143c1f5ce255d86a7da49b5b750dd196596ca5d0df77372 +oid sha256:df821aad57d097baeaa606f475c418e350b4df7dd7637dd956ed4704f056ce1a size 470 diff --git a/data/minecraft/structure/village/taiga/streets/straight_01.nbt b/data/minecraft/structure/village/taiga/streets/straight_01.nbt index 9ff45a7d..3e99ff2a 100644 --- a/data/minecraft/structure/village/taiga/streets/straight_01.nbt +++ b/data/minecraft/structure/village/taiga/streets/straight_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0595d5fd04f3490438d8cff3aa179e7fe6a177a0fa27d39b62b232ae358616a1 -size 1130 +oid sha256:1e790771fa7d8957817e3ff3b78e6cb43ec93917bdda736bd060253ab8f4f435 +size 1131 diff --git a/data/minecraft/structure/village/taiga/streets/straight_02.nbt b/data/minecraft/structure/village/taiga/streets/straight_02.nbt index e04551c6..cce8e1a4 100644 --- a/data/minecraft/structure/village/taiga/streets/straight_02.nbt +++ b/data/minecraft/structure/village/taiga/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffb157acc59b8c2b9836773ebdd6d4e51225082e784ff198e4c8f15cbad1536c +oid sha256:627884574f4091a0e0332e7aaa547d8fd2ad3cf0c284e15544f08501480c0686 size 1146 diff --git a/data/minecraft/structure/village/taiga/streets/straight_03.nbt b/data/minecraft/structure/village/taiga/streets/straight_03.nbt index 94a2dbca..621456e9 100644 --- a/data/minecraft/structure/village/taiga/streets/straight_03.nbt +++ b/data/minecraft/structure/village/taiga/streets/straight_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa305f9d34e2c3d445135b9e1e7cf395d02b6c2e7fc626f1d456c1877a2e33c7 +oid sha256:8c770d285aaf7f2427398f1a69fd3f92b95b187743006af247181015cba48431 size 775 diff --git a/data/minecraft/structure/village/taiga/streets/straight_04.nbt b/data/minecraft/structure/village/taiga/streets/straight_04.nbt index b3736c15..7b77c2f7 100644 --- a/data/minecraft/structure/village/taiga/streets/straight_04.nbt +++ b/data/minecraft/structure/village/taiga/streets/straight_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de77824ca54c3de04fac36b93ba3d58d7965d609626641810efa79c920509abb +oid sha256:8dd21fe86e2b74e370d31206a51f5e8bbbdd07f9503716dcac304541dd19e922 size 685 diff --git a/data/minecraft/structure/village/taiga/streets/straight_05.nbt b/data/minecraft/structure/village/taiga/streets/straight_05.nbt index 4160b68e..d621cec9 100644 --- a/data/minecraft/structure/village/taiga/streets/straight_05.nbt +++ b/data/minecraft/structure/village/taiga/streets/straight_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15be927d67876ee93a8a6ec5091bbfa3eb6f74bd063e5452896d4776db68194f -size 1388 +oid sha256:caebce2c8c197e19f414c848b6bb934d6c3afc273c547f4568b5813ef26f255f +size 1389 diff --git a/data/minecraft/structure/village/taiga/streets/straight_06.nbt b/data/minecraft/structure/village/taiga/streets/straight_06.nbt index 69b16279..d35c4690 100644 --- a/data/minecraft/structure/village/taiga/streets/straight_06.nbt +++ b/data/minecraft/structure/village/taiga/streets/straight_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f203436a78086651dc5f20fe8103205be6a6dacb9f971031eb56c11ad339987 +oid sha256:b1d82c60ea828f7bd12bb112abdbe915eec76a84d9bad9e3a7968f9dd0952e30 size 1702 diff --git a/data/minecraft/structure/village/taiga/streets/turn_01.nbt b/data/minecraft/structure/village/taiga/streets/turn_01.nbt index 6629e7b3..5396bcf3 100644 --- a/data/minecraft/structure/village/taiga/streets/turn_01.nbt +++ b/data/minecraft/structure/village/taiga/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bc95ba981cc1bd5a068208a0ca5f93435d961cf95d2d88c1de26b3129d7ca02 +oid sha256:3ab92c8d186b540546a6f2387cf12a94fd9efc3a3467517aba5b59ebc93e9a40 size 789 diff --git a/data/minecraft/structure/village/taiga/taiga_decoration_1.nbt b/data/minecraft/structure/village/taiga/taiga_decoration_1.nbt index 53bd1320..5e01d616 100644 --- a/data/minecraft/structure/village/taiga/taiga_decoration_1.nbt +++ b/data/minecraft/structure/village/taiga/taiga_decoration_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c70749faf2ee0072d96ece47301f8b19439640c2d756164f5f5394faed851ed4 +oid sha256:86f5a52cf36007039ced14b78322c33b4508abdd82e1f00d8ed748dd125979f7 size 422 diff --git a/data/minecraft/structure/village/taiga/taiga_decoration_2.nbt b/data/minecraft/structure/village/taiga/taiga_decoration_2.nbt index ffe7e1ab..9c626e38 100644 --- a/data/minecraft/structure/village/taiga/taiga_decoration_2.nbt +++ b/data/minecraft/structure/village/taiga/taiga_decoration_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec92a4d820fa21d047fedd7551d57183e8ccf62ebe5c4781973bd6b3852fe2ff -size 367 +oid sha256:57eb948efeaf68738c64a735fd3a8983fc4ba2596ea890b957c612d5372ba778 +size 368 diff --git a/data/minecraft/structure/village/taiga/taiga_decoration_3.nbt b/data/minecraft/structure/village/taiga/taiga_decoration_3.nbt index 9f8afcc8..2ec2d7c6 100644 --- a/data/minecraft/structure/village/taiga/taiga_decoration_3.nbt +++ b/data/minecraft/structure/village/taiga/taiga_decoration_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e792aaf520c9e3ed0e5fde095f3de0a2690ec48531967732901a6aab17b57b4d +oid sha256:9b276e38481bfe0ce15810c3f93ef2aea5dc963b1d07b20d6ecd9279ddbddd1f size 353 diff --git a/data/minecraft/structure/village/taiga/taiga_decoration_4.nbt b/data/minecraft/structure/village/taiga/taiga_decoration_4.nbt index 161295c3..9b660119 100644 --- a/data/minecraft/structure/village/taiga/taiga_decoration_4.nbt +++ b/data/minecraft/structure/village/taiga/taiga_decoration_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34d1d8ef89ec7367c487fa25f6e53969c88fe0c7b421f268d43b782fbdf42156 +oid sha256:c608271f80c6ee07497669a97138eeab6e522c338335c827687d174a67e498aa size 323 diff --git a/data/minecraft/structure/village/taiga/taiga_decoration_5.nbt b/data/minecraft/structure/village/taiga/taiga_decoration_5.nbt index 24d0695b..4efe3f87 100644 --- a/data/minecraft/structure/village/taiga/taiga_decoration_5.nbt +++ b/data/minecraft/structure/village/taiga/taiga_decoration_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9523519cee735c153ed9d564887ebd63119b3a30d040ac967c4a94ff235ea539 +oid sha256:e0d27e29ffde61e82b0359ba38ff0b829cea4b874a1072e13486520bc2d7f0e8 size 249 diff --git a/data/minecraft/structure/village/taiga/taiga_decoration_6.nbt b/data/minecraft/structure/village/taiga/taiga_decoration_6.nbt index ed09e0a2..335fd0da 100644 --- a/data/minecraft/structure/village/taiga/taiga_decoration_6.nbt +++ b/data/minecraft/structure/village/taiga/taiga_decoration_6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90397564c3aba9376b5b6df94cb9086b7920799d1ff0c4a871395162ad89c2d5 -size 470 +oid sha256:023d0cdd7670d52cb9bbbe5293acc0425ddd039f0c143798dde5b771de549fe6 +size 469 diff --git a/data/minecraft/structure/village/taiga/taiga_lamp_post_1.nbt b/data/minecraft/structure/village/taiga/taiga_lamp_post_1.nbt index fb60d15a..245efb25 100644 --- a/data/minecraft/structure/village/taiga/taiga_lamp_post_1.nbt +++ b/data/minecraft/structure/village/taiga/taiga_lamp_post_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69719a366b2489f1cccf90e920dc6ca611bf2830a86bdb30dc15a35995698233 +oid sha256:816a10e6913819e2c8d033ea8418a76dab1ecc2a6bf04eeee296205113eab0fb size 252 diff --git a/data/minecraft/structure/village/taiga/town_centers/taiga_meeting_point_1.nbt b/data/minecraft/structure/village/taiga/town_centers/taiga_meeting_point_1.nbt index 641b20ff..fca22810 100644 --- a/data/minecraft/structure/village/taiga/town_centers/taiga_meeting_point_1.nbt +++ b/data/minecraft/structure/village/taiga/town_centers/taiga_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e602ab46333e79a6cfb367cd5052291ba877c8c8946b227131445a09c49bce3 +oid sha256:45f3723f608794f48be419495b1c7d22a51e9b5f716761209936e971fef047af size 3946 diff --git a/data/minecraft/structure/village/taiga/town_centers/taiga_meeting_point_2.nbt b/data/minecraft/structure/village/taiga/town_centers/taiga_meeting_point_2.nbt index 3deb93ff..2116bb7a 100644 --- a/data/minecraft/structure/village/taiga/town_centers/taiga_meeting_point_2.nbt +++ b/data/minecraft/structure/village/taiga/town_centers/taiga_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4471c683841668f0491bc1f2834306c67836085e2e6a7dad0db7539d6df58b2 +oid sha256:752a32c0eb1cb536c013f863565a28b6332e83e307c982b22c756b990993029e size 2270 diff --git a/data/minecraft/structure/village/taiga/villagers/baby.nbt b/data/minecraft/structure/village/taiga/villagers/baby.nbt index 5d0d0741..d3fce75f 100644 --- a/data/minecraft/structure/village/taiga/villagers/baby.nbt +++ b/data/minecraft/structure/village/taiga/villagers/baby.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a5115abfd975404087ba40cbbc6a81f4e058ece64dde38a5d8aeb3e5a8c37e9 +oid sha256:ec390ede70f31092d6669ca876d2bedd391012ca566dd38dce3092a129d65f6e size 719 diff --git a/data/minecraft/structure/village/taiga/villagers/nitwit.nbt b/data/minecraft/structure/village/taiga/villagers/nitwit.nbt index dc585582..344fbdd5 100644 --- a/data/minecraft/structure/village/taiga/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/taiga/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7bdb49f9a42e6fe8d2372afbd708666135870e33bb399ceaf20579f33ab72239 +oid sha256:2be1fbe81aa1b5c6ef9e9e2671b60faafedf408a28ca358834df9eabe1d3aad8 size 716 diff --git a/data/minecraft/structure/village/taiga/villagers/unemployed.nbt b/data/minecraft/structure/village/taiga/villagers/unemployed.nbt index e9970387..967dcfa7 100644 --- a/data/minecraft/structure/village/taiga/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/taiga/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84ce11f7d650f6d490346ae997fbed447edce6b382e5102a05868e8db9fb91b5 +oid sha256:edd652c3afe41f19b63a17a69d2aec255ad7b333042ce64b4c361e4e37db97d4 size 714 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_cartographer_house_1.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_cartographer_house_1.nbt index 24cc65b5..3e337061 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_cartographer_house_1.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_cartographer_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7939104b114395ed6f1ad5bd440c9fcdbac47b0299f83d4b355d5235d8181240 -size 2613 +oid sha256:0f2730e2a9e006d6f56a1461268a299ca3a70cec255a4b302b7776ec379a83e1 +size 2612 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_fisher_cottage_1.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_fisher_cottage_1.nbt index fd4c92d6..3a4c5233 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_fisher_cottage_1.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_fisher_cottage_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f82a85915ca83bc8b746a70f0902725105b8f21654a9a5986afdd29622c9ced +oid sha256:3ace6b1cf5c7baaf1e0de40150c3f08210845bc572d63e1ab703dfc6c47ee0c6 size 3666 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_large_farm_2.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_large_farm_2.nbt index b2b93fd8..8209a404 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_large_farm_2.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_large_farm_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e991be49f51bc5074af77f1e03784327da7d18ccce3c2c9bf34d86506b476b35 +oid sha256:99676c788d054c3efd8d84abfe7fff79bd9126c7578b80ed166ad6d5be786ad0 size 1606 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_library_1.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_library_1.nbt index 8c76f66c..bd0408d8 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_library_1.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_library_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:607ccb9650c5ca58ac86f56037ff1569c1a1597e07262bf66db9d6f63b51267b -size 3458 +oid sha256:10a6a7c3d2695b0bf5a7d2b743cd229af501d0817d80eeeff5aee7a32d5ce8af +size 3459 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_1.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_1.nbt index 12276456..2eb45531 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_1.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7210708c22e8346d30993ad53f38f6d13248d12fbc213b0704363414992a92cc -size 2786 +oid sha256:4248efb9461f14a8345a872a387e820e56c502fba0139b4c0ecfc7395eae5a11 +size 2785 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_2.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_2.nbt index 4ebf0451..e53ef46e 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_2.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9a12e85f02a50f3d7d07399742fc50627e7311c32259dc408a28a750f1823c3 -size 2605 +oid sha256:1a3f4f34e344c16292e1a845a41708e3a0528d871ed3c53a4de8fe2390bbc3be +size 2604 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_3.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_3.nbt index 81e3ffe4..a2b6caac 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_3.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2109d6eb0a73de62cc669280cb773f07572aadea34a495d99782eb42d3ae0c7 +oid sha256:9456e191a4ca2ff61576bc458589772ba9f199519cfe126e4ee56be8c4a048b2 size 3069 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_4.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_4.nbt index 3d4751b9..de9ce9aa 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_4.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_medium_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e727d69255b103836886bae3eeb9e52cf48124b918c9ece731ac485ccf118784 -size 2710 +oid sha256:3cc08a29e7eeed59e6938b8af156371404a523def7ae8fbfe1efb65daef22e10 +size 2709 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_shepherds_house_1.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_shepherds_house_1.nbt index 788ee099..238ce003 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_shepherds_house_1.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_shepherds_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9d0d3c339f06b84dcedfdb84407ef1624820b795d898f2475f0eb0cb4e2c87f +oid sha256:b69fa4c66d0a84146310970b459625ee5c0a8e96ec61fecadcaeca47447ffd31 size 3040 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_1.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_1.nbt index 2ccd44fd..ad61d3ad 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_1.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdcaf4dbed8fbd431ce6ffd5d19849b38ce580c218c2e6c10ebb2f45d4ac259c -size 2380 +oid sha256:59838c6505b2288c1167dc1aea7bd3ec756e4adb7ff75bfe516834ee090328b5 +size 2381 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_2.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_2.nbt index 5de0f60b..a24a3c56 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_2.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23ea8e1d5d33b21dda43ebaefeeba355131ca4a859ca0cb867907b6260c1776c -size 1795 +oid sha256:5504001987c3dbbed74714012f03154efc48de63c61241d75088af41dc8ed62f +size 1796 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_3.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_3.nbt index 42cd78fe..b2b7b739 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_3.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d77f30d728f0e5d7ddbc66dd983b5295c3372f4ff943c405d9be48d7905bb126 +oid sha256:6416e5606756ba5df38b642fe101d78f9783a9455683d0fc24b88bdd5cb153ad size 1885 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_4.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_4.nbt index 766e9df0..75b2bc6d 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_4.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33c4259369bd4f560e541a6b60cdb88a763195cfd1292ecde80fc1f6c03e13de -size 1612 +oid sha256:47ac2831fd6054c2db1dc50c3e860401f82b9afb7232f3027124b4116b6c8ccd +size 1613 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_5.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_5.nbt index cc0d9ec9..6267beae 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_5.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_small_house_5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90f8f65b19cbb8f78df05202207d1e02de0f8634e025d9b3ec9fda3f966242b8 -size 2048 +oid sha256:fa64d0e39f37ac2981a9b9cd33c5cceb1c075e1f60c9dc5411715293c5f8f9d5 +size 2047 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_temple_1.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_temple_1.nbt index 449b9a98..d5b8c724 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_temple_1.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_temple_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76dcdb12604539231fe8389db31100bc6b32b449aaa4d50d8211e95e89c48b5d +oid sha256:cfe8d58537f8b3acfb1d26a982212881df5f73fda5975533e8d9afc027238d95 size 6643 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_tool_smith_1.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_tool_smith_1.nbt index 6da7f0d5..3129a517 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_tool_smith_1.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_tool_smith_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16fa81ab85f679d4dd8b6f27a676a30ed67058e55a56324c194a33eb0a3a4302 -size 2174 +oid sha256:6546625eb4226802915334e6c13ebc11ebd10a48ce37d8bda1e0b60c9d5cb37e +size 2173 diff --git a/data/minecraft/structure/village/taiga/zombie/houses/taiga_weaponsmith_2.nbt b/data/minecraft/structure/village/taiga/zombie/houses/taiga_weaponsmith_2.nbt index 6d77ce37..e8fc5fdd 100644 --- a/data/minecraft/structure/village/taiga/zombie/houses/taiga_weaponsmith_2.nbt +++ b/data/minecraft/structure/village/taiga/zombie/houses/taiga_weaponsmith_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e75d5f17e2fb6962bfdfcab14f8f084f815528d6cf9cb910ec98e1b5b8e4fd1 +oid sha256:8910daed3f7d529f9cf4ad4b9b0797731afb3ee05c933ee70308173ea2807950 size 1193 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/corner_01.nbt b/data/minecraft/structure/village/taiga/zombie/streets/corner_01.nbt index a6446d24..7fb678b3 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/corner_01.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/corner_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:379fa937b708d6187e8f2e18d51514691c3cc429366b65ec0e40b20bbe9ed287 +oid sha256:7fd543122ebbfcdf109ed6c44241a6a8ee3922dd227b1faff1766e3a88a80989 size 1186 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/corner_02.nbt b/data/minecraft/structure/village/taiga/zombie/streets/corner_02.nbt index 07c6d4f4..9d432783 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/corner_02.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/corner_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a37ba581a26b6e331fd0dbba89b8b01f33539c708c871ffcf045cec3231aed37 +oid sha256:d7735197f5ce8f8f15bcf0aae0c970eca99af011682b7088da231cddb592ff94 size 1190 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/corner_03.nbt b/data/minecraft/structure/village/taiga/zombie/streets/corner_03.nbt index 9f0ed066..3c1a6979 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/corner_03.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/corner_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:819dc649440c151b38fae89024e94c456842b765a04c3a20b96eb289108541fd +oid sha256:4b0d91d3641e858f7e7c5c9f2e32fbb86e18b5872b69fb971fe7d65c0364f26e size 355 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_01.nbt b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_01.nbt index 8d6070ce..528bab3b 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_01.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c70bc0ad6e253e030bf5eb9b2c62566368a1578fabe0d392743498a77b9831d0 +oid sha256:004a3e05a67e58a9b5b39451ddbb0638034da27bfa362d018020947d3c5a4c3b size 1219 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_02.nbt b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_02.nbt index 2337c1ce..c660ec52 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_02.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad06263bdf62491e2f5e0efb1953544e5001635eb1022251bf38c0aa9d4e3282 +oid sha256:6f9a9aa2780180bde39188b81768da42793c541476c4645adf5a28c3fdd8f087 size 1164 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_03.nbt b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_03.nbt index daa2fe01..531b4127 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_03.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:457a1d8886b8f380cae97a1532bfaeb849eb7ab699e8118e8d5f790843f74568 +oid sha256:7b6d37b64237ba9b3003b757646ad33af8fe50d6a53ea97676d771806d0c23b7 size 1207 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_04.nbt b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_04.nbt index a5589ef7..d991733e 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_04.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4c0c8697ceac724826fdc008f9a06de6e746263aa6499a4f9c0c605d8ea9a4c +oid sha256:6ad0fab353822b354584efa5abf3471d7420873ba61b3776682e447d1c2739a6 size 444 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_05.nbt b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_05.nbt index 24469abd..16834a6b 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_05.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:627395b8efaec00c13625759b3a4c1f3b78b49132ae857d687bc534b3fc9d776 +oid sha256:764bdaf8dd7c9e0b0d68b9aacfb298b3e2c520bf6147a042367a7201f88ffd1a size 413 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_06.nbt b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_06.nbt index 7a53b2db..68361194 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/crossroad_06.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/crossroad_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d8e7bccb080a42a04e7ca41f90da1357a436b301c009b8e7bb74dbff6958344 +oid sha256:f87b65e748080e9f48b182e2eafc0a04dbd711f59e116dec742e4799cc5bc821 size 475 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/straight_01.nbt b/data/minecraft/structure/village/taiga/zombie/streets/straight_01.nbt index f9bfd963..122ff6e8 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/straight_01.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/straight_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3a2e8fbcd73b7d2f624aefedd155b7103d834f2c0609329d0ad9e372c303037 -size 1134 +oid sha256:d894606afcb6a074da64dafe30e885a1d64309b8f94ab88d38de7ea71d415921 +size 1135 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/straight_02.nbt b/data/minecraft/structure/village/taiga/zombie/streets/straight_02.nbt index 8bcbdfa7..48b4252d 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/straight_02.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/straight_02.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99efc48da60c033f8c7a2a35b9c3baa38d0c20a7d0aec60b16b44b899527b537 +oid sha256:f56734fb2af211bd1a64b53f3256a7358261b235dade0bdcbd101c04d87e2be0 size 1151 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/straight_03.nbt b/data/minecraft/structure/village/taiga/zombie/streets/straight_03.nbt index 7c50071b..3a9b8025 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/straight_03.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/straight_03.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25f41bf9c3868c272afd79f69bde757dd5ac6c7c78d2209237daa02c44e5079f -size 780 +oid sha256:a7042b8817f534930349c25e977795a4616987943632b9d7b8a269142bdfaafa +size 781 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/straight_04.nbt b/data/minecraft/structure/village/taiga/zombie/streets/straight_04.nbt index af8e0b65..6df14544 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/straight_04.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/straight_04.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:375a137ff42e2f69324dfd1c6228e2d9bf2ba2a414c33c3ba15c0bcc7833ef05 +oid sha256:5fa4721dee7e82d5d2db697494084275b01bdbb3bd20aa8e311ea9971383d9bb size 690 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/straight_05.nbt b/data/minecraft/structure/village/taiga/zombie/streets/straight_05.nbt index 08139f51..11efbe16 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/straight_05.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/straight_05.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3153e73f6092a91a374bfc1c9c3284a898193d39f0726888b8c74aa9fd16e04 -size 1393 +oid sha256:8a92896f11aacbf7e895983f64d876d1e3ebd2daeda388a7c6f01a015e049d4f +size 1394 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/straight_06.nbt b/data/minecraft/structure/village/taiga/zombie/streets/straight_06.nbt index 24e0846c..e82ee2d7 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/straight_06.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/straight_06.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55a8141c8f56aac94caa6dc927aa52e7b47bab25268c1b9ddbbd3eab1adeb9b3 +oid sha256:4cc9849709e5dac9c9aa5ae2e633225c9fdd12b3a827c619f38d5b1e7ae89d2c size 1707 diff --git a/data/minecraft/structure/village/taiga/zombie/streets/turn_01.nbt b/data/minecraft/structure/village/taiga/zombie/streets/turn_01.nbt index 02697f08..a39ac646 100644 --- a/data/minecraft/structure/village/taiga/zombie/streets/turn_01.nbt +++ b/data/minecraft/structure/village/taiga/zombie/streets/turn_01.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b090a840d9b21b6f72d978a96cca56011b5330a8be6e0ccb51916c9edd77ad1 +oid sha256:4323a007b9e27089d7ace62006a6ab10e5cdd851a88d1a504f822d9f0285ce45 size 793 diff --git a/data/minecraft/structure/village/taiga/zombie/town_centers/taiga_meeting_point_1.nbt b/data/minecraft/structure/village/taiga/zombie/town_centers/taiga_meeting_point_1.nbt index 837e3847..ee7ee008 100644 --- a/data/minecraft/structure/village/taiga/zombie/town_centers/taiga_meeting_point_1.nbt +++ b/data/minecraft/structure/village/taiga/zombie/town_centers/taiga_meeting_point_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07c9bea57640fd086d11f373a79540f8dd9a299832b2a4ef1aa99ed55f80ffe3 -size 1848 +oid sha256:e5778e71c8cc1f246fe5f2a370d0760e244f5a56c9121b4c0b8f6f78e9b8298b +size 1849 diff --git a/data/minecraft/structure/village/taiga/zombie/town_centers/taiga_meeting_point_2.nbt b/data/minecraft/structure/village/taiga/zombie/town_centers/taiga_meeting_point_2.nbt index 94cbbbf4..3e967e17 100644 --- a/data/minecraft/structure/village/taiga/zombie/town_centers/taiga_meeting_point_2.nbt +++ b/data/minecraft/structure/village/taiga/zombie/town_centers/taiga_meeting_point_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dab5c81f89effb0d4b015323271b9210c7053ee26586072f6d2301d620b6d19b +oid sha256:de3d50dc1f5be0b1c7b5348b73470f90d8a651563521667481d6dba1a2780702 size 2257 diff --git a/data/minecraft/structure/village/taiga/zombie/villagers/nitwit.nbt b/data/minecraft/structure/village/taiga/zombie/villagers/nitwit.nbt index 5f4b641d..5bd01d1b 100644 --- a/data/minecraft/structure/village/taiga/zombie/villagers/nitwit.nbt +++ b/data/minecraft/structure/village/taiga/zombie/villagers/nitwit.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:911c7de45fe81b2747c03f204f7203da7d0a92dabd28789d43e993684942b50a +oid sha256:04888253233476763a11119b57dcc561eabafb65a6d29c9211ce41036da94780 size 721 diff --git a/data/minecraft/structure/village/taiga/zombie/villagers/unemployed.nbt b/data/minecraft/structure/village/taiga/zombie/villagers/unemployed.nbt index 0408eac6..0b832654 100644 --- a/data/minecraft/structure/village/taiga/zombie/villagers/unemployed.nbt +++ b/data/minecraft/structure/village/taiga/zombie/villagers/unemployed.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d1e96ce32f263c51b530d8c1de257af2fdef3b9426412cf3e58ece79d686d31 +oid sha256:03766a20219dd735ffc274fa161da09e5259cdff6bdfc72eda8b7e5635fdd109 size 720 diff --git a/data/minecraft/structure/woodland_mansion/1x1_a1.nbt b/data/minecraft/structure/woodland_mansion/1x1_a1.nbt index 22d37e80..6a961052 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_a1.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_a1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30fc085e2602d29ec3c86428c2a1cae0c535396133f5b813d7ed840aacd1ff90 +oid sha256:8d179e82c3963aae063d03e0a323fa3b0d3b86e417367ed764e879e101d14a7c size 1433 diff --git a/data/minecraft/structure/woodland_mansion/1x1_a2.nbt b/data/minecraft/structure/woodland_mansion/1x1_a2.nbt index 55b15f64..69f99460 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_a2.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_a2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c81813e448b2c967393942e60d36bb4dfe438ff9a7b0fee6e102c71158b1e23 -size 1529 +oid sha256:dafbb1082ddfeeb842e711867f5d1f2b046e6341f4279855f1ac0204bc5a3911 +size 1530 diff --git a/data/minecraft/structure/woodland_mansion/1x1_a3.nbt b/data/minecraft/structure/woodland_mansion/1x1_a3.nbt index 06840c77..5c7e4d7a 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_a3.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_a3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c931d03b27717a54566f6cbd6d57361556df853cb7e26c1cd45227713f8f3775 +oid sha256:0b1d9da64206e343187be04e377a2ca9ca4fe2f85ebf3cd7d5705a57cd385887 size 1416 diff --git a/data/minecraft/structure/woodland_mansion/1x1_a4.nbt b/data/minecraft/structure/woodland_mansion/1x1_a4.nbt index 8cc29bfd..2d17437b 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_a4.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_a4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:641be1513f23ec9a47b53f25ebf84f1b18df7dc7303ad48980d0b3a4834e5023 +oid sha256:e354e16410d0cf215af0a171cd2ca1e7cc42b7c33079b18504784729b518432c size 1682 diff --git a/data/minecraft/structure/woodland_mansion/1x1_a5.nbt b/data/minecraft/structure/woodland_mansion/1x1_a5.nbt index 7802d48e..72a2dc44 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_a5.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_a5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32a81e4f0bf0b480fc33e5793735140019960e4a0b3865e0aac491385ab5d5ac +oid sha256:52e55bc50aea6554e35c24387e47a3d012d5b9b49170fe4235fccb818fd9e10e size 1491 diff --git a/data/minecraft/structure/woodland_mansion/1x1_as1.nbt b/data/minecraft/structure/woodland_mansion/1x1_as1.nbt index 8e116628..47ee29cc 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_as1.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_as1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57d614e1936f00e03ebffb3e3667da35b9a5dc464c063a3226ecc9cfd852403e +oid sha256:54b6a9000f25e11c25a23845ba68db587e362f47fbe0fe82eccb5682a4ddd203 size 1485 diff --git a/data/minecraft/structure/woodland_mansion/1x1_as2.nbt b/data/minecraft/structure/woodland_mansion/1x1_as2.nbt index 29677a7d..830c99f2 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_as2.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_as2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4e2957e9d978dd1078f3a66a15bf7159ce554e595ad752fae9e147ee33e18ac -size 1455 +oid sha256:6f0dbfca7d9a67cd4e2df465d517d203d3c66d27ffe0f2766dcccf30753cb7e9 +size 1454 diff --git a/data/minecraft/structure/woodland_mansion/1x1_as3.nbt b/data/minecraft/structure/woodland_mansion/1x1_as3.nbt index 76c2bfa5..4b321913 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_as3.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_as3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3faf7f43803b8b83d3762d1b7ab3f760cb87fd9767de324e8b759f3d9f42e38c +oid sha256:6ae51351bae2ccb6900d38232d34528a6c5f4698d8d58e34848d9c405030deff size 1211 diff --git a/data/minecraft/structure/woodland_mansion/1x1_as4.nbt b/data/minecraft/structure/woodland_mansion/1x1_as4.nbt index 501974d2..b67cb46e 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_as4.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_as4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51b8da8442d15ba74e924cc9153e6c02d6cfb50ba44be77eb965576ffac9b228 -size 1211 +oid sha256:72ec63e32853d03d7dd9e251e2e68459060d0c011771e1243db8e0fe180de61a +size 1212 diff --git a/data/minecraft/structure/woodland_mansion/1x1_b1.nbt b/data/minecraft/structure/woodland_mansion/1x1_b1.nbt index 22678bbb..c1ba3a9c 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_b1.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_b1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ad57ef49e68fba2629442d619052f41dbc3024eccef6c7dedfa5b3a828b18c0 +oid sha256:ac733f88d393275735ed74e7101f96d42f9bb273d9ae38a66132235dd93e57e5 size 1924 diff --git a/data/minecraft/structure/woodland_mansion/1x1_b2.nbt b/data/minecraft/structure/woodland_mansion/1x1_b2.nbt index 700ecc16..c776691e 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_b2.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_b2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8597e782fbedaf4855487219cf2ea063b90cef4a2176bec0d86888daf47e16ed +oid sha256:3398b42a1938f7fa367c10ef4d190ef7aa4b6f3498bb17787a0f5620111e8337 size 1864 diff --git a/data/minecraft/structure/woodland_mansion/1x1_b3.nbt b/data/minecraft/structure/woodland_mansion/1x1_b3.nbt index 3dea311e..b23acf97 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_b3.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_b3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b04d61a057a55ca471dee35538e656670288229f2e004528a4b1ed680618a64 -size 1806 +oid sha256:8f443bc59cd2ecd3775d2de5715b6dfd5370d3c83fc766502f3b9efff014b9bd +size 1807 diff --git a/data/minecraft/structure/woodland_mansion/1x1_b4.nbt b/data/minecraft/structure/woodland_mansion/1x1_b4.nbt index dfc51068..11671261 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_b4.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_b4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ff15e16b363e729f6600cc5bb755a54fbfb5102e672c6c6a8136a249f15c3f2 +oid sha256:2c18b2c84edba42a2ee851781859a8451ac2401d94c6d5235d4585be51d54fc4 size 1831 diff --git a/data/minecraft/structure/woodland_mansion/1x1_b5.nbt b/data/minecraft/structure/woodland_mansion/1x1_b5.nbt index 85578a80..5737e309 100644 --- a/data/minecraft/structure/woodland_mansion/1x1_b5.nbt +++ b/data/minecraft/structure/woodland_mansion/1x1_b5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18ab6c1f256187672b0047f5df0f7260fd0b6dc08d74b361c8e8e566e89ac268 -size 1921 +oid sha256:118214568f4a101ce8f5218f2b355146c76697bf5f043e5bf3765304d607ce89 +size 1920 diff --git a/data/minecraft/structure/woodland_mansion/1x2_a1.nbt b/data/minecraft/structure/woodland_mansion/1x2_a1.nbt index fee7dbcb..3f5c3b9b 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_a1.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_a1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f50d8cf78aba3811535a088440bf3f00dd28ae93922f373159cbc765c4168a1a +oid sha256:42f404e7c2a2922cc411c0f787a7c69f47d10178635c0d1977b5466eb615aeef size 2936 diff --git a/data/minecraft/structure/woodland_mansion/1x2_a2.nbt b/data/minecraft/structure/woodland_mansion/1x2_a2.nbt index c656e789..d94af41b 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_a2.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_a2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51a81f1e0973086e4c70131b68d9aba1ae2d02f44ddbdef4e381fb176a33dd06 +oid sha256:20302996b6a0df51fb957179c5f25a998b2b0f9b811859b3de456d4186fe4a22 size 2829 diff --git a/data/minecraft/structure/woodland_mansion/1x2_a3.nbt b/data/minecraft/structure/woodland_mansion/1x2_a3.nbt index bec87870..c4cbc36e 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_a3.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_a3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41f831ea329bc7f3e87836069aa247af5b5071a2e8961c4bdb0fc4eeb7023ec1 -size 2950 +oid sha256:11ade9837b1d53dd52794390c007f1638dc1b34e12e1e7b4688fff5c9b8d585c +size 2951 diff --git a/data/minecraft/structure/woodland_mansion/1x2_a4.nbt b/data/minecraft/structure/woodland_mansion/1x2_a4.nbt index 82bbb3c6..eb095591 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_a4.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_a4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f90fa12c5010cd4b6472d433834555850d34415f683c0183f6e63ece0257a86a -size 2897 +oid sha256:5c81e5109d2ebebc953bd6224654a04d02c09dd6c738843f2a79eb3c8c9c8ab7 +size 2896 diff --git a/data/minecraft/structure/woodland_mansion/1x2_a5.nbt b/data/minecraft/structure/woodland_mansion/1x2_a5.nbt index 05914767..bdcbdbae 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_a5.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_a5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:825d26fbc73ef10a53c63a6e9daa7ac5f7e0251ca5baf126e1e2e69940551cea +oid sha256:dc2566f5c0ca6215426713fdb942c2fa12a3d1a67637e10447f665ab397b4fae size 2570 diff --git a/data/minecraft/structure/woodland_mansion/1x2_a6.nbt b/data/minecraft/structure/woodland_mansion/1x2_a6.nbt index aef611a1..9f348368 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_a6.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_a6.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fda3b7b1da3daadf6f7055169cd528a96ee6c581ef7e9725ca34793288deab3 -size 2809 +oid sha256:458d00a033e70021a7034d33c5ff81e6efb8a36c0862aab5cb6c4acd4945b18b +size 2808 diff --git a/data/minecraft/structure/woodland_mansion/1x2_a7.nbt b/data/minecraft/structure/woodland_mansion/1x2_a7.nbt index 096faa7d..41db954b 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_a7.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_a7.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0da8d39d40197a23869d8b10cd7305b8167072341c14d0cd7e9ba1dd609cd32 +oid sha256:ae27eece498acf81cb0eb82f038d744fa4740a0e485f76a330894191be0d6ade size 2948 diff --git a/data/minecraft/structure/woodland_mansion/1x2_a8.nbt b/data/minecraft/structure/woodland_mansion/1x2_a8.nbt index 5f769231..d7fbd114 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_a8.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_a8.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77d2814c077c4fcf63526126a952e17544522bb7b8c5df46f5cc9f3048c993bc +oid sha256:5eebfbe4711fc094ce1a863d320e8893738ffe2ed648316268c11ca275d734a3 size 3189 diff --git a/data/minecraft/structure/woodland_mansion/1x2_a9.nbt b/data/minecraft/structure/woodland_mansion/1x2_a9.nbt index 42c8880f..ef7254c4 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_a9.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_a9.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:034272acd79ac4183c8279a8b018eea38e8cc93585c16fa2d53b845ae4f7cc30 +oid sha256:6c53cd4c303f00b0546e59313aa0884fba6ca0eeed10646b97ead5d033761f79 size 3094 diff --git a/data/minecraft/structure/woodland_mansion/1x2_b1.nbt b/data/minecraft/structure/woodland_mansion/1x2_b1.nbt index 8df3b95d..a9e76549 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_b1.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_b1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7288cfa3a0bdb9b4214eb6298e65de1794780333efd1e09f030cc9023ead16f8 -size 3276 +oid sha256:443ba965d921142d7b48c9bae4895af968b77ae0cd077995362926359c2370f4 +size 3277 diff --git a/data/minecraft/structure/woodland_mansion/1x2_b2.nbt b/data/minecraft/structure/woodland_mansion/1x2_b2.nbt index dc566f28..6a0eb9d1 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_b2.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_b2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc989762aff480d116619e5f325388ae96b7f2c4bc426f4b81827a7477849b18 -size 3133 +oid sha256:1b1c834a5362aac90bb8b8639074c520aae0480bbd2f2d437f13e90bd73f3742 +size 3134 diff --git a/data/minecraft/structure/woodland_mansion/1x2_b3.nbt b/data/minecraft/structure/woodland_mansion/1x2_b3.nbt index 2fa89afa..f226d752 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_b3.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_b3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b373e149458c3429f837588b326ea6ac9397f820b0ce2e30b7702c1a9d9c407 +oid sha256:913d2ab4884db934da1f91c7daf90b0274bb3b85d13d8cf1a10619b69f0dbacc size 2793 diff --git a/data/minecraft/structure/woodland_mansion/1x2_b4.nbt b/data/minecraft/structure/woodland_mansion/1x2_b4.nbt index a767c48e..69a0d908 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_b4.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_b4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c462389ff550a1056bc22e9160f07852addbad92e60a0999e2f62ad864faf1fb -size 2963 +oid sha256:d0a11ce4c2d7d555c78c151cd707ca141446e1e518a379cbc8560bef0460f756 +size 2964 diff --git a/data/minecraft/structure/woodland_mansion/1x2_b5.nbt b/data/minecraft/structure/woodland_mansion/1x2_b5.nbt index 6be9dc4f..5302ce76 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_b5.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_b5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a7b20e3c481bea79525372aee4d834cf2504368d123f0ec8fd0bf274056c528 +oid sha256:136ec83be2d1e8512d59afe6ad1a78cbb4990b41669f94e84874476cc736cef0 size 2408 diff --git a/data/minecraft/structure/woodland_mansion/1x2_c1.nbt b/data/minecraft/structure/woodland_mansion/1x2_c1.nbt index 1e87f111..a9c07e22 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_c1.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_c1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed07d85d9c6cd5ada34765dfd7e423ce407087061292b02de24c27f7763a9828 +oid sha256:d75f79bbc65691aedfbac12de41f8e859c9f450332f950157547541a51ebdcd8 size 3546 diff --git a/data/minecraft/structure/woodland_mansion/1x2_c2.nbt b/data/minecraft/structure/woodland_mansion/1x2_c2.nbt index dfd7e250..2f43c81b 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_c2.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_c2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b68f5a48e3f208a7ee073ace841deddbd552c3f11a67bb06b643cfe3383026d2 +oid sha256:c380a93704a7dd8009825ca734faf83f816075a24000afc58947584aa01d40ed size 3348 diff --git a/data/minecraft/structure/woodland_mansion/1x2_c3.nbt b/data/minecraft/structure/woodland_mansion/1x2_c3.nbt index dbebcf5d..1cf4b81c 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_c3.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_c3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e835443af0b54156663af8a1a3a3c69052a1011a2a747f83c18a469918ad123d +oid sha256:0b17c1b83e795f69963e3b33179cfc4d6051669c8313367138a901222d849628 size 3616 diff --git a/data/minecraft/structure/woodland_mansion/1x2_c4.nbt b/data/minecraft/structure/woodland_mansion/1x2_c4.nbt index e1e26b01..68f9ec73 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_c4.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_c4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27db53573f4cfee8eef4f0c9a211d22c4d2f191270db2fbe30a6fa225e614312 +oid sha256:cb6eccab83246438e241aef93c11786008015264e96280d35de03f56aa61f322 size 3620 diff --git a/data/minecraft/structure/woodland_mansion/1x2_c_stairs.nbt b/data/minecraft/structure/woodland_mansion/1x2_c_stairs.nbt index 4e72b32a..cc0a7a66 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_c_stairs.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_c_stairs.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68775cd27d80ac84586cae584ebf427b1c3b65695bc48a23757f0e495116e96c +oid sha256:bee62efba9e5f2807182ee009b23e8a8d35c0ffa56c7ab2aa8a1b8f3bc351864 size 6730 diff --git a/data/minecraft/structure/woodland_mansion/1x2_d1.nbt b/data/minecraft/structure/woodland_mansion/1x2_d1.nbt index fee22c31..8e150e9e 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_d1.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_d1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59a980ac4eea30d98090555de0d903155677787b33035d7340e4803a4be99126 -size 3732 +oid sha256:2ae3d4061ae1237b23ad2489676cf53576382e908e653a7db9fc472edf46617a +size 3733 diff --git a/data/minecraft/structure/woodland_mansion/1x2_d2.nbt b/data/minecraft/structure/woodland_mansion/1x2_d2.nbt index 993394ac..b0156841 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_d2.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_d2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f081449340e4e0ed039f0734086d68b380db87e80554d9f5f5e428db6ab8c2b +oid sha256:d0e389172d90798f6c4b13bae842939824c4bec6b58c10eb83c9b27f6f6bf158 size 3905 diff --git a/data/minecraft/structure/woodland_mansion/1x2_d3.nbt b/data/minecraft/structure/woodland_mansion/1x2_d3.nbt index 7454e158..878f426a 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_d3.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_d3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83f4a950a9b3aba3a38b8d6a12adae867ea8bdf40653b83d31b949d49a8b7c56 +oid sha256:a388efd10e82be44fb0368c035903dc831727b926664996bf1bfb0d6258d75f7 size 3843 diff --git a/data/minecraft/structure/woodland_mansion/1x2_d4.nbt b/data/minecraft/structure/woodland_mansion/1x2_d4.nbt index 07ad78c8..1cd0d38b 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_d4.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_d4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d83cdf6cd704dce05e54274a3ff2ba6facf9a7a0c734ea185b5b2c4f36ab2032 +oid sha256:5cfa9b8ea97ee6c3b7f75e96d51ec5875f1438c3ae063ac5463af35344a8bdb0 size 3409 diff --git a/data/minecraft/structure/woodland_mansion/1x2_d5.nbt b/data/minecraft/structure/woodland_mansion/1x2_d5.nbt index 3f2f168d..d60ba051 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_d5.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_d5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a280364193ff6fa7668f661a3ccaf977e1901421116bbd376099ab8895ba511e -size 3373 +oid sha256:2d26d4a7b0504902506a47db90480d9a3fc595d1bb2fe5a38edd576582ab6e4b +size 3374 diff --git a/data/minecraft/structure/woodland_mansion/1x2_d_stairs.nbt b/data/minecraft/structure/woodland_mansion/1x2_d_stairs.nbt index a16bb823..07883e13 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_d_stairs.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_d_stairs.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5bbe6e6ebd47d0e7bde444ce19bb66259a2843a2fa56d89dfd46bf8c6857496 +oid sha256:bc5288ea2cdc084943963ae52b3489feb57b8cdb9772c00e19c96babca72ccc4 size 6625 diff --git a/data/minecraft/structure/woodland_mansion/1x2_s1.nbt b/data/minecraft/structure/woodland_mansion/1x2_s1.nbt index 8001045d..2d02665d 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_s1.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_s1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ebe3a10619bc4fee67e883a5cc1ebabdcedc29309f9aad41c3040f6317db639 +oid sha256:af6b4105f346ff336c3f451e26c2f73d11ff687a3fd2c05e21d02edaee1d0646 size 2686 diff --git a/data/minecraft/structure/woodland_mansion/1x2_s2.nbt b/data/minecraft/structure/woodland_mansion/1x2_s2.nbt index a03c4dd2..0af6b927 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_s2.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_s2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c9e80a4834a17002e1cdaf06be4c493edcb8bb012b25cf832a7f262f3b33f59 -size 2732 +oid sha256:1dc443b107c9d08e58624f7c5eb737172aa807bdccf250d6393a41156895a931 +size 2731 diff --git a/data/minecraft/structure/woodland_mansion/1x2_se1.nbt b/data/minecraft/structure/woodland_mansion/1x2_se1.nbt index 22f54171..6025f79e 100644 --- a/data/minecraft/structure/woodland_mansion/1x2_se1.nbt +++ b/data/minecraft/structure/woodland_mansion/1x2_se1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:beeecde93028fe7b44d3e0e8a9f49e11a66508493d443806f9bb5f5a732e5619 +oid sha256:abfad6e20a3cf174db1cde0c180c837d918b6563af9d701051d77a142bc14635 size 3883 diff --git a/data/minecraft/structure/woodland_mansion/2x2_a1.nbt b/data/minecraft/structure/woodland_mansion/2x2_a1.nbt index b3a30a7d..a964c4b1 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_a1.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_a1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c05d9a34aeeedae051887883703a5801feb723f70ad057dae1a2635dddcb6c0b +oid sha256:957dba2bf4d5034885d300bf175870500e05f6f8c3784475f1a87606cae44fbe size 6288 diff --git a/data/minecraft/structure/woodland_mansion/2x2_a2.nbt b/data/minecraft/structure/woodland_mansion/2x2_a2.nbt index 9afe8c17..c8f45599 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_a2.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_a2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd288b30ff8e231cfc0f71972e6b24a3119c714f39eb5cae92f34bfa15f22867 +oid sha256:4ab579789e2a1e2da89c06cddddbc9a99d12141952762f9741f03e4dadae7e87 size 5632 diff --git a/data/minecraft/structure/woodland_mansion/2x2_a3.nbt b/data/minecraft/structure/woodland_mansion/2x2_a3.nbt index 630c57ce..1ae5c25e 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_a3.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_a3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3acc230a932ac22d798d3212e2734d3aca28990f6eef3ee29f594f0fdbb17c4c +oid sha256:30702e4d16defb700bd82603210323b5b12225f32898909df2cca5894d06749c size 5213 diff --git a/data/minecraft/structure/woodland_mansion/2x2_a4.nbt b/data/minecraft/structure/woodland_mansion/2x2_a4.nbt index a947c469..69fa34de 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_a4.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_a4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:335668135cac0fe5d5cb4b84ce5bdae960e4128ace7b3d5c10988f32bf4caa35 -size 5410 +oid sha256:4e8b77e8d321ccf71ad65754898288ed3fd1b759ff1be7073c0a56300ee088e4 +size 5409 diff --git a/data/minecraft/structure/woodland_mansion/2x2_b1.nbt b/data/minecraft/structure/woodland_mansion/2x2_b1.nbt index baf5858b..38ea00f3 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_b1.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_b1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cdf47d68dbd984643c11a5942f519e3e6262aecdb4075ec593d4a1a5b2196f0 -size 7312 +oid sha256:9120be3b78b129d6b2e81c78da5143af16b13f6ec5a69641428b83e804dc54f0 +size 7313 diff --git a/data/minecraft/structure/woodland_mansion/2x2_b2.nbt b/data/minecraft/structure/woodland_mansion/2x2_b2.nbt index a29c3d89..bb652096 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_b2.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_b2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c91363addedd601cbfbcb3e8ab1174746aaf399ad5084c1aaad46b21809837cc +oid sha256:46093092f1d15c24f0718079127254407c01dd6ee33685517af829161bbfdfa4 size 7299 diff --git a/data/minecraft/structure/woodland_mansion/2x2_b3.nbt b/data/minecraft/structure/woodland_mansion/2x2_b3.nbt index aa28c516..826fe9e7 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_b3.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_b3.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9da20cb654069d39211c880de11c5b8185ab0f810397fc7435dec6bab6771ec5 +oid sha256:d364bb426be6d54ff5fb825cc131517584f5ac3fcdcf84a547ad3233b0ad9adf size 7104 diff --git a/data/minecraft/structure/woodland_mansion/2x2_b4.nbt b/data/minecraft/structure/woodland_mansion/2x2_b4.nbt index ad67849c..f7073616 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_b4.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_b4.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07700e8ef7e04c3ea4b52457c7dafdfcef2379e037122c5d0715662d71dd300a -size 7240 +oid sha256:06354b3ea11cd040043a3c6ea2a6398b9382998e05fef868c5bf46ddf8e5f7c2 +size 7241 diff --git a/data/minecraft/structure/woodland_mansion/2x2_b5.nbt b/data/minecraft/structure/woodland_mansion/2x2_b5.nbt index 81e9a3ff..67fca1eb 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_b5.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_b5.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd41644cf3a97446c4587805dffb3aec375d4e401c3b1aae0fdf04eba8395318 +oid sha256:db280fc2fb9859a55cb10dbb0d6e257aa3d0338ff5365298288d3337bd5ce707 size 7542 diff --git a/data/minecraft/structure/woodland_mansion/2x2_s1.nbt b/data/minecraft/structure/woodland_mansion/2x2_s1.nbt index 1273ddb5..8c21830d 100644 --- a/data/minecraft/structure/woodland_mansion/2x2_s1.nbt +++ b/data/minecraft/structure/woodland_mansion/2x2_s1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df60baff1b156b1963e92cefadef789d18198a9b869fc96e450ee8da1d969d78 +oid sha256:df6bb35e22d82a53fd31f2970b54aa4e5abec8586b6396e5d30ef16b7ddc5ad8 size 6794 diff --git a/data/minecraft/structure/woodland_mansion/carpet_east.nbt b/data/minecraft/structure/woodland_mansion/carpet_east.nbt index 82426c70..6c5d3c49 100644 --- a/data/minecraft/structure/woodland_mansion/carpet_east.nbt +++ b/data/minecraft/structure/woodland_mansion/carpet_east.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08fbc4e268c00af246da4d09f1483b944b73ef144542fe41b78c91151ab788ac +oid sha256:63e5cfc5fc0266fea0cd894911f262dc1899356d63f776f51f7da89944d4c96a size 179 diff --git a/data/minecraft/structure/woodland_mansion/carpet_north.nbt b/data/minecraft/structure/woodland_mansion/carpet_north.nbt index 12a4dd49..84064346 100644 --- a/data/minecraft/structure/woodland_mansion/carpet_north.nbt +++ b/data/minecraft/structure/woodland_mansion/carpet_north.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6f00d122f3d5e423296063e8b075c990e20e42b50e111d529841bc73678b16d +oid sha256:d5a1eef65248d2f16858e3ff62aea9555cf64d7213e77ad880874b70f9484e4f size 176 diff --git a/data/minecraft/structure/woodland_mansion/carpet_south_1.nbt b/data/minecraft/structure/woodland_mansion/carpet_south_1.nbt index 53f9e4cf..48dd03f8 100644 --- a/data/minecraft/structure/woodland_mansion/carpet_south_1.nbt +++ b/data/minecraft/structure/woodland_mansion/carpet_south_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a49b4c43f3d41d8fb1de869a87872e77566e417361655ae2f84bec4e4f0552a -size 720 +oid sha256:a684fc7964273eb6c90fb076fff18883d06a429327cd2df2f08519519b79558a +size 719 diff --git a/data/minecraft/structure/woodland_mansion/carpet_south_2.nbt b/data/minecraft/structure/woodland_mansion/carpet_south_2.nbt index 3d684eaf..4a4429c3 100644 --- a/data/minecraft/structure/woodland_mansion/carpet_south_2.nbt +++ b/data/minecraft/structure/woodland_mansion/carpet_south_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e6db28b7807fb93964deffe6a294eb9e7fabab133f65a72d171dd2ffc75ec37 +oid sha256:291aa408b1e77410a19f313f697f1abdc50a31c5b1d2e0a25e252a872f8a3e9a size 929 diff --git a/data/minecraft/structure/woodland_mansion/carpet_west_1.nbt b/data/minecraft/structure/woodland_mansion/carpet_west_1.nbt index 0cbfbb7b..451c50f8 100644 --- a/data/minecraft/structure/woodland_mansion/carpet_west_1.nbt +++ b/data/minecraft/structure/woodland_mansion/carpet_west_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b2bea87e3b0859c4c11d6946b15b2d729357034007adf9dd6a48c2df7131bd9 +oid sha256:cfa571031afcd440696284a5440174a40854230385be2ca828b2c12815bbc88d size 793 diff --git a/data/minecraft/structure/woodland_mansion/carpet_west_2.nbt b/data/minecraft/structure/woodland_mansion/carpet_west_2.nbt index badaff67..ed3cc172 100644 --- a/data/minecraft/structure/woodland_mansion/carpet_west_2.nbt +++ b/data/minecraft/structure/woodland_mansion/carpet_west_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb4fd8527774388cfd389881569e8a6491e48c30d5af96cff87127ac4af74e5d +oid sha256:05ca8710ab139fadc5259218b0ec027587b2716a0d69afa01141d9c010645a56 size 1021 diff --git a/data/minecraft/structure/woodland_mansion/corridor_floor.nbt b/data/minecraft/structure/woodland_mansion/corridor_floor.nbt index e23e25bf..af6937a2 100644 --- a/data/minecraft/structure/woodland_mansion/corridor_floor.nbt +++ b/data/minecraft/structure/woodland_mansion/corridor_floor.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a452ba6e9ad42febd527b491fe74d096eeafbcf9187151669a344a7b993d9464 +oid sha256:3b617c9e650ad1091d37229c9d02c7092bbcbd8d525f77b70842bdc1616293e2 size 1171 diff --git a/data/minecraft/structure/woodland_mansion/entrance.nbt b/data/minecraft/structure/woodland_mansion/entrance.nbt index 8f3a0b9e..03bb4e99 100644 --- a/data/minecraft/structure/woodland_mansion/entrance.nbt +++ b/data/minecraft/structure/woodland_mansion/entrance.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:169872472b3c5f5d069346921102559ab41b33634e3263eae905310bab3c541b +oid sha256:1b8ca614295f295b5032d0c0d39ed746552aa8bdb911049bc532910d35e7ca43 size 18255 diff --git a/data/minecraft/structure/woodland_mansion/indoors_door_1.nbt b/data/minecraft/structure/woodland_mansion/indoors_door_1.nbt index 452b3df0..cf9bd835 100644 --- a/data/minecraft/structure/woodland_mansion/indoors_door_1.nbt +++ b/data/minecraft/structure/woodland_mansion/indoors_door_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0d5162136ffc136fd3faa0f981a6f46a3ad5b65630f8de5fac520a6284e0f0b +oid sha256:c26ee222c3b46de6f291840be01cff63b010e139db1df138c283699a097978b1 size 409 diff --git a/data/minecraft/structure/woodland_mansion/indoors_door_2.nbt b/data/minecraft/structure/woodland_mansion/indoors_door_2.nbt index 0af9243e..f41c5f59 100644 --- a/data/minecraft/structure/woodland_mansion/indoors_door_2.nbt +++ b/data/minecraft/structure/woodland_mansion/indoors_door_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c25a5e8830ce1e0e4e74cbe6c981acc71068005e7f3a8b5ad170509df4cf7e55 -size 503 +oid sha256:b906b1c832cf2cf1647ddf6971864cb2297af2b5acbd1b3eeaa0e262d7e25d21 +size 504 diff --git a/data/minecraft/structure/woodland_mansion/indoors_wall_1.nbt b/data/minecraft/structure/woodland_mansion/indoors_wall_1.nbt index c63f7213..a3ba8531 100644 --- a/data/minecraft/structure/woodland_mansion/indoors_wall_1.nbt +++ b/data/minecraft/structure/woodland_mansion/indoors_wall_1.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30adab67da4aafd2bd9280e8463c8d009caed93cd7297c7c402bdc47f9a24db1 +oid sha256:a1545cfb9fb7140cb35e059db77211c7ed055e9ffd919e1c0c9125d595bccd30 size 364 diff --git a/data/minecraft/structure/woodland_mansion/indoors_wall_2.nbt b/data/minecraft/structure/woodland_mansion/indoors_wall_2.nbt index d503ab77..0167c656 100644 --- a/data/minecraft/structure/woodland_mansion/indoors_wall_2.nbt +++ b/data/minecraft/structure/woodland_mansion/indoors_wall_2.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35ec0f67ebcd9b86804a9611bef82283dc87bc84a11146efcd18d4797634c263 -size 440 +oid sha256:e799a7e748ef40c974bfdd965a79a40c69758c2f06f5197dac6f056f2ea30ae6 +size 441 diff --git a/data/minecraft/structure/woodland_mansion/roof.nbt b/data/minecraft/structure/woodland_mansion/roof.nbt index f19e361a..c34c0d62 100644 --- a/data/minecraft/structure/woodland_mansion/roof.nbt +++ b/data/minecraft/structure/woodland_mansion/roof.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b6895ab28e4b40cb61ebebbd9005a5ca91a2e89a9198952d25ff71eb3b77202 +oid sha256:faaa1638248d9f8a3fe99bf80e8230a05c2d6b4051747b3e45e3613c3485a635 size 332 diff --git a/data/minecraft/structure/woodland_mansion/roof_corner.nbt b/data/minecraft/structure/woodland_mansion/roof_corner.nbt index 15e150cd..2c9f1b13 100644 --- a/data/minecraft/structure/woodland_mansion/roof_corner.nbt +++ b/data/minecraft/structure/woodland_mansion/roof_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7302ed3a9e568c2a6abc68b70658177495aafeacfaeb177cb727472bf76729fa +oid sha256:152ad6aed41f5d72f32773ee98ee4142e373de551b6830c9cefe509cacd78f58 size 449 diff --git a/data/minecraft/structure/woodland_mansion/roof_front.nbt b/data/minecraft/structure/woodland_mansion/roof_front.nbt index 7e801ee1..be54ba0b 100644 --- a/data/minecraft/structure/woodland_mansion/roof_front.nbt +++ b/data/minecraft/structure/woodland_mansion/roof_front.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:033aa00a09f50487fc63d80c46662e1765798dd212d86e7262dd302988c27cd8 -size 636 +oid sha256:b61455699cd82053f9807b3a2f364ec09644e148909118de7528019d5dce2a10 +size 635 diff --git a/data/minecraft/structure/woodland_mansion/roof_inner_corner.nbt b/data/minecraft/structure/woodland_mansion/roof_inner_corner.nbt index e71e12d7..cb0aac39 100644 --- a/data/minecraft/structure/woodland_mansion/roof_inner_corner.nbt +++ b/data/minecraft/structure/woodland_mansion/roof_inner_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f902e970ecfc8c690dc164e64982e6f629f50a18d51657bb0c3e0fa97ce06b46 +oid sha256:1e0840c8bcb81d7a935099b4313d7ada790f1dd2cc8183dbe0a005c1816859b0 size 444 diff --git a/data/minecraft/structure/woodland_mansion/small_wall.nbt b/data/minecraft/structure/woodland_mansion/small_wall.nbt index 16875754..af2edac5 100644 --- a/data/minecraft/structure/woodland_mansion/small_wall.nbt +++ b/data/minecraft/structure/woodland_mansion/small_wall.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a9f887c3cb6d26a811ae3a6152c8f60f533ff8c86a4b4d46125e38d45444f47 +oid sha256:f9f6d31d2a11febab375298c8091899d59f94d408d5451a1c2647b1691953bcb size 510 diff --git a/data/minecraft/structure/woodland_mansion/small_wall_corner.nbt b/data/minecraft/structure/woodland_mansion/small_wall_corner.nbt index 99d4873d..3b699383 100644 --- a/data/minecraft/structure/woodland_mansion/small_wall_corner.nbt +++ b/data/minecraft/structure/woodland_mansion/small_wall_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e30baaf45530a649e7c25aaec054ef418b25526368b5291fe7c410edf004f5d +oid sha256:3268eaecd144f276a2b5261e17d42d45bd7a3c4c0900f0ba22ea3fec84e69e81 size 261 diff --git a/data/minecraft/structure/woodland_mansion/wall_corner.nbt b/data/minecraft/structure/woodland_mansion/wall_corner.nbt index f1da1131..0f736a14 100644 --- a/data/minecraft/structure/woodland_mansion/wall_corner.nbt +++ b/data/minecraft/structure/woodland_mansion/wall_corner.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:104f61e84833729743b7b8c6759f8c4d38862c3375069e32abc17f0988589cce +oid sha256:d117b39d8c3d833d6001fdf64851853bf5a9d83103d8f6c7a35d21410ae30bfb size 307 diff --git a/data/minecraft/structure/woodland_mansion/wall_flat.nbt b/data/minecraft/structure/woodland_mansion/wall_flat.nbt index 51fbb84a..fd12d954 100644 --- a/data/minecraft/structure/woodland_mansion/wall_flat.nbt +++ b/data/minecraft/structure/woodland_mansion/wall_flat.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3a39093b86ad20f49a0e8e3ec00558afa4aeae842f9f93f03af374ee24e7225 +oid sha256:58666cbe474f3a7daec96ecc6c7dcbd1224b6004b05ccf5a37717d3b0d6dd034 size 726 diff --git a/data/minecraft/structure/woodland_mansion/wall_window.nbt b/data/minecraft/structure/woodland_mansion/wall_window.nbt index c3aeb7bc..25eec005 100644 --- a/data/minecraft/structure/woodland_mansion/wall_window.nbt +++ b/data/minecraft/structure/woodland_mansion/wall_window.nbt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ba650eb7d2711e8001971f23218fd9210bf64875d72978d9286f6675a916670 -size 829 +oid sha256:c119307b9941dd837d58d4428370da09ecbb0887e2391c7ce58829e8bbefc9e6 +size 830 diff --git a/data/minecraft/tags/painting_variant/placeable.json b/data/minecraft/tags/painting_variant/placeable.json index fa9feb5c..79664889 100644 --- a/data/minecraft/tags/painting_variant/placeable.json +++ b/data/minecraft/tags/painting_variant/placeable.json @@ -45,7 +45,6 @@ "minecraft:passage", "minecraft:pond", "minecraft:sunflowers", - "minecraft:tides", - "minecraft:dennis" + "minecraft:tides" ] } \ No newline at end of file diff --git a/net/minecraft/DetectedVersion.java b/net/minecraft/DetectedVersion.java index d848763e..7adba0eb 100644 --- a/net/minecraft/DetectedVersion.java +++ b/net/minecraft/DetectedVersion.java @@ -9,7 +9,6 @@ import java.io.InputStreamReader; import java.time.ZonedDateTime; import java.util.Date; import java.util.UUID; -import net.minecraft.WorldVersion.Simple; import net.minecraft.util.GsonHelper; import net.minecraft.world.level.storage.DataVersion; import org.slf4j.Logger; @@ -19,14 +18,14 @@ public class DetectedVersion { public static final WorldVersion BUILT_IN = createFromConstants(); private static WorldVersion createFromConstants() { - return new Simple( - UUID.randomUUID().toString().replaceAll("-", ""), "1.21.8", new DataVersion(4440, "main"), SharedConstants.getProtocolVersion(), 64, 81, new Date(), true + return new WorldVersion.Simple( + UUID.randomUUID().toString().replaceAll("-", ""), "1.21.6", new DataVersion(4435, "main"), SharedConstants.getProtocolVersion(), 63, 80, new Date(), true ); } private static WorldVersion createFromJson(JsonObject json) { JsonObject jsonObject = GsonHelper.getAsJsonObject(json, "pack_version"); - return new Simple( + return new WorldVersion.Simple( GsonHelper.getAsString(json, "id"), GsonHelper.getAsString(json, "name"), new DataVersion(GsonHelper.getAsInt(json, "world_version"), GsonHelper.getAsString(json, "series_id", "main")), diff --git a/net/minecraft/SharedConstants.java b/net/minecraft/SharedConstants.java index 12794bf1..2d3a3623 100644 --- a/net/minecraft/SharedConstants.java +++ b/net/minecraft/SharedConstants.java @@ -34,7 +34,7 @@ public class SharedConstants { * @deprecated Use {@link #getCurrentVersion()} and {@link com.mojang.bridge.game.GameVersion#getWorldVersion()} instead. */ @Deprecated - public static final int WORLD_VERSION = 4440; + public static final int WORLD_VERSION = 4435; @Deprecated public static final String SERIES = "main"; /** @@ -44,7 +44,7 @@ public class SharedConstants { * @deprecated Use {@link #getCurrentVersion()} and {@link com.mojang.bridge.game.GameVersion#getName()} instead. */ @Deprecated - public static final String VERSION_STRING = "1.21.8"; + public static final String VERSION_STRING = "1.21.6"; /** * The numeric format number for the networking protocol used by the release target of this game version. * @@ -54,7 +54,7 @@ public class SharedConstants { * @deprecated Use {@link #getProtocolVersion()} instead. */ @Deprecated - public static final int RELEASE_NETWORK_PROTOCOL_VERSION = 772; + public static final int RELEASE_NETWORK_PROTOCOL_VERSION = 771; /** * The numeric format number for the networking protocol used by the snapshot of this game version. * @@ -66,7 +66,7 @@ public class SharedConstants { * @deprecated Use {@link #getProtocolVersion()} instead. */ @Deprecated - public static final int SNAPSHOT_NETWORK_PROTOCOL_VERSION = 259; + public static final int SNAPSHOT_NETWORK_PROTOCOL_VERSION = 256; public static final int SNBT_NAG_VERSION = 4420; /** * The bit in the networking protocol version for denoting {@linkplain #SNAPSHOT snapshot versions}. @@ -82,7 +82,7 @@ public class SharedConstants { * @deprecated Use {@link #getCurrentVersion()}, {@link com.mojang.bridge.game.GameVersion#com.mojang.bridge.game.GameVersion#getPackVersion(com.mojang.bridge.game.PackType)}, and com.mojang.bridge.game.PackType#RESOURCE instead. */ @Deprecated - public static final int RESOURCE_PACK_FORMAT = 64; + public static final int RESOURCE_PACK_FORMAT = 63; /** * The format of the data packs used by this game version. Data packs contain server-side data such as recipes, loot tables, and tags. * @@ -90,7 +90,7 @@ public class SharedConstants { * @deprecated Use {@link #getCurrentVersion()}, {@link com.mojang.bridge.game.GameVersion#com.mojang.bridge.game.GameVersion#getPackVersion(com.mojang.bridge.game.PackType)}, and com.mojang.bridge.game.PackType#DATA instead. */ @Deprecated - public static final int DATA_PACK_FORMAT = 81; + public static final int DATA_PACK_FORMAT = 80; @Deprecated public static final int LANGUAGE_FORMAT = 1; public static final int REPORT_FORMAT_VERSION = 1; @@ -282,7 +282,7 @@ public class SharedConstants { *

For releases, this will be equivalent to {@link #RELEASE_NETWORK_PROTOCOL_VERSION}. For snapshot versions, this will be the combination (bitwise OR) of {@link #SNAPSHOT_NETWORK_PROTOCOL_VERSION} and the bit marked by {@link #SNAPSHOT_PROTOCOL_BIT}.

*/ public static int getProtocolVersion() { - return 772; + return 771; } public static boolean debugVoidTerrain(ChunkPos chunkPos) { diff --git a/net/minecraft/Util.java b/net/minecraft/Util.java index 854e3914..53b3ad32 100644 --- a/net/minecraft/Util.java +++ b/net/minecraft/Util.java @@ -82,7 +82,7 @@ import net.minecraft.server.Bootstrap; import net.minecraft.util.Mth; import net.minecraft.util.RandomSource; import net.minecraft.util.SingleKeyCache; -import net.minecraft.util.TimeSource.NanoTimeSource; +import net.minecraft.util.TimeSource; import net.minecraft.util.datafix.DataFixers; import net.minecraft.world.level.block.state.properties.Property; import org.jetbrains.annotations.Nullable; @@ -100,7 +100,7 @@ public class Util { public static final int LINEAR_LOOKUP_THRESHOLD = 8; private static final Set ALLOWED_UNTRUSTED_LINK_PROTOCOLS = Set.of("http", "https"); public static final long NANOS_PER_MILLI = 1000000L; - public static NanoTimeSource timeSource = System::nanoTime; + public static TimeSource.NanoTimeSource timeSource = System::nanoTime; public static final Ticker TICKER = new Ticker() { @Override public long read() { @@ -480,11 +480,6 @@ public class Util { } } - public static boolean isAarch64() { - String string = System.getProperty("os.arch").toLowerCase(Locale.ROOT); - return string.equals("aarch64"); - } - public static URI parseAndValidateUntrustedUri(String uri) throws URISyntaxException { URI uRI = new URI(uri); String string = uRI.getScheme(); @@ -1058,8 +1053,18 @@ public class Util { public static enum OS { LINUX("linux"), SOLARIS("solaris"), - WINDOWS("WINDOWS", 2, "windows"), - OSX("OSX", 3, "mac"), + WINDOWS("windows") { + @Override + protected String[] getOpenUriArguments(URI uri) { + return new String[]{"rundll32", "url.dll,FileProtocolHandler", uri.toString()}; + } + }, + OSX("mac") { + @Override + protected String[] getOpenUriArguments(URI uri) { + return new String[]{"open", uri.toString()}; + } + }, UNKNOWN("unknown"); private final String telemetryName; diff --git a/net/minecraft/client/data/models/ItemModelGenerators.java b/net/minecraft/client/data/models/ItemModelGenerators.java index 1bfcaf21..ab90fc07 100644 --- a/net/minecraft/client/data/models/ItemModelGenerators.java +++ b/net/minecraft/client/data/models/ItemModelGenerators.java @@ -17,31 +17,33 @@ import net.minecraft.client.data.models.model.ModelLocationUtils; import net.minecraft.client.data.models.model.ModelTemplate; import net.minecraft.client.data.models.model.ModelTemplates; import net.minecraft.client.data.models.model.TextureMapping; -import net.minecraft.client.renderer.item.ItemModel.Unbaked; -import net.minecraft.client.renderer.item.RangeSelectItemModel.Entry; -import net.minecraft.client.renderer.item.SelectItemModel.SwitchCase; +import net.minecraft.client.renderer.item.BundleSelectedItemSpecialRenderer; +import net.minecraft.client.renderer.item.ItemModel; +import net.minecraft.client.renderer.item.RangeSelectItemModel; +import net.minecraft.client.renderer.item.SelectItemModel; import net.minecraft.client.renderer.item.properties.conditional.Broken; import net.minecraft.client.renderer.item.properties.conditional.BundleHasSelectedItem; import net.minecraft.client.renderer.item.properties.conditional.ConditionalItemModelProperty; import net.minecraft.client.renderer.item.properties.conditional.FishingRodCast; import net.minecraft.client.renderer.item.properties.numeric.CompassAngle; +import net.minecraft.client.renderer.item.properties.numeric.CompassAngleState; import net.minecraft.client.renderer.item.properties.numeric.CrossbowPull; import net.minecraft.client.renderer.item.properties.numeric.Time; import net.minecraft.client.renderer.item.properties.numeric.UseCycle; import net.minecraft.client.renderer.item.properties.numeric.UseDuration; -import net.minecraft.client.renderer.item.properties.numeric.CompassAngleState.CompassTarget; -import net.minecraft.client.renderer.item.properties.numeric.Time.TimeSource; import net.minecraft.client.renderer.item.properties.select.Charge; import net.minecraft.client.renderer.item.properties.select.DisplayContext; import net.minecraft.client.renderer.item.properties.select.TrimMaterialProperty; +import net.minecraft.client.renderer.special.ShieldSpecialRenderer; +import net.minecraft.client.renderer.special.TridentSpecialRenderer; import net.minecraft.core.component.DataComponents; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; +import net.minecraft.world.item.CrossbowItem; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.Items; -import net.minecraft.world.item.CrossbowItem.ChargeType; import net.minecraft.world.item.equipment.EquipmentAsset; import net.minecraft.world.item.equipment.EquipmentAssets; import net.minecraft.world.item.equipment.trim.MaterialAssetGroup; @@ -115,14 +117,14 @@ public class ItemModelGenerators { this.itemModelOutput.accept(item, ItemModelUtils.tintedModel(resourceLocation, BLANK_LAYER, tintSource)); } - private List createCompassModels(Item item) { - List list = new ArrayList(); - Unbaked unbaked = ItemModelUtils.plainModel(this.createFlatItemModel(item, "_16", ModelTemplates.FLAT_ITEM)); + private List createCompassModels(Item item) { + List list = new ArrayList(); + ItemModel.Unbaked unbaked = ItemModelUtils.plainModel(this.createFlatItemModel(item, "_16", ModelTemplates.FLAT_ITEM)); list.add(ItemModelUtils.override(unbaked, 0.0F)); for (int i = 1; i < 32; i++) { int j = Mth.positiveModulo(i - 16, 32); - Unbaked unbaked2 = ItemModelUtils.plainModel(this.createFlatItemModel(item, String.format(Locale.ROOT, "_%02d", j), ModelTemplates.FLAT_ITEM)); + ItemModel.Unbaked unbaked2 = ItemModelUtils.plainModel(this.createFlatItemModel(item, String.format(Locale.ROOT, "_%02d", j), ModelTemplates.FLAT_ITEM)); list.add(ItemModelUtils.override(unbaked2, i - 0.5F)); } @@ -131,32 +133,33 @@ public class ItemModelGenerators { } private void generateStandardCompassItem(Item item) { - List list = this.createCompassModels(item); + List list = this.createCompassModels(item); this.itemModelOutput .accept( item, ItemModelUtils.conditional( ItemModelUtils.hasComponent(DataComponents.LODESTONE_TRACKER), - ItemModelUtils.rangeSelect(new CompassAngle(true, CompassTarget.LODESTONE), 32.0F, list), + ItemModelUtils.rangeSelect(new CompassAngle(true, CompassAngleState.CompassTarget.LODESTONE), 32.0F, list), ItemModelUtils.inOverworld( - ItemModelUtils.rangeSelect(new CompassAngle(true, CompassTarget.SPAWN), 32.0F, list), - ItemModelUtils.rangeSelect(new CompassAngle(true, CompassTarget.NONE), 32.0F, list) + ItemModelUtils.rangeSelect(new CompassAngle(true, CompassAngleState.CompassTarget.SPAWN), 32.0F, list), + ItemModelUtils.rangeSelect(new CompassAngle(true, CompassAngleState.CompassTarget.NONE), 32.0F, list) ) ) ); } private void generateRecoveryCompassItem(Item item) { - this.itemModelOutput.accept(item, ItemModelUtils.rangeSelect(new CompassAngle(true, CompassTarget.RECOVERY), 32.0F, this.createCompassModels(item))); + this.itemModelOutput + .accept(item, ItemModelUtils.rangeSelect(new CompassAngle(true, CompassAngleState.CompassTarget.RECOVERY), 32.0F, this.createCompassModels(item))); } private void generateClockItem(Item item) { - List list = new ArrayList(); - Unbaked unbaked = ItemModelUtils.plainModel(this.createFlatItemModel(item, "_00", ModelTemplates.FLAT_ITEM)); + List list = new ArrayList(); + ItemModel.Unbaked unbaked = ItemModelUtils.plainModel(this.createFlatItemModel(item, "_00", ModelTemplates.FLAT_ITEM)); list.add(ItemModelUtils.override(unbaked, 0.0F)); for (int i = 1; i < 64; i++) { - Unbaked unbaked2 = ItemModelUtils.plainModel(this.createFlatItemModel(item, String.format(Locale.ROOT, "_%02d", i), ModelTemplates.FLAT_ITEM)); + ItemModel.Unbaked unbaked2 = ItemModelUtils.plainModel(this.createFlatItemModel(item, String.format(Locale.ROOT, "_%02d", i), ModelTemplates.FLAT_ITEM)); list.add(ItemModelUtils.override(unbaked2, i - 0.5F)); } @@ -165,7 +168,8 @@ public class ItemModelGenerators { .accept( item, ItemModelUtils.inOverworld( - ItemModelUtils.rangeSelect(new Time(true, TimeSource.DAYTIME), 64.0F, list), ItemModelUtils.rangeSelect(new Time(true, TimeSource.RANDOM), 64.0F, list) + ItemModelUtils.rangeSelect(new Time(true, Time.TimeSource.DAYTIME), 64.0F, list), + ItemModelUtils.rangeSelect(new Time(true, Time.TimeSource.RANDOM), 64.0F, list) ) ); } @@ -186,12 +190,12 @@ public class ItemModelGenerators { ResourceLocation resourceLocation = ModelLocationUtils.getModelLocation(item); ResourceLocation resourceLocation2 = TextureMapping.getItemTexture(item); ResourceLocation resourceLocation3 = TextureMapping.getItemTexture(item, "_overlay"); - List>> list = new ArrayList(TRIM_MATERIAL_MODELS.size()); + List>> list = new ArrayList(TRIM_MATERIAL_MODELS.size()); for (ItemModelGenerators.TrimMaterialData trimMaterialData : TRIM_MATERIAL_MODELS) { ResourceLocation resourceLocation4 = resourceLocation.withSuffix("_" + trimMaterialData.assets().base().suffix() + "_trim"); ResourceLocation resourceLocation5 = modelId.withSuffix("_" + trimMaterialData.assets().assetId(equipmentAsset).suffix()); - Unbaked unbaked; + ItemModel.Unbaked unbaked; if (usesSecondLayer) { this.generateLayeredItem(resourceLocation4, resourceLocation2, resourceLocation3, resourceLocation5); unbaked = ItemModelUtils.tintedModel(resourceLocation4, new Dye(-6265536)); @@ -203,7 +207,7 @@ public class ItemModelGenerators { list.add(ItemModelUtils.when(trimMaterialData.materialKey, unbaked)); } - Unbaked unbaked2; + ItemModel.Unbaked unbaked2; if (usesSecondLayer) { ModelTemplates.TWO_LAYERED_ITEM.create(resourceLocation, TextureMapping.layered(resourceLocation2, resourceLocation3), this.modelOutput); unbaked2 = ItemModelUtils.tintedModel(resourceLocation, new Dye(-6265536)); @@ -216,15 +220,13 @@ public class ItemModelGenerators { } private void generateBundleModels(Item bundleItem) { - Unbaked unbaked = ItemModelUtils.plainModel(this.createFlatItemModel(bundleItem, ModelTemplates.FLAT_ITEM)); + ItemModel.Unbaked unbaked = ItemModelUtils.plainModel(this.createFlatItemModel(bundleItem, ModelTemplates.FLAT_ITEM)); ResourceLocation resourceLocation = this.generateBundleCoverModel(bundleItem, ModelTemplates.BUNDLE_OPEN_BACK_INVENTORY, "_open_back"); ResourceLocation resourceLocation2 = this.generateBundleCoverModel(bundleItem, ModelTemplates.BUNDLE_OPEN_FRONT_INVENTORY, "_open_front"); - Unbaked unbaked2 = ItemModelUtils.composite( - ItemModelUtils.plainModel(resourceLocation), - new net.minecraft.client.renderer.item.BundleSelectedItemSpecialRenderer.Unbaked(), - ItemModelUtils.plainModel(resourceLocation2) + ItemModel.Unbaked unbaked2 = ItemModelUtils.composite( + ItemModelUtils.plainModel(resourceLocation), new BundleSelectedItemSpecialRenderer.Unbaked(), ItemModelUtils.plainModel(resourceLocation2) ); - Unbaked unbaked3 = ItemModelUtils.conditional(new BundleHasSelectedItem(), unbaked2, unbaked); + ItemModel.Unbaked unbaked3 = ItemModelUtils.conditional(new BundleHasSelectedItem(), unbaked2, unbaked); this.itemModelOutput.accept(bundleItem, ItemModelUtils.select(new DisplayContext(), unbaked, ItemModelUtils.when(ItemDisplayContext.GUI, unbaked3))); } @@ -234,10 +236,10 @@ public class ItemModelGenerators { } private void generateBow(Item bowItem) { - Unbaked unbaked = ItemModelUtils.plainModel(ModelLocationUtils.getModelLocation(bowItem)); - Unbaked unbaked2 = ItemModelUtils.plainModel(this.createFlatItemModel(bowItem, "_pulling_0", ModelTemplates.BOW)); - Unbaked unbaked3 = ItemModelUtils.plainModel(this.createFlatItemModel(bowItem, "_pulling_1", ModelTemplates.BOW)); - Unbaked unbaked4 = ItemModelUtils.plainModel(this.createFlatItemModel(bowItem, "_pulling_2", ModelTemplates.BOW)); + ItemModel.Unbaked unbaked = ItemModelUtils.plainModel(ModelLocationUtils.getModelLocation(bowItem)); + ItemModel.Unbaked unbaked2 = ItemModelUtils.plainModel(this.createFlatItemModel(bowItem, "_pulling_0", ModelTemplates.BOW)); + ItemModel.Unbaked unbaked3 = ItemModelUtils.plainModel(this.createFlatItemModel(bowItem, "_pulling_1", ModelTemplates.BOW)); + ItemModel.Unbaked unbaked4 = ItemModelUtils.plainModel(this.createFlatItemModel(bowItem, "_pulling_2", ModelTemplates.BOW)); this.itemModelOutput .accept( bowItem, @@ -250,12 +252,12 @@ public class ItemModelGenerators { } private void generateCrossbow(Item crossbowItem) { - Unbaked unbaked = ItemModelUtils.plainModel(ModelLocationUtils.getModelLocation(crossbowItem)); - Unbaked unbaked2 = ItemModelUtils.plainModel(this.createFlatItemModel(crossbowItem, "_pulling_0", ModelTemplates.CROSSBOW)); - Unbaked unbaked3 = ItemModelUtils.plainModel(this.createFlatItemModel(crossbowItem, "_pulling_1", ModelTemplates.CROSSBOW)); - Unbaked unbaked4 = ItemModelUtils.plainModel(this.createFlatItemModel(crossbowItem, "_pulling_2", ModelTemplates.CROSSBOW)); - Unbaked unbaked5 = ItemModelUtils.plainModel(this.createFlatItemModel(crossbowItem, "_arrow", ModelTemplates.CROSSBOW)); - Unbaked unbaked6 = ItemModelUtils.plainModel(this.createFlatItemModel(crossbowItem, "_firework", ModelTemplates.CROSSBOW)); + ItemModel.Unbaked unbaked = ItemModelUtils.plainModel(ModelLocationUtils.getModelLocation(crossbowItem)); + ItemModel.Unbaked unbaked2 = ItemModelUtils.plainModel(this.createFlatItemModel(crossbowItem, "_pulling_0", ModelTemplates.CROSSBOW)); + ItemModel.Unbaked unbaked3 = ItemModelUtils.plainModel(this.createFlatItemModel(crossbowItem, "_pulling_1", ModelTemplates.CROSSBOW)); + ItemModel.Unbaked unbaked4 = ItemModelUtils.plainModel(this.createFlatItemModel(crossbowItem, "_pulling_2", ModelTemplates.CROSSBOW)); + ItemModel.Unbaked unbaked5 = ItemModelUtils.plainModel(this.createFlatItemModel(crossbowItem, "_arrow", ModelTemplates.CROSSBOW)); + ItemModel.Unbaked unbaked6 = ItemModelUtils.plainModel(this.createFlatItemModel(crossbowItem, "_firework", ModelTemplates.CROSSBOW)); this.itemModelOutput .accept( crossbowItem, @@ -266,27 +268,27 @@ public class ItemModelGenerators { ItemModelUtils.rangeSelect(new CrossbowPull(), unbaked2, ItemModelUtils.override(unbaked3, 0.58F), ItemModelUtils.override(unbaked4, 1.0F)), unbaked ), - ItemModelUtils.when(ChargeType.ARROW, unbaked5), - ItemModelUtils.when(ChargeType.ROCKET, unbaked6) + ItemModelUtils.when(CrossbowItem.ChargeType.ARROW, unbaked5), + ItemModelUtils.when(CrossbowItem.ChargeType.ROCKET, unbaked6) ) ); } - private void generateBooleanDispatch(Item item, ConditionalItemModelProperty property, Unbaked trueModel, Unbaked falseModel) { + private void generateBooleanDispatch(Item item, ConditionalItemModelProperty property, ItemModel.Unbaked trueModel, ItemModel.Unbaked falseModel) { this.itemModelOutput.accept(item, ItemModelUtils.conditional(property, trueModel, falseModel)); } private void generateElytra(Item elytraItem) { - Unbaked unbaked = ItemModelUtils.plainModel(this.createFlatItemModel(elytraItem, ModelTemplates.FLAT_ITEM)); - Unbaked unbaked2 = ItemModelUtils.plainModel(this.createFlatItemModel(elytraItem, "_broken", ModelTemplates.FLAT_ITEM)); + ItemModel.Unbaked unbaked = ItemModelUtils.plainModel(this.createFlatItemModel(elytraItem, ModelTemplates.FLAT_ITEM)); + ItemModel.Unbaked unbaked2 = ItemModelUtils.plainModel(this.createFlatItemModel(elytraItem, "_broken", ModelTemplates.FLAT_ITEM)); this.generateBooleanDispatch(elytraItem, new Broken(), unbaked2, unbaked); } private void generateBrush(Item brushItem) { - Unbaked unbaked = ItemModelUtils.plainModel(ModelLocationUtils.getModelLocation(brushItem)); - Unbaked unbaked2 = ItemModelUtils.plainModel(ModelLocationUtils.getModelLocation(brushItem, "_brushing_0")); - Unbaked unbaked3 = ItemModelUtils.plainModel(ModelLocationUtils.getModelLocation(brushItem, "_brushing_1")); - Unbaked unbaked4 = ItemModelUtils.plainModel(ModelLocationUtils.getModelLocation(brushItem, "_brushing_2")); + ItemModel.Unbaked unbaked = ItemModelUtils.plainModel(ModelLocationUtils.getModelLocation(brushItem)); + ItemModel.Unbaked unbaked2 = ItemModelUtils.plainModel(ModelLocationUtils.getModelLocation(brushItem, "_brushing_0")); + ItemModel.Unbaked unbaked3 = ItemModelUtils.plainModel(ModelLocationUtils.getModelLocation(brushItem, "_brushing_1")); + ItemModel.Unbaked unbaked4 = ItemModelUtils.plainModel(ModelLocationUtils.getModelLocation(brushItem, "_brushing_2")); this.itemModelOutput .accept( brushItem, @@ -302,48 +304,40 @@ public class ItemModelGenerators { } private void generateFishingRod(Item fishingRodItem) { - Unbaked unbaked = ItemModelUtils.plainModel(this.createFlatItemModel(fishingRodItem, ModelTemplates.FLAT_HANDHELD_ROD_ITEM)); - Unbaked unbaked2 = ItemModelUtils.plainModel(this.createFlatItemModel(fishingRodItem, "_cast", ModelTemplates.FLAT_HANDHELD_ROD_ITEM)); + ItemModel.Unbaked unbaked = ItemModelUtils.plainModel(this.createFlatItemModel(fishingRodItem, ModelTemplates.FLAT_HANDHELD_ROD_ITEM)); + ItemModel.Unbaked unbaked2 = ItemModelUtils.plainModel(this.createFlatItemModel(fishingRodItem, "_cast", ModelTemplates.FLAT_HANDHELD_ROD_ITEM)); this.generateBooleanDispatch(fishingRodItem, new FishingRodCast(), unbaked2, unbaked); } private void generateGoatHorn(Item goatHornItem) { - Unbaked unbaked = ItemModelUtils.plainModel(ModelLocationUtils.getModelLocation(goatHornItem)); - Unbaked unbaked2 = ItemModelUtils.plainModel(ModelLocationUtils.decorateItemModelLocation("tooting_goat_horn")); + ItemModel.Unbaked unbaked = ItemModelUtils.plainModel(ModelLocationUtils.getModelLocation(goatHornItem)); + ItemModel.Unbaked unbaked2 = ItemModelUtils.plainModel(ModelLocationUtils.decorateItemModelLocation("tooting_goat_horn")); this.generateBooleanDispatch(goatHornItem, ItemModelUtils.isUsingItem(), unbaked2, unbaked); } private void generateShield(Item shieldItem) { - Unbaked unbaked = ItemModelUtils.specialModel( - ModelLocationUtils.getModelLocation(shieldItem), new net.minecraft.client.renderer.special.ShieldSpecialRenderer.Unbaked() - ); - Unbaked unbaked2 = ItemModelUtils.specialModel( - ModelLocationUtils.getModelLocation(shieldItem, "_blocking"), new net.minecraft.client.renderer.special.ShieldSpecialRenderer.Unbaked() - ); + ItemModel.Unbaked unbaked = ItemModelUtils.specialModel(ModelLocationUtils.getModelLocation(shieldItem), new ShieldSpecialRenderer.Unbaked()); + ItemModel.Unbaked unbaked2 = ItemModelUtils.specialModel(ModelLocationUtils.getModelLocation(shieldItem, "_blocking"), new ShieldSpecialRenderer.Unbaked()); this.generateBooleanDispatch(shieldItem, ItemModelUtils.isUsingItem(), unbaked2, unbaked); } - private static Unbaked createFlatModelDispatch(Unbaked itemModel, Unbaked holdingModel) { + private static ItemModel.Unbaked createFlatModelDispatch(ItemModel.Unbaked itemModel, ItemModel.Unbaked holdingModel) { return ItemModelUtils.select( new DisplayContext(), holdingModel, ItemModelUtils.when(List.of(ItemDisplayContext.GUI, ItemDisplayContext.GROUND, ItemDisplayContext.FIXED), itemModel) ); } private void generateSpyglass(Item spyglassItem) { - Unbaked unbaked = ItemModelUtils.plainModel(this.createFlatItemModel(spyglassItem, ModelTemplates.FLAT_ITEM)); - Unbaked unbaked2 = ItemModelUtils.plainModel(ModelLocationUtils.getModelLocation(spyglassItem, "_in_hand")); + ItemModel.Unbaked unbaked = ItemModelUtils.plainModel(this.createFlatItemModel(spyglassItem, ModelTemplates.FLAT_ITEM)); + ItemModel.Unbaked unbaked2 = ItemModelUtils.plainModel(ModelLocationUtils.getModelLocation(spyglassItem, "_in_hand")); this.itemModelOutput.accept(spyglassItem, createFlatModelDispatch(unbaked, unbaked2)); } private void generateTrident(Item tridentItem) { - Unbaked unbaked = ItemModelUtils.plainModel(this.createFlatItemModel(tridentItem, ModelTemplates.FLAT_ITEM)); - Unbaked unbaked2 = ItemModelUtils.specialModel( - ModelLocationUtils.getModelLocation(tridentItem, "_in_hand"), new net.minecraft.client.renderer.special.TridentSpecialRenderer.Unbaked() - ); - Unbaked unbaked3 = ItemModelUtils.specialModel( - ModelLocationUtils.getModelLocation(tridentItem, "_throwing"), new net.minecraft.client.renderer.special.TridentSpecialRenderer.Unbaked() - ); - Unbaked unbaked4 = ItemModelUtils.conditional(ItemModelUtils.isUsingItem(), unbaked3, unbaked2); + ItemModel.Unbaked unbaked = ItemModelUtils.plainModel(this.createFlatItemModel(tridentItem, ModelTemplates.FLAT_ITEM)); + ItemModel.Unbaked unbaked2 = ItemModelUtils.specialModel(ModelLocationUtils.getModelLocation(tridentItem, "_in_hand"), new TridentSpecialRenderer.Unbaked()); + ItemModel.Unbaked unbaked3 = ItemModelUtils.specialModel(ModelLocationUtils.getModelLocation(tridentItem, "_throwing"), new TridentSpecialRenderer.Unbaked()); + ItemModel.Unbaked unbaked4 = ItemModelUtils.conditional(ItemModelUtils.isUsingItem(), unbaked3, unbaked2); this.itemModelOutput.accept(tridentItem, createFlatModelDispatch(unbaked, unbaked4)); } @@ -539,7 +533,6 @@ public class ItemModelGenerators { this.generateFlatItem(Items.MUSIC_DISC_CREATOR, ModelTemplates.MUSIC_DISC); this.generateFlatItem(Items.MUSIC_DISC_CREATOR_MUSIC_BOX, ModelTemplates.MUSIC_DISC); this.generateFlatItem(Items.MUSIC_DISC_FAR, ModelTemplates.MUSIC_DISC); - this.generateFlatItem(Items.MUSIC_DISC_LAVA_CHICKEN, ModelTemplates.MUSIC_DISC); this.generateFlatItem(Items.MUSIC_DISC_MALL, ModelTemplates.MUSIC_DISC); this.generateFlatItem(Items.MUSIC_DISC_MELLOHI, ModelTemplates.MUSIC_DISC); this.generateFlatItem(Items.MUSIC_DISC_PIGSTEP, ModelTemplates.MUSIC_DISC); diff --git a/net/minecraft/client/data/models/model/ItemModelUtils.java b/net/minecraft/client/data/models/model/ItemModelUtils.java index 2cbeb42e..7abed64a 100644 --- a/net/minecraft/client/data/models/model/ItemModelUtils.java +++ b/net/minecraft/client/data/models/model/ItemModelUtils.java @@ -3,14 +3,18 @@ package net.minecraft.client.data.models.model; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.Map.Entry; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.color.item.Constant; import net.minecraft.client.color.item.ItemTintSource; -import net.minecraft.client.renderer.item.ItemModel.Unbaked; -import net.minecraft.client.renderer.item.RangeSelectItemModel.Entry; -import net.minecraft.client.renderer.item.SelectItemModel.SwitchCase; -import net.minecraft.client.renderer.item.SelectItemModel.UnbakedSwitch; +import net.minecraft.client.renderer.item.BlockModelWrapper; +import net.minecraft.client.renderer.item.CompositeModel; +import net.minecraft.client.renderer.item.ConditionalItemModel; +import net.minecraft.client.renderer.item.ItemModel; +import net.minecraft.client.renderer.item.RangeSelectItemModel; +import net.minecraft.client.renderer.item.SelectItemModel; +import net.minecraft.client.renderer.item.SpecialModelWrapper; import net.minecraft.client.renderer.item.properties.conditional.ConditionalItemModelProperty; import net.minecraft.client.renderer.item.properties.conditional.HasComponent; import net.minecraft.client.renderer.item.properties.conditional.IsUsingItem; @@ -19,6 +23,7 @@ import net.minecraft.client.renderer.item.properties.select.ContextDimension; import net.minecraft.client.renderer.item.properties.select.ItemBlockState; import net.minecraft.client.renderer.item.properties.select.LocalTime; import net.minecraft.client.renderer.item.properties.select.SelectItemModelProperty; +import net.minecraft.client.renderer.special.SpecialModelRenderer; import net.minecraft.core.component.DataComponentType; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.Level; @@ -26,78 +31,80 @@ import net.minecraft.world.level.block.state.properties.Property; @Environment(EnvType.CLIENT) public class ItemModelUtils { - public static Unbaked plainModel(ResourceLocation model) { - return new net.minecraft.client.renderer.item.BlockModelWrapper.Unbaked(model, List.of()); + public static ItemModel.Unbaked plainModel(ResourceLocation model) { + return new BlockModelWrapper.Unbaked(model, List.of()); } - public static Unbaked tintedModel(ResourceLocation model, ItemTintSource... tintSources) { - return new net.minecraft.client.renderer.item.BlockModelWrapper.Unbaked(model, List.of(tintSources)); + public static ItemModel.Unbaked tintedModel(ResourceLocation model, ItemTintSource... tintSources) { + return new BlockModelWrapper.Unbaked(model, List.of(tintSources)); } public static ItemTintSource constantTint(int value) { return new Constant(value); } - public static Unbaked composite(Unbaked... models) { - return new net.minecraft.client.renderer.item.CompositeModel.Unbaked(List.of(models)); + public static ItemModel.Unbaked composite(ItemModel.Unbaked... models) { + return new CompositeModel.Unbaked(List.of(models)); } - public static Unbaked specialModel(ResourceLocation base, net.minecraft.client.renderer.special.SpecialModelRenderer.Unbaked specialModel) { - return new net.minecraft.client.renderer.item.SpecialModelWrapper.Unbaked(base, specialModel); + public static ItemModel.Unbaked specialModel(ResourceLocation base, SpecialModelRenderer.Unbaked specialModel) { + return new SpecialModelWrapper.Unbaked(base, specialModel); } - public static Entry override(Unbaked model, float threshold) { - return new Entry(threshold, model); + public static RangeSelectItemModel.Entry override(ItemModel.Unbaked threshold, float model) { + return new RangeSelectItemModel.Entry(model, threshold); } - public static Unbaked rangeSelect(RangeSelectItemModelProperty property, Unbaked fallback, Entry... entries) { - return new net.minecraft.client.renderer.item.RangeSelectItemModel.Unbaked(property, 1.0F, List.of(entries), Optional.of(fallback)); + public static ItemModel.Unbaked rangeSelect(RangeSelectItemModelProperty property, ItemModel.Unbaked fallback, RangeSelectItemModel.Entry... entries) { + return new RangeSelectItemModel.Unbaked(property, 1.0F, List.of(entries), Optional.of(fallback)); } - public static Unbaked rangeSelect(RangeSelectItemModelProperty property, float scale, Unbaked fallback, Entry... entries) { - return new net.minecraft.client.renderer.item.RangeSelectItemModel.Unbaked(property, scale, List.of(entries), Optional.of(fallback)); + public static ItemModel.Unbaked rangeSelect( + RangeSelectItemModelProperty property, float scale, ItemModel.Unbaked fallback, RangeSelectItemModel.Entry... entries + ) { + return new RangeSelectItemModel.Unbaked(property, scale, List.of(entries), Optional.of(fallback)); } - public static Unbaked rangeSelect(RangeSelectItemModelProperty property, Unbaked fallback, List entries) { - return new net.minecraft.client.renderer.item.RangeSelectItemModel.Unbaked(property, 1.0F, entries, Optional.of(fallback)); + public static ItemModel.Unbaked rangeSelect(RangeSelectItemModelProperty property, ItemModel.Unbaked fallback, List entries) { + return new RangeSelectItemModel.Unbaked(property, 1.0F, entries, Optional.of(fallback)); } - public static Unbaked rangeSelect(RangeSelectItemModelProperty property, List entries) { - return new net.minecraft.client.renderer.item.RangeSelectItemModel.Unbaked(property, 1.0F, entries, Optional.empty()); + public static ItemModel.Unbaked rangeSelect(RangeSelectItemModelProperty property, List entries) { + return new RangeSelectItemModel.Unbaked(property, 1.0F, entries, Optional.empty()); } - public static Unbaked rangeSelect(RangeSelectItemModelProperty property, float scale, List entries) { - return new net.minecraft.client.renderer.item.RangeSelectItemModel.Unbaked(property, scale, entries, Optional.empty()); + public static ItemModel.Unbaked rangeSelect(RangeSelectItemModelProperty property, float scale, List entries) { + return new RangeSelectItemModel.Unbaked(property, scale, entries, Optional.empty()); } - public static Unbaked conditional(ConditionalItemModelProperty property, Unbaked onTrue, Unbaked onFalse) { - return new net.minecraft.client.renderer.item.ConditionalItemModel.Unbaked(property, onTrue, onFalse); + public static ItemModel.Unbaked conditional(ConditionalItemModelProperty property, ItemModel.Unbaked onTrue, ItemModel.Unbaked onFalse) { + return new ConditionalItemModel.Unbaked(property, onTrue, onFalse); } - public static SwitchCase when(T value, Unbaked model) { - return new SwitchCase<>(List.of(value), model); + public static SelectItemModel.SwitchCase when(T value, ItemModel.Unbaked model) { + return new SelectItemModel.SwitchCase<>(List.of(value), model); } - public static SwitchCase when(List values, Unbaked model) { - return new SwitchCase<>(values, model); + public static SelectItemModel.SwitchCase when(List values, ItemModel.Unbaked model) { + return new SelectItemModel.SwitchCase<>(values, model); } @SafeVarargs - public static Unbaked select(SelectItemModelProperty property, Unbaked fallback, SwitchCase... cases) { + public static ItemModel.Unbaked select(SelectItemModelProperty property, ItemModel.Unbaked fallback, SelectItemModel.SwitchCase... cases) { return select(property, fallback, List.of(cases)); } - public static Unbaked select(SelectItemModelProperty property, Unbaked fallback, List> cases) { - return new net.minecraft.client.renderer.item.SelectItemModel.Unbaked(new UnbakedSwitch<>(property, cases), Optional.of(fallback)); + public static ItemModel.Unbaked select(SelectItemModelProperty property, ItemModel.Unbaked fallback, List> cases) { + return new SelectItemModel.Unbaked(new SelectItemModel.UnbakedSwitch<>(property, cases), Optional.of(fallback)); } @SafeVarargs - public static Unbaked select(SelectItemModelProperty property, SwitchCase... cases) { + public static ItemModel.Unbaked select(SelectItemModelProperty property, SelectItemModel.SwitchCase... cases) { return select(property, List.of(cases)); } - public static Unbaked select(SelectItemModelProperty property, List> cases) { - return new net.minecraft.client.renderer.item.SelectItemModel.Unbaked(new UnbakedSwitch<>(property, cases), Optional.empty()); + public static ItemModel.Unbaked select(SelectItemModelProperty property, List> cases) { + return new SelectItemModel.Unbaked(new SelectItemModel.UnbakedSwitch<>(property, cases), Optional.empty()); } public static ConditionalItemModelProperty isUsingItem() { @@ -108,19 +115,21 @@ public class ItemModelUtils { return new HasComponent(componentType, false); } - public static Unbaked inOverworld(Unbaked inOverworldModel, Unbaked notInOverworldModel) { + public static ItemModel.Unbaked inOverworld(ItemModel.Unbaked inOverworldModel, ItemModel.Unbaked notInOverworldModel) { return select(new ContextDimension(), notInOverworldModel, when(Level.OVERWORLD, inOverworldModel)); } - public static > Unbaked selectBlockItemProperty(Property property, Unbaked fallback, Map modelMap) { - List> list = modelMap.entrySet().stream().sorted(java.util.Map.Entry.comparingByKey()).map(entry -> { + public static > ItemModel.Unbaked selectBlockItemProperty( + Property property, ItemModel.Unbaked fallback, Map modelMap + ) { + List> list = modelMap.entrySet().stream().sorted(Entry.comparingByKey()).map(entry -> { String string = property.getName((T)entry.getKey()); - return new SwitchCase(List.of(string), (Unbaked)entry.getValue()); + return new SelectItemModel.SwitchCase(List.of(string), (ItemModel.Unbaked)entry.getValue()); }).toList(); return select(new ItemBlockState(property.getName()), fallback, list); } - public static Unbaked isXmas(Unbaked xmasModel, Unbaked normalModel) { + public static ItemModel.Unbaked isXmas(ItemModel.Unbaked xmasModel, ItemModel.Unbaked normalModel) { return select(LocalTime.create("MM-dd", "", Optional.empty()), normalModel, List.of(when(List.of("12-24", "12-25", "12-26"), xmasModel))); } } diff --git a/net/minecraft/client/gui/Font.java b/net/minecraft/client/gui/Font.java index 7c01af3b..111a49d7 100644 --- a/net/minecraft/client/gui/Font.java +++ b/net/minecraft/client/gui/Font.java @@ -4,13 +4,13 @@ import com.ibm.icu.text.ArabicShaping; import com.ibm.icu.text.ArabicShapingException; import com.ibm.icu.text.Bidi; import com.mojang.blaze3d.font.GlyphInfo; +import com.mojang.blaze3d.vertex.VertexConsumer; import java.util.ArrayList; import java.util.List; import java.util.function.Function; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.StringSplitter; -import net.minecraft.client.gui.Font.GlyphVisitor.1; import net.minecraft.client.gui.font.FontSet; import net.minecraft.client.gui.font.glyphs.BakedGlyph; import net.minecraft.client.gui.font.glyphs.EmptyGlyph; @@ -33,10 +33,10 @@ import org.joml.Matrix4f; @Environment(EnvType.CLIENT) public class Font { - private static final float EFFECT_DEPTH = 0.01F; - private static final float OVER_EFFECT_DEPTH = 0.01F; - private static final float UNDER_EFFECT_DEPTH = -0.01F; - public static final float SHADOW_DEPTH = 0.03F; + private static final float EFFECT_DEPTH = 0.001F; + private static final float OVER_EFFECT_DEPTH = 0.001F; + private static final float UNDER_EFFECT_DEPTH = -0.001F; + public static final float SHADOW_DEPTH = 0.003F; public static final int NO_SHADOW = 0; public final int lineHeight = 9; public final RandomSource random = RandomSource.create(); @@ -233,7 +233,20 @@ public class Font { @Environment(EnvType.CLIENT) public interface GlyphVisitor { static Font.GlyphVisitor forMultiBufferSource(MultiBufferSource bufferSource, Matrix4f pose, Font.DisplayMode displayMode, int packedLight) { - return new 1(bufferSource, displayMode, pose, packedLight); + return new Font.GlyphVisitor() { + @Override + public void acceptGlyph(BakedGlyph.GlyphInstance glyph) { + BakedGlyph bakedGlyph = glyph.glyph(); + VertexConsumer vertexConsumer = bufferSource.getBuffer(bakedGlyph.renderType(displayMode)); + bakedGlyph.renderChar(glyph, pose, vertexConsumer, packedLight, false); + } + + @Override + public void acceptEffect(BakedGlyph glyph, BakedGlyph.Effect effect) { + VertexConsumer vertexConsumer = bufferSource.getBuffer(glyph.renderType(displayMode)); + glyph.renderEffect(effect, pose, vertexConsumer, packedLight, false); + } + }; } void acceptGlyph(BakedGlyph.GlyphInstance glyph); @@ -331,11 +344,11 @@ public class Font { this.markBackground(this.x, this.y, f); if (style.isStrikethrough()) { - this.addEffect(new BakedGlyph.Effect(g, this.y + 4.5F - 1.0F, this.x + f, this.y + 4.5F, 0.01F, k, l, h)); + this.addEffect(new BakedGlyph.Effect(g, this.y + 4.5F - 1.0F, this.x + f, this.y + 4.5F, 0.001F, k, l, h)); } if (style.isUnderlined()) { - this.addEffect(new BakedGlyph.Effect(g, this.y + 9.0F - 1.0F, this.x + f, this.y + 9.0F, 0.01F, k, l, h)); + this.addEffect(new BakedGlyph.Effect(g, this.y + 9.0F - 1.0F, this.x + f, this.y + 9.0F, 0.001F, k, l, h)); } this.x += f; @@ -347,7 +360,7 @@ public class Font { BakedGlyph bakedGlyph = null; if (ARGB.alpha(this.backgroundColor) != 0) { BakedGlyph.Effect effect = new BakedGlyph.Effect( - this.backgroundLeft, this.backgroundTop, this.backgroundRight, this.backgroundBottom, -0.01F, this.backgroundColor + this.backgroundLeft, this.backgroundTop, this.backgroundRight, this.backgroundBottom, -0.001F, this.backgroundColor ); bakedGlyph = Font.this.getFontSet(Style.DEFAULT_FONT).whiteGlyph(); visitor.acceptEffect(bakedGlyph, effect); diff --git a/net/minecraft/client/gui/GuiGraphics.java b/net/minecraft/client/gui/GuiGraphics.java index 8ad905c9..acb4a84e 100644 --- a/net/minecraft/client/gui/GuiGraphics.java +++ b/net/minecraft/client/gui/GuiGraphics.java @@ -41,25 +41,17 @@ import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.client.renderer.entity.state.EntityRenderState; -import net.minecraft.client.renderer.item.TrackingItemStackRenderState; +import net.minecraft.client.renderer.item.ItemStackRenderState; import net.minecraft.client.renderer.state.MapRenderState; -import net.minecraft.client.renderer.state.MapRenderState.MapDecorationRenderState; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.metadata.gui.GuiSpriteScaling; -import net.minecraft.client.resources.metadata.gui.GuiSpriteScaling.NineSlice; -import net.minecraft.client.resources.metadata.gui.GuiSpriteScaling.Stretch; -import net.minecraft.client.resources.metadata.gui.GuiSpriteScaling.Tile; -import net.minecraft.client.resources.metadata.gui.GuiSpriteScaling.NineSlice.Border; import net.minecraft.core.component.DataComponents; import net.minecraft.locale.Language; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.FormattedText; +import net.minecraft.network.chat.HoverEvent; import net.minecraft.network.chat.Style; -import net.minecraft.network.chat.HoverEvent.EntityTooltipInfo; -import net.minecraft.network.chat.HoverEvent.ShowEntity; -import net.minecraft.network.chat.HoverEvent.ShowItem; -import net.minecraft.network.chat.HoverEvent.ShowText; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.ARGB; import net.minecraft.util.FormattedCharSequence; @@ -246,11 +238,6 @@ public class GuiGraphics { ); } - public void textHighlight(int minX, int minY, int maxX, int maxY) { - this.fill(RenderPipelines.GUI_INVERT, minX, minY, maxX, maxY, -1); - this.fill(RenderPipelines.GUI_TEXT_HIGHLIGHT, minX, minY, maxX, maxY, -16776961); - } - /** * Draws a centered string at the specified coordinates using the given font, text, and color. * @@ -377,11 +364,11 @@ public class GuiGraphics { public void blitSprite(RenderPipeline pipeline, ResourceLocation sprite, int x, int y, int width, int height, int color) { TextureAtlasSprite textureAtlasSprite = this.sprites.getSprite(sprite); GuiSpriteScaling guiSpriteScaling = this.sprites.getSpriteScaling(textureAtlasSprite); - if (guiSpriteScaling instanceof Stretch) { + if (guiSpriteScaling instanceof GuiSpriteScaling.Stretch) { this.blitSprite(pipeline, textureAtlasSprite, x, y, width, height, color); - } else if (guiSpriteScaling instanceof Tile tile) { + } else if (guiSpriteScaling instanceof GuiSpriteScaling.Tile tile) { this.blitTiledSprite(pipeline, textureAtlasSprite, x, y, width, height, 0, 0, tile.width(), tile.height(), tile.width(), tile.height(), color); - } else if (guiSpriteScaling instanceof NineSlice nineSlice) { + } else if (guiSpriteScaling instanceof GuiSpriteScaling.NineSlice nineSlice) { this.blitNineSlicedSprite(pipeline, textureAtlasSprite, nineSlice, x, y, width, height, color); } } @@ -397,7 +384,7 @@ public class GuiGraphics { ) { TextureAtlasSprite textureAtlasSprite = this.sprites.getSprite(sprite); GuiSpriteScaling guiSpriteScaling = this.sprites.getSpriteScaling(textureAtlasSprite); - if (guiSpriteScaling instanceof Stretch) { + if (guiSpriteScaling instanceof GuiSpriteScaling.Stretch) { this.blitSprite(pipeline, textureAtlasSprite, textureWidth, textureHeight, u, v, x, y, width, height, color); } else { this.enableScissor(x, y, x + width, y + height); @@ -436,8 +423,10 @@ public class GuiGraphics { } } - private void blitNineSlicedSprite(RenderPipeline pipeline, TextureAtlasSprite sprite, NineSlice nineSlice, int x, int y, int width, int height, int color) { - Border border = nineSlice.border(); + private void blitNineSlicedSprite( + RenderPipeline pipeline, TextureAtlasSprite sprite, GuiSpriteScaling.NineSlice nineSlice, int x, int y, int width, int height, int color + ) { + GuiSpriteScaling.NineSlice.Border border = nineSlice.border(); int i = Math.min(border.left(), width / 2); int j = Math.min(border.right(), width / 2); int k = Math.min(border.top(), height / 2); @@ -548,7 +537,7 @@ public class GuiGraphics { private void blitNineSliceInnerSegment( RenderPipeline pipeline, - NineSlice nineSlice, + GuiSpriteScaling.NineSlice nineSlice, TextureAtlasSprite sprite, int borderMinX, int borderMinY, @@ -754,14 +743,12 @@ public class GuiGraphics { */ private void renderItem(@Nullable LivingEntity entity, @Nullable Level level, ItemStack stack, int x, int y, int seed) { if (!stack.isEmpty()) { - TrackingItemStackRenderState trackingItemStackRenderState = new TrackingItemStackRenderState(); - this.minecraft.getItemModelResolver().updateForTopItem(trackingItemStackRenderState, stack, ItemDisplayContext.GUI, level, entity, seed); + ItemStackRenderState itemStackRenderState = new ItemStackRenderState(); + this.minecraft.getItemModelResolver().updateForTopItem(itemStackRenderState, stack, ItemDisplayContext.GUI, level, entity, seed); try { this.guiRenderState - .submitItem( - new GuiItemRenderState(stack.getItem().getName().toString(), new Matrix3x2f(this.pose), trackingItemStackRenderState, x, y, this.scissorStack.peek()) - ); + .submitItem(new GuiItemRenderState(stack.getItem().getName().toString(), new Matrix3x2f(this.pose), itemStackRenderState, x, y, this.scissorStack.peek())); } catch (Throwable var11) { CrashReport crashReport = CrashReport.forThrowable(var11, "Rendering item"); CrashReportCategory crashReportCategory = crashReport.addCategory("Item being rendered"); @@ -975,16 +962,16 @@ public class GuiGraphics { public void renderComponentHoverEffect(Font font, @Nullable Style style, int mouseX, int mouseY) { if (style != null && style.getHoverEvent() != null) { switch (style.getHoverEvent()) { - case ShowItem(ItemStack var17): + case HoverEvent.ShowItem(ItemStack var17): this.setTooltipForNextFrame(font, var17, mouseX, mouseY); break; - case ShowEntity(EntityTooltipInfo var22): - EntityTooltipInfo var18 = var22; + case HoverEvent.ShowEntity(HoverEvent.EntityTooltipInfo var22): + HoverEvent.EntityTooltipInfo var18 = var22; if (this.minecraft.options.advancedItemTooltips) { this.setComponentTooltipForNextFrame(font, var18.getTooltipLines(), mouseX, mouseY); } break; - case ShowText(Component var13): + case HoverEvent.ShowText(Component var13): this.setTooltipForNextFrame(font, font.split(var13, Math.max(this.guiWidth() / 2, 200)), mouseX, mouseY); break; default: @@ -998,7 +985,7 @@ public class GuiGraphics { GpuTextureView gpuTextureView = textureManager.getTexture(renderState.texture).getTextureView(); this.submitBlit(RenderPipelines.GUI_TEXTURED, gpuTextureView, 0, 0, 128, 128, 0.0F, 1.0F, 0.0F, 1.0F, -1); - for (MapDecorationRenderState mapDecorationRenderState : renderState.decorations) { + for (MapRenderState.MapDecorationRenderState mapDecorationRenderState : renderState.decorations) { if (mapDecorationRenderState.renderOnFrame) { this.pose.pushMatrix(); this.pose.translate(mapDecorationRenderState.x / 2.0F + 64.0F, mapDecorationRenderState.y / 2.0F + 64.0F); diff --git a/net/minecraft/client/gui/components/AbstractWidget.java b/net/minecraft/client/gui/components/AbstractWidget.java index 008c920f..05695aa3 100644 --- a/net/minecraft/client/gui/components/AbstractWidget.java +++ b/net/minecraft/client/gui/components/AbstractWidget.java @@ -14,7 +14,6 @@ import net.minecraft.client.gui.layouts.LayoutElement; import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.client.gui.narration.NarratedElementType; import net.minecraft.client.gui.narration.NarrationElementOutput; -import net.minecraft.client.gui.narration.NarratableEntry.NarrationPriority; import net.minecraft.client.gui.navigation.FocusNavigationEvent; import net.minecraft.client.gui.navigation.ScreenRectangle; import net.minecraft.client.resources.sounds.SimpleSoundInstance; @@ -105,9 +104,9 @@ public abstract class AbstractWidget implements Renderable, GuiEventListener, La } } - protected void renderScrollingString(GuiGraphics guiGraphics, Font font, int padding, int color) { - int i = this.getX() + padding; - int j = this.getX() + this.getWidth() - padding; + protected void renderScrollingString(GuiGraphics guiGraphics, Font font, int width, int color) { + int i = this.getX() + width; + int j = this.getX() + this.getWidth() - width; renderScrollingString(guiGraphics, font, this.getMessage(), i, this.getY(), j, this.getY() + this.getHeight(), color); } @@ -234,11 +233,11 @@ public abstract class AbstractWidget implements Renderable, GuiEventListener, La } @Override - public NarrationPriority narrationPriority() { + public NarratableEntry.NarrationPriority narrationPriority() { if (this.isFocused()) { - return NarrationPriority.FOCUSED; + return NarratableEntry.NarrationPriority.FOCUSED; } else { - return this.isHovered ? NarrationPriority.HOVERED : NarrationPriority.NONE; + return this.isHovered ? NarratableEntry.NarrationPriority.HOVERED : NarratableEntry.NarrationPriority.NONE; } } diff --git a/net/minecraft/client/gui/components/EditBox.java b/net/minecraft/client/gui/components/EditBox.java index ea9a081a..8c347c88 100644 --- a/net/minecraft/client/gui/components/EditBox.java +++ b/net/minecraft/client/gui/components/EditBox.java @@ -470,7 +470,7 @@ public class EditBox extends AbstractWidget { if (l != j) { int n = this.textX + this.font.width(string.substring(0, l)); - guiGraphics.textHighlight(Math.min(m, this.getX() + this.width), this.textY - 1, Math.min(n - 1, this.getX() + this.width), this.textY + 1 + 9); + this.renderHighlight(guiGraphics, m, this.textY - 1, n - 1, this.textY + 1 + 9); } if (bl2) { @@ -491,6 +491,30 @@ public class EditBox extends AbstractWidget { } } + private void renderHighlight(GuiGraphics guiGraphics, int minX, int minY, int maxX, int maxY) { + if (minX < maxX) { + int i = minX; + minX = maxX; + maxX = i; + } + + if (minY < maxY) { + int i = minY; + minY = maxY; + maxY = i; + } + + if (maxX > this.getX() + this.width) { + maxX = this.getX() + this.width; + } + + if (minX > this.getX() + this.width) { + minX = this.getX() + this.width; + } + + guiGraphics.fill(RenderPipelines.GUI_TEXT_HIGHLIGHT, minX, minY, maxX, maxY, -16776961); + } + /** * Sets the maximum length for the text in this text box. If the current text is longer than this length, the current text will be trimmed. */ diff --git a/net/minecraft/client/gui/components/MultiLineEditBox.java b/net/minecraft/client/gui/components/MultiLineEditBox.java index 2cfe36d1..0c10ebe9 100644 --- a/net/minecraft/client/gui/components/MultiLineEditBox.java +++ b/net/minecraft/client/gui/components/MultiLineEditBox.java @@ -6,10 +6,10 @@ import net.fabricmc.api.Environment; import net.minecraft.Util; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.MultilineTextField.StringView; import net.minecraft.client.gui.narration.NarratedElementType; import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.util.StringUtil; @@ -124,7 +124,7 @@ public class MultiLineEditBox extends AbstractTextAreaWidget { int k = 0; int l = this.getInnerTop(); - for (StringView stringView : this.textField.iterateLines()) { + for (MultilineTextField.StringView stringView : this.textField.iterateLines()) { boolean bl3 = this.withinContentAreaTopBottom(l, l + 9); int m = this.getInnerLeft(); if (bl && bl2 && i >= stringView.beginIndex() && i < stringView.endIndex()) { @@ -153,11 +153,11 @@ public class MultiLineEditBox extends AbstractTextAreaWidget { } if (this.textField.hasSelection()) { - StringView stringView2 = this.textField.getSelected(); + MultilineTextField.StringView stringView2 = this.textField.getSelected(); int n = this.getInnerLeft(); l = this.getInnerTop(); - for (StringView stringView3 : this.textField.iterateLines()) { + for (MultilineTextField.StringView stringView3 : this.textField.iterateLines()) { if (stringView2.beginIndex() > stringView3.endIndex()) { l += 9; } else { @@ -174,7 +174,7 @@ public class MultiLineEditBox extends AbstractTextAreaWidget { p = this.font.width(string.substring(stringView3.beginIndex(), stringView2.endIndex())); } - guiGraphics.textHighlight(n + o, l, n + p, l + 9); + this.renderHighlight(guiGraphics, n + o, l, n + p, l + 9); } l += 9; @@ -204,13 +204,17 @@ public class MultiLineEditBox extends AbstractTextAreaWidget { return 9.0 / 2.0; } + private void renderHighlight(GuiGraphics guiGraphics, int minX, int minY, int maxX, int maxY) { + guiGraphics.fill(RenderPipelines.GUI_TEXT_HIGHLIGHT, minX, minY, maxX, maxY, -16776961); + } + private void scrollToCursor() { double d = this.scrollAmount(); - StringView stringView = this.textField.getLineView((int)(d / 9.0)); + MultilineTextField.StringView stringView = this.textField.getLineView((int)(d / 9.0)); if (this.textField.cursor() <= stringView.beginIndex()) { d = this.textField.getLineAtCursor() * 9; } else { - StringView stringView2 = this.textField.getLineView((int)((d + this.height) / 9.0) - 1); + MultilineTextField.StringView stringView2 = this.textField.getLineView((int)((d + this.height) / 9.0) - 1); if (this.textField.cursor() > stringView2.endIndex()) { d = this.textField.getLineAtCursor() * 9 - this.height + 9 + this.totalInnerPadding(); } diff --git a/net/minecraft/client/gui/components/PlayerSkinWidget.java b/net/minecraft/client/gui/components/PlayerSkinWidget.java index f733d08d..c9554dd6 100644 --- a/net/minecraft/client/gui/components/PlayerSkinWidget.java +++ b/net/minecraft/client/gui/components/PlayerSkinWidget.java @@ -11,7 +11,6 @@ import net.minecraft.client.model.PlayerModel; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.model.geom.ModelLayers; import net.minecraft.client.resources.PlayerSkin; -import net.minecraft.client.resources.PlayerSkin.Model; import net.minecraft.client.sounds.SoundManager; import net.minecraft.network.chat.CommonComponents; import net.minecraft.util.Mth; @@ -43,7 +42,7 @@ public class PlayerSkinWidget extends AbstractWidget { float f = 0.97F * this.getHeight() / 2.125F; float g = -1.0625F; PlayerSkin playerSkin = (PlayerSkin)this.skin.get(); - PlayerModel playerModel = playerSkin.model() == Model.SLIM ? this.slimModel : this.wideModel; + PlayerModel playerModel = playerSkin.model() == PlayerSkin.Model.SLIM ? this.slimModel : this.wideModel; guiGraphics.submitSkinRenderState( playerModel, playerSkin.texture(), f, this.rotationX, this.rotationY, -1.0625F, this.getX(), this.getY(), this.getRight(), this.getBottom() ); diff --git a/net/minecraft/client/gui/font/glyphs/BakedGlyph.java b/net/minecraft/client/gui/font/glyphs/BakedGlyph.java index 71fe7344..da521e99 100644 --- a/net/minecraft/client/gui/font/glyphs/BakedGlyph.java +++ b/net/minecraft/client/gui/font/glyphs/BakedGlyph.java @@ -78,7 +78,7 @@ public class BakedGlyph { this.render(bl, f + glyph.boldOffset() + glyph.shadowOffset(), g + glyph.shadowOffset(), h, pose, buffer, j, true, packedLight); } - k = noDepth ? 0.0F : 0.03F; + k = noDepth ? 0.0F : 0.003F; } else { k = 0.0F; } @@ -119,7 +119,7 @@ public class BakedGlyph { float f = noDepth ? 0.0F : effect.depth; if (effect.hasShadow()) { this.buildEffect(effect, effect.shadowOffset(), f, effect.shadowColor(), buffer, packedLight, pose); - f += noDepth ? 0.0F : 0.03F; + f += noDepth ? 0.0F : 0.003F; } this.buildEffect(effect, 0.0F, f, effect.color, buffer, packedLight, pose); diff --git a/net/minecraft/client/gui/render/GuiRenderer.java b/net/minecraft/client/gui/render/GuiRenderer.java index 8a1a2bd0..61c85eb7 100644 --- a/net/minecraft/client/gui/render/GuiRenderer.java +++ b/net/minecraft/client/gui/render/GuiRenderer.java @@ -5,15 +5,14 @@ import com.google.common.collect.ImmutableMap.Builder; import com.mojang.blaze3d.ProjectionType; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; -import com.mojang.blaze3d.buffers.GpuBuffer.MappedView; import com.mojang.blaze3d.pipeline.RenderPipeline; import com.mojang.blaze3d.pipeline.RenderTarget; +import com.mojang.blaze3d.platform.Lighting; import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.systems.RenderSystem.AutoStorageIndexBuffer; import com.mojang.blaze3d.textures.FilterMode; import com.mojang.blaze3d.textures.GpuTexture; import com.mojang.blaze3d.textures.GpuTextureView; @@ -23,7 +22,6 @@ import com.mojang.blaze3d.vertex.ByteBufferBuilder; import com.mojang.blaze3d.vertex.MeshData; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexFormat; -import com.mojang.blaze3d.vertex.MeshData.DrawState; import com.mojang.logging.LogUtils; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; @@ -42,10 +40,8 @@ import java.util.function.Supplier; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Font.GlyphVisitor; +import net.minecraft.client.gui.Font; import net.minecraft.client.gui.font.glyphs.BakedGlyph; -import net.minecraft.client.gui.font.glyphs.BakedGlyph.Effect; -import net.minecraft.client.gui.font.glyphs.BakedGlyph.GlyphInstance; import net.minecraft.client.gui.navigation.ScreenRectangle; import net.minecraft.client.gui.render.pip.OversizedItemRenderer; import net.minecraft.client.gui.render.pip.PictureInPictureRenderer; @@ -55,14 +51,13 @@ import net.minecraft.client.gui.render.state.GlyphRenderState; import net.minecraft.client.gui.render.state.GuiElementRenderState; import net.minecraft.client.gui.render.state.GuiItemRenderState; import net.minecraft.client.gui.render.state.GuiRenderState; -import net.minecraft.client.gui.render.state.GuiRenderState.TraverseRange; import net.minecraft.client.gui.render.state.pip.OversizedItemRenderState; import net.minecraft.client.gui.render.state.pip.PictureInPictureRenderState; import net.minecraft.client.renderer.CachedOrthoProjectionMatrixBuffer; import net.minecraft.client.renderer.MappableRingBuffer; +import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderPipelines; -import net.minecraft.client.renderer.MultiBufferSource.BufferSource; -import net.minecraft.client.renderer.item.TrackingItemStackRenderState; +import net.minecraft.client.renderer.item.ItemStackRenderState; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.util.Mth; import org.apache.commons.lang3.mutable.MutableBoolean; @@ -78,7 +73,7 @@ import org.slf4j.Logger; public class GuiRenderer implements AutoCloseable { private static final Logger LOGGER = LogUtils.getLogger(); private static final float MAX_GUI_Z = 10000.0F; - private static final float MIN_GUI_Z = 0.0F; + public static final float MIN_GUI_Z = 0.0F; private static final float GUI_Z_NEAR = 1000.0F; public static final int GUI_3D_Z_FAR = 1000; public static final int GUI_3D_Z_NEAR = -1000; @@ -103,7 +98,7 @@ public class GuiRenderer implements AutoCloseable { private int firstDrawIndexAfterBlur = Integer.MAX_VALUE; private final CachedOrthoProjectionMatrixBuffer guiProjectionMatrixBuffer = new CachedOrthoProjectionMatrixBuffer("gui", 1000.0F, 11000.0F, true); private final CachedOrthoProjectionMatrixBuffer itemsProjectionMatrixBuffer = new CachedOrthoProjectionMatrixBuffer("items", -1000.0F, 1000.0F, true); - private final BufferSource bufferSource; + private final MultiBufferSource.BufferSource bufferSource; private final Map, PictureInPictureRenderer> pictureInPictureRenderers; @Nullable private GpuTexture itemsAtlas; @@ -126,7 +121,7 @@ public class GuiRenderer implements AutoCloseable { @Nullable private BufferBuilder bufferBuilder = null; - public GuiRenderer(GuiRenderState renderState, BufferSource bufferSource, List> pictureInPictureRenderers) { + public GuiRenderer(GuiRenderState renderState, MultiBufferSource.BufferSource bufferSource, List> pictureInPictureRenderers) { this.renderState = renderState; this.bufferSource = bufferSource; Builder, PictureInPictureRenderer> builder = ImmutableMap.builder(); @@ -178,13 +173,13 @@ public class GuiRenderer implements AutoCloseable { this.prepareItemElements(); this.prepareText(); this.renderState.sortElements(ELEMENT_SORT_COMPARATOR); - this.addElementsToMeshes(TraverseRange.BEFORE_BLUR); + this.addElementsToMeshes(GuiRenderState.TraverseRange.BEFORE_BLUR); this.firstDrawIndexAfterBlur = this.meshesToDraw.size(); - this.addElementsToMeshes(TraverseRange.AFTER_BLUR); + this.addElementsToMeshes(GuiRenderState.TraverseRange.AFTER_BLUR); this.recordDraws(); } - private void addElementsToMeshes(TraverseRange traverseRange) { + private void addElementsToMeshes(GuiRenderState.TraverseRange traverseRange) { this.previousScissorArea = null; this.previousPipeline = null; this.previousTextureSetup = null; @@ -195,7 +190,7 @@ public class GuiRenderer implements AutoCloseable { } } - private void draw(GpuBufferSlice fogUniforms) { + private void draw(GpuBufferSlice bufferSlice) { if (!this.draws.isEmpty()) { Minecraft minecraft = Minecraft.getInstance(); Window window = minecraft.getWindow(); @@ -212,14 +207,14 @@ public class GuiRenderer implements AutoCloseable { } } - AutoStorageIndexBuffer autoStorageIndexBuffer = RenderSystem.getSequentialBuffer(VertexFormat.Mode.QUADS); + RenderSystem.AutoStorageIndexBuffer autoStorageIndexBuffer = RenderSystem.getSequentialBuffer(VertexFormat.Mode.QUADS); GpuBuffer gpuBuffer = autoStorageIndexBuffer.getBuffer(i); VertexFormat.IndexType indexType = autoStorageIndexBuffer.type(); GpuBufferSlice gpuBufferSlice = RenderSystem.getDynamicUniforms() .writeTransform(new Matrix4f().setTranslation(0.0F, 0.0F, -11000.0F), new Vector4f(1.0F, 1.0F, 1.0F, 1.0F), new Vector3f(), new Matrix4f(), 0.0F); if (this.firstDrawIndexAfterBlur > 0) { this.executeDrawRange( - () -> "GUI before blur", renderTarget, fogUniforms, gpuBufferSlice, gpuBuffer, indexType, 0, Math.min(this.firstDrawIndexAfterBlur, this.draws.size()) + () -> "GUI before blur", renderTarget, bufferSlice, gpuBufferSlice, gpuBuffer, indexType, 0, Math.min(this.firstDrawIndexAfterBlur, this.draws.size()) ); } @@ -227,7 +222,7 @@ public class GuiRenderer implements AutoCloseable { RenderSystem.getDevice().createCommandEncoder().clearDepthTexture(renderTarget.getDepthTexture(), 1.0); minecraft.gameRenderer.processBlurEffect(); this.executeDrawRange( - () -> "GUI after blur", renderTarget, fogUniforms, gpuBufferSlice, gpuBuffer, indexType, this.firstDrawIndexAfterBlur, this.draws.size() + () -> "GUI after blur", renderTarget, bufferSlice, gpuBufferSlice, gpuBuffer, indexType, this.firstDrawIndexAfterBlur, this.draws.size() ); } } @@ -236,7 +231,7 @@ public class GuiRenderer implements AutoCloseable { private void executeDrawRange( Supplier debugGroup, RenderTarget renderTarget, - GpuBufferSlice fogUniforms, + GpuBufferSlice fog, GpuBufferSlice dynamicTransforms, GpuBuffer buffer, VertexFormat.IndexType indexType, @@ -253,7 +248,7 @@ public class GuiRenderer implements AutoCloseable { OptionalDouble.empty() )) { RenderSystem.bindDefaultUniforms(renderPass); - renderPass.setUniform("Fog", fogUniforms); + renderPass.setUniform("Fog", fog); renderPass.setUniform("DynamicTransforms", dynamicTransforms); for (int i = start; i < end; i++) { @@ -280,23 +275,23 @@ public class GuiRenderer implements AutoCloseable { this.previousScissorArea = screenRectangle; } - renderState.buildVertices(this.bufferBuilder, 0.0F + layer); + renderState.buildVertices(this.bufferBuilder, 0.0F + layer * 0.01F); } private void prepareText() { this.renderState.forEachText(guiTextRenderState -> { final Matrix3x2f matrix3x2f = guiTextRenderState.pose; final ScreenRectangle screenRectangle = guiTextRenderState.scissor; - guiTextRenderState.ensurePrepared().visit(new GlyphVisitor() { + guiTextRenderState.ensurePrepared().visit(new Font.GlyphVisitor() { @Override - public void acceptGlyph(GlyphInstance glyph) { + public void acceptGlyph(BakedGlyph.GlyphInstance glyph) { if (glyph.glyph().textureView() != null) { GuiRenderer.this.renderState.submitGlyphToCurrentLayer(new GlyphRenderState(matrix3x2f, glyph, screenRectangle)); } } @Override - public void acceptEffect(BakedGlyph glyph, Effect effect) { + public void acceptEffect(BakedGlyph glyph, BakedGlyph.Effect effect) { if (glyph.textureView() != null) { GuiRenderer.this.renderState.submitGlyphToCurrentLayer(new GlyphEffectRenderState(matrix3x2f, glyph, effect, screenRectangle)); } @@ -317,7 +312,7 @@ public class GuiRenderer implements AutoCloseable { RenderSystem.outputColorTextureOverride = this.itemsAtlasView; RenderSystem.outputDepthTextureOverride = this.itemsAtlasDepthView; RenderSystem.setProjectionMatrix(this.itemsProjectionMatrixBuffer.getBuffer(k, k), ProjectionType.ORTHOGRAPHIC); - Minecraft.getInstance().gameRenderer.getLighting().setupFor(com.mojang.blaze3d.platform.Lighting.Entry.ITEMS_3D); + Minecraft.getInstance().gameRenderer.getLighting().setupFor(Lighting.Entry.ITEMS_3D); PoseStack poseStack = new PoseStack(); MutableBoolean mutableBoolean = new MutableBoolean(false); MutableBoolean mutableBoolean2 = new MutableBoolean(false); @@ -327,15 +322,15 @@ public class GuiRenderer implements AutoCloseable { if (guiItemRenderState.oversizedItemBounds() != null) { mutableBoolean2.setTrue(); } else { - TrackingItemStackRenderState trackingItemStackRenderState = guiItemRenderState.itemStackRenderState(); - GuiRenderer.AtlasPosition atlasPosition = (GuiRenderer.AtlasPosition)this.atlasPositions.get(trackingItemStackRenderState.getModelIdentity()); - if (atlasPosition == null || trackingItemStackRenderState.isAnimated() && atlasPosition.lastAnimatedOnFrame != this.frameNumber) { + ItemStackRenderState itemStackRenderState = guiItemRenderState.itemStackRenderState(); + GuiRenderer.AtlasPosition atlasPosition = (GuiRenderer.AtlasPosition)this.atlasPositions.get(itemStackRenderState.getModelIdentity()); + if (atlasPosition == null || itemStackRenderState.isAnimated() && atlasPosition.lastAnimatedOnFrame != this.frameNumber) { if (this.itemAtlasX + j > k) { this.itemAtlasX = 0; this.itemAtlasY += j; } - boolean bl = trackingItemStackRenderState.isAnimated() && atlasPosition != null; + boolean bl = itemStackRenderState.isAnimated() && atlasPosition != null; if (!bl && this.itemAtlasY + j > k) { if (mutableBoolean.isFalse()) { LOGGER.warn("Trying to render too many items in GUI at the same time. Skipping some of them."); @@ -348,7 +343,7 @@ public class GuiRenderer implements AutoCloseable { RenderSystem.getDevice().createCommandEncoder().clearColorAndDepthTextures(this.itemsAtlas, 0, this.itemsAtlasDepth, 1.0, kx, k - l - j, j, j); } - this.renderItemToAtlas(trackingItemStackRenderState, poseStack, kx, l, j); + this.renderItemToAtlas(itemStackRenderState, poseStack, kx, l, j); float f = (float)kx / k; float g = (float)(k - l) / k; this.submitBlitFromItemAtlas(guiItemRenderState, f, g, j, k); @@ -376,9 +371,9 @@ public class GuiRenderer implements AutoCloseable { .forEachItem( guiItemRenderState -> { if (guiItemRenderState.oversizedItemBounds() != null) { - TrackingItemStackRenderState trackingItemStackRenderState = guiItemRenderState.itemStackRenderState(); + ItemStackRenderState itemStackRenderState = guiItemRenderState.itemStackRenderState(); OversizedItemRenderer oversizedItemRenderer = (OversizedItemRenderer)this.oversizedItemRenderers - .computeIfAbsent(trackingItemStackRenderState.getModelIdentity(), object -> new OversizedItemRenderer(this.bufferSource)); + .computeIfAbsent(itemStackRenderState.getModelIdentity(), object -> new OversizedItemRenderer(this.bufferSource)); ScreenRectangle screenRectangle = guiItemRenderState.oversizedItemBounds(); OversizedItemRenderState oversizedItemRenderState = new OversizedItemRenderState( guiItemRenderState, screenRectangle.left(), screenRectangle.top(), screenRectangle.right(), screenRectangle.bottom() @@ -403,18 +398,18 @@ public class GuiRenderer implements AutoCloseable { } } - private void renderItemToAtlas(TrackingItemStackRenderState renderState, PoseStack poseStack, int x, int y, int size) { + private void renderItemToAtlas(ItemStackRenderState renderState, PoseStack poseStack, int x, int y, int itemSize) { poseStack.pushPose(); - poseStack.translate(x + size / 2.0F, y + size / 2.0F, 0.0F); - poseStack.scale(size, -size, size); + poseStack.translate(x + itemSize / 2.0F, y + itemSize / 2.0F, 0.0F); + poseStack.scale(itemSize, -itemSize, itemSize); boolean bl = !renderState.usesBlockLight(); if (bl) { - Minecraft.getInstance().gameRenderer.getLighting().setupFor(com.mojang.blaze3d.platform.Lighting.Entry.ITEMS_FLAT); + Minecraft.getInstance().gameRenderer.getLighting().setupFor(Lighting.Entry.ITEMS_FLAT); } else { - Minecraft.getInstance().gameRenderer.getLighting().setupFor(com.mojang.blaze3d.platform.Lighting.Entry.ITEMS_3D); + Minecraft.getInstance().gameRenderer.getLighting().setupFor(Lighting.Entry.ITEMS_3D); } - RenderSystem.enableScissorForRenderTypeDraws(x, this.itemsAtlas.getHeight(0) - y - size, size, size); + RenderSystem.enableScissorForRenderTypeDraws(x, this.itemsAtlas.getHeight(0) - y - itemSize, itemSize, itemSize); renderState.render(poseStack, this.bufferSource, 15728880, OverlayTexture.NO_OVERLAY); this.bufferSource.endBatch(); RenderSystem.disableScissorForRenderTypeDraws(); @@ -537,7 +532,7 @@ public class GuiRenderer implements AutoCloseable { for (GuiRenderer.MeshToDraw meshToDraw : this.meshesToDraw) { MeshData meshData = meshToDraw.mesh; - DrawState drawState = meshData.drawState(); + MeshData.DrawState drawState = meshData.drawState(); VertexFormat vertexFormat = drawState.format(); MappableRingBuffer mappableRingBuffer = (MappableRingBuffer)this.vertexBuffers.get(vertexFormat); if (!object2IntMap.containsKey(vertexFormat)) { @@ -548,7 +543,7 @@ public class GuiRenderer implements AutoCloseable { int i = byteBuffer.remaining(); int j = object2IntMap.getInt(vertexFormat); - try (MappedView mappedView = commandEncoder.mapBuffer(mappableRingBuffer.currentBuffer().slice(j, i), false, true)) { + try (GpuBuffer.MappedView mappedView = commandEncoder.mapBuffer(mappableRingBuffer.currentBuffer().slice(j, i), false, true)) { MemoryUtil.memCopy(byteBuffer, mappedView.data()); } @@ -590,7 +585,7 @@ public class GuiRenderer implements AutoCloseable { Object2IntMap object2IntMap = new Object2IntOpenHashMap<>(); for (GuiRenderer.MeshToDraw meshToDraw : this.meshesToDraw) { - DrawState drawState = meshToDraw.mesh.drawState(); + MeshData.DrawState drawState = meshToDraw.mesh.drawState(); VertexFormat vertexFormat = drawState.format(); if (!object2IntMap.containsKey(vertexFormat)) { object2IntMap.put(vertexFormat, 0); @@ -633,7 +628,7 @@ public class GuiRenderer implements AutoCloseable { return new BufferBuilder(this.byteBufferBuilder, pipeline.getVertexFormatMode(), pipeline.getVertexFormat()); } - private boolean scissorChanged(@Nullable ScreenRectangle scissorArea, @Nullable ScreenRectangle oldScissorArea) { + private boolean scissorChanged(ScreenRectangle scissorArea, @Nullable ScreenRectangle oldScissorArea) { if (scissorArea == oldScissorArea) { return false; } else { diff --git a/net/minecraft/client/gui/render/pip/OversizedItemRenderer.java b/net/minecraft/client/gui/render/pip/OversizedItemRenderer.java index 1622e329..971ab923 100644 --- a/net/minecraft/client/gui/render/pip/OversizedItemRenderer.java +++ b/net/minecraft/client/gui/render/pip/OversizedItemRenderer.java @@ -1,6 +1,6 @@ package net.minecraft.client.gui.render.pip; -import com.mojang.blaze3d.platform.Lighting.Entry; +import com.mojang.blaze3d.platform.Lighting; import com.mojang.blaze3d.vertex.PoseStack; import java.util.Objects; import net.fabricmc.api.EnvType; @@ -10,8 +10,8 @@ import net.minecraft.client.gui.navigation.ScreenRectangle; import net.minecraft.client.gui.render.state.GuiItemRenderState; import net.minecraft.client.gui.render.state.GuiRenderState; import net.minecraft.client.gui.render.state.pip.OversizedItemRenderState; -import net.minecraft.client.renderer.MultiBufferSource.BufferSource; -import net.minecraft.client.renderer.item.TrackingItemStackRenderState; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.item.ItemStackRenderState; import net.minecraft.client.renderer.texture.OverlayTexture; import org.jetbrains.annotations.Nullable; @@ -21,7 +21,7 @@ public class OversizedItemRenderer extends PictureInPictureRenderer { if (this.structure.getMode() == StructureMode.SAVE) { - this.sendToServer(UpdateType.SAVE_AREA); + this.sendToServer(StructureBlockEntity.UpdateType.SAVE_AREA); this.minecraft.setScreen(null); } }).bounds(this.width / 2 + 4 + 100, 185, 50, 20).build()); this.loadButton = this.addRenderableWidget(Button.builder(Component.translatable("structure_block.button.load"), button -> { if (this.structure.getMode() == StructureMode.LOAD) { - this.sendToServer(UpdateType.LOAD_AREA); + this.sendToServer(StructureBlockEntity.UpdateType.LOAD_AREA); this.minecraft.setScreen(null); } }).bounds(this.width / 2 + 4 + 100, 185, 50, 20).build()); @@ -130,7 +129,7 @@ public class StructureBlockEditScreen extends Screen { ); this.detectButton = this.addRenderableWidget(Button.builder(Component.translatable("structure_block.button.detect_size"), button -> { if (this.structure.getMode() == StructureMode.SAVE) { - this.sendToServer(UpdateType.SCAN_AREA); + this.sendToServer(StructureBlockEntity.UpdateType.SCAN_AREA); this.minecraft.setScreen(null); } }).bounds(this.width / 2 + 4 + 100, 120, 50, 20).build()); @@ -349,7 +348,7 @@ public class StructureBlockEditScreen extends Screen { } } - private boolean sendToServer(UpdateType updateType) { + private boolean sendToServer(StructureBlockEntity.UpdateType updateType) { BlockPos blockPos = new BlockPos( this.parseCoordinate(this.posXEdit.getValue()), this.parseCoordinate(this.posYEdit.getValue()), this.parseCoordinate(this.posZEdit.getValue()) ); diff --git a/net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent.java b/net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent.java index aba9501e..60b2e3f9 100644 --- a/net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent.java +++ b/net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent.java @@ -11,8 +11,6 @@ import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.Renderable; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.narration.NarrationElementOutput; -import net.minecraft.client.gui.screens.recipebook.OverlayRecipeComponent.OverlayRecipeButton.Pos; -import net.minecraft.client.gui.screens.recipebook.RecipeCollection.CraftableStatus; import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.CommonComponents; import net.minecraft.recipebook.PlaceRecipeHelper; @@ -53,8 +51,8 @@ public class OverlayRecipeComponent implements Renderable, GuiEventListener { public void init(RecipeCollection collection, ContextMap contextMap, boolean isFiltering, int x, int y, int overlayX, int overlayY, float width) { this.collection = collection; - List list = collection.getSelectedRecipes(CraftableStatus.CRAFTABLE); - List list2 = isFiltering ? Collections.emptyList() : collection.getSelectedRecipes(CraftableStatus.NOT_CRAFTABLE); + List list = collection.getSelectedRecipes(RecipeCollection.CraftableStatus.CRAFTABLE); + List list2 = isFiltering ? Collections.emptyList() : collection.getSelectedRecipes(RecipeCollection.CraftableStatus.NOT_CRAFTABLE); int i = list.size(); int j = i + list2.size(); int k = j <= 16 ? 4 : 5; @@ -174,8 +172,8 @@ public class OverlayRecipeComponent implements Renderable, GuiEventListener { super(x, y, recipe, isCraftable, calculateIngredientsPositions(recipeDisplay, contextMap)); } - private static List calculateIngredientsPositions(RecipeDisplay recipeDisplay, ContextMap contextMap) { - List list = new ArrayList(); + private static List calculateIngredientsPositions(RecipeDisplay recipeDisplay, ContextMap contextMap) { + List list = new ArrayList(); switch (recipeDisplay) { case ShapedCraftingRecipeDisplay shapedCraftingRecipeDisplay: PlaceRecipeHelper.placeRecipe( @@ -219,17 +217,19 @@ public class OverlayRecipeComponent implements Renderable, GuiEventListener { abstract class OverlayRecipeButton extends AbstractWidget { final RecipeDisplayId recipe; private final boolean isCraftable; - private final List slots; + private final List slots; - public OverlayRecipeButton(final int x, final int y, final RecipeDisplayId recipe, final boolean isCraftable, final List slots) { + public OverlayRecipeButton( + final int x, final int y, final RecipeDisplayId recipe, final boolean isCraftable, final List slots + ) { super(x, y, 24, 24, CommonComponents.EMPTY); this.slots = slots; this.recipe = recipe; this.isCraftable = isCraftable; } - protected static Pos createGridPos(int x, int y, List possibleItems) { - return new Pos(3 + x * 7, 3 + y * 7, possibleItems); + protected static OverlayRecipeComponent.OverlayRecipeButton.Pos createGridPos(int x, int y, List possibleItems) { + return new OverlayRecipeComponent.OverlayRecipeButton.Pos(3 + x * 7, 3 + y * 7, possibleItems); } protected abstract ResourceLocation getSprite(boolean enabled); @@ -245,7 +245,7 @@ public class OverlayRecipeComponent implements Renderable, GuiEventListener { float f = this.getX() + 2; float g = this.getY() + 2; - for (Pos pos : this.slots) { + for (OverlayRecipeComponent.OverlayRecipeButton.Pos pos : this.slots) { guiGraphics.pose().pushMatrix(); guiGraphics.pose().translate(f + pos.x, g + pos.y); guiGraphics.pose().scale(0.375F, 0.375F); @@ -254,6 +254,24 @@ public class OverlayRecipeComponent implements Renderable, GuiEventListener { guiGraphics.pose().popMatrix(); } } + + @Environment(EnvType.CLIENT) + protected record Pos(int x, int y, List ingredients) { + + public Pos(int x, int y, List ingredients) { + if (ingredients.isEmpty()) { + throw new IllegalArgumentException("Ingredient list must be non-empty"); + } else { + this.x = x; + this.y = y; + this.ingredients = ingredients; + } + } + + public ItemStack selectIngredient(int index) { + return (ItemStack)this.ingredients.get(index % this.ingredients.size()); + } + } } @Environment(EnvType.CLIENT) @@ -269,7 +287,7 @@ public class OverlayRecipeComponent implements Renderable, GuiEventListener { super(x, y, recipe, isCraftable, calculateIngredientsPositions(recipeDisplay, contextMap)); } - private static List calculateIngredientsPositions(RecipeDisplay recipeDisplay, ContextMap contextMap) { + private static List calculateIngredientsPositions(RecipeDisplay recipeDisplay, ContextMap contextMap) { if (recipeDisplay instanceof FurnaceRecipeDisplay furnaceRecipeDisplay) { List list = furnaceRecipeDisplay.ingredient().resolveForStacks(contextMap); if (!list.isEmpty()) { diff --git a/net/minecraft/client/gui/screens/recipebook/RecipeButton.java b/net/minecraft/client/gui/screens/recipebook/RecipeButton.java index 847d5f91..cd570210 100644 --- a/net/minecraft/client/gui/screens/recipebook/RecipeButton.java +++ b/net/minecraft/client/gui/screens/recipebook/RecipeButton.java @@ -11,7 +11,6 @@ import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.narration.NarratedElementType; import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.screens.recipebook.RecipeCollection.CraftableStatus; import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; @@ -43,7 +42,7 @@ public class RecipeButton extends AbstractWidget { public void init(RecipeCollection collection, boolean isFiltering, RecipeBookPage page, ContextMap contextMap) { this.collection = collection; - List list = collection.getSelectedRecipes(isFiltering ? CraftableStatus.CRAFTABLE : CraftableStatus.ANY); + List list = collection.getSelectedRecipes(isFiltering ? RecipeCollection.CraftableStatus.CRAFTABLE : RecipeCollection.CraftableStatus.ANY); this.selectedEntries = list.stream() .map(recipeDisplayEntry -> new RecipeButton.ResolvedEntry(recipeDisplayEntry.id(), recipeDisplayEntry.resultItems(contextMap))) .toList(); diff --git a/net/minecraft/client/multiplayer/chat/report/ReportEnvironment.java b/net/minecraft/client/multiplayer/chat/report/ReportEnvironment.java index 7e41b933..5d847871 100644 --- a/net/minecraft/client/multiplayer/chat/report/ReportEnvironment.java +++ b/net/minecraft/client/multiplayer/chat/report/ReportEnvironment.java @@ -8,8 +8,6 @@ import java.util.Locale; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.chat.report.ReportEnvironment.Server.Realm; -import net.minecraft.client.multiplayer.chat.report.ReportEnvironment.Server.ThirdParty; import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) @@ -19,11 +17,11 @@ public record ReportEnvironment(String clientVersion, @Nullable ReportEnvironmen } public static ReportEnvironment thirdParty(String ip) { - return create(new ThirdParty(ip)); + return create(new ReportEnvironment.Server.ThirdParty(ip)); } public static ReportEnvironment realm(RealmsServer realmsServer) { - return create(new Realm(realmsServer)); + return create(new ReportEnvironment.Server.Realm(realmsServer)); } public static ReportEnvironment create(@Nullable ReportEnvironment.Server server) { @@ -36,17 +34,17 @@ public record ReportEnvironment(String clientVersion, @Nullable ReportEnvironmen @Nullable public ThirdPartyServerInfo thirdPartyServerInfo() { - return this.server instanceof ThirdParty thirdParty ? new ThirdPartyServerInfo(thirdParty.ip) : null; + return this.server instanceof ReportEnvironment.Server.ThirdParty thirdParty ? new ThirdPartyServerInfo(thirdParty.ip) : null; } @Nullable public RealmInfo realmInfo() { - return this.server instanceof Realm realm ? new RealmInfo(String.valueOf(realm.realmId()), realm.slotId()) : null; + return this.server instanceof ReportEnvironment.Server.Realm realm ? new RealmInfo(String.valueOf(realm.realmId()), realm.slotId()) : null; } private static String getClientVersion() { StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append("1.21.8"); + stringBuilder.append("1.21.6"); if (Minecraft.checkModStatus().shouldReportAsModified()) { stringBuilder.append(" (modded)"); } @@ -56,5 +54,15 @@ public record ReportEnvironment(String clientVersion, @Nullable ReportEnvironmen @Environment(EnvType.CLIENT) public interface Server { + @Environment(EnvType.CLIENT) + public record Realm(long realmId, int slotId) implements ReportEnvironment.Server { + public Realm(RealmsServer realmsServer) { + this(realmsServer.id, realmsServer.activeSlot); + } + } + + @Environment(EnvType.CLIENT) + public record ThirdParty(String ip) implements ReportEnvironment.Server { + } } } diff --git a/net/minecraft/client/renderer/RenderPipelines.java b/net/minecraft/client/renderer/RenderPipelines.java index 11c36c27..170898f6 100644 --- a/net/minecraft/client/renderer/RenderPipelines.java +++ b/net/minecraft/client/renderer/RenderPipelines.java @@ -4,6 +4,7 @@ import com.mojang.blaze3d.pipeline.BlendFunction; import com.mojang.blaze3d.pipeline.RenderPipeline; import com.mojang.blaze3d.platform.DepthTestFunction; import com.mojang.blaze3d.platform.DestFactor; +import com.mojang.blaze3d.platform.LogicOp; import com.mojang.blaze3d.platform.PolygonMode; import com.mojang.blaze3d.platform.SourceFactor; import com.mojang.blaze3d.shaders.UniformType; @@ -598,11 +599,8 @@ public class RenderPipelines { .build() ); public static final RenderPipeline GUI = register(RenderPipeline.builder(GUI_SNIPPET).withLocation("pipeline/gui").build()); - public static final RenderPipeline GUI_INVERT = register( - RenderPipeline.builder(GUI_SNIPPET).withLocation("pipeline/gui_invert").withBlend(BlendFunction.INVERT).build() - ); public static final RenderPipeline GUI_TEXT_HIGHLIGHT = register( - RenderPipeline.builder(GUI_SNIPPET).withLocation("pipeline/gui_text_highlight").withBlend(BlendFunction.ADDITIVE).build() + RenderPipeline.builder(GUI_SNIPPET).withLocation("pipeline/gui_text_highlight").withColorLogic(LogicOp.OR_REVERSE).build() ); public static final RenderPipeline GUI_TEXTURED = register(RenderPipeline.builder(GUI_TEXTURED_SNIPPET).withLocation("pipeline/gui_textured").build()); public static final RenderPipeline GUI_TEXTURED_PREMULTIPLIED_ALPHA = register( @@ -638,7 +636,10 @@ public class RenderPipelines { .build() ); public static final RenderPipeline CROSSHAIR = register( - RenderPipeline.builder(GUI_TEXTURED_SNIPPET).withLocation("pipeline/crosshair").withBlend(BlendFunction.INVERT).build() + RenderPipeline.builder(GUI_TEXTURED_SNIPPET) + .withLocation("pipeline/crosshair") + .withBlend(new BlendFunction(SourceFactor.ONE_MINUS_DST_COLOR, DestFactor.ONE_MINUS_SRC_COLOR, SourceFactor.ONE, DestFactor.ZERO)) + .build() ); public static final RenderPipeline MOJANG_LOGO = register( RenderPipeline.builder(GUI_TEXTURED_SNIPPET) diff --git a/net/minecraft/client/renderer/block/model/BlockModelDefinition.java b/net/minecraft/client/renderer/block/model/BlockModelDefinition.java index 9f6c7e21..569e860f 100644 --- a/net/minecraft/client/renderer/block/model/BlockModelDefinition.java +++ b/net/minecraft/client/renderer/block/model/BlockModelDefinition.java @@ -15,8 +15,7 @@ import java.util.function.Predicate; import java.util.function.Supplier; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.renderer.block.model.BlockStateModel.Unbaked; -import net.minecraft.client.renderer.block.model.BlockStateModel.UnbakedRoot; +import net.minecraft.client.renderer.block.model.multipart.MultiPartModel; import net.minecraft.client.renderer.block.model.multipart.Selector; import net.minecraft.util.ExtraCodecs; import net.minecraft.world.level.block.Block; @@ -43,17 +42,17 @@ public record BlockModelDefinition( : DataResult.success(blockModelDefinition) ); - public Map instantiate(StateDefinition stateDefinition, Supplier sourceSupplier) { - Map map = new IdentityHashMap(); - this.simpleModels.ifPresent(simpleModelSelectors -> simpleModelSelectors.instantiate(stateDefinition, sourceSupplier, (blockState, unbakedRoot) -> { - UnbakedRoot unbakedRoot2 = (UnbakedRoot)map.put(blockState, unbakedRoot); + public Map instantiate(StateDefinition stateDefinition, Supplier name) { + Map map = new IdentityHashMap(); + this.simpleModels.ifPresent(simpleModelSelectors -> simpleModelSelectors.instantiate(stateDefinition, name, (blockState, unbakedRoot) -> { + BlockStateModel.UnbakedRoot unbakedRoot2 = (BlockStateModel.UnbakedRoot)map.put(blockState, unbakedRoot); if (unbakedRoot2 != null) { throw new IllegalArgumentException("Overlapping definition on state: " + blockState); } })); this.multiPart.ifPresent(multiPartDefinition -> { List list = stateDefinition.getPossibleStates(); - UnbakedRoot unbakedRoot = multiPartDefinition.instantiate(stateDefinition); + BlockStateModel.UnbakedRoot unbakedRoot = multiPartDefinition.instantiate(stateDefinition); for (BlockState blockState : list) { map.putIfAbsent(blockState, unbakedRoot); @@ -67,29 +66,29 @@ public record BlockModelDefinition( public static final Codec CODEC = ExtraCodecs.nonEmptyList(Selector.CODEC.listOf()) .xmap(BlockModelDefinition.MultiPartDefinition::new, BlockModelDefinition.MultiPartDefinition::selectors); - public net.minecraft.client.renderer.block.model.multipart.MultiPartModel.Unbaked instantiate(StateDefinition stateDefinition) { - Builder> builder = ImmutableList.builderWithExpectedSize( - this.selectors.size() - ); + public MultiPartModel.Unbaked instantiate(StateDefinition stateDefinition) { + Builder> builder = ImmutableList.builderWithExpectedSize(this.selectors.size()); for (Selector selector : this.selectors) { - builder.add(new net.minecraft.client.renderer.block.model.multipart.MultiPartModel.Selector<>(selector.instantiate(stateDefinition), selector.variant())); + builder.add(new MultiPartModel.Selector<>(selector.instantiate(stateDefinition), selector.variant())); } - return new net.minecraft.client.renderer.block.model.multipart.MultiPartModel.Unbaked(builder.build()); + return new MultiPartModel.Unbaked(builder.build()); } } @Environment(EnvType.CLIENT) - public record SimpleModelSelectors(Map models) { - public static final Codec CODEC = ExtraCodecs.nonEmptyMap(Codec.unboundedMap(Codec.STRING, Unbaked.CODEC)) + public record SimpleModelSelectors(Map models) { + public static final Codec CODEC = ExtraCodecs.nonEmptyMap( + Codec.unboundedMap(Codec.STRING, BlockStateModel.Unbaked.CODEC) + ) .xmap(BlockModelDefinition.SimpleModelSelectors::new, BlockModelDefinition.SimpleModelSelectors::models); - public void instantiate(StateDefinition stateDefinition, Supplier sourceSupplier, BiConsumer output) { + public void instantiate(StateDefinition stateDefinition, Supplier name, BiConsumer output) { this.models.forEach((string, unbaked) -> { try { Predicate> predicate = VariantSelector.predicate(stateDefinition, string); - UnbakedRoot unbakedRoot = unbaked.asRoot(); + BlockStateModel.UnbakedRoot unbakedRoot = unbaked.asRoot(); for (BlockState blockState : stateDefinition.getPossibleStates()) { if (predicate.test(blockState)) { @@ -97,7 +96,7 @@ public record BlockModelDefinition( } } } catch (Exception var9) { - BlockModelDefinition.LOGGER.warn("Exception loading blockstate definition: '{}' for variant: '{}': {}", sourceSupplier.get(), string, var9.getMessage()); + BlockModelDefinition.LOGGER.warn("Exception loading blockstate definition: '{}' for variant: '{}': {}", name.get(), string, var9.getMessage()); } }); } diff --git a/net/minecraft/client/renderer/entity/ItemRenderer.java b/net/minecraft/client/renderer/entity/ItemRenderer.java index d3ffe8c7..1be6588e 100644 --- a/net/minecraft/client/renderer/entity/ItemRenderer.java +++ b/net/minecraft/client/renderer/entity/ItemRenderer.java @@ -4,7 +4,6 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.SheetedDecalTextureGenerator; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.blaze3d.vertex.VertexMultiConsumer; -import com.mojang.blaze3d.vertex.PoseStack.Pose; import com.mojang.math.MatrixUtil; import java.util.List; import net.fabricmc.api.EnvType; @@ -52,7 +51,7 @@ public class ItemRenderer { ) { VertexConsumer vertexConsumer; if (foilType == ItemStackRenderState.FoilType.SPECIAL) { - Pose pose = poseStack.last().copy(); + PoseStack.Pose pose = poseStack.last().copy(); if (displayContext == ItemDisplayContext.GUI) { MatrixUtil.mulComponentWise(pose.pose(), 0.5F); } else if (displayContext.firstPerson()) { @@ -73,7 +72,7 @@ public class ItemRenderer { : bufferSource.getBuffer(renderType); } - private static VertexConsumer getSpecialFoilBuffer(MultiBufferSource bufferSource, RenderType renderType, Pose pose) { + private static VertexConsumer getSpecialFoilBuffer(MultiBufferSource bufferSource, RenderType renderType, PoseStack.Pose pose) { return VertexMultiConsumer.create( new SheetedDecalTextureGenerator( bufferSource.getBuffer(useTransparentGlint(renderType) ? RenderType.glintTranslucent() : RenderType.glint()), pose, 0.0078125F @@ -101,7 +100,7 @@ public class ItemRenderer { } private static void renderQuadList(PoseStack poseStack, VertexConsumer buffer, List quads, int[] tintLayers, int packedLight, int packedOverlay) { - Pose pose = poseStack.last(); + PoseStack.Pose pose = poseStack.last(); for (BakedQuad bakedQuad : quads) { float f; @@ -151,5 +150,6 @@ public class ItemRenderer { ) { this.resolver.updateForTopItem(this.scratchItemStackRenderState, stack, displayContext, level, entity, seed); this.scratchItemStackRenderState.render(poseStack, bufferSource, packedLight, packedOverlay); + this.scratchItemStackRenderState.clearModelIdentity(); } } diff --git a/net/minecraft/client/renderer/fog/FogRenderer.java b/net/minecraft/client/renderer/fog/FogRenderer.java index 1f5471fe..77a24c05 100644 --- a/net/minecraft/client/renderer/fog/FogRenderer.java +++ b/net/minecraft/client/renderer/fog/FogRenderer.java @@ -5,7 +5,6 @@ import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.buffers.Std140Builder; import com.mojang.blaze3d.buffers.Std140SizeCalculator; -import com.mojang.blaze3d.buffers.GpuBuffer.MappedView; import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.systems.RenderSystem; import java.nio.ByteBuffer; @@ -41,9 +40,9 @@ public class FogRenderer implements AutoCloseable { private static final List FOG_ENVIRONMENTS = Lists.newArrayList( new LavaFogEnvironment(), new PowderedSnowFogEnvironment(), + new WaterFogEnvironment(), new BlindnessFogEnvironment(), new DarknessFogEnvironment(), - new WaterFogEnvironment(), new DimensionOrBossFogEnvironment(), new AtmosphericFogEnvironment() ); @@ -180,7 +179,7 @@ public class FogRenderer implements AutoCloseable { fogData.renderDistanceStart = g - h; fogData.renderDistanceEnd = g; - try (MappedView mappedView = RenderSystem.getDevice().createCommandEncoder().mapBuffer(this.regularBuffer.currentBuffer(), false, true)) { + try (GpuBuffer.MappedView mappedView = RenderSystem.getDevice().createCommandEncoder().mapBuffer(this.regularBuffer.currentBuffer(), false, true)) { this.updateBuffer( mappedView.data(), 0, diff --git a/net/minecraft/client/renderer/item/ItemStackRenderState.java b/net/minecraft/client/renderer/item/ItemStackRenderState.java index b79b3005..f1cf5aba 100644 --- a/net/minecraft/client/renderer/item/ItemStackRenderState.java +++ b/net/minecraft/client/renderer/item/ItemStackRenderState.java @@ -1,7 +1,6 @@ package net.minecraft.client.renderer.item; import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.PoseStack.Pose; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -19,7 +18,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.RandomSource; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.AABB.Builder; import org.jetbrains.annotations.Nullable; import org.joml.Matrix4f; import org.joml.Vector3f; @@ -31,6 +29,7 @@ public class ItemStackRenderState { private int activeLayerCount; private boolean animated; private boolean oversizedInGui; + private final List modelIdentityElements = new ArrayList(); @Nullable private AABB cachedModelBoundingBox; private ItemStackRenderState.LayerRenderState[] layers = new ItemStackRenderState.LayerRenderState[]{new ItemStackRenderState.LayerRenderState()}; @@ -74,6 +73,15 @@ public class ItemStackRenderState { } public void appendModelIdentityElement(Object modelIdentityElement) { + this.modelIdentityElements.add(modelIdentityElement); + } + + public Object getModelIdentity() { + return this.modelIdentityElements; + } + + public void clearModelIdentity() { + this.modelIdentityElements.clear(); } private ItemStackRenderState.LayerRenderState firstLayer() { @@ -95,7 +103,7 @@ public class ItemStackRenderState { public void visitExtents(Consumer visitor) { Vector3f vector3f = new Vector3f(); - Pose pose = new Pose(); + PoseStack.Pose pose = new PoseStack.Pose(); for (int i = 0; i < this.activeLayerCount; i++) { ItemStackRenderState.LayerRenderState layerRenderState = this.layers[i]; @@ -121,7 +129,7 @@ public class ItemStackRenderState { if (this.cachedModelBoundingBox != null) { return this.cachedModelBoundingBox; } else { - Builder builder = new Builder(); + AABB.Builder builder = new AABB.Builder(); this.visitExtents(builder::include); AABB aABB = builder.build(); this.cachedModelBoundingBox = aABB; diff --git a/net/minecraft/client/renderer/item/TrackingItemStackRenderState.java b/net/minecraft/client/renderer/item/TrackingItemStackRenderState.java deleted file mode 100644 index 20b3589e..00000000 --- a/net/minecraft/client/renderer/item/TrackingItemStackRenderState.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.minecraft.client.renderer.item; - -import java.util.ArrayList; -import java.util.List; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; - -@Environment(EnvType.CLIENT) -public class TrackingItemStackRenderState extends ItemStackRenderState { - private final List modelIdentityElements = new ArrayList(); - - @Override - public void appendModelIdentityElement(Object modelIdentityElement) { - this.modelIdentityElements.add(modelIdentityElement); - } - - public Object getModelIdentity() { - return this.modelIdentityElements; - } -} diff --git a/net/minecraft/client/renderer/texture/CubeMapTexture.java b/net/minecraft/client/renderer/texture/CubeMapTexture.java index 9a2b2765..e552be0b 100644 --- a/net/minecraft/client/renderer/texture/CubeMapTexture.java +++ b/net/minecraft/client/renderer/texture/CubeMapTexture.java @@ -95,7 +95,6 @@ public class CubeMapTexture extends ReloadableTexture { GpuDevice gpuDevice = RenderSystem.getDevice(); int i = image.getWidth(); int j = image.getHeight() / 6; - this.close(); this.texture = gpuDevice.createTexture(this.resourceId()::toString, 21, TextureFormat.RGBA8, i, j, 6, 1); this.textureView = gpuDevice.createTextureView(this.texture); this.setFilter(blur, false); diff --git a/net/minecraft/client/renderer/texture/ReloadableTexture.java b/net/minecraft/client/renderer/texture/ReloadableTexture.java index 55cd6c1a..c1e05984 100644 --- a/net/minecraft/client/renderer/texture/ReloadableTexture.java +++ b/net/minecraft/client/renderer/texture/ReloadableTexture.java @@ -33,7 +33,6 @@ public abstract class ReloadableTexture extends AbstractTexture { protected void doLoad(NativeImage image, boolean blur, boolean clamp) { GpuDevice gpuDevice = RenderSystem.getDevice(); - this.close(); this.texture = gpuDevice.createTexture(this.resourceId::toString, 5, TextureFormat.RGBA8, image.getWidth(), image.getHeight(), 1, 1); this.textureView = gpuDevice.createTextureView(this.texture); this.setFilter(blur, false); diff --git a/net/minecraft/client/renderer/texture/TextureAtlas.java b/net/minecraft/client/renderer/texture/TextureAtlas.java index e4b58645..f6c234b0 100644 --- a/net/minecraft/client/renderer/texture/TextureAtlas.java +++ b/net/minecraft/client/renderer/texture/TextureAtlas.java @@ -19,8 +19,6 @@ import net.fabricmc.api.Environment; import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; import net.minecraft.ReportedException; -import net.minecraft.client.renderer.texture.SpriteLoader.Preparations; -import net.minecraft.client.renderer.texture.TextureAtlasSprite.Ticker; import net.minecraft.resources.ResourceLocation; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -33,7 +31,7 @@ public class TextureAtlas extends AbstractTexture implements Dumpable, Tickable @Deprecated public static final ResourceLocation LOCATION_PARTICLES = ResourceLocation.withDefaultNamespace("textures/atlas/particles.png"); private List sprites = List.of(); - private List animatedTextures = List.of(); + private List animatedTextures = List.of(); private Map texturesByName = Map.of(); @Nullable private TextureAtlasSprite missingSprite; @@ -48,19 +46,16 @@ public class TextureAtlas extends AbstractTexture implements Dumpable, Tickable this.maxSupportedTextureSize = RenderSystem.getDevice().getMaxTextureSize(); } - private void createTexture(int width, int height, int mipLevel) { - LOGGER.info("Created: {}x{}x{} {}-atlas", width, height, mipLevel, this.location); + public void upload(SpriteLoader.Preparations preparations) { + LOGGER.info("Created: {}x{}x{} {}-atlas", preparations.width(), preparations.height(), preparations.mipLevel(), this.location); GpuDevice gpuDevice = RenderSystem.getDevice(); - this.close(); - this.texture = gpuDevice.createTexture(this.location::toString, 7, TextureFormat.RGBA8, width, height, 1, mipLevel + 1); + this.texture = gpuDevice.createTexture( + this.location::toString, 7, TextureFormat.RGBA8, preparations.width(), preparations.height(), 1, preparations.mipLevel() + 1 + ); this.textureView = gpuDevice.createTextureView(this.texture); - this.width = width; - this.height = height; - this.mipLevel = mipLevel; - } - - public void upload(Preparations preparations) { - this.createTexture(preparations.width(), preparations.height(), preparations.mipLevel()); + this.width = preparations.width(); + this.height = preparations.height(); + this.mipLevel = preparations.mipLevel(); this.clearTextureData(); this.setFilter(false, this.mipLevel > 1); this.texturesByName = Map.copyOf(preparations.regions()); @@ -69,22 +64,22 @@ public class TextureAtlas extends AbstractTexture implements Dumpable, Tickable throw new IllegalStateException("Atlas '" + this.location + "' (" + this.texturesByName.size() + " sprites) has no missing texture sprite"); } else { List list = new ArrayList(); - List list2 = new ArrayList(); + List list2 = new ArrayList(); for (TextureAtlasSprite textureAtlasSprite : preparations.regions().values()) { list.add(textureAtlasSprite.contents()); try { textureAtlasSprite.uploadFirstFrame(this.texture); - } catch (Throwable var9) { - CrashReport crashReport = CrashReport.forThrowable(var9, "Stitching texture atlas"); + } catch (Throwable var10) { + CrashReport crashReport = CrashReport.forThrowable(var10, "Stitching texture atlas"); CrashReportCategory crashReportCategory = crashReport.addCategory("Texture being stitched together"); crashReportCategory.setDetail("Atlas path", this.location); crashReportCategory.setDetail("Sprite", textureAtlasSprite); throw new ReportedException(crashReport); } - Ticker ticker = textureAtlasSprite.createTicker(); + TextureAtlasSprite.Ticker ticker = textureAtlasSprite.createTicker(); if (ticker != null) { list2.add(ticker); } @@ -145,7 +140,7 @@ public class TextureAtlas extends AbstractTexture implements Dumpable, Tickable public void cycleAnimationFrames() { if (this.texture != null) { - for (Ticker ticker : this.animatedTextures) { + for (TextureAtlasSprite.Ticker ticker : this.animatedTextures) { ticker.tickAndUpload(this.texture); } } @@ -167,7 +162,7 @@ public class TextureAtlas extends AbstractTexture implements Dumpable, Tickable public void clearTextureData() { this.sprites.forEach(SpriteContents::close); - this.animatedTextures.forEach(Ticker::close); + this.animatedTextures.forEach(TextureAtlasSprite.Ticker::close); this.sprites = List.of(); this.animatedTextures = List.of(); this.texturesByName = Map.of(); diff --git a/net/minecraft/core/SectionPos.java b/net/minecraft/core/SectionPos.java index a4153727..bdef0f2b 100644 --- a/net/minecraft/core/SectionPos.java +++ b/net/minecraft/core/SectionPos.java @@ -235,10 +235,10 @@ public class SectionPos extends Vec3i { return betweenClosedStream(i - radius, j - radius, k - radius, i + radius, j + radius, k + radius); } - public static Stream aroundChunk(ChunkPos chunkPos, int radius, int minY, int maxY) { + public static Stream aroundChunk(ChunkPos chunkPos, int x, int y, int z) { int i = chunkPos.x; int j = chunkPos.z; - return betweenClosedStream(i - radius, minY, j - radius, i + radius, maxY, j + radius); + return betweenClosedStream(i - x, y, j - x, i + x, z, j + x); } public static Stream betweenClosedStream(int x1, int y1, int z1, int x2, int y2, int z2) { diff --git a/net/minecraft/data/loot/packs/VanillaEntityLoot.java b/net/minecraft/data/loot/packs/VanillaEntityLoot.java index 4ada6ca4..5f067567 100644 --- a/net/minecraft/data/loot/packs/VanillaEntityLoot.java +++ b/net/minecraft/data/loot/packs/VanillaEntityLoot.java @@ -1,12 +1,13 @@ package net.minecraft.data.loot.packs; +import net.minecraft.advancements.critereon.DamageSourcePredicate; +import net.minecraft.advancements.critereon.EntityPredicate; +import net.minecraft.advancements.critereon.MinMaxBounds; import net.minecraft.advancements.critereon.RaiderPredicate; import net.minecraft.advancements.critereon.SlimePredicate; import net.minecraft.advancements.critereon.TagPredicate; -import net.minecraft.advancements.critereon.EntityPredicate.Builder; -import net.minecraft.advancements.critereon.MinMaxBounds.Ints; import net.minecraft.core.HolderGetter; -import net.minecraft.core.HolderLookup.Provider; +import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.Registries; import net.minecraft.data.loot.EntityLootSubProvider; import net.minecraft.resources.ResourceKey; @@ -21,9 +22,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.item.alchemy.Potions; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.storage.loot.BuiltInLootTables; +import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.LootTable; -import net.minecraft.world.level.storage.loot.LootContext.EntityTarget; import net.minecraft.world.level.storage.loot.entries.EmptyLootItem; import net.minecraft.world.level.storage.loot.entries.LootItem; import net.minecraft.world.level.storage.loot.entries.NestedLootTable; @@ -42,7 +43,7 @@ import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator; public class VanillaEntityLoot extends EntityLootSubProvider { - public VanillaEntityLoot(Provider registries) { + public VanillaEntityLoot(HolderLookup.Provider registries) { super(FeatureFlags.REGISTRY.allFlags(), registries); } @@ -211,7 +212,11 @@ public class VanillaEntityLoot extends EntityLootSubProvider { .withPool( LootPool.lootPool() .add(TagEntry.expandTag(ItemTags.CREEPER_DROP_MUSIC_DISCS)) - .when(LootItemEntityPropertyCondition.hasProperties(EntityTarget.ATTACKER, Builder.entity().of(holderGetter, EntityTypeTags.SKELETONS))) + .when( + LootItemEntityPropertyCondition.hasProperties( + LootContext.EntityTarget.ATTACKER, EntityPredicate.Builder.entity().of(holderGetter, EntityTypeTags.SKELETONS) + ) + ) ) ); this.add( @@ -336,9 +341,9 @@ public class VanillaEntityLoot extends EntityLootSubProvider { .apply(SetItemCountFunction.setCount(ConstantValue.exactly(1.0F))) .when( DamageSourceCondition.hasDamageSource( - net.minecraft.advancements.critereon.DamageSourcePredicate.Builder.damageType() + DamageSourcePredicate.Builder.damageType() .tag(TagPredicate.is(DamageTypeTags.IS_PROJECTILE)) - .direct(Builder.entity().of(holderGetter, EntityType.FIREBALL)) + .direct(EntityPredicate.Builder.entity().of(holderGetter, EntityType.FIREBALL)) ) ) .when(LootItemKilledByPlayerCondition.killedByPlayer()) @@ -479,7 +484,11 @@ public class VanillaEntityLoot extends EntityLootSubProvider { .apply(SetItemCountFunction.setCount(UniformGenerator.between(-2.0F, 1.0F))) .apply(EnchantedCountIncreaseFunction.lootingMultiplier(this.registries, UniformGenerator.between(0.0F, 1.0F))) .when(this.killedByFrog(holderGetter).invert()) - .when(LootItemEntityPropertyCondition.hasProperties(EntityTarget.THIS, Builder.entity().subPredicate(SlimePredicate.sized(Ints.atLeast(2))))) + .when( + LootItemEntityPropertyCondition.hasProperties( + LootContext.EntityTarget.THIS, EntityPredicate.Builder.entity().subPredicate(SlimePredicate.sized(MinMaxBounds.Ints.atLeast(2))) + ) + ) ) .add( LootItem.lootTableItem(Items.PEARLESCENT_FROGLIGHT) @@ -596,7 +605,11 @@ public class VanillaEntityLoot extends EntityLootSubProvider { .apply(SetItemCountFunction.setCount(ConstantValue.exactly(1.0F))) .apply(SetOminousBottleAmplifierFunction.setAmplifier(UniformGenerator.between(0.0F, 4.0F))) ) - .when(LootItemEntityPropertyCondition.hasProperties(EntityTarget.THIS, Builder.entity().subPredicate(RaiderPredicate.CAPTAIN_WITHOUT_RAID))) + .when( + LootItemEntityPropertyCondition.hasProperties( + LootContext.EntityTarget.THIS, EntityPredicate.Builder.entity().subPredicate(RaiderPredicate.CAPTAIN_WITHOUT_RAID) + ) + ) ) ); this.add(EntityType.PLAYER, LootTable.lootTable()); @@ -763,7 +776,11 @@ public class VanillaEntityLoot extends EntityLootSubProvider { .when(this.killedByFrog(holderGetter).invert()) ) .add(LootItem.lootTableItem(Items.SLIME_BALL).apply(SetItemCountFunction.setCount(ConstantValue.exactly(1.0F))).when(this.killedByFrog(holderGetter))) - .when(LootItemEntityPropertyCondition.hasProperties(EntityTarget.THIS, Builder.entity().subPredicate(SlimePredicate.sized(Ints.exactly(1))))) + .when( + LootItemEntityPropertyCondition.hasProperties( + LootContext.EntityTarget.THIS, EntityPredicate.Builder.entity().subPredicate(SlimePredicate.sized(MinMaxBounds.Ints.exactly(1))) + ) + ) ) ); this.add(EntityType.SNIFFER, LootTable.lootTable()); @@ -904,11 +921,7 @@ public class VanillaEntityLoot extends EntityLootSubProvider { LootPool.lootPool() .setRolls(ConstantValue.exactly(1.0F)) .add(LootItem.lootTableItem(Items.BOWL)) - .when( - DamageSourceCondition.hasDamageSource( - net.minecraft.advancements.critereon.DamageSourcePredicate.Builder.damageType().tag(TagPredicate.is(DamageTypeTags.IS_LIGHTNING)) - ) - ) + .when(DamageSourceCondition.hasDamageSource(DamageSourcePredicate.Builder.damageType().tag(TagPredicate.is(DamageTypeTags.IS_LIGHTNING)))) ) ); this.add(EntityType.VEX, LootTable.lootTable()); @@ -1046,19 +1059,6 @@ public class VanillaEntityLoot extends EntityLootSubProvider { .when(LootItemKilledByPlayerCondition.killedByPlayer()) .when(LootItemRandomChanceWithEnchantedBonusCondition.randomChanceAndLootingBoost(this.registries, 0.025F, 0.01F)) ) - .withPool( - LootPool.lootPool() - .add(LootItem.lootTableItem(Items.MUSIC_DISC_LAVA_CHICKEN)) - .when(LootItemKilledByPlayerCondition.killedByPlayer()) - .when( - LootItemEntityPropertyCondition.hasProperties( - EntityTarget.THIS, - Builder.entity() - .flags(net.minecraft.advancements.critereon.EntityFlagsPredicate.Builder.flags().setIsBaby(true)) - .vehicle(Builder.entity().of(holderGetter, EntityType.CHICKEN)) - ) - ) - ) ); this.add( EntityType.ZOMBIE_HORSE, @@ -1151,7 +1151,7 @@ public class VanillaEntityLoot extends EntityLootSubProvider { ); } - public net.minecraft.world.level.storage.loot.LootTable.Builder elderGuardianLootTable() { + public LootTable.Builder elderGuardianLootTable() { return LootTable.lootTable() .withPool( LootPool.lootPool() diff --git a/net/minecraft/data/tags/PaintingVariantTagsProvider.java b/net/minecraft/data/tags/PaintingVariantTagsProvider.java index c909bdea..f8aa856e 100644 --- a/net/minecraft/data/tags/PaintingVariantTagsProvider.java +++ b/net/minecraft/data/tags/PaintingVariantTagsProvider.java @@ -1,7 +1,7 @@ package net.minecraft.data.tags; import java.util.concurrent.CompletableFuture; -import net.minecraft.core.HolderLookup.Provider; +import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.Registries; import net.minecraft.data.PackOutput; import net.minecraft.tags.PaintingVariantTags; @@ -9,12 +9,12 @@ import net.minecraft.world.entity.decoration.PaintingVariant; import net.minecraft.world.entity.decoration.PaintingVariants; public class PaintingVariantTagsProvider extends KeyTagProvider { - public PaintingVariantTagsProvider(PackOutput output, CompletableFuture provider) { + public PaintingVariantTagsProvider(PackOutput output, CompletableFuture provider) { super(output, Registries.PAINTING_VARIANT, provider); } @Override - protected void addTags(Provider provider) { + protected void addTags(HolderLookup.Provider provider) { this.tag(PaintingVariantTags.PLACEABLE) .add( PaintingVariants.KEBAB, @@ -62,8 +62,7 @@ public class PaintingVariantTagsProvider extends KeyTagProvider PaintingVariants.PASSAGE, PaintingVariants.POND, PaintingVariants.SUNFLOWERS, - PaintingVariants.TIDES, - PaintingVariants.DENNIS + PaintingVariants.TIDES ); } } diff --git a/net/minecraft/sounds/SoundEvents.java b/net/minecraft/sounds/SoundEvents.java index 0583b231..9b620f3a 100644 --- a/net/minecraft/sounds/SoundEvents.java +++ b/net/minecraft/sounds/SoundEvents.java @@ -7,11 +7,10 @@ import java.util.stream.IntStream; import java.util.stream.Stream; import net.minecraft.core.Holder; import net.minecraft.core.Registry; -import net.minecraft.core.Holder.Reference; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.animal.wolf.WolfSoundVariant; -import net.minecraft.world.entity.animal.wolf.WolfSoundVariants.SoundSet; +import net.minecraft.world.entity.animal.wolf.WolfSoundVariants; public class SoundEvents { public static final SoundEvent ALLAY_AMBIENT_WITH_ITEM = register("entity.allay.ambient_with_item"); @@ -21,22 +20,22 @@ public class SoundEvents { public static final SoundEvent ALLAY_ITEM_GIVEN = register("entity.allay.item_given"); public static final SoundEvent ALLAY_ITEM_TAKEN = register("entity.allay.item_taken"); public static final SoundEvent ALLAY_THROW = register("entity.allay.item_thrown"); - public static final Reference AMBIENT_CAVE = registerForHolder("ambient.cave"); - public static final Reference AMBIENT_BASALT_DELTAS_ADDITIONS = registerForHolder("ambient.basalt_deltas.additions"); - public static final Reference AMBIENT_BASALT_DELTAS_LOOP = registerForHolder("ambient.basalt_deltas.loop"); - public static final Reference AMBIENT_BASALT_DELTAS_MOOD = registerForHolder("ambient.basalt_deltas.mood"); - public static final Reference AMBIENT_CRIMSON_FOREST_ADDITIONS = registerForHolder("ambient.crimson_forest.additions"); - public static final Reference AMBIENT_CRIMSON_FOREST_LOOP = registerForHolder("ambient.crimson_forest.loop"); - public static final Reference AMBIENT_CRIMSON_FOREST_MOOD = registerForHolder("ambient.crimson_forest.mood"); - public static final Reference AMBIENT_NETHER_WASTES_ADDITIONS = registerForHolder("ambient.nether_wastes.additions"); - public static final Reference AMBIENT_NETHER_WASTES_LOOP = registerForHolder("ambient.nether_wastes.loop"); - public static final Reference AMBIENT_NETHER_WASTES_MOOD = registerForHolder("ambient.nether_wastes.mood"); - public static final Reference AMBIENT_SOUL_SAND_VALLEY_ADDITIONS = registerForHolder("ambient.soul_sand_valley.additions"); - public static final Reference AMBIENT_SOUL_SAND_VALLEY_LOOP = registerForHolder("ambient.soul_sand_valley.loop"); - public static final Reference AMBIENT_SOUL_SAND_VALLEY_MOOD = registerForHolder("ambient.soul_sand_valley.mood"); - public static final Reference AMBIENT_WARPED_FOREST_ADDITIONS = registerForHolder("ambient.warped_forest.additions"); - public static final Reference AMBIENT_WARPED_FOREST_LOOP = registerForHolder("ambient.warped_forest.loop"); - public static final Reference AMBIENT_WARPED_FOREST_MOOD = registerForHolder("ambient.warped_forest.mood"); + public static final Holder.Reference AMBIENT_CAVE = registerForHolder("ambient.cave"); + public static final Holder.Reference AMBIENT_BASALT_DELTAS_ADDITIONS = registerForHolder("ambient.basalt_deltas.additions"); + public static final Holder.Reference AMBIENT_BASALT_DELTAS_LOOP = registerForHolder("ambient.basalt_deltas.loop"); + public static final Holder.Reference AMBIENT_BASALT_DELTAS_MOOD = registerForHolder("ambient.basalt_deltas.mood"); + public static final Holder.Reference AMBIENT_CRIMSON_FOREST_ADDITIONS = registerForHolder("ambient.crimson_forest.additions"); + public static final Holder.Reference AMBIENT_CRIMSON_FOREST_LOOP = registerForHolder("ambient.crimson_forest.loop"); + public static final Holder.Reference AMBIENT_CRIMSON_FOREST_MOOD = registerForHolder("ambient.crimson_forest.mood"); + public static final Holder.Reference AMBIENT_NETHER_WASTES_ADDITIONS = registerForHolder("ambient.nether_wastes.additions"); + public static final Holder.Reference AMBIENT_NETHER_WASTES_LOOP = registerForHolder("ambient.nether_wastes.loop"); + public static final Holder.Reference AMBIENT_NETHER_WASTES_MOOD = registerForHolder("ambient.nether_wastes.mood"); + public static final Holder.Reference AMBIENT_SOUL_SAND_VALLEY_ADDITIONS = registerForHolder("ambient.soul_sand_valley.additions"); + public static final Holder.Reference AMBIENT_SOUL_SAND_VALLEY_LOOP = registerForHolder("ambient.soul_sand_valley.loop"); + public static final Holder.Reference AMBIENT_SOUL_SAND_VALLEY_MOOD = registerForHolder("ambient.soul_sand_valley.mood"); + public static final Holder.Reference AMBIENT_WARPED_FOREST_ADDITIONS = registerForHolder("ambient.warped_forest.additions"); + public static final Holder.Reference AMBIENT_WARPED_FOREST_LOOP = registerForHolder("ambient.warped_forest.loop"); + public static final Holder.Reference AMBIENT_WARPED_FOREST_MOOD = registerForHolder("ambient.warped_forest.mood"); public static final SoundEvent AMBIENT_UNDERWATER_ENTER = register("ambient.underwater.enter"); public static final SoundEvent AMBIENT_UNDERWATER_EXIT = register("ambient.underwater.exit"); public static final SoundEvent AMBIENT_UNDERWATER_LOOP = register("ambient.underwater.loop"); @@ -212,7 +211,7 @@ public class SoundEvents { public static final SoundEvent BREEZE_DEATH = register("entity.breeze.death"); public static final SoundEvent BREEZE_HURT = register("entity.breeze.hurt"); public static final SoundEvent BREEZE_WHIRL = register("entity.breeze.whirl"); - public static final Reference BREEZE_WIND_CHARGE_BURST = registerForHolder("entity.breeze.wind_burst"); + public static final Holder.Reference BREEZE_WIND_CHARGE_BURST = registerForHolder("entity.breeze.wind_burst"); public static final SoundEvent BREWING_STAND_BREW = register("block.brewing_stand.brew"); public static final SoundEvent BRUSH_GENERIC = register("item.brush.brushing.generic"); public static final SoundEvent BRUSH_SAND = register("item.brush.brushing.sand"); @@ -255,7 +254,7 @@ public class SoundEvents { public static final SoundEvent CAMEL_DEATH = register("entity.camel.death"); public static final SoundEvent CAMEL_EAT = register("entity.camel.eat"); public static final SoundEvent CAMEL_HURT = register("entity.camel.hurt"); - public static final Reference CAMEL_SADDLE = registerForHolder("entity.camel.saddle"); + public static final Holder.Reference CAMEL_SADDLE = registerForHolder("entity.camel.saddle"); public static final SoundEvent CAMEL_SIT = register("entity.camel.sit"); public static final SoundEvent CAMEL_STAND = register("entity.camel.stand"); public static final SoundEvent CAMEL_STEP = register("entity.camel.step"); @@ -627,9 +626,9 @@ public class SoundEvents { public static final SoundEvent GENERIC_BIG_FALL = register("entity.generic.big_fall"); public static final SoundEvent GENERIC_BURN = register("entity.generic.burn"); public static final SoundEvent GENERIC_DEATH = register("entity.generic.death"); - public static final Reference GENERIC_DRINK = registerForHolder("entity.generic.drink"); - public static final Reference GENERIC_EAT = registerForHolder("entity.generic.eat"); - public static final Reference GENERIC_EXPLODE = registerForHolder("entity.generic.explode"); + public static final Holder.Reference GENERIC_DRINK = registerForHolder("entity.generic.drink"); + public static final Holder.Reference GENERIC_EAT = registerForHolder("entity.generic.eat"); + public static final Holder.Reference GENERIC_EXPLODE = registerForHolder("entity.generic.explode"); public static final SoundEvent GENERIC_EXTINGUISH_FIRE = register("entity.generic.extinguish_fire"); public static final SoundEvent GENERIC_HURT = register("entity.generic.hurt"); public static final SoundEvent GENERIC_SMALL_FALL = register("entity.generic.small_fall"); @@ -748,7 +747,7 @@ public class SoundEvents { public static final SoundEvent TRIAL_SPAWNER_OPEN_SHUTTER = register("block.trial_spawner.open_shutter"); public static final SoundEvent TRIAL_SPAWNER_CLOSE_SHUTTER = register("block.trial_spawner.close_shutter"); public static final SoundEvent TRIAL_SPAWNER_EJECT_ITEM = register("block.trial_spawner.eject_item"); - public static final Reference HARNESS_EQUIP = registerForHolder("entity.happy_ghast.equip"); + public static final Holder.Reference HARNESS_EQUIP = registerForHolder("entity.happy_ghast.equip"); public static final SoundEvent HARNESS_UNEQUIP = register("entity.happy_ghast.unequip"); public static final SoundEvent HARNESS_GOGGLES_UP = register("entity.happy_ghast.harness_goggles_up"); public static final SoundEvent HARNESS_GOGGLES_DOWN = register("entity.happy_ghast.harness_goggles_down"); @@ -768,13 +767,13 @@ public class SoundEvents { public static final SoundEvent HONEY_BLOCK_SLIDE = register("block.honey_block.slide"); public static final SoundEvent HONEY_BLOCK_STEP = register("block.honey_block.step"); public static final SoundEvent HONEYCOMB_WAX_ON = register("item.honeycomb.wax_on"); - public static final Reference HONEY_DRINK = registerForHolder("item.honey_bottle.drink"); + public static final Holder.Reference HONEY_DRINK = registerForHolder("item.honey_bottle.drink"); public static final int GOAT_HORN_VARIANT_COUNT = 8; - public static final ImmutableList> GOAT_HORN_SOUND_VARIANTS = registerGoatHornSoundVariants(); + public static final ImmutableList> GOAT_HORN_SOUND_VARIANTS = registerGoatHornSoundVariants(); public static final SoundEvent HORSE_AMBIENT = register("entity.horse.ambient"); public static final SoundEvent HORSE_ANGRY = register("entity.horse.angry"); - public static final Reference HORSE_ARMOR = registerForHolder("entity.horse.armor"); - public static final Reference HORSE_ARMOR_UNEQUIP = registerForHolder("item.horse_armor.unequip"); + public static final Holder.Reference HORSE_ARMOR = registerForHolder("entity.horse.armor"); + public static final Holder.Reference HORSE_ARMOR_UNEQUIP = registerForHolder("item.horse_armor.unequip"); public static final SoundEvent HORSE_BREATHE = register("entity.horse.breathe"); public static final SoundEvent HORSE_DEATH = register("entity.horse.death"); public static final SoundEvent HORSE_EAT = register("entity.horse.eat"); @@ -782,7 +781,7 @@ public class SoundEvents { public static final SoundEvent HORSE_HURT = register("entity.horse.hurt"); public static final SoundEvent HORSE_JUMP = register("entity.horse.jump"); public static final SoundEvent HORSE_LAND = register("entity.horse.land"); - public static final Reference HORSE_SADDLE = registerForHolder("entity.horse.saddle"); + public static final Holder.Reference HORSE_SADDLE = registerForHolder("entity.horse.saddle"); public static final SoundEvent HORSE_STEP = register("entity.horse.step"); public static final SoundEvent HORSE_STEP_WOOD = register("entity.horse.step_wood"); public static final SoundEvent HOSTILE_BIG_FALL = register("entity.hostile.big_fall"); @@ -824,7 +823,7 @@ public class SoundEvents { public static final SoundEvent ITEM_FRAME_PLACE = register("entity.item_frame.place"); public static final SoundEvent ITEM_FRAME_REMOVE_ITEM = register("entity.item_frame.remove_item"); public static final SoundEvent ITEM_FRAME_ROTATE_ITEM = register("entity.item_frame.rotate_item"); - public static final Reference ITEM_BREAK = registerForHolder("entity.item.break"); + public static final Holder.Reference ITEM_BREAK = registerForHolder("entity.item.break"); public static final SoundEvent ITEM_PICKUP = register("entity.item.pickup"); public static final SoundEvent LADDER_BREAK = register("block.ladder.break"); public static final SoundEvent LADDER_FALL = register("block.ladder.fall"); @@ -861,8 +860,8 @@ public class SoundEvents { public static final SoundEvent LLAMA_HURT = register("entity.llama.hurt"); public static final SoundEvent LLAMA_SPIT = register("entity.llama.spit"); public static final SoundEvent LLAMA_STEP = register("entity.llama.step"); - public static final Reference LLAMA_SWAG = registerForHolder("entity.llama.swag"); - public static final Reference LLAMA_CARPET_UNEQUIP = registerForHolder("item.llama_carpet.unequip"); + public static final Holder.Reference LLAMA_SWAG = registerForHolder("entity.llama.swag"); + public static final Holder.Reference LLAMA_CARPET_UNEQUIP = registerForHolder("item.llama_carpet.unequip"); public static final SoundEvent MAGMA_CUBE_DEATH_SMALL = register("entity.magma_cube.death_small"); public static final SoundEvent LODESTONE_BREAK = register("block.lodestone.break"); public static final SoundEvent LODESTONE_STEP = register("block.lodestone.step"); @@ -938,58 +937,57 @@ public class SoundEvents { public static final SoundEvent MULE_EAT = register("entity.mule.eat"); public static final SoundEvent MULE_HURT = register("entity.mule.hurt"); public static final SoundEvent MULE_JUMP = register("entity.mule.jump"); - public static final Reference MUSIC_CREATIVE = registerForHolder("music.creative"); - public static final Reference MUSIC_CREDITS = registerForHolder("music.credits"); - public static final Reference MUSIC_DISC_5 = registerForHolder("music_disc.5"); - public static final Reference MUSIC_DISC_11 = registerForHolder("music_disc.11"); - public static final Reference MUSIC_DISC_13 = registerForHolder("music_disc.13"); - public static final Reference MUSIC_DISC_BLOCKS = registerForHolder("music_disc.blocks"); - public static final Reference MUSIC_DISC_CAT = registerForHolder("music_disc.cat"); - public static final Reference MUSIC_DISC_CHIRP = registerForHolder("music_disc.chirp"); - public static final Reference MUSIC_DISC_FAR = registerForHolder("music_disc.far"); - public static final Reference MUSIC_DISC_LAVA_CHICKEN = registerForHolder("music_disc.lava_chicken"); - public static final Reference MUSIC_DISC_MALL = registerForHolder("music_disc.mall"); - public static final Reference MUSIC_DISC_MELLOHI = registerForHolder("music_disc.mellohi"); - public static final Reference MUSIC_DISC_PIGSTEP = registerForHolder("music_disc.pigstep"); - public static final Reference MUSIC_DISC_STAL = registerForHolder("music_disc.stal"); - public static final Reference MUSIC_DISC_STRAD = registerForHolder("music_disc.strad"); - public static final Reference MUSIC_DISC_WAIT = registerForHolder("music_disc.wait"); - public static final Reference MUSIC_DISC_WARD = registerForHolder("music_disc.ward"); - public static final Reference MUSIC_DISC_OTHERSIDE = registerForHolder("music_disc.otherside"); - public static final Reference MUSIC_DISC_RELIC = registerForHolder("music_disc.relic"); - public static final Reference MUSIC_DISC_CREATOR = registerForHolder("music_disc.creator"); - public static final Reference MUSIC_DISC_CREATOR_MUSIC_BOX = registerForHolder("music_disc.creator_music_box"); - public static final Reference MUSIC_DISC_PRECIPICE = registerForHolder("music_disc.precipice"); - public static final Reference MUSIC_DISC_TEARS = registerForHolder("music_disc.tears"); - public static final Reference MUSIC_DRAGON = registerForHolder("music.dragon"); - public static final Reference MUSIC_END = registerForHolder("music.end"); - public static final Reference MUSIC_GAME = registerForHolder("music.game"); - public static final Reference MUSIC_MENU = registerForHolder("music.menu"); - public static final Reference MUSIC_BIOME_BASALT_DELTAS = registerForHolder("music.nether.basalt_deltas"); - public static final Reference MUSIC_BIOME_CRIMSON_FOREST = registerForHolder("music.nether.crimson_forest"); - public static final Reference MUSIC_BIOME_DEEP_DARK = registerForHolder("music.overworld.deep_dark"); - public static final Reference MUSIC_BIOME_DRIPSTONE_CAVES = registerForHolder("music.overworld.dripstone_caves"); - public static final Reference MUSIC_BIOME_GROVE = registerForHolder("music.overworld.grove"); - public static final Reference MUSIC_BIOME_JAGGED_PEAKS = registerForHolder("music.overworld.jagged_peaks"); - public static final Reference MUSIC_BIOME_LUSH_CAVES = registerForHolder("music.overworld.lush_caves"); - public static final Reference MUSIC_BIOME_SWAMP = registerForHolder("music.overworld.swamp"); - public static final Reference MUSIC_BIOME_FOREST = registerForHolder("music.overworld.forest"); - public static final Reference MUSIC_BIOME_OLD_GROWTH_TAIGA = registerForHolder("music.overworld.old_growth_taiga"); - public static final Reference MUSIC_BIOME_MEADOW = registerForHolder("music.overworld.meadow"); - public static final Reference MUSIC_BIOME_CHERRY_GROVE = registerForHolder("music.overworld.cherry_grove"); - public static final Reference MUSIC_BIOME_NETHER_WASTES = registerForHolder("music.nether.nether_wastes"); - public static final Reference MUSIC_BIOME_FROZEN_PEAKS = registerForHolder("music.overworld.frozen_peaks"); - public static final Reference MUSIC_BIOME_SNOWY_SLOPES = registerForHolder("music.overworld.snowy_slopes"); - public static final Reference MUSIC_BIOME_SOUL_SAND_VALLEY = registerForHolder("music.nether.soul_sand_valley"); - public static final Reference MUSIC_BIOME_STONY_PEAKS = registerForHolder("music.overworld.stony_peaks"); - public static final Reference MUSIC_BIOME_WARPED_FOREST = registerForHolder("music.nether.warped_forest"); - public static final Reference MUSIC_BIOME_FLOWER_FOREST = registerForHolder("music.overworld.flower_forest"); - public static final Reference MUSIC_BIOME_DESERT = registerForHolder("music.overworld.desert"); - public static final Reference MUSIC_BIOME_BADLANDS = registerForHolder("music.overworld.badlands"); - public static final Reference MUSIC_BIOME_JUNGLE = registerForHolder("music.overworld.jungle"); - public static final Reference MUSIC_BIOME_SPARSE_JUNGLE = registerForHolder("music.overworld.sparse_jungle"); - public static final Reference MUSIC_BIOME_BAMBOO_JUNGLE = registerForHolder("music.overworld.bamboo_jungle"); - public static final Reference MUSIC_UNDER_WATER = registerForHolder("music.under_water"); + public static final Holder.Reference MUSIC_CREATIVE = registerForHolder("music.creative"); + public static final Holder.Reference MUSIC_CREDITS = registerForHolder("music.credits"); + public static final Holder.Reference MUSIC_DISC_5 = registerForHolder("music_disc.5"); + public static final Holder.Reference MUSIC_DISC_11 = registerForHolder("music_disc.11"); + public static final Holder.Reference MUSIC_DISC_13 = registerForHolder("music_disc.13"); + public static final Holder.Reference MUSIC_DISC_BLOCKS = registerForHolder("music_disc.blocks"); + public static final Holder.Reference MUSIC_DISC_CAT = registerForHolder("music_disc.cat"); + public static final Holder.Reference MUSIC_DISC_CHIRP = registerForHolder("music_disc.chirp"); + public static final Holder.Reference MUSIC_DISC_FAR = registerForHolder("music_disc.far"); + public static final Holder.Reference MUSIC_DISC_MALL = registerForHolder("music_disc.mall"); + public static final Holder.Reference MUSIC_DISC_MELLOHI = registerForHolder("music_disc.mellohi"); + public static final Holder.Reference MUSIC_DISC_PIGSTEP = registerForHolder("music_disc.pigstep"); + public static final Holder.Reference MUSIC_DISC_STAL = registerForHolder("music_disc.stal"); + public static final Holder.Reference MUSIC_DISC_STRAD = registerForHolder("music_disc.strad"); + public static final Holder.Reference MUSIC_DISC_WAIT = registerForHolder("music_disc.wait"); + public static final Holder.Reference MUSIC_DISC_WARD = registerForHolder("music_disc.ward"); + public static final Holder.Reference MUSIC_DISC_OTHERSIDE = registerForHolder("music_disc.otherside"); + public static final Holder.Reference MUSIC_DISC_RELIC = registerForHolder("music_disc.relic"); + public static final Holder.Reference MUSIC_DISC_CREATOR = registerForHolder("music_disc.creator"); + public static final Holder.Reference MUSIC_DISC_CREATOR_MUSIC_BOX = registerForHolder("music_disc.creator_music_box"); + public static final Holder.Reference MUSIC_DISC_PRECIPICE = registerForHolder("music_disc.precipice"); + public static final Holder.Reference MUSIC_DISC_TEARS = registerForHolder("music_disc.tears"); + public static final Holder.Reference MUSIC_DRAGON = registerForHolder("music.dragon"); + public static final Holder.Reference MUSIC_END = registerForHolder("music.end"); + public static final Holder.Reference MUSIC_GAME = registerForHolder("music.game"); + public static final Holder.Reference MUSIC_MENU = registerForHolder("music.menu"); + public static final Holder.Reference MUSIC_BIOME_BASALT_DELTAS = registerForHolder("music.nether.basalt_deltas"); + public static final Holder.Reference MUSIC_BIOME_CRIMSON_FOREST = registerForHolder("music.nether.crimson_forest"); + public static final Holder.Reference MUSIC_BIOME_DEEP_DARK = registerForHolder("music.overworld.deep_dark"); + public static final Holder.Reference MUSIC_BIOME_DRIPSTONE_CAVES = registerForHolder("music.overworld.dripstone_caves"); + public static final Holder.Reference MUSIC_BIOME_GROVE = registerForHolder("music.overworld.grove"); + public static final Holder.Reference MUSIC_BIOME_JAGGED_PEAKS = registerForHolder("music.overworld.jagged_peaks"); + public static final Holder.Reference MUSIC_BIOME_LUSH_CAVES = registerForHolder("music.overworld.lush_caves"); + public static final Holder.Reference MUSIC_BIOME_SWAMP = registerForHolder("music.overworld.swamp"); + public static final Holder.Reference MUSIC_BIOME_FOREST = registerForHolder("music.overworld.forest"); + public static final Holder.Reference MUSIC_BIOME_OLD_GROWTH_TAIGA = registerForHolder("music.overworld.old_growth_taiga"); + public static final Holder.Reference MUSIC_BIOME_MEADOW = registerForHolder("music.overworld.meadow"); + public static final Holder.Reference MUSIC_BIOME_CHERRY_GROVE = registerForHolder("music.overworld.cherry_grove"); + public static final Holder.Reference MUSIC_BIOME_NETHER_WASTES = registerForHolder("music.nether.nether_wastes"); + public static final Holder.Reference MUSIC_BIOME_FROZEN_PEAKS = registerForHolder("music.overworld.frozen_peaks"); + public static final Holder.Reference MUSIC_BIOME_SNOWY_SLOPES = registerForHolder("music.overworld.snowy_slopes"); + public static final Holder.Reference MUSIC_BIOME_SOUL_SAND_VALLEY = registerForHolder("music.nether.soul_sand_valley"); + public static final Holder.Reference MUSIC_BIOME_STONY_PEAKS = registerForHolder("music.overworld.stony_peaks"); + public static final Holder.Reference MUSIC_BIOME_WARPED_FOREST = registerForHolder("music.nether.warped_forest"); + public static final Holder.Reference MUSIC_BIOME_FLOWER_FOREST = registerForHolder("music.overworld.flower_forest"); + public static final Holder.Reference MUSIC_BIOME_DESERT = registerForHolder("music.overworld.desert"); + public static final Holder.Reference MUSIC_BIOME_BADLANDS = registerForHolder("music.overworld.badlands"); + public static final Holder.Reference MUSIC_BIOME_JUNGLE = registerForHolder("music.overworld.jungle"); + public static final Holder.Reference MUSIC_BIOME_SPARSE_JUNGLE = registerForHolder("music.overworld.sparse_jungle"); + public static final Holder.Reference MUSIC_BIOME_BAMBOO_JUNGLE = registerForHolder("music.overworld.bamboo_jungle"); + public static final Holder.Reference MUSIC_UNDER_WATER = registerForHolder("music.under_water"); public static final SoundEvent NETHER_BRICKS_BREAK = register("block.nether_bricks.break"); public static final SoundEvent NETHER_BRICKS_STEP = register("block.nether_bricks.step"); public static final SoundEvent NETHER_BRICKS_PLACE = register("block.nether_bricks.place"); @@ -1058,32 +1056,32 @@ public class SoundEvents { public static final SoundEvent NETHERRACK_PLACE = register("block.netherrack.place"); public static final SoundEvent NETHERRACK_HIT = register("block.netherrack.hit"); public static final SoundEvent NETHERRACK_FALL = register("block.netherrack.fall"); - public static final Reference NOTE_BLOCK_BASEDRUM = registerForHolder("block.note_block.basedrum"); - public static final Reference NOTE_BLOCK_BASS = registerForHolder("block.note_block.bass"); - public static final Reference NOTE_BLOCK_BELL = registerForHolder("block.note_block.bell"); - public static final Reference NOTE_BLOCK_CHIME = registerForHolder("block.note_block.chime"); - public static final Reference NOTE_BLOCK_FLUTE = registerForHolder("block.note_block.flute"); - public static final Reference NOTE_BLOCK_GUITAR = registerForHolder("block.note_block.guitar"); - public static final Reference NOTE_BLOCK_HARP = registerForHolder("block.note_block.harp"); - public static final Reference NOTE_BLOCK_HAT = registerForHolder("block.note_block.hat"); - public static final Reference NOTE_BLOCK_PLING = registerForHolder("block.note_block.pling"); - public static final Reference NOTE_BLOCK_SNARE = registerForHolder("block.note_block.snare"); - public static final Reference NOTE_BLOCK_XYLOPHONE = registerForHolder("block.note_block.xylophone"); - public static final Reference NOTE_BLOCK_IRON_XYLOPHONE = registerForHolder("block.note_block.iron_xylophone"); - public static final Reference NOTE_BLOCK_COW_BELL = registerForHolder("block.note_block.cow_bell"); - public static final Reference NOTE_BLOCK_DIDGERIDOO = registerForHolder("block.note_block.didgeridoo"); - public static final Reference NOTE_BLOCK_BIT = registerForHolder("block.note_block.bit"); - public static final Reference NOTE_BLOCK_BANJO = registerForHolder("block.note_block.banjo"); - public static final Reference NOTE_BLOCK_IMITATE_ZOMBIE = registerForHolder("block.note_block.imitate.zombie"); - public static final Reference NOTE_BLOCK_IMITATE_SKELETON = registerForHolder("block.note_block.imitate.skeleton"); - public static final Reference NOTE_BLOCK_IMITATE_CREEPER = registerForHolder("block.note_block.imitate.creeper"); - public static final Reference NOTE_BLOCK_IMITATE_ENDER_DRAGON = registerForHolder("block.note_block.imitate.ender_dragon"); - public static final Reference NOTE_BLOCK_IMITATE_WITHER_SKELETON = registerForHolder("block.note_block.imitate.wither_skeleton"); - public static final Reference NOTE_BLOCK_IMITATE_PIGLIN = registerForHolder("block.note_block.imitate.piglin"); + public static final Holder.Reference NOTE_BLOCK_BASEDRUM = registerForHolder("block.note_block.basedrum"); + public static final Holder.Reference NOTE_BLOCK_BASS = registerForHolder("block.note_block.bass"); + public static final Holder.Reference NOTE_BLOCK_BELL = registerForHolder("block.note_block.bell"); + public static final Holder.Reference NOTE_BLOCK_CHIME = registerForHolder("block.note_block.chime"); + public static final Holder.Reference NOTE_BLOCK_FLUTE = registerForHolder("block.note_block.flute"); + public static final Holder.Reference NOTE_BLOCK_GUITAR = registerForHolder("block.note_block.guitar"); + public static final Holder.Reference NOTE_BLOCK_HARP = registerForHolder("block.note_block.harp"); + public static final Holder.Reference NOTE_BLOCK_HAT = registerForHolder("block.note_block.hat"); + public static final Holder.Reference NOTE_BLOCK_PLING = registerForHolder("block.note_block.pling"); + public static final Holder.Reference NOTE_BLOCK_SNARE = registerForHolder("block.note_block.snare"); + public static final Holder.Reference NOTE_BLOCK_XYLOPHONE = registerForHolder("block.note_block.xylophone"); + public static final Holder.Reference NOTE_BLOCK_IRON_XYLOPHONE = registerForHolder("block.note_block.iron_xylophone"); + public static final Holder.Reference NOTE_BLOCK_COW_BELL = registerForHolder("block.note_block.cow_bell"); + public static final Holder.Reference NOTE_BLOCK_DIDGERIDOO = registerForHolder("block.note_block.didgeridoo"); + public static final Holder.Reference NOTE_BLOCK_BIT = registerForHolder("block.note_block.bit"); + public static final Holder.Reference NOTE_BLOCK_BANJO = registerForHolder("block.note_block.banjo"); + public static final Holder.Reference NOTE_BLOCK_IMITATE_ZOMBIE = registerForHolder("block.note_block.imitate.zombie"); + public static final Holder.Reference NOTE_BLOCK_IMITATE_SKELETON = registerForHolder("block.note_block.imitate.skeleton"); + public static final Holder.Reference NOTE_BLOCK_IMITATE_CREEPER = registerForHolder("block.note_block.imitate.creeper"); + public static final Holder.Reference NOTE_BLOCK_IMITATE_ENDER_DRAGON = registerForHolder("block.note_block.imitate.ender_dragon"); + public static final Holder.Reference NOTE_BLOCK_IMITATE_WITHER_SKELETON = registerForHolder("block.note_block.imitate.wither_skeleton"); + public static final Holder.Reference NOTE_BLOCK_IMITATE_PIGLIN = registerForHolder("block.note_block.imitate.piglin"); public static final SoundEvent OCELOT_HURT = register("entity.ocelot.hurt"); public static final SoundEvent OCELOT_AMBIENT = register("entity.ocelot.ambient"); public static final SoundEvent OCELOT_DEATH = register("entity.ocelot.death"); - public static final Reference OMINOUS_BOTTLE_DISPOSE = registerForHolder("item.ominous_bottle.dispose"); + public static final Holder.Reference OMINOUS_BOTTLE_DISPOSE = registerForHolder("item.ominous_bottle.dispose"); public static final SoundEvent PAINTING_BREAK = register("entity.painting.break"); public static final SoundEvent PAINTING_PLACE = register("entity.painting.place"); public static final SoundEvent PALE_HANGING_MOSS_IDLE = register("block.pale_hanging_moss.idle"); @@ -1149,7 +1147,7 @@ public class SoundEvents { public static final SoundEvent PIG_AMBIENT = register("entity.pig.ambient"); public static final SoundEvent PIG_DEATH = register("entity.pig.death"); public static final SoundEvent PIG_HURT = register("entity.pig.hurt"); - public static final Reference PIG_SADDLE = registerForHolder("entity.pig.saddle"); + public static final Holder.Reference PIG_SADDLE = registerForHolder("entity.pig.saddle"); public static final SoundEvent PIG_STEP = register("entity.pig.step"); public static final SoundEvent PIGLIN_ADMIRING_ITEM = register("entity.piglin.admiring_item"); public static final SoundEvent PIGLIN_AMBIENT = register("entity.piglin.ambient"); @@ -1225,7 +1223,7 @@ public class SoundEvents { public static final SoundEvent RABBIT_DEATH = register("entity.rabbit.death"); public static final SoundEvent RABBIT_HURT = register("entity.rabbit.hurt"); public static final SoundEvent RABBIT_JUMP = register("entity.rabbit.jump"); - public static final Reference RAID_HORN = registerForHolder("event.raid.horn"); + public static final Holder.Reference RAID_HORN = registerForHolder("event.raid.horn"); public static final SoundEvent RAVAGER_AMBIENT = register("entity.ravager.ambient"); public static final SoundEvent RAVAGER_ATTACK = register("entity.ravager.attack"); public static final SoundEvent RAVAGER_CELEBRATE = register("entity.ravager.celebrate"); @@ -1247,7 +1245,7 @@ public class SoundEvents { public static final SoundEvent REDSTONE_TORCH_BURNOUT = register("block.redstone_torch.burnout"); public static final SoundEvent RESPAWN_ANCHOR_AMBIENT = register("block.respawn_anchor.ambient"); public static final SoundEvent RESPAWN_ANCHOR_CHARGE = register("block.respawn_anchor.charge"); - public static final Reference RESPAWN_ANCHOR_DEPLETE = registerForHolder("block.respawn_anchor.deplete"); + public static final Holder.Reference RESPAWN_ANCHOR_DEPLETE = registerForHolder("block.respawn_anchor.deplete"); public static final SoundEvent RESPAWN_ANCHOR_SET_SPAWN = register("block.respawn_anchor.set_spawn"); public static final SoundEvent ROOTED_DIRT_BREAK = register("block.rooted_dirt.break"); public static final SoundEvent ROOTED_DIRT_FALL = register("block.rooted_dirt.fall"); @@ -1306,8 +1304,8 @@ public class SoundEvents { public static final SoundEvent SHEEP_SHEAR = register("entity.sheep.shear"); public static final SoundEvent SHEEP_STEP = register("entity.sheep.step"); public static final SoundEvent SHEARS_SNIP = register("item.shears.snip"); - public static final Reference SHIELD_BLOCK = registerForHolder("item.shield.block"); - public static final Reference SHIELD_BREAK = registerForHolder("item.shield.break"); + public static final Holder.Reference SHIELD_BLOCK = registerForHolder("item.shield.block"); + public static final Holder.Reference SHIELD_BREAK = registerForHolder("item.shield.break"); public static final SoundEvent SHROOMLIGHT_BREAK = register("block.shroomlight.break"); public static final SoundEvent SHROOMLIGHT_STEP = register("block.shroomlight.step"); public static final SoundEvent SHROOMLIGHT_PLACE = register("block.shroomlight.place"); @@ -1371,7 +1369,7 @@ public class SoundEvents { public static final SoundEvent SOUL_SOIL_PLACE = register("block.soul_soil.place"); public static final SoundEvent SOUL_SOIL_HIT = register("block.soul_soil.hit"); public static final SoundEvent SOUL_SOIL_FALL = register("block.soul_soil.fall"); - public static final Reference SOUL_ESCAPE = registerForHolder("particle.soul_escape"); + public static final Holder.Reference SOUL_ESCAPE = registerForHolder("particle.soul_escape"); public static final SoundEvent SPAWNER_BREAK = register("block.spawner.break"); public static final SoundEvent SPAWNER_FALL = register("block.spawner.fall"); public static final SoundEvent SPAWNER_HIT = register("block.spawner.hit"); @@ -1399,7 +1397,7 @@ public class SoundEvents { public static final SoundEvent STRIDER_STEP = register("entity.strider.step"); public static final SoundEvent STRIDER_STEP_LAVA = register("entity.strider.step_lava"); public static final SoundEvent STRIDER_EAT = register("entity.strider.eat"); - public static final Reference STRIDER_SADDLE = registerForHolder("entity.strider.saddle"); + public static final Holder.Reference STRIDER_SADDLE = registerForHolder("entity.strider.saddle"); public static final SoundEvent SLIME_DEATH_SMALL = register("entity.slime.death_small"); public static final SoundEvent SLIME_HURT_SMALL = register("entity.slime.hurt_small"); public static final SoundEvent SLIME_JUMP_SMALL = register("entity.slime.jump_small"); @@ -1516,7 +1514,7 @@ public class SoundEvents { public static final SoundEvent TURTLE_SHAMBLE = register("entity.turtle.shamble"); public static final SoundEvent TURTLE_SHAMBLE_BABY = register("entity.turtle.shamble_baby"); public static final SoundEvent TURTLE_SWIM = register("entity.turtle.swim"); - public static final Reference UI_BUTTON_CLICK = registerForHolder("ui.button.click"); + public static final Holder.Reference UI_BUTTON_CLICK = registerForHolder("ui.button.click"); public static final SoundEvent UI_LOOM_SELECT_PATTERN = register("ui.loom.select_pattern"); public static final SoundEvent UI_LOOM_TAKE_RESULT = register("ui.loom.take_result"); public static final SoundEvent UI_CARTOGRAPHY_TABLE_TAKE_RESULT = register("ui.cartography_table.take_result"); @@ -1619,7 +1617,7 @@ public class SoundEvents { public static final SoundEvent WET_SPONGE_HIT = register("block.wet_sponge.hit"); public static final SoundEvent WET_SPONGE_PLACE = register("block.wet_sponge.place"); public static final SoundEvent WET_SPONGE_STEP = register("block.wet_sponge.step"); - public static final Reference WIND_CHARGE_BURST = registerForHolder("entity.wind_charge.wind_burst"); + public static final Holder.Reference WIND_CHARGE_BURST = registerForHolder("entity.wind_charge.wind_burst"); public static final SoundEvent WIND_CHARGE_THROW = register("entity.wind_charge.throw"); public static final SoundEvent WITCH_AMBIENT = register("entity.witch.ambient"); public static final SoundEvent WITCH_CELEBRATE = register("entity.witch.celebrate"); @@ -1637,13 +1635,13 @@ public class SoundEvents { public static final SoundEvent WITHER_SKELETON_HURT = register("entity.wither_skeleton.hurt"); public static final SoundEvent WITHER_SKELETON_STEP = register("entity.wither_skeleton.step"); public static final SoundEvent WITHER_SPAWN = register("entity.wither.spawn"); - public static final Reference WOLF_ARMOR_BREAK = registerForHolder("item.wolf_armor.break"); + public static final Holder.Reference WOLF_ARMOR_BREAK = registerForHolder("item.wolf_armor.break"); public static final SoundEvent WOLF_ARMOR_CRACK = register("item.wolf_armor.crack"); public static final SoundEvent WOLF_ARMOR_DAMAGE = register("item.wolf_armor.damage"); public static final SoundEvent WOLF_ARMOR_REPAIR = register("item.wolf_armor.repair"); public static final SoundEvent WOLF_SHAKE = register("entity.wolf.shake"); public static final SoundEvent WOLF_STEP = register("entity.wolf.step"); - public static final Map WOLF_SOUNDS = registerWolfSoundVariants(); + public static final Map WOLF_SOUNDS = registerWolfSoundVariants(); public static final SoundEvent WOODEN_DOOR_CLOSE = register("block.wooden_door.close"); public static final SoundEvent WOODEN_DOOR_OPEN = register("block.wooden_door.open"); public static final SoundEvent WOODEN_TRAPDOOR_CLOSE = register("block.wooden_trapdoor.close"); @@ -1694,7 +1692,7 @@ public class SoundEvents { public static final SoundEvent APPLY_EFFECT_BAD_OMEN = register("event.mob_effect.bad_omen"); public static final SoundEvent APPLY_EFFECT_TRIAL_OMEN = register("event.mob_effect.trial_omen"); public static final SoundEvent APPLY_EFFECT_RAID_OMEN = register("event.mob_effect.raid_omen"); - public static final Reference SADDLE_UNEQUIP = registerForHolder("item.saddle.unequip"); + public static final Holder.Reference SADDLE_UNEQUIP = registerForHolder("item.saddle.unequip"); private static Holder register(ResourceLocation name, ResourceLocation location, float range) { return Registry.registerForHolder(BuiltInRegistries.SOUND_EVENT, name, SoundEvent.createFixedRangeEvent(location, range)); @@ -1708,11 +1706,11 @@ public class SoundEvents { return register(name, name); } - private static Reference registerForHolder(String name) { + private static Holder.Reference registerForHolder(String name) { return registerForHolder(ResourceLocation.withDefaultNamespace(name)); } - private static Reference registerForHolder(ResourceLocation name) { + private static Holder.Reference registerForHolder(ResourceLocation name) { return registerForHolder(name, name); } @@ -1720,18 +1718,18 @@ public class SoundEvents { return Registry.register(BuiltInRegistries.SOUND_EVENT, name, SoundEvent.createVariableRangeEvent(location)); } - private static Reference registerForHolder(ResourceLocation name, ResourceLocation location) { + private static Holder.Reference registerForHolder(ResourceLocation name, ResourceLocation location) { return Registry.registerForHolder(BuiltInRegistries.SOUND_EVENT, name, SoundEvent.createVariableRangeEvent(location)); } - private static ImmutableList> registerGoatHornSoundVariants() { - return (ImmutableList>)IntStream.range(0, 8) + private static ImmutableList> registerGoatHornSoundVariants() { + return (ImmutableList>)IntStream.range(0, 8) .mapToObj(i -> registerForHolder("item.goat_horn.sound." + i)) .collect(ImmutableList.toImmutableList()); } - private static Map registerWolfSoundVariants() { - return (Map)Stream.of(SoundSet.values()) + private static Map registerWolfSoundVariants() { + return (Map)Stream.of(WolfSoundVariants.SoundSet.values()) .collect( Collectors.toMap( soundSet -> soundSet, diff --git a/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.java b/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.java index 09c1c3b2..08cc67b0 100644 --- a/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.java +++ b/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.java @@ -10,12 +10,11 @@ import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.PoiTypeTags; import net.minecraft.world.entity.PathfinderMob; -import net.minecraft.world.entity.ai.goal.Goal.Flag; -import net.minecraft.world.entity.ai.navigation.PathNavigation; +import net.minecraft.world.entity.ai.navigation.GroundPathNavigation; import net.minecraft.world.entity.ai.util.DefaultRandomPos; import net.minecraft.world.entity.ai.util.GoalUtils; import net.minecraft.world.entity.ai.util.LandRandomPos; -import net.minecraft.world.entity.ai.village.poi.PoiManager.Occupancy; +import net.minecraft.world.entity.ai.village.poi.PoiManager; import net.minecraft.world.level.block.DoorBlock; import net.minecraft.world.level.pathfinder.Node; import net.minecraft.world.level.pathfinder.Path; @@ -39,7 +38,7 @@ public class MoveThroughVillageGoal extends Goal { this.onlyAtNight = onlyAtNight; this.distanceToPoi = distanceToPoi; this.canDealWithDoors = canDealWithDoors; - this.setFlags(EnumSet.of(Flag.MOVE)); + this.setFlags(EnumSet.of(Goal.Flag.MOVE)); if (!GoalUtils.hasGroundPathNavigation(mob)) { throw new IllegalArgumentException("Unsupported mob for MoveThroughVillageGoal"); } @@ -68,7 +67,7 @@ public class MoveThroughVillageGoal extends Goal { return Double.NEGATIVE_INFINITY; } else { Optional optionalx = serverLevel.getPoiManager() - .find(holder -> holder.is(PoiTypeTags.VILLAGE), this::hasNotVisited, blockPos2x, 10, Occupancy.IS_OCCUPIED); + .find(holder -> holder.is(PoiTypeTags.VILLAGE), this::hasNotVisited, blockPos2x, 10, PoiManager.Occupancy.IS_OCCUPIED); return (Double)optionalx.map(blockPos2xx -> -blockPos2xx.distSqr(blockPos)).orElse(Double.NEGATIVE_INFINITY); } } @@ -77,24 +76,24 @@ public class MoveThroughVillageGoal extends Goal { return false; } else { Optional optional = serverLevel.getPoiManager() - .find(holder -> holder.is(PoiTypeTags.VILLAGE), this::hasNotVisited, BlockPos.containing(vec3), 10, Occupancy.IS_OCCUPIED); + .find(holder -> holder.is(PoiTypeTags.VILLAGE), this::hasNotVisited, BlockPos.containing(vec3), 10, PoiManager.Occupancy.IS_OCCUPIED); if (optional.isEmpty()) { return false; } else { this.poiPos = ((BlockPos)optional.get()).immutable(); - PathNavigation pathNavigation = this.mob.getNavigation(); - pathNavigation.setCanOpenDoors(this.canDealWithDoors.getAsBoolean()); - this.path = pathNavigation.createPath(this.poiPos, 0); - pathNavigation.setCanOpenDoors(true); + GroundPathNavigation groundPathNavigation = (GroundPathNavigation)this.mob.getNavigation(); + groundPathNavigation.setCanOpenDoors(this.canDealWithDoors.getAsBoolean()); + this.path = groundPathNavigation.createPath(this.poiPos, 0); + groundPathNavigation.setCanOpenDoors(true); if (this.path == null) { Vec3 vec32 = DefaultRandomPos.getPosTowards(this.mob, 10, 7, Vec3.atBottomCenterOf(this.poiPos), (float) (Math.PI / 2)); if (vec32 == null) { return false; } - pathNavigation.setCanOpenDoors(this.canDealWithDoors.getAsBoolean()); + groundPathNavigation.setCanOpenDoors(this.canDealWithDoors.getAsBoolean()); this.path = this.mob.getNavigation().createPath(vec32.x, vec32.y, vec32.z, 0); - pathNavigation.setCanOpenDoors(true); + groundPathNavigation.setCanOpenDoors(true); if (this.path == null) { return false; } diff --git a/net/minecraft/world/entity/ai/goal/RestrictSunGoal.java b/net/minecraft/world/entity/ai/goal/RestrictSunGoal.java index 3add5f70..c3b22cb4 100644 --- a/net/minecraft/world/entity/ai/goal/RestrictSunGoal.java +++ b/net/minecraft/world/entity/ai/goal/RestrictSunGoal.java @@ -19,15 +19,13 @@ public class RestrictSunGoal extends Goal { @Override public void start() { - if (this.mob.getNavigation() instanceof GroundPathNavigation groundPathNavigation) { - groundPathNavigation.setAvoidSun(true); - } + ((GroundPathNavigation)this.mob.getNavigation()).setAvoidSun(true); } @Override public void stop() { - if (GoalUtils.hasGroundPathNavigation(this.mob) && this.mob.getNavigation() instanceof GroundPathNavigation groundPathNavigation) { - groundPathNavigation.setAvoidSun(false); + if (GoalUtils.hasGroundPathNavigation(this.mob)) { + ((GroundPathNavigation)this.mob.getNavigation()).setAvoidSun(false); } } } diff --git a/net/minecraft/world/entity/animal/HappyGhast.java b/net/minecraft/world/entity/animal/HappyGhast.java index c65cf52f..e71edd52 100644 --- a/net/minecraft/world/entity/animal/HappyGhast.java +++ b/net/minecraft/world/entity/animal/HappyGhast.java @@ -3,7 +3,6 @@ package net.minecraft.world.entity.animal; import com.mojang.serialization.Dynamic; import java.util.function.Predicate; import net.minecraft.core.BlockPos; -import net.minecraft.network.protocol.game.ClientboundEntityPositionSyncPacket; import net.minecraft.network.protocol.game.DebugPackets; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; @@ -27,24 +26,21 @@ import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.Leashable; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.ai.Brain; -import net.minecraft.world.entity.ai.Brain.Provider; +import net.minecraft.world.entity.ai.attributes.AttributeSupplier; import net.minecraft.world.entity.ai.attributes.Attributes; -import net.minecraft.world.entity.ai.attributes.AttributeSupplier.Builder; import net.minecraft.world.entity.ai.control.BodyRotationControl; import net.minecraft.world.entity.ai.control.FlyingMoveControl; import net.minecraft.world.entity.ai.control.LookControl; import net.minecraft.world.entity.ai.goal.FloatGoal; -import net.minecraft.world.entity.ai.goal.TemptGoal.ForNonPathfinders; +import net.minecraft.world.entity.ai.goal.TemptGoal; import net.minecraft.world.entity.ai.navigation.FlyingPathNavigation; import net.minecraft.world.entity.ai.navigation.PathNavigation; import net.minecraft.world.entity.monster.Ghast; -import net.minecraft.world.entity.monster.Ghast.GhastMoveControl; -import net.minecraft.world.entity.monster.Ghast.RandomFloatAroundGoal; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.biome.Biome.Precipitation; +import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.storage.ValueInput; import net.minecraft.world.level.storage.ValueOutput; @@ -74,16 +70,11 @@ public class HappyGhast extends Animal { public HappyGhast(EntityType entityType, Level level) { super(entityType, level); - this.moveControl = new GhastMoveControl(this, true, this::isOnStillTimeout); + this.moveControl = new Ghast.GhastMoveControl(this, true, this::isOnStillTimeout); this.lookControl = new HappyGhast.HappyGhastLookControl(); } private void setServerStillTimeout(int serverStillTimeout) { - if (this.serverStillTimeout <= 0 && serverStillTimeout > 0 && this.level() instanceof ServerLevel serverLevel) { - this.syncPacketPositionCodec(this.getX(), this.getY(), this.getZ()); - serverLevel.getChunkSource().chunkMap.broadcast(this, ClientboundEntityPositionSyncPacket.of(this)); - } - this.serverStillTimeout = serverStillTimeout; this.syncStayStillFlag(); } @@ -98,7 +89,7 @@ public class HappyGhast extends Animal { this.goalSelector .addGoal( 4, - new ForNonPathfinders( + new TemptGoal.ForNonPathfinders( this, 1.0, itemStack -> !this.isWearingBodyArmor() && !this.isBaby() ? itemStack.is(ItemTags.HAPPY_GHAST_TEMPT_ITEMS) : IS_FOOD.test(itemStack), @@ -106,11 +97,11 @@ public class HappyGhast extends Animal { 7.0 ) ); - this.goalSelector.addGoal(5, new RandomFloatAroundGoal(this, 16)); + this.goalSelector.addGoal(5, new Ghast.RandomFloatAroundGoal(this, 16)); } private void adultGhastSetup() { - this.moveControl = new GhastMoveControl(this, true, this::isOnStillTimeout); + this.moveControl = new Ghast.GhastMoveControl(this, true, this::isOnStillTimeout); this.lookControl = new HappyGhast.HappyGhastLookControl(); this.navigation = this.createNavigation(this.level()); if (this.level() instanceof ServerLevel serverLevel) { @@ -140,7 +131,7 @@ public class HappyGhast extends Animal { super.ageBoundaryReached(); } - public static Builder createAttributes() { + public static AttributeSupplier.Builder createAttributes() { return Animal.createAnimalAttributes() .add(Attributes.MAX_HEALTH, 20.0) .add(Attributes.TEMPT_RANGE, 16.0) @@ -371,7 +362,7 @@ public class HappyGhast extends Animal { } @Override - protected Provider brainProvider() { + protected Brain.Provider brainProvider() { return HappyGhastAi.brainProvider(); } @@ -444,7 +435,7 @@ public class HappyGhast extends Animal { private void continuousHeal() { if (this.level() instanceof ServerLevel serverLevel && this.isAlive() && this.deathTime == 0 && this.getMaxHealth() != this.getHealth()) { - boolean bl = serverLevel.dimensionType().natural() && (this.isInClouds() || serverLevel.precipitationAt(this.blockPosition()) != Precipitation.NONE); + boolean bl = serverLevel.dimensionType().natural() && (this.isInClouds() || serverLevel.precipitationAt(this.blockPosition()) != Biome.Precipitation.NONE); if (this.tickCount % (bl ? 20 : 600) == 0) { this.heal(1.0F); } @@ -458,7 +449,7 @@ public class HappyGhast extends Animal { } @Override - protected void defineSynchedData(net.minecraft.network.syncher.SynchedEntityData.Builder builder) { + protected void defineSynchedData(SynchedEntityData.Builder builder) { super.defineSynchedData(builder); builder.define(IS_LEASH_HOLDER, false); builder.define(STAYS_STILL, false); @@ -536,7 +527,7 @@ public class HappyGhast extends Animal { private boolean scanPlayerAboveGhast() { AABB aABB = this.getBoundingBox(); - AABB aABB2 = new AABB(aABB.minX - 1.0, aABB.maxY - 1.0E-5F, aABB.minZ - 1.0, aABB.maxX + 1.0, aABB.maxY + aABB.getYsize() / 2.0, aABB.maxZ + 1.0); + AABB aABB2 = new AABB(aABB.minX - 1.0, aABB.maxY, aABB.minZ - 1.0, aABB.maxX + 1.0, aABB.maxY + aABB.getYsize() / 2.0, aABB.maxZ + 1.0); for (Player player : this.level().players()) { if (!player.isSpectator()) { diff --git a/net/minecraft/world/entity/decoration/PaintingVariants.java b/net/minecraft/world/entity/decoration/PaintingVariants.java index cbdda33c..c5dbce32 100644 --- a/net/minecraft/world/entity/decoration/PaintingVariants.java +++ b/net/minecraft/world/entity/decoration/PaintingVariants.java @@ -59,7 +59,6 @@ public class PaintingVariants { public static final ResourceKey POND = create("pond"); public static final ResourceKey SUNFLOWERS = create("sunflowers"); public static final ResourceKey TIDES = create("tides"); - public static final ResourceKey DENNIS = create("dennis"); public static void bootstrap(BootstrapContext context) { register(context, KEBAB, 1, 1); @@ -112,7 +111,6 @@ public class PaintingVariants { register(context, POND, 3, 4); register(context, SUNFLOWERS, 3, 3); register(context, TIDES, 3, 3); - register(context, DENNIS, 3, 3); } private static void register(BootstrapContext context, ResourceKey key, int width, int height) { diff --git a/net/minecraft/world/entity/monster/Vindicator.java b/net/minecraft/world/entity/monster/Vindicator.java index 5605fe3f..eecceb61 100644 --- a/net/minecraft/world/entity/monster/Vindicator.java +++ b/net/minecraft/world/entity/monster/Vindicator.java @@ -17,27 +17,25 @@ import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.SpawnGroupData; +import net.minecraft.world.entity.ai.attributes.AttributeSupplier; import net.minecraft.world.entity.ai.attributes.Attributes; -import net.minecraft.world.entity.ai.attributes.AttributeSupplier.Builder; import net.minecraft.world.entity.ai.goal.AvoidEntityGoal; import net.minecraft.world.entity.ai.goal.BreakDoorGoal; import net.minecraft.world.entity.ai.goal.FloatGoal; +import net.minecraft.world.entity.ai.goal.Goal; import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal; import net.minecraft.world.entity.ai.goal.MeleeAttackGoal; import net.minecraft.world.entity.ai.goal.RandomStrollGoal; -import net.minecraft.world.entity.ai.goal.Goal.Flag; import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal; import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal; +import net.minecraft.world.entity.ai.navigation.GroundPathNavigation; import net.minecraft.world.entity.ai.util.GoalUtils; import net.minecraft.world.entity.animal.IronGolem; -import net.minecraft.world.entity.monster.AbstractIllager.IllagerArmPose; -import net.minecraft.world.entity.monster.AbstractIllager.RaiderOpenDoorGoal; import net.minecraft.world.entity.monster.creaking.Creaking; import net.minecraft.world.entity.npc.AbstractVillager; import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.raid.Raid; import net.minecraft.world.entity.raid.Raider; -import net.minecraft.world.entity.raid.Raider.HoldGroundAttackGoal; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.enchantment.EnchantmentHelper; @@ -65,8 +63,8 @@ public class Vindicator extends AbstractIllager { this.goalSelector.addGoal(0, new FloatGoal(this)); this.goalSelector.addGoal(1, new AvoidEntityGoal(this, Creaking.class, 8.0F, 1.0, 1.2)); this.goalSelector.addGoal(2, new Vindicator.VindicatorBreakDoorGoal(this)); - this.goalSelector.addGoal(3, new RaiderOpenDoorGoal(this, this)); - this.goalSelector.addGoal(4, new HoldGroundAttackGoal(this, 10.0F)); + this.goalSelector.addGoal(3, new AbstractIllager.RaiderOpenDoorGoal(this)); + this.goalSelector.addGoal(4, new Raider.HoldGroundAttackGoal(this, 10.0F)); this.goalSelector.addGoal(5, new MeleeAttackGoal(this, 1.0, false)); this.targetSelector.addGoal(1, new HurtByTargetGoal(this, Raider.class).setAlertOthers()); this.targetSelector.addGoal(2, new NearestAttackableTargetGoal(this, Player.class, true)); @@ -82,13 +80,13 @@ public class Vindicator extends AbstractIllager { protected void customServerAiStep(ServerLevel level) { if (!this.isNoAi() && GoalUtils.hasGroundPathNavigation(this)) { boolean bl = level.isRaided(this.blockPosition()); - this.getNavigation().setCanOpenDoors(bl); + ((GroundPathNavigation)this.getNavigation()).setCanOpenDoors(bl); } super.customServerAiStep(level); } - public static Builder createAttributes() { + public static AttributeSupplier.Builder createAttributes() { return Monster.createMonsterAttributes() .add(Attributes.MOVEMENT_SPEED, 0.35F) .add(Attributes.FOLLOW_RANGE, 12.0) @@ -105,11 +103,11 @@ public class Vindicator extends AbstractIllager { } @Override - public IllagerArmPose getArmPose() { + public AbstractIllager.IllagerArmPose getArmPose() { if (this.isAggressive()) { - return IllagerArmPose.ATTACKING; + return AbstractIllager.IllagerArmPose.ATTACKING; } else { - return this.isCelebrating() ? IllagerArmPose.CELEBRATING : IllagerArmPose.CROSSED; + return this.isCelebrating() ? AbstractIllager.IllagerArmPose.CELEBRATING : AbstractIllager.IllagerArmPose.CROSSED; } } @@ -130,7 +128,7 @@ public class Vindicator extends AbstractIllager { ServerLevelAccessor level, DifficultyInstance difficulty, EntitySpawnReason spawnReason, @Nullable SpawnGroupData spawnGroupData ) { SpawnGroupData spawnGroupData2 = super.finalizeSpawn(level, difficulty, spawnReason, spawnGroupData); - this.getNavigation().setCanOpenDoors(true); + ((GroundPathNavigation)this.getNavigation()).setCanOpenDoors(true); RandomSource randomSource = level.getRandom(); this.populateDefaultEquipmentSlots(randomSource, difficulty); this.populateDefaultEquipmentEnchantments(level, randomSource, difficulty); @@ -185,7 +183,7 @@ public class Vindicator extends AbstractIllager { static class VindicatorBreakDoorGoal extends BreakDoorGoal { public VindicatorBreakDoorGoal(Mob mob) { super(mob, 6, Vindicator.DOOR_BREAKING_PREDICATE); - this.setFlags(EnumSet.of(Flag.MOVE)); + this.setFlags(EnumSet.of(Goal.Flag.MOVE)); } @Override diff --git a/net/minecraft/world/entity/monster/piglin/AbstractPiglin.java b/net/minecraft/world/entity/monster/piglin/AbstractPiglin.java index 5aa41a2c..35ccdec1 100644 --- a/net/minecraft/world/entity/monster/piglin/AbstractPiglin.java +++ b/net/minecraft/world/entity/monster/piglin/AbstractPiglin.java @@ -6,13 +6,13 @@ import net.minecraft.network.protocol.game.DebugPackets; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; -import net.minecraft.network.syncher.SynchedEntityData.Builder; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.ConversionParams; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.ai.navigation.GroundPathNavigation; import net.minecraft.world.entity.ai.util.GoalUtils; import net.minecraft.world.entity.monster.Monster; import net.minecraft.world.level.Level; @@ -41,7 +41,7 @@ public abstract class AbstractPiglin extends Monster { private void applyOpenDoorsAbility() { if (GoalUtils.hasGroundPathNavigation(this)) { - this.getNavigation().setCanOpenDoors(true); + ((GroundPathNavigation)this.getNavigation()).setCanOpenDoors(true); } } @@ -56,7 +56,7 @@ public abstract class AbstractPiglin extends Monster { } @Override - protected void defineSynchedData(Builder builder) { + protected void defineSynchedData(SynchedEntityData.Builder builder) { super.defineSynchedData(builder); builder.define(DATA_IMMUNE_TO_ZOMBIFICATION, false); } diff --git a/net/minecraft/world/entity/monster/piglin/Piglin.java b/net/minecraft/world/entity/monster/piglin/Piglin.java index 43b38aeb..01f719e6 100644 --- a/net/minecraft/world/entity/monster/piglin/Piglin.java +++ b/net/minecraft/world/entity/monster/piglin/Piglin.java @@ -7,7 +7,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; -import net.minecraft.network.syncher.SynchedEntityData.Builder; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -32,11 +31,10 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.Pose; import net.minecraft.world.entity.SpawnGroupData; import net.minecraft.world.entity.ai.Brain; -import net.minecraft.world.entity.ai.Brain.Provider; import net.minecraft.world.entity.ai.attributes.AttributeInstance; import net.minecraft.world.entity.ai.attributes.AttributeModifier; +import net.minecraft.world.entity.ai.attributes.AttributeSupplier; import net.minecraft.world.entity.ai.attributes.Attributes; -import net.minecraft.world.entity.ai.attributes.AttributeModifier.Operation; import net.minecraft.world.entity.ai.memory.MemoryModuleType; import net.minecraft.world.entity.ai.sensing.Sensor; import net.minecraft.world.entity.ai.sensing.SensorType; @@ -68,7 +66,9 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento private static final EntityDataAccessor DATA_IS_CHARGING_CROSSBOW = SynchedEntityData.defineId(Piglin.class, EntityDataSerializers.BOOLEAN); private static final EntityDataAccessor DATA_IS_DANCING = SynchedEntityData.defineId(Piglin.class, EntityDataSerializers.BOOLEAN); private static final ResourceLocation SPEED_MODIFIER_BABY_ID = ResourceLocation.withDefaultNamespace("baby"); - private static final AttributeModifier SPEED_MODIFIER_BABY = new AttributeModifier(SPEED_MODIFIER_BABY_ID, 0.2F, Operation.ADD_MULTIPLIED_BASE); + private static final AttributeModifier SPEED_MODIFIER_BABY = new AttributeModifier( + SPEED_MODIFIER_BABY_ID, 0.2F, AttributeModifier.Operation.ADD_MULTIPLIED_BASE + ); private static final int MAX_HEALTH = 16; private static final float MOVEMENT_SPEED_WHEN_FIGHTING = 0.35F; private static final int ATTACK_DAMAGE = 5; @@ -174,7 +174,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento } @Override - protected void defineSynchedData(Builder builder) { + protected void defineSynchedData(SynchedEntityData.Builder builder) { super.defineSynchedData(builder); builder.define(DATA_BABY_ID, false); builder.define(DATA_IS_CHARGING_CROSSBOW, false); @@ -189,7 +189,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento } } - public static net.minecraft.world.entity.ai.attributes.AttributeSupplier.Builder createAttributes() { + public static AttributeSupplier.Builder createAttributes() { return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 16.0).add(Attributes.MOVEMENT_SPEED, 0.35F).add(Attributes.ATTACK_DAMAGE, 5.0); } @@ -246,7 +246,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento } @Override - protected Provider brainProvider() { + protected Brain.Provider brainProvider() { return Brain.provider(MEMORY_TYPES, SENSOR_TYPES); } diff --git a/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/net/minecraft/world/entity/monster/piglin/PiglinBrute.java index a3a9a7a4..9b5d6d64 100644 --- a/net/minecraft/world/entity/monster/piglin/PiglinBrute.java +++ b/net/minecraft/world/entity/monster/piglin/PiglinBrute.java @@ -17,9 +17,8 @@ import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.SpawnGroupData; import net.minecraft.world.entity.ai.Brain; -import net.minecraft.world.entity.ai.Brain.Provider; +import net.minecraft.world.entity.ai.attributes.AttributeSupplier; import net.minecraft.world.entity.ai.attributes.Attributes; -import net.minecraft.world.entity.ai.attributes.AttributeSupplier.Builder; import net.minecraft.world.entity.ai.memory.MemoryModuleType; import net.minecraft.world.entity.ai.sensing.Sensor; import net.minecraft.world.entity.ai.sensing.SensorType; @@ -66,7 +65,7 @@ public class PiglinBrute extends AbstractPiglin { this.xpReward = 20; } - public static Builder createAttributes() { + public static AttributeSupplier.Builder createAttributes() { return Monster.createMonsterAttributes() .add(Attributes.MAX_HEALTH, 50.0) .add(Attributes.MOVEMENT_SPEED, 0.35F) @@ -90,7 +89,7 @@ public class PiglinBrute extends AbstractPiglin { } @Override - protected Provider brainProvider() { + protected Brain.Provider brainProvider() { return Brain.provider(MEMORY_TYPES, SENSOR_TYPES); } diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java index 1ed78842..48fb9650 100644 --- a/net/minecraft/world/entity/npc/Villager.java +++ b/net/minecraft/world/entity/npc/Villager.java @@ -34,7 +34,6 @@ import net.minecraft.stats.Stats; import net.minecraft.tags.ItemTags; import net.minecraft.util.Mth; import net.minecraft.util.SpawnUtil; -import net.minecraft.util.SpawnUtil.Strategy; import net.minecraft.util.profiling.Profiler; import net.minecraft.util.profiling.ProfilerFiller; import net.minecraft.world.Difficulty; @@ -57,15 +56,15 @@ import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.ReputationEventHandler; import net.minecraft.world.entity.SpawnGroupData; import net.minecraft.world.entity.ai.Brain; -import net.minecraft.world.entity.ai.Brain.Provider; +import net.minecraft.world.entity.ai.attributes.AttributeSupplier; import net.minecraft.world.entity.ai.attributes.Attributes; -import net.minecraft.world.entity.ai.attributes.AttributeSupplier.Builder; import net.minecraft.world.entity.ai.behavior.VillagerGoalPackages; import net.minecraft.world.entity.ai.gossip.GossipContainer; import net.minecraft.world.entity.ai.gossip.GossipType; import net.minecraft.world.entity.ai.memory.MemoryModuleType; import net.minecraft.world.entity.ai.memory.MemoryStatus; import net.minecraft.world.entity.ai.memory.NearestVisibleLivingEntities; +import net.minecraft.world.entity.ai.navigation.GroundPathNavigation; import net.minecraft.world.entity.ai.sensing.GolemSensor; import net.minecraft.world.entity.ai.sensing.Sensor; import net.minecraft.world.entity.ai.sensing.SensorType; @@ -75,7 +74,6 @@ import net.minecraft.world.entity.ai.village.poi.PoiType; import net.minecraft.world.entity.ai.village.poi.PoiTypes; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.monster.Witch; -import net.minecraft.world.entity.npc.VillagerTrades.ItemListing; import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.raid.Raid; import net.minecraft.world.entity.schedule.Activity; @@ -195,7 +193,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler public Villager(EntityType entityType, Level level, Holder villagerType) { super(entityType, level); - this.getNavigation().setCanOpenDoors(true); + ((GroundPathNavigation)this.getNavigation()).setCanOpenDoors(true); this.getNavigation().setCanFloat(true); this.getNavigation().setRequiredPathLength(48.0F); this.setCanPickUpLoot(true); @@ -208,7 +206,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler } @Override - protected Provider brainProvider() { + protected Brain.Provider brainProvider() { return Brain.provider(MEMORY_TYPES, SENSOR_TYPES); } @@ -262,7 +260,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler } } - public static Builder createAttributes() { + public static AttributeSupplier.Builder createAttributes() { return Mob.createMobAttributes().add(Attributes.MOVEMENT_SPEED, 0.5); } @@ -491,7 +489,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler } @Override - protected void defineSynchedData(net.minecraft.network.syncher.SynchedEntityData.Builder builder) { + protected void defineSynchedData(SynchedEntityData.Builder builder) { super.defineSynchedData(builder); builder.define(DATA_VILLAGER_DATA, createDefaultVillagerData()); } @@ -833,16 +831,17 @@ public class Villager extends AbstractVillager implements ReputationEventHandler VillagerData villagerData = this.getVillagerData(); ResourceKey resourceKey = (ResourceKey)villagerData.profession().unwrapKey().orElse(null); if (resourceKey != null) { - Int2ObjectMap int2ObjectMap2; + Int2ObjectMap int2ObjectMap2; if (this.level().enabledFeatures().contains(FeatureFlags.TRADE_REBALANCE)) { - Int2ObjectMap int2ObjectMap = (Int2ObjectMap)VillagerTrades.EXPERIMENTAL_TRADES.get(resourceKey); + Int2ObjectMap int2ObjectMap = (Int2ObjectMap)VillagerTrades.EXPERIMENTAL_TRADES + .get(resourceKey); int2ObjectMap2 = int2ObjectMap != null ? int2ObjectMap : (Int2ObjectMap)VillagerTrades.TRADES.get(resourceKey); } else { - int2ObjectMap2 = (Int2ObjectMap)VillagerTrades.TRADES.get(resourceKey); + int2ObjectMap2 = (Int2ObjectMap)VillagerTrades.TRADES.get(resourceKey); } if (int2ObjectMap2 != null && !int2ObjectMap2.isEmpty()) { - ItemListing[] itemListings = int2ObjectMap2.get(villagerData.level()); + VillagerTrades.ItemListing[] itemListings = int2ObjectMap2.get(villagerData.level()); if (itemListings != null) { MerchantOffers merchantOffers = this.getOffers(); this.addOffersFromItemListings(merchantOffers, itemListings, 2); @@ -878,7 +877,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler List list2 = list.stream().filter(villager -> villager.wantsToSpawnGolem(gameTime)).limit(5L).toList(); if (list2.size() >= minVillagerAmount) { if (!SpawnUtil.trySpawnMob( - EntityType.IRON_GOLEM, EntitySpawnReason.MOB_SUMMONED, serverLevel, this.blockPosition(), 10, 8, 6, Strategy.LEGACY_IRON_GOLEM, false + EntityType.IRON_GOLEM, EntitySpawnReason.MOB_SUMMONED, serverLevel, this.blockPosition(), 10, 8, 6, SpawnUtil.Strategy.LEGACY_IRON_GOLEM, false ) .isEmpty()) { list.forEach(GolemSensor::golemDetected); diff --git a/net/minecraft/world/entity/npc/WanderingTrader.java b/net/minecraft/world/entity/npc/WanderingTrader.java index 69b2d7c0..0ff57b9b 100644 --- a/net/minecraft/world/entity/npc/WanderingTrader.java +++ b/net/minecraft/world/entity/npc/WanderingTrader.java @@ -24,7 +24,6 @@ import net.minecraft.world.entity.ai.goal.PanicGoal; import net.minecraft.world.entity.ai.goal.TradeWithPlayerGoal; import net.minecraft.world.entity.ai.goal.UseItemGoal; import net.minecraft.world.entity.ai.goal.WaterAvoidingRandomStrollGoal; -import net.minecraft.world.entity.ai.goal.Goal.Flag; import net.minecraft.world.entity.monster.Evoker; import net.minecraft.world.entity.monster.Illusioner; import net.minecraft.world.entity.monster.Pillager; @@ -32,7 +31,6 @@ import net.minecraft.world.entity.monster.Vex; import net.minecraft.world.entity.monster.Vindicator; import net.minecraft.world.entity.monster.Zoglin; import net.minecraft.world.entity.monster.Zombie; -import net.minecraft.world.entity.npc.VillagerTrades.ItemListing; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -136,8 +134,8 @@ public class WanderingTrader extends AbstractVillager implements Consumable.Over protected void updateTrades() { MerchantOffers merchantOffers = this.getOffers(); - for (Pair pair : VillagerTrades.WANDERING_TRADER_TRADES) { - ItemListing[] itemListings = pair.getLeft(); + for (Pair pair : VillagerTrades.WANDERING_TRADER_TRADES) { + VillagerTrades.ItemListing[] itemListings = pair.getLeft(); this.addOffersFromItemListings(merchantOffers, itemListings, pair.getRight()); } } @@ -240,7 +238,7 @@ public class WanderingTrader extends AbstractVillager implements Consumable.Over this.trader = trader; this.stopDistance = stopDistance; this.speedModifier = speedModifier; - this.setFlags(EnumSet.of(Flag.MOVE)); + this.setFlags(EnumSet.of(Goal.Flag.MOVE)); } @Override diff --git a/net/minecraft/world/item/CreativeModeTabs.java b/net/minecraft/world/item/CreativeModeTabs.java index 99ce93ea..33f88c95 100644 --- a/net/minecraft/world/item/CreativeModeTabs.java +++ b/net/minecraft/world/item/CreativeModeTabs.java @@ -12,8 +12,6 @@ import java.util.stream.Stream; import net.minecraft.core.Holder; import net.minecraft.core.HolderLookup; import net.minecraft.core.Registry; -import net.minecraft.core.HolderLookup.Provider; -import net.minecraft.core.HolderLookup.RegistryLookup; import net.minecraft.core.component.DataComponents; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; @@ -29,11 +27,6 @@ import net.minecraft.tags.TagKey; import net.minecraft.world.entity.decoration.PaintingVariant; import net.minecraft.world.entity.raid.Raid; import net.minecraft.world.flag.FeatureFlagSet; -import net.minecraft.world.item.CreativeModeTab.ItemDisplayParameters; -import net.minecraft.world.item.CreativeModeTab.Output; -import net.minecraft.world.item.CreativeModeTab.Row; -import net.minecraft.world.item.CreativeModeTab.TabVisibility; -import net.minecraft.world.item.CreativeModeTab.Type; import net.minecraft.world.item.alchemy.Potion; import net.minecraft.world.item.alchemy.PotionContents; import net.minecraft.world.item.component.Fireworks; @@ -69,7 +62,7 @@ public class CreativeModeTabs { Holder::value, Comparator.comparingInt(PaintingVariant::area).thenComparing(PaintingVariant::width) ); @Nullable - private static ItemDisplayParameters CACHED_PARAMETERS; + private static CreativeModeTab.ItemDisplayParameters CACHED_PARAMETERS; private static ResourceKey createKey(String name) { return ResourceKey.create(Registries.CREATIVE_MODE_TAB, ResourceLocation.withDefaultNamespace(name)); @@ -79,7 +72,7 @@ public class CreativeModeTabs { Registry.register( registry, BUILDING_BLOCKS, - CreativeModeTab.builder(Row.TOP, 0) + CreativeModeTab.builder(CreativeModeTab.Row.TOP, 0) .title(Component.translatable("itemGroup.buildingBlocks")) .icon(() -> new ItemStack(Blocks.BRICKS)) .displayItems((itemDisplayParameters, output) -> { @@ -509,7 +502,7 @@ public class CreativeModeTabs { Registry.register( registry, COLORED_BLOCKS, - CreativeModeTab.builder(Row.TOP, 1) + CreativeModeTab.builder(CreativeModeTab.Row.TOP, 1) .title(Component.translatable("itemGroup.coloredBlocks")) .icon(() -> new ItemStack(Blocks.CYAN_WOOL)) .displayItems((itemDisplayParameters, output) -> { @@ -717,7 +710,7 @@ public class CreativeModeTabs { Registry.register( registry, NATURAL_BLOCKS, - CreativeModeTab.builder(Row.TOP, 2) + CreativeModeTab.builder(CreativeModeTab.Row.TOP, 2) .title(Component.translatable("itemGroup.natural")) .icon(() -> new ItemStack(Blocks.GRASS_BLOCK)) .displayItems((itemDisplayParameters, output) -> { @@ -970,7 +963,7 @@ public class CreativeModeTabs { Registry.register( registry, FUNCTIONAL_BLOCKS, - CreativeModeTab.builder(Row.TOP, 3) + CreativeModeTab.builder(CreativeModeTab.Row.TOP, 3) .title(Component.translatable("itemGroup.functional")) .icon(() -> new ItemStack(Items.OAK_SIGN)) .displayItems( @@ -1043,7 +1036,11 @@ public class CreativeModeTabs { .lookup(Registries.PAINTING_VARIANT) .ifPresent( registryLookup -> generatePresetPaintings( - output, itemDisplayParameters.holders(), registryLookup, holder -> holder.is(PaintingVariantTags.PLACEABLE), TabVisibility.PARENT_AND_SEARCH_TABS + output, + itemDisplayParameters.holders(), + registryLookup, + holder -> holder.is(PaintingVariantTags.PLACEABLE), + CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS ) ); output.accept(Items.BOOKSHELF); @@ -1170,7 +1167,7 @@ public class CreativeModeTabs { Registry.register( registry, REDSTONE_BLOCKS, - CreativeModeTab.builder(Row.TOP, 4) + CreativeModeTab.builder(CreativeModeTab.Row.TOP, 4) .title(Component.translatable("itemGroup.redstone")) .icon(() -> new ItemStack(Items.REDSTONE)) .displayItems((itemDisplayParameters, output) -> { @@ -1248,24 +1245,24 @@ public class CreativeModeTabs { Registry.register( registry, HOTBAR, - CreativeModeTab.builder(Row.TOP, 5) + CreativeModeTab.builder(CreativeModeTab.Row.TOP, 5) .title(Component.translatable("itemGroup.hotbar")) .icon(() -> new ItemStack(Blocks.BOOKSHELF)) .alignedRight() - .type(Type.HOTBAR) + .type(CreativeModeTab.Type.HOTBAR) .build() ); Registry.register( registry, SEARCH, - CreativeModeTab.builder(Row.TOP, 6) + CreativeModeTab.builder(CreativeModeTab.Row.TOP, 6) .title(Component.translatable("itemGroup.search")) .icon(() -> new ItemStack(Items.COMPASS)) .displayItems((itemDisplayParameters, output) -> { Set set = ItemStackLinkedSet.createTypeAndComponentsSet(); for (CreativeModeTab creativeModeTab : registry) { - if (creativeModeTab.getType() != Type.SEARCH) { + if (creativeModeTab.getType() != CreativeModeTab.Type.SEARCH) { set.addAll(creativeModeTab.getSearchTabDisplayItems()); } } @@ -1274,13 +1271,13 @@ public class CreativeModeTabs { }) .backgroundTexture(SEARCH_BACKGROUND) .alignedRight() - .type(Type.SEARCH) + .type(CreativeModeTab.Type.SEARCH) .build() ); Registry.register( registry, TOOLS_AND_UTILITIES, - CreativeModeTab.builder(Row.BOTTOM, 0) + CreativeModeTab.builder(CreativeModeTab.Row.BOTTOM, 0) .title(Component.translatable("itemGroup.tools")) .icon(() -> new ItemStack(Items.DIAMOND_PICKAXE)) .displayItems( @@ -1355,7 +1352,7 @@ public class CreativeModeTabs { output.accept(Items.ENDER_PEARL); output.accept(Items.ENDER_EYE); output.accept(Items.ELYTRA); - generateFireworksAllDurations(output, TabVisibility.PARENT_AND_SEARCH_TABS); + generateFireworksAllDurations(output, CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); output.accept(Items.SADDLE); output.accept(Items.WHITE_HARNESS); output.accept(Items.LIGHT_GRAY_HARNESS); @@ -1407,7 +1404,9 @@ public class CreativeModeTabs { itemDisplayParameters.holders() .lookup(Registries.INSTRUMENT) .ifPresent( - registryLookup -> generateInstrumentTypes(output, registryLookup, Items.GOAT_HORN, InstrumentTags.GOAT_HORNS, TabVisibility.PARENT_AND_SEARCH_TABS) + registryLookup -> generateInstrumentTypes( + output, registryLookup, Items.GOAT_HORN, InstrumentTags.GOAT_HORNS, CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS + ) ); output.accept(Items.MUSIC_DISC_13); output.accept(Items.MUSIC_DISC_CAT); @@ -1429,7 +1428,6 @@ public class CreativeModeTabs { output.accept(Items.MUSIC_DISC_5); output.accept(Items.MUSIC_DISC_PIGSTEP); output.accept(Items.MUSIC_DISC_TEARS); - output.accept(Items.MUSIC_DISC_LAVA_CHICKEN); } ) .build() @@ -1437,7 +1435,7 @@ public class CreativeModeTabs { Registry.register( registry, COMBAT, - CreativeModeTab.builder(Row.BOTTOM, 1) + CreativeModeTab.builder(CreativeModeTab.Row.BOTTOM, 1) .title(Component.translatable("itemGroup.combat")) .icon(() -> new ItemStack(Items.NETHERITE_SWORD)) .displayItems( @@ -1497,14 +1495,14 @@ public class CreativeModeTabs { output.accept(Items.WIND_CHARGE); output.accept(Items.BOW); output.accept(Items.CROSSBOW); - generateFireworksAllDurations(output, TabVisibility.PARENT_AND_SEARCH_TABS); + generateFireworksAllDurations(output, CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); output.accept(Items.ARROW); output.accept(Items.SPECTRAL_ARROW); itemDisplayParameters.holders() .lookup(Registries.POTION) .ifPresent( registryLookup -> generatePotionEffectTypes( - output, registryLookup, Items.TIPPED_ARROW, TabVisibility.PARENT_AND_SEARCH_TABS, itemDisplayParameters.enabledFeatures() + output, registryLookup, Items.TIPPED_ARROW, CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS, itemDisplayParameters.enabledFeatures() ) ); } @@ -1514,65 +1512,77 @@ public class CreativeModeTabs { Registry.register( registry, FOOD_AND_DRINKS, - CreativeModeTab.builder(Row.BOTTOM, 2) + CreativeModeTab.builder(CreativeModeTab.Row.BOTTOM, 2) .title(Component.translatable("itemGroup.foodAndDrink")) .icon(() -> new ItemStack(Items.GOLDEN_APPLE)) - .displayItems((itemDisplayParameters, output) -> { - output.accept(Items.APPLE); - output.accept(Items.GOLDEN_APPLE); - output.accept(Items.ENCHANTED_GOLDEN_APPLE); - output.accept(Items.MELON_SLICE); - output.accept(Items.SWEET_BERRIES); - output.accept(Items.GLOW_BERRIES); - output.accept(Items.CHORUS_FRUIT); - output.accept(Items.CARROT); - output.accept(Items.GOLDEN_CARROT); - output.accept(Items.POTATO); - output.accept(Items.BAKED_POTATO); - output.accept(Items.POISONOUS_POTATO); - output.accept(Items.BEETROOT); - output.accept(Items.DRIED_KELP); - output.accept(Items.BEEF); - output.accept(Items.COOKED_BEEF); - output.accept(Items.PORKCHOP); - output.accept(Items.COOKED_PORKCHOP); - output.accept(Items.MUTTON); - output.accept(Items.COOKED_MUTTON); - output.accept(Items.CHICKEN); - output.accept(Items.COOKED_CHICKEN); - output.accept(Items.RABBIT); - output.accept(Items.COOKED_RABBIT); - output.accept(Items.COD); - output.accept(Items.COOKED_COD); - output.accept(Items.SALMON); - output.accept(Items.COOKED_SALMON); - output.accept(Items.TROPICAL_FISH); - output.accept(Items.PUFFERFISH); - output.accept(Items.BREAD); - output.accept(Items.COOKIE); - output.accept(Items.CAKE); - output.accept(Items.PUMPKIN_PIE); - output.accept(Items.ROTTEN_FLESH); - output.accept(Items.SPIDER_EYE); - output.accept(Items.MUSHROOM_STEW); - output.accept(Items.BEETROOT_SOUP); - output.accept(Items.RABBIT_STEW); - generateSuspiciousStews(output, TabVisibility.PARENT_AND_SEARCH_TABS); - output.accept(Items.MILK_BUCKET); - output.accept(Items.HONEY_BOTTLE); - generateOminousBottles(output, TabVisibility.PARENT_AND_SEARCH_TABS); - itemDisplayParameters.holders().lookup(Registries.POTION).ifPresent(registryLookup -> { - generatePotionEffectTypes(output, registryLookup, Items.POTION, TabVisibility.PARENT_AND_SEARCH_TABS, itemDisplayParameters.enabledFeatures()); - generatePotionEffectTypes(output, registryLookup, Items.SPLASH_POTION, TabVisibility.PARENT_AND_SEARCH_TABS, itemDisplayParameters.enabledFeatures()); - generatePotionEffectTypes(output, registryLookup, Items.LINGERING_POTION, TabVisibility.PARENT_AND_SEARCH_TABS, itemDisplayParameters.enabledFeatures()); - }); - }) + .displayItems( + (itemDisplayParameters, output) -> { + output.accept(Items.APPLE); + output.accept(Items.GOLDEN_APPLE); + output.accept(Items.ENCHANTED_GOLDEN_APPLE); + output.accept(Items.MELON_SLICE); + output.accept(Items.SWEET_BERRIES); + output.accept(Items.GLOW_BERRIES); + output.accept(Items.CHORUS_FRUIT); + output.accept(Items.CARROT); + output.accept(Items.GOLDEN_CARROT); + output.accept(Items.POTATO); + output.accept(Items.BAKED_POTATO); + output.accept(Items.POISONOUS_POTATO); + output.accept(Items.BEETROOT); + output.accept(Items.DRIED_KELP); + output.accept(Items.BEEF); + output.accept(Items.COOKED_BEEF); + output.accept(Items.PORKCHOP); + output.accept(Items.COOKED_PORKCHOP); + output.accept(Items.MUTTON); + output.accept(Items.COOKED_MUTTON); + output.accept(Items.CHICKEN); + output.accept(Items.COOKED_CHICKEN); + output.accept(Items.RABBIT); + output.accept(Items.COOKED_RABBIT); + output.accept(Items.COD); + output.accept(Items.COOKED_COD); + output.accept(Items.SALMON); + output.accept(Items.COOKED_SALMON); + output.accept(Items.TROPICAL_FISH); + output.accept(Items.PUFFERFISH); + output.accept(Items.BREAD); + output.accept(Items.COOKIE); + output.accept(Items.CAKE); + output.accept(Items.PUMPKIN_PIE); + output.accept(Items.ROTTEN_FLESH); + output.accept(Items.SPIDER_EYE); + output.accept(Items.MUSHROOM_STEW); + output.accept(Items.BEETROOT_SOUP); + output.accept(Items.RABBIT_STEW); + generateSuspiciousStews(output, CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); + output.accept(Items.MILK_BUCKET); + output.accept(Items.HONEY_BOTTLE); + generateOminousBottles(output, CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); + itemDisplayParameters.holders() + .lookup(Registries.POTION) + .ifPresent( + registryLookup -> { + generatePotionEffectTypes( + output, registryLookup, Items.POTION, CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS, itemDisplayParameters.enabledFeatures() + ); + generatePotionEffectTypes( + output, registryLookup, Items.SPLASH_POTION, CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS, itemDisplayParameters.enabledFeatures() + ); + generatePotionEffectTypes( + output, registryLookup, Items.LINGERING_POTION, CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS, itemDisplayParameters.enabledFeatures() + ); + } + ); + } + ) .build() ); Registry.register( registry, INGREDIENTS, - CreativeModeTab.builder(Row.BOTTOM, 3) + CreativeModeTab.builder(CreativeModeTab.Row.BOTTOM, 3) .title(Component.translatable("itemGroup.ingredients")) .icon(() -> new ItemStack(Items.IRON_INGOT)) .displayItems((itemDisplayParameters, output) -> { @@ -1727,8 +1737,8 @@ public class CreativeModeTabs { output.accept(Items.TRIAL_KEY); output.accept(Items.OMINOUS_TRIAL_KEY); itemDisplayParameters.holders().lookup(Registries.ENCHANTMENT).ifPresent(registryLookup -> { - generateEnchantmentBookTypesOnlyMaxLevel(output, registryLookup, TabVisibility.PARENT_TAB_ONLY); - generateEnchantmentBookTypesAllLevels(output, registryLookup, TabVisibility.SEARCH_TAB_ONLY); + generateEnchantmentBookTypesOnlyMaxLevel(output, registryLookup, CreativeModeTab.TabVisibility.PARENT_TAB_ONLY); + generateEnchantmentBookTypesAllLevels(output, registryLookup, CreativeModeTab.TabVisibility.SEARCH_TAB_ONLY); }); }) .build() @@ -1736,7 +1746,7 @@ public class CreativeModeTabs { Registry.register( registry, SPAWN_EGGS, - CreativeModeTab.builder(Row.BOTTOM, 4) + CreativeModeTab.builder(CreativeModeTab.Row.BOTTOM, 4) .title(Component.translatable("itemGroup.spawnEggs")) .icon(() -> new ItemStack(Items.CREEPER_SPAWN_EGG)) .displayItems((itemDisplayParameters, output) -> { @@ -1829,7 +1839,7 @@ public class CreativeModeTabs { Registry.register( registry, OP_BLOCKS, - CreativeModeTab.builder(Row.BOTTOM, 5) + CreativeModeTab.builder(CreativeModeTab.Row.BOTTOM, 5) .title(Component.translatable("itemGroup.op")) .icon(() -> new ItemStack(Items.COMMAND_BLOCK)) .alignedRight() @@ -1859,7 +1869,11 @@ public class CreativeModeTabs { .lookup(Registries.PAINTING_VARIANT) .ifPresent( registryLookup -> generatePresetPaintings( - output, itemDisplayParameters.holders(), registryLookup, holder -> !holder.is(PaintingVariantTags.PLACEABLE), TabVisibility.PARENT_AND_SEARCH_TABS + output, + itemDisplayParameters.holders(), + registryLookup, + holder -> !holder.is(PaintingVariantTags.PLACEABLE), + CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS ) ); } @@ -1870,20 +1884,20 @@ public class CreativeModeTabs { return Registry.register( registry, INVENTORY, - CreativeModeTab.builder(Row.BOTTOM, 6) + CreativeModeTab.builder(CreativeModeTab.Row.BOTTOM, 6) .title(Component.translatable("itemGroup.inventory")) .icon(() -> new ItemStack(Blocks.CHEST)) .backgroundTexture(INVENTORY_BACKGROUND) .hideTitle() .alignedRight() - .type(Type.INVENTORY) + .type(CreativeModeTab.Type.INVENTORY) .noScrollBar() .build() ); } public static void validate() { - Map, String> map = new HashMap(); + Map, String> map = new HashMap(); for (ResourceKey resourceKey : BuiltInRegistries.CREATIVE_MODE_TAB.registryKeySet()) { CreativeModeTab creativeModeTab = BuiltInRegistries.CREATIVE_MODE_TAB.getValueOrThrow(resourceKey); @@ -1900,7 +1914,7 @@ public class CreativeModeTabs { } private static void generatePotionEffectTypes( - Output output, HolderLookup potions, Item item, TabVisibility tabVisibility, FeatureFlagSet requiredFeatures + CreativeModeTab.Output output, HolderLookup potions, Item item, CreativeModeTab.TabVisibility tabVisibility, FeatureFlagSet requiredFeatures ) { potions.listElements() .filter(reference -> ((Potion)reference.value()).isEnabled(requiredFeatures)) @@ -1908,13 +1922,17 @@ public class CreativeModeTabs { .forEach(itemStack -> output.accept(itemStack, tabVisibility)); } - private static void generateEnchantmentBookTypesOnlyMaxLevel(Output output, HolderLookup enchantments, TabVisibility tabVisibility) { + private static void generateEnchantmentBookTypesOnlyMaxLevel( + CreativeModeTab.Output output, HolderLookup enchantments, CreativeModeTab.TabVisibility tabVisibility + ) { enchantments.listElements() .map(reference -> EnchantmentHelper.createBook(new EnchantmentInstance(reference, ((Enchantment)reference.value()).getMaxLevel()))) .forEach(itemStack -> output.accept(itemStack, tabVisibility)); } - private static void generateEnchantmentBookTypesAllLevels(Output output, HolderLookup enchantments, TabVisibility tabVisibility) { + private static void generateEnchantmentBookTypesAllLevels( + CreativeModeTab.Output output, HolderLookup enchantments, CreativeModeTab.TabVisibility tabVisibility + ) { enchantments.listElements() .flatMap( reference -> IntStream.rangeClosed(((Enchantment)reference.value()).getMinLevel(), ((Enchantment)reference.value()).getMaxLevel()) @@ -1924,13 +1942,13 @@ public class CreativeModeTabs { } private static void generateInstrumentTypes( - Output output, HolderLookup instruments, Item item, TagKey instrument, TabVisibility tabVisibility + CreativeModeTab.Output output, HolderLookup instruments, Item item, TagKey instrument, CreativeModeTab.TabVisibility tabVisibility ) { instruments.get(instrument) .ifPresent(named -> named.stream().map(holder -> InstrumentItem.create(item, holder)).forEach(itemStack -> output.accept(itemStack, tabVisibility))); } - private static void generateSuspiciousStews(Output output, TabVisibility tabVisibility) { + private static void generateSuspiciousStews(CreativeModeTab.Output output, CreativeModeTab.TabVisibility tabVisibility) { List list = SuspiciousEffectHolder.getAllEffectHolders(); Set set = ItemStackLinkedSet.createTypeAndComponentsSet(); @@ -1943,7 +1961,7 @@ public class CreativeModeTabs { output.acceptAll(set, tabVisibility); } - private static void generateOminousBottles(Output output, TabVisibility tabVisibility) { + private static void generateOminousBottles(CreativeModeTab.Output output, CreativeModeTab.TabVisibility tabVisibility) { for (int i = 0; i <= 4; i++) { ItemStack itemStack = new ItemStack(Items.OMINOUS_BOTTLE); itemStack.set(DataComponents.OMINOUS_BOTTLE_AMPLIFIER, new OminousBottleAmplifier(i)); @@ -1951,7 +1969,7 @@ public class CreativeModeTabs { } } - private static void generateFireworksAllDurations(Output output, TabVisibility tabVisibility) { + private static void generateFireworksAllDurations(CreativeModeTab.Output output, CreativeModeTab.TabVisibility tabVisibility) { for (byte b : FireworkRocketItem.CRAFTABLE_DURATIONS) { ItemStack itemStack = new ItemStack(Items.FIREWORK_ROCKET); itemStack.set(DataComponents.FIREWORKS, new Fireworks(b, List.of())); @@ -1960,11 +1978,11 @@ public class CreativeModeTabs { } private static void generatePresetPaintings( - Output output, - Provider registries, - RegistryLookup paintingVariants, + CreativeModeTab.Output output, + HolderLookup.Provider registries, + HolderLookup.RegistryLookup paintingVariants, Predicate> predicate, - TabVisibility tabVisibility + CreativeModeTab.TabVisibility tabVisibility ) { RegistryOps registryOps = registries.createSerializationContext(NbtOps.INSTANCE); paintingVariants.listElements().filter(predicate).sorted(PAINTING_COMPARATOR).forEach(reference -> { @@ -1990,16 +2008,20 @@ public class CreativeModeTabs { return BuiltInRegistries.CREATIVE_MODE_TAB.getValueOrThrow(SEARCH); } - private static void buildAllTabContents(ItemDisplayParameters parameters) { - streamAllTabs().filter(creativeModeTab -> creativeModeTab.getType() == Type.CATEGORY).forEach(creativeModeTab -> creativeModeTab.buildContents(parameters)); - streamAllTabs().filter(creativeModeTab -> creativeModeTab.getType() != Type.CATEGORY).forEach(creativeModeTab -> creativeModeTab.buildContents(parameters)); + private static void buildAllTabContents(CreativeModeTab.ItemDisplayParameters parameters) { + streamAllTabs() + .filter(creativeModeTab -> creativeModeTab.getType() == CreativeModeTab.Type.CATEGORY) + .forEach(creativeModeTab -> creativeModeTab.buildContents(parameters)); + streamAllTabs() + .filter(creativeModeTab -> creativeModeTab.getType() != CreativeModeTab.Type.CATEGORY) + .forEach(creativeModeTab -> creativeModeTab.buildContents(parameters)); } - public static boolean tryRebuildTabContents(FeatureFlagSet enabledFeatures, boolean hasPermissions, Provider registries) { + public static boolean tryRebuildTabContents(FeatureFlagSet enabledFeatures, boolean hasPermissions, HolderLookup.Provider registries) { if (CACHED_PARAMETERS != null && !CACHED_PARAMETERS.needsUpdate(enabledFeatures, hasPermissions, registries)) { return false; } else { - CACHED_PARAMETERS = new ItemDisplayParameters(enabledFeatures, hasPermissions, registries); + CACHED_PARAMETERS = new CreativeModeTab.ItemDisplayParameters(enabledFeatures, hasPermissions, registries); buildAllTabContents(CACHED_PARAMETERS); return true; } diff --git a/net/minecraft/world/item/Items.java b/net/minecraft/world/item/Items.java index a0ec7519..103ab0e9 100644 --- a/net/minecraft/world/item/Items.java +++ b/net/minecraft/world/item/Items.java @@ -21,7 +21,6 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.animal.ChickenVariants; import net.minecraft.world.food.Foods; -import net.minecraft.world.item.Item.Properties; import net.minecraft.world.item.alchemy.PotionContents; import net.minecraft.world.item.component.Bees; import net.minecraft.world.item.component.BlockItemStateProperties; @@ -42,8 +41,6 @@ import net.minecraft.world.item.component.OminousBottleAmplifier; import net.minecraft.world.item.component.SuspiciousStewEffects; import net.minecraft.world.item.component.Weapon; import net.minecraft.world.item.component.WritableBookContent; -import net.minecraft.world.item.component.BlocksAttacks.DamageReduction; -import net.minecraft.world.item.component.BlocksAttacks.ItemDamageFunction; import net.minecraft.world.item.enchantment.ItemEnchantments; import net.minecraft.world.item.equipment.ArmorMaterials; import net.minecraft.world.item.equipment.ArmorType; @@ -144,19 +141,19 @@ public class Items { public static final Item DEEPSLATE_DIAMOND_ORE = registerBlock(Blocks.DEEPSLATE_DIAMOND_ORE); public static final Item NETHER_GOLD_ORE = registerBlock(Blocks.NETHER_GOLD_ORE); public static final Item NETHER_QUARTZ_ORE = registerBlock(Blocks.NETHER_QUARTZ_ORE); - public static final Item ANCIENT_DEBRIS = registerBlock(Blocks.ANCIENT_DEBRIS, new Properties().fireResistant()); + public static final Item ANCIENT_DEBRIS = registerBlock(Blocks.ANCIENT_DEBRIS, new Item.Properties().fireResistant()); public static final Item COAL_BLOCK = registerBlock(Blocks.COAL_BLOCK); public static final Item RAW_IRON_BLOCK = registerBlock(Blocks.RAW_IRON_BLOCK); public static final Item RAW_COPPER_BLOCK = registerBlock(Blocks.RAW_COPPER_BLOCK); public static final Item RAW_GOLD_BLOCK = registerBlock(Blocks.RAW_GOLD_BLOCK); - public static final Item HEAVY_CORE = registerBlock(Blocks.HEAVY_CORE, new Properties().rarity(Rarity.EPIC)); + public static final Item HEAVY_CORE = registerBlock(Blocks.HEAVY_CORE, new Item.Properties().rarity(Rarity.EPIC)); public static final Item AMETHYST_BLOCK = registerBlock(Blocks.AMETHYST_BLOCK); public static final Item BUDDING_AMETHYST = registerBlock(Blocks.BUDDING_AMETHYST); public static final Item IRON_BLOCK = registerBlock(Blocks.IRON_BLOCK); public static final Item COPPER_BLOCK = registerBlock(Blocks.COPPER_BLOCK); public static final Item GOLD_BLOCK = registerBlock(Blocks.GOLD_BLOCK); public static final Item DIAMOND_BLOCK = registerBlock(Blocks.DIAMOND_BLOCK); - public static final Item NETHERITE_BLOCK = registerBlock(Blocks.NETHERITE_BLOCK, new Properties().fireResistant()); + public static final Item NETHERITE_BLOCK = registerBlock(Blocks.NETHERITE_BLOCK, new Item.Properties().fireResistant()); public static final Item EXPOSED_COPPER = registerBlock(Blocks.EXPOSED_COPPER); public static final Item WEATHERED_COPPER = registerBlock(Blocks.WEATHERED_COPPER); public static final Item OXIDIZED_COPPER = registerBlock(Blocks.OXIDIZED_COPPER); @@ -369,17 +366,17 @@ public class Items { public static final Item BRICKS = registerBlock(Blocks.BRICKS); public static final Item BOOKSHELF = registerBlock(Blocks.BOOKSHELF); public static final Item CHISELED_BOOKSHELF = registerBlock( - Blocks.CHISELED_BOOKSHELF, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) + Blocks.CHISELED_BOOKSHELF, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) ); public static final Item DECORATED_POT = registerBlock( Blocks.DECORATED_POT, - new Properties().component(DataComponents.POT_DECORATIONS, PotDecorations.EMPTY).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + new Item.Properties().component(DataComponents.POT_DECORATIONS, PotDecorations.EMPTY).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) ); public static final Item MOSSY_COBBLESTONE = registerBlock(Blocks.MOSSY_COBBLESTONE); public static final Item OBSIDIAN = registerBlock(Blocks.OBSIDIAN); public static final Item TORCH = registerBlock( Blocks.TORCH, - (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.WALL_TORCH, Direction.DOWN, properties)) + (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.WALL_TORCH, Direction.DOWN, properties)) ); public static final Item END_ROD = registerBlock(Blocks.END_ROD); public static final Item CHORUS_PLANT = registerBlock(Blocks.CHORUS_PLANT); @@ -390,12 +387,12 @@ public class Items { public static final Item SPAWNER = registerBlock(Blocks.SPAWNER); public static final Item CREAKING_HEART = registerBlock(Blocks.CREAKING_HEART); public static final Item CHEST = registerBlock( - Blocks.CHEST, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) + Blocks.CHEST, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) ); public static final Item CRAFTING_TABLE = registerBlock(Blocks.CRAFTING_TABLE); public static final Item FARMLAND = registerBlock(Blocks.FARMLAND); public static final Item FURNACE = registerBlock( - Blocks.FURNACE, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) + Blocks.FURNACE, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) ); public static final Item LADDER = registerBlock(Blocks.LADDER); public static final Item COBBLESTONE_STAIRS = registerBlock(Blocks.COBBLESTONE_STAIRS); @@ -421,7 +418,7 @@ public class Items { public static final Item PUMPKIN = registerBlock(Blocks.PUMPKIN); public static final Item CARVED_PUMPKIN = registerBlock( Blocks.CARVED_PUMPKIN, - (UnaryOperator)(properties -> Waypoint.addHideAttribute(properties) + (UnaryOperator)(properties -> Waypoint.addHideAttribute(properties) .component( DataComponents.EQUIPPABLE, Equippable.builder(EquipmentSlot.HEAD).setSwappable(false).setCameraOverlay(ResourceLocation.withDefaultNamespace("misc/pumpkinblur")).build() @@ -436,7 +433,7 @@ public class Items { public static final Item SMOOTH_BASALT = registerBlock(Blocks.SMOOTH_BASALT); public static final Item SOUL_TORCH = registerBlock( Blocks.SOUL_TORCH, - (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.SOUL_WALL_TORCH, Direction.DOWN, properties)) + (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.SOUL_WALL_TORCH, Direction.DOWN, properties)) ); public static final Item GLOWSTONE = registerBlock(Blocks.GLOWSTONE); public static final Item INFESTED_STONE = registerBlock(Blocks.INFESTED_STONE); @@ -492,7 +489,7 @@ public class Items { public static final Item END_PORTAL_FRAME = registerBlock(Blocks.END_PORTAL_FRAME); public static final Item END_STONE = registerBlock(Blocks.END_STONE); public static final Item END_STONE_BRICKS = registerBlock(Blocks.END_STONE_BRICKS); - public static final Item DRAGON_EGG = registerBlock(Blocks.DRAGON_EGG, new Properties().rarity(Rarity.EPIC)); + public static final Item DRAGON_EGG = registerBlock(Blocks.DRAGON_EGG, new Item.Properties().rarity(Rarity.EPIC)); public static final Item SANDSTONE_STAIRS = registerBlock(Blocks.SANDSTONE_STAIRS); public static final Item ENDER_CHEST = registerBlock(Blocks.ENDER_CHEST); public static final Item EMERALD_BLOCK = registerBlock(Blocks.EMERALD_BLOCK); @@ -509,8 +506,8 @@ public class Items { public static final Item BAMBOO_MOSAIC_STAIRS = registerBlock(Blocks.BAMBOO_MOSAIC_STAIRS); public static final Item CRIMSON_STAIRS = registerBlock(Blocks.CRIMSON_STAIRS); public static final Item WARPED_STAIRS = registerBlock(Blocks.WARPED_STAIRS); - public static final Item COMMAND_BLOCK = registerBlock(Blocks.COMMAND_BLOCK, GameMasterBlockItem::new, new Properties().rarity(Rarity.EPIC)); - public static final Item BEACON = registerBlock(Blocks.BEACON, new Properties().rarity(Rarity.RARE)); + public static final Item COMMAND_BLOCK = registerBlock(Blocks.COMMAND_BLOCK, GameMasterBlockItem::new, new Item.Properties().rarity(Rarity.EPIC)); + public static final Item BEACON = registerBlock(Blocks.BEACON, new Item.Properties().rarity(Rarity.RARE)); public static final Item COBBLESTONE_WALL = registerBlock(Blocks.COBBLESTONE_WALL); public static final Item MOSSY_COBBLESTONE_WALL = registerBlock(Blocks.MOSSY_COBBLESTONE_WALL); public static final Item BRICK_WALL = registerBlock(Blocks.BRICK_WALL); @@ -557,62 +554,63 @@ public class Items { public static final Item GREEN_TERRACOTTA = registerBlock(Blocks.GREEN_TERRACOTTA); public static final Item RED_TERRACOTTA = registerBlock(Blocks.RED_TERRACOTTA); public static final Item BLACK_TERRACOTTA = registerBlock(Blocks.BLACK_TERRACOTTA); - public static final Item BARRIER = registerBlock(Blocks.BARRIER, new Properties().rarity(Rarity.EPIC)); + public static final Item BARRIER = registerBlock(Blocks.BARRIER, new Item.Properties().rarity(Rarity.EPIC)); public static final Item LIGHT = registerBlock( Blocks.LIGHT, - (UnaryOperator)(properties -> properties.rarity(Rarity.EPIC) + (UnaryOperator)(properties -> properties.rarity(Rarity.EPIC) .component(DataComponents.BLOCK_STATE, BlockItemStateProperties.EMPTY.with(LightBlock.LEVEL, 15))) ); public static final Item HAY_BLOCK = registerBlock(Blocks.HAY_BLOCK); public static final Item WHITE_CARPET = registerBlock( - Blocks.WHITE_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.WHITE))) + Blocks.WHITE_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.WHITE))) ); public static final Item ORANGE_CARPET = registerBlock( - Blocks.ORANGE_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.ORANGE))) + Blocks.ORANGE_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.ORANGE))) ); public static final Item MAGENTA_CARPET = registerBlock( - Blocks.MAGENTA_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.MAGENTA))) + Blocks.MAGENTA_CARPET, + (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.MAGENTA))) ); public static final Item LIGHT_BLUE_CARPET = registerBlock( Blocks.LIGHT_BLUE_CARPET, - (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.LIGHT_BLUE))) + (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.LIGHT_BLUE))) ); public static final Item YELLOW_CARPET = registerBlock( - Blocks.YELLOW_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.YELLOW))) + Blocks.YELLOW_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.YELLOW))) ); public static final Item LIME_CARPET = registerBlock( - Blocks.LIME_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.LIME))) + Blocks.LIME_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.LIME))) ); public static final Item PINK_CARPET = registerBlock( - Blocks.PINK_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.PINK))) + Blocks.PINK_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.PINK))) ); public static final Item GRAY_CARPET = registerBlock( - Blocks.GRAY_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.GRAY))) + Blocks.GRAY_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.GRAY))) ); public static final Item LIGHT_GRAY_CARPET = registerBlock( Blocks.LIGHT_GRAY_CARPET, - (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.LIGHT_GRAY))) + (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.LIGHT_GRAY))) ); public static final Item CYAN_CARPET = registerBlock( - Blocks.CYAN_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.CYAN))) + Blocks.CYAN_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.CYAN))) ); public static final Item PURPLE_CARPET = registerBlock( - Blocks.PURPLE_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.PURPLE))) + Blocks.PURPLE_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.PURPLE))) ); public static final Item BLUE_CARPET = registerBlock( - Blocks.BLUE_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.BLUE))) + Blocks.BLUE_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.BLUE))) ); public static final Item BROWN_CARPET = registerBlock( - Blocks.BROWN_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.BROWN))) + Blocks.BROWN_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.BROWN))) ); public static final Item GREEN_CARPET = registerBlock( - Blocks.GREEN_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.GREEN))) + Blocks.GREEN_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.GREEN))) ); public static final Item RED_CARPET = registerBlock( - Blocks.RED_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.RED))) + Blocks.RED_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.RED))) ); public static final Item BLACK_CARPET = registerBlock( - Blocks.BLACK_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.BLACK))) + Blocks.BLACK_CARPET, (UnaryOperator)(properties -> properties.component(DataComponents.EQUIPPABLE, Equippable.llamaSwag(DyeColor.BLACK))) ); public static final Item TERRACOTTA = registerBlock(Blocks.TERRACOTTA); public static final Item PACKED_ICE = registerBlock(Blocks.PACKED_ICE); @@ -667,65 +665,65 @@ public class Items { public static final Item CUT_RED_SANDSTONE = registerBlock(Blocks.CUT_RED_SANDSTONE); public static final Item RED_SANDSTONE_STAIRS = registerBlock(Blocks.RED_SANDSTONE_STAIRS); public static final Item REPEATING_COMMAND_BLOCK = registerBlock( - Blocks.REPEATING_COMMAND_BLOCK, GameMasterBlockItem::new, new Properties().rarity(Rarity.EPIC) + Blocks.REPEATING_COMMAND_BLOCK, GameMasterBlockItem::new, new Item.Properties().rarity(Rarity.EPIC) ); - public static final Item CHAIN_COMMAND_BLOCK = registerBlock(Blocks.CHAIN_COMMAND_BLOCK, GameMasterBlockItem::new, new Properties().rarity(Rarity.EPIC)); + public static final Item CHAIN_COMMAND_BLOCK = registerBlock(Blocks.CHAIN_COMMAND_BLOCK, GameMasterBlockItem::new, new Item.Properties().rarity(Rarity.EPIC)); public static final Item MAGMA_BLOCK = registerBlock(Blocks.MAGMA_BLOCK); public static final Item NETHER_WART_BLOCK = registerBlock(Blocks.NETHER_WART_BLOCK); public static final Item WARPED_WART_BLOCK = registerBlock(Blocks.WARPED_WART_BLOCK); public static final Item RED_NETHER_BRICKS = registerBlock(Blocks.RED_NETHER_BRICKS); public static final Item BONE_BLOCK = registerBlock(Blocks.BONE_BLOCK); - public static final Item STRUCTURE_VOID = registerBlock(Blocks.STRUCTURE_VOID, new Properties().rarity(Rarity.EPIC)); + public static final Item STRUCTURE_VOID = registerBlock(Blocks.STRUCTURE_VOID, new Item.Properties().rarity(Rarity.EPIC)); public static final Item SHULKER_BOX = registerBlock( - Blocks.SHULKER_BOX, new Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + Blocks.SHULKER_BOX, new Item.Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) ); public static final Item WHITE_SHULKER_BOX = registerBlock( - Blocks.WHITE_SHULKER_BOX, new Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + Blocks.WHITE_SHULKER_BOX, new Item.Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) ); public static final Item ORANGE_SHULKER_BOX = registerBlock( - Blocks.ORANGE_SHULKER_BOX, new Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + Blocks.ORANGE_SHULKER_BOX, new Item.Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) ); public static final Item MAGENTA_SHULKER_BOX = registerBlock( - Blocks.MAGENTA_SHULKER_BOX, new Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + Blocks.MAGENTA_SHULKER_BOX, new Item.Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) ); public static final Item LIGHT_BLUE_SHULKER_BOX = registerBlock( - Blocks.LIGHT_BLUE_SHULKER_BOX, new Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + Blocks.LIGHT_BLUE_SHULKER_BOX, new Item.Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) ); public static final Item YELLOW_SHULKER_BOX = registerBlock( - Blocks.YELLOW_SHULKER_BOX, new Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + Blocks.YELLOW_SHULKER_BOX, new Item.Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) ); public static final Item LIME_SHULKER_BOX = registerBlock( - Blocks.LIME_SHULKER_BOX, new Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + Blocks.LIME_SHULKER_BOX, new Item.Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) ); public static final Item PINK_SHULKER_BOX = registerBlock( - Blocks.PINK_SHULKER_BOX, new Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + Blocks.PINK_SHULKER_BOX, new Item.Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) ); public static final Item GRAY_SHULKER_BOX = registerBlock( - Blocks.GRAY_SHULKER_BOX, new Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + Blocks.GRAY_SHULKER_BOX, new Item.Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) ); public static final Item LIGHT_GRAY_SHULKER_BOX = registerBlock( - Blocks.LIGHT_GRAY_SHULKER_BOX, new Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + Blocks.LIGHT_GRAY_SHULKER_BOX, new Item.Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) ); public static final Item CYAN_SHULKER_BOX = registerBlock( - Blocks.CYAN_SHULKER_BOX, new Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + Blocks.CYAN_SHULKER_BOX, new Item.Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) ); public static final Item PURPLE_SHULKER_BOX = registerBlock( - Blocks.PURPLE_SHULKER_BOX, new Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + Blocks.PURPLE_SHULKER_BOX, new Item.Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) ); public static final Item BLUE_SHULKER_BOX = registerBlock( - Blocks.BLUE_SHULKER_BOX, new Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + Blocks.BLUE_SHULKER_BOX, new Item.Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) ); public static final Item BROWN_SHULKER_BOX = registerBlock( - Blocks.BROWN_SHULKER_BOX, new Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + Blocks.BROWN_SHULKER_BOX, new Item.Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) ); public static final Item GREEN_SHULKER_BOX = registerBlock( - Blocks.GREEN_SHULKER_BOX, new Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + Blocks.GREEN_SHULKER_BOX, new Item.Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) ); public static final Item RED_SHULKER_BOX = registerBlock( - Blocks.RED_SHULKER_BOX, new Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + Blocks.RED_SHULKER_BOX, new Item.Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) ); public static final Item BLACK_SHULKER_BOX = registerBlock( - Blocks.BLACK_SHULKER_BOX, new Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + Blocks.BLACK_SHULKER_BOX, new Item.Properties().stacksTo(1).component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) ); public static final Item WHITE_GLAZED_TERRACOTTA = registerBlock(Blocks.WHITE_GLAZED_TERRACOTTA); public static final Item ORANGE_GLAZED_TERRACOTTA = registerBlock(Blocks.ORANGE_GLAZED_TERRACOTTA); @@ -776,7 +774,7 @@ public class Items { public static final Item RED_CONCRETE_POWDER = registerBlock(Blocks.RED_CONCRETE_POWDER); public static final Item BLACK_CONCRETE_POWDER = registerBlock(Blocks.BLACK_CONCRETE_POWDER); public static final Item TURTLE_EGG = registerBlock(Blocks.TURTLE_EGG); - public static final Item SNIFFER_EGG = registerBlock(Blocks.SNIFFER_EGG, (UnaryOperator)(properties -> properties.rarity(Rarity.UNCOMMON))); + public static final Item SNIFFER_EGG = registerBlock(Blocks.SNIFFER_EGG, (UnaryOperator)(properties -> properties.rarity(Rarity.UNCOMMON))); public static final Item DRIED_GHAST = registerBlock(Blocks.DRIED_GHAST); public static final Item DEAD_TUBE_CORAL_BLOCK = registerBlock(Blocks.DEAD_TUBE_CORAL_BLOCK); public static final Item DEAD_BRAIN_CORAL_BLOCK = registerBlock(Blocks.DEAD_BRAIN_CORAL_BLOCK); @@ -800,48 +798,58 @@ public class Items { public static final Item DEAD_TUBE_CORAL = registerBlock(Blocks.DEAD_TUBE_CORAL); public static final Item TUBE_CORAL_FAN = registerBlock( Blocks.TUBE_CORAL_FAN, - (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.TUBE_CORAL_WALL_FAN, Direction.DOWN, properties)) + (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.TUBE_CORAL_WALL_FAN, Direction.DOWN, properties)) ); public static final Item BRAIN_CORAL_FAN = registerBlock( Blocks.BRAIN_CORAL_FAN, - (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.BRAIN_CORAL_WALL_FAN, Direction.DOWN, properties)) + (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.BRAIN_CORAL_WALL_FAN, Direction.DOWN, properties)) ); public static final Item BUBBLE_CORAL_FAN = registerBlock( Blocks.BUBBLE_CORAL_FAN, - (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.BUBBLE_CORAL_WALL_FAN, Direction.DOWN, properties)) + (BiFunction)((block, properties) -> new StandingAndWallBlockItem( + block, Blocks.BUBBLE_CORAL_WALL_FAN, Direction.DOWN, properties + )) ); public static final Item FIRE_CORAL_FAN = registerBlock( Blocks.FIRE_CORAL_FAN, - (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.FIRE_CORAL_WALL_FAN, Direction.DOWN, properties)) + (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.FIRE_CORAL_WALL_FAN, Direction.DOWN, properties)) ); public static final Item HORN_CORAL_FAN = registerBlock( Blocks.HORN_CORAL_FAN, - (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.HORN_CORAL_WALL_FAN, Direction.DOWN, properties)) + (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.HORN_CORAL_WALL_FAN, Direction.DOWN, properties)) ); public static final Item DEAD_TUBE_CORAL_FAN = registerBlock( Blocks.DEAD_TUBE_CORAL_FAN, - (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.DEAD_TUBE_CORAL_WALL_FAN, Direction.DOWN, properties)) + (BiFunction)((block, properties) -> new StandingAndWallBlockItem( + block, Blocks.DEAD_TUBE_CORAL_WALL_FAN, Direction.DOWN, properties + )) ); public static final Item DEAD_BRAIN_CORAL_FAN = registerBlock( Blocks.DEAD_BRAIN_CORAL_FAN, - (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.DEAD_BRAIN_CORAL_WALL_FAN, Direction.DOWN, properties)) + (BiFunction)((block, properties) -> new StandingAndWallBlockItem( + block, Blocks.DEAD_BRAIN_CORAL_WALL_FAN, Direction.DOWN, properties + )) ); public static final Item DEAD_BUBBLE_CORAL_FAN = registerBlock( Blocks.DEAD_BUBBLE_CORAL_FAN, - (BiFunction)((block, properties) -> new StandingAndWallBlockItem( + (BiFunction)((block, properties) -> new StandingAndWallBlockItem( block, Blocks.DEAD_BUBBLE_CORAL_WALL_FAN, Direction.DOWN, properties )) ); public static final Item DEAD_FIRE_CORAL_FAN = registerBlock( Blocks.DEAD_FIRE_CORAL_FAN, - (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.DEAD_FIRE_CORAL_WALL_FAN, Direction.DOWN, properties)) + (BiFunction)((block, properties) -> new StandingAndWallBlockItem( + block, Blocks.DEAD_FIRE_CORAL_WALL_FAN, Direction.DOWN, properties + )) ); public static final Item DEAD_HORN_CORAL_FAN = registerBlock( Blocks.DEAD_HORN_CORAL_FAN, - (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.DEAD_HORN_CORAL_WALL_FAN, Direction.DOWN, properties)) + (BiFunction)((block, properties) -> new StandingAndWallBlockItem( + block, Blocks.DEAD_HORN_CORAL_WALL_FAN, Direction.DOWN, properties + )) ); public static final Item BLUE_ICE = registerBlock(Blocks.BLUE_ICE); - public static final Item CONDUIT = registerBlock(Blocks.CONDUIT, new Properties().rarity(Rarity.UNCOMMON)); + public static final Item CONDUIT = registerBlock(Blocks.CONDUIT, new Item.Properties().rarity(Rarity.UNCOMMON)); public static final Item POLISHED_GRANITE_STAIRS = registerBlock(Blocks.POLISHED_GRANITE_STAIRS); public static final Item SMOOTH_RED_SANDSTONE_STAIRS = registerBlock(Blocks.SMOOTH_RED_SANDSTONE_STAIRS); public static final Item MOSSY_STONE_BRICK_STAIRS = registerBlock(Blocks.MOSSY_STONE_BRICK_STAIRS); @@ -879,11 +887,11 @@ public class Items { public static final Item DEEPSLATE_TILE_SLAB = registerBlock(Blocks.DEEPSLATE_TILE_SLAB); public static final Item SCAFFOLDING = registerBlock(Blocks.SCAFFOLDING, ScaffoldingBlockItem::new); public static final Item REDSTONE = registerItem( - "redstone", createBlockItemWithCustomItemName(Blocks.REDSTONE_WIRE), new Properties().trimMaterial(TrimMaterials.REDSTONE) + "redstone", createBlockItemWithCustomItemName(Blocks.REDSTONE_WIRE), new Item.Properties().trimMaterial(TrimMaterials.REDSTONE) ); public static final Item REDSTONE_TORCH = registerBlock( Blocks.REDSTONE_TORCH, - (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.REDSTONE_WALL_TORCH, Direction.DOWN, properties)) + (BiFunction)((block, properties) -> new StandingAndWallBlockItem(block, Blocks.REDSTONE_WALL_TORCH, Direction.DOWN, properties)) ); public static final Item REDSTONE_BLOCK = registerBlock(Blocks.REDSTONE_BLOCK); public static final Item REPEATER = registerBlock(Blocks.REPEATER); @@ -894,13 +902,13 @@ public class Items { public static final Item HONEY_BLOCK = registerBlock(Blocks.HONEY_BLOCK); public static final Item OBSERVER = registerBlock(Blocks.OBSERVER); public static final Item HOPPER = registerBlock( - Blocks.HOPPER, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) + Blocks.HOPPER, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) ); public static final Item DISPENSER = registerBlock( - Blocks.DISPENSER, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) + Blocks.DISPENSER, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) ); public static final Item DROPPER = registerBlock( - Blocks.DROPPER, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) + Blocks.DROPPER, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) ); public static final Item LECTERN = registerBlock(Blocks.LECTERN); public static final Item TARGET = registerBlock(Blocks.TARGET); @@ -911,7 +919,7 @@ public class Items { public static final Item CALIBRATED_SCULK_SENSOR = registerBlock(Blocks.CALIBRATED_SCULK_SENSOR); public static final Item TRIPWIRE_HOOK = registerBlock(Blocks.TRIPWIRE_HOOK); public static final Item TRAPPED_CHEST = registerBlock( - Blocks.TRAPPED_CHEST, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) + Blocks.TRAPPED_CHEST, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) ); public static final Item TNT = registerBlock(Blocks.TNT); public static final Item REDSTONE_LAMP = registerBlock(Blocks.REDSTONE_LAMP); @@ -1004,78 +1012,80 @@ public class Items { public static final Item DETECTOR_RAIL = registerBlock(Blocks.DETECTOR_RAIL); public static final Item RAIL = registerBlock(Blocks.RAIL); public static final Item ACTIVATOR_RAIL = registerBlock(Blocks.ACTIVATOR_RAIL); - public static final Item SADDLE = registerItem("saddle", new Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.saddle())); + public static final Item SADDLE = registerItem("saddle", new Item.Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.saddle())); public static final Item WHITE_HARNESS = registerItem( - "white_harness", new Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.WHITE)) + "white_harness", new Item.Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.WHITE)) ); public static final Item ORANGE_HARNESS = registerItem( - "orange_harness", new Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.ORANGE)) + "orange_harness", new Item.Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.ORANGE)) ); public static final Item MAGENTA_HARNESS = registerItem( - "magenta_harness", new Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.MAGENTA)) + "magenta_harness", new Item.Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.MAGENTA)) ); public static final Item LIGHT_BLUE_HARNESS = registerItem( - "light_blue_harness", new Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.LIGHT_BLUE)) + "light_blue_harness", new Item.Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.LIGHT_BLUE)) ); public static final Item YELLOW_HARNESS = registerItem( - "yellow_harness", new Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.YELLOW)) + "yellow_harness", new Item.Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.YELLOW)) ); public static final Item LIME_HARNESS = registerItem( - "lime_harness", new Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.LIME)) + "lime_harness", new Item.Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.LIME)) ); public static final Item PINK_HARNESS = registerItem( - "pink_harness", new Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.PINK)) + "pink_harness", new Item.Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.PINK)) ); public static final Item GRAY_HARNESS = registerItem( - "gray_harness", new Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.GRAY)) + "gray_harness", new Item.Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.GRAY)) ); public static final Item LIGHT_GRAY_HARNESS = registerItem( - "light_gray_harness", new Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.LIGHT_GRAY)) + "light_gray_harness", new Item.Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.LIGHT_GRAY)) ); public static final Item CYAN_HARNESS = registerItem( - "cyan_harness", new Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.CYAN)) + "cyan_harness", new Item.Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.CYAN)) ); public static final Item PURPLE_HARNESS = registerItem( - "purple_harness", new Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.PURPLE)) + "purple_harness", new Item.Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.PURPLE)) ); public static final Item BLUE_HARNESS = registerItem( - "blue_harness", new Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.BLUE)) + "blue_harness", new Item.Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.BLUE)) ); public static final Item BROWN_HARNESS = registerItem( - "brown_harness", new Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.BROWN)) + "brown_harness", new Item.Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.BROWN)) ); public static final Item GREEN_HARNESS = registerItem( - "green_harness", new Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.GREEN)) + "green_harness", new Item.Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.GREEN)) ); public static final Item RED_HARNESS = registerItem( - "red_harness", new Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.RED)) + "red_harness", new Item.Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.RED)) ); public static final Item BLACK_HARNESS = registerItem( - "black_harness", new Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.BLACK)) + "black_harness", new Item.Properties().stacksTo(1).component(DataComponents.EQUIPPABLE, Equippable.harness(DyeColor.BLACK)) + ); + public static final Item MINECART = registerItem( + "minecart", properties -> new MinecartItem(EntityType.MINECART, properties), new Item.Properties().stacksTo(1) ); - public static final Item MINECART = registerItem("minecart", properties -> new MinecartItem(EntityType.MINECART, properties), new Properties().stacksTo(1)); public static final Item CHEST_MINECART = registerItem( - "chest_minecart", properties -> new MinecartItem(EntityType.CHEST_MINECART, properties), new Properties().stacksTo(1) + "chest_minecart", properties -> new MinecartItem(EntityType.CHEST_MINECART, properties), new Item.Properties().stacksTo(1) ); public static final Item FURNACE_MINECART = registerItem( - "furnace_minecart", properties -> new MinecartItem(EntityType.FURNACE_MINECART, properties), new Properties().stacksTo(1) + "furnace_minecart", properties -> new MinecartItem(EntityType.FURNACE_MINECART, properties), new Item.Properties().stacksTo(1) ); public static final Item TNT_MINECART = registerItem( - "tnt_minecart", properties -> new MinecartItem(EntityType.TNT_MINECART, properties), new Properties().stacksTo(1) + "tnt_minecart", properties -> new MinecartItem(EntityType.TNT_MINECART, properties), new Item.Properties().stacksTo(1) ); public static final Item HOPPER_MINECART = registerItem( - "hopper_minecart", properties -> new MinecartItem(EntityType.HOPPER_MINECART, properties), new Properties().stacksTo(1) + "hopper_minecart", properties -> new MinecartItem(EntityType.HOPPER_MINECART, properties), new Item.Properties().stacksTo(1) ); public static final Item CARROT_ON_A_STICK = registerItem( - "carrot_on_a_stick", properties -> new FoodOnAStickItem<>(EntityType.PIG, 7, properties), new Properties().durability(25) + "carrot_on_a_stick", properties -> new FoodOnAStickItem<>(EntityType.PIG, 7, properties), new Item.Properties().durability(25) ); public static final Item WARPED_FUNGUS_ON_A_STICK = registerItem( - "warped_fungus_on_a_stick", properties -> new FoodOnAStickItem<>(EntityType.STRIDER, 1, properties), new Properties().durability(100) + "warped_fungus_on_a_stick", properties -> new FoodOnAStickItem<>(EntityType.STRIDER, 1, properties), new Item.Properties().durability(100) ); public static final Item PHANTOM_MEMBRANE = registerItem("phantom_membrane"); public static final Item ELYTRA = registerItem( "elytra", - new Properties() + new Item.Properties() .durability(432) .rarity(Rarity.EPIC) .component(DataComponents.GLIDER, Unit.INSTANCE) @@ -1085,387 +1095,415 @@ public class Items { ) .repairable(PHANTOM_MEMBRANE) ); - public static final Item OAK_BOAT = registerItem("oak_boat", properties -> new BoatItem(EntityType.OAK_BOAT, properties), new Properties().stacksTo(1)); + public static final Item OAK_BOAT = registerItem("oak_boat", properties -> new BoatItem(EntityType.OAK_BOAT, properties), new Item.Properties().stacksTo(1)); public static final Item OAK_CHEST_BOAT = registerItem( - "oak_chest_boat", properties -> new BoatItem(EntityType.OAK_CHEST_BOAT, properties), new Properties().stacksTo(1) + "oak_chest_boat", properties -> new BoatItem(EntityType.OAK_CHEST_BOAT, properties), new Item.Properties().stacksTo(1) ); public static final Item SPRUCE_BOAT = registerItem( - "spruce_boat", properties -> new BoatItem(EntityType.SPRUCE_BOAT, properties), new Properties().stacksTo(1) + "spruce_boat", properties -> new BoatItem(EntityType.SPRUCE_BOAT, properties), new Item.Properties().stacksTo(1) ); public static final Item SPRUCE_CHEST_BOAT = registerItem( - "spruce_chest_boat", properties -> new BoatItem(EntityType.SPRUCE_CHEST_BOAT, properties), new Properties().stacksTo(1) + "spruce_chest_boat", properties -> new BoatItem(EntityType.SPRUCE_CHEST_BOAT, properties), new Item.Properties().stacksTo(1) + ); + public static final Item BIRCH_BOAT = registerItem( + "birch_boat", properties -> new BoatItem(EntityType.BIRCH_BOAT, properties), new Item.Properties().stacksTo(1) ); - public static final Item BIRCH_BOAT = registerItem("birch_boat", properties -> new BoatItem(EntityType.BIRCH_BOAT, properties), new Properties().stacksTo(1)); public static final Item BIRCH_CHEST_BOAT = registerItem( - "birch_chest_boat", properties -> new BoatItem(EntityType.BIRCH_CHEST_BOAT, properties), new Properties().stacksTo(1) + "birch_chest_boat", properties -> new BoatItem(EntityType.BIRCH_CHEST_BOAT, properties), new Item.Properties().stacksTo(1) ); public static final Item JUNGLE_BOAT = registerItem( - "jungle_boat", properties -> new BoatItem(EntityType.JUNGLE_BOAT, properties), new Properties().stacksTo(1) + "jungle_boat", properties -> new BoatItem(EntityType.JUNGLE_BOAT, properties), new Item.Properties().stacksTo(1) ); public static final Item JUNGLE_CHEST_BOAT = registerItem( - "jungle_chest_boat", properties -> new BoatItem(EntityType.JUNGLE_CHEST_BOAT, properties), new Properties().stacksTo(1) + "jungle_chest_boat", properties -> new BoatItem(EntityType.JUNGLE_CHEST_BOAT, properties), new Item.Properties().stacksTo(1) ); public static final Item ACACIA_BOAT = registerItem( - "acacia_boat", properties -> new BoatItem(EntityType.ACACIA_BOAT, properties), new Properties().stacksTo(1) + "acacia_boat", properties -> new BoatItem(EntityType.ACACIA_BOAT, properties), new Item.Properties().stacksTo(1) ); public static final Item ACACIA_CHEST_BOAT = registerItem( - "acacia_chest_boat", properties -> new BoatItem(EntityType.ACACIA_CHEST_BOAT, properties), new Properties().stacksTo(1) + "acacia_chest_boat", properties -> new BoatItem(EntityType.ACACIA_CHEST_BOAT, properties), new Item.Properties().stacksTo(1) ); public static final Item CHERRY_BOAT = registerItem( - "cherry_boat", properties -> new BoatItem(EntityType.CHERRY_BOAT, properties), new Properties().stacksTo(1) + "cherry_boat", properties -> new BoatItem(EntityType.CHERRY_BOAT, properties), new Item.Properties().stacksTo(1) ); public static final Item CHERRY_CHEST_BOAT = registerItem( - "cherry_chest_boat", properties -> new BoatItem(EntityType.CHERRY_CHEST_BOAT, properties), new Properties().stacksTo(1) + "cherry_chest_boat", properties -> new BoatItem(EntityType.CHERRY_CHEST_BOAT, properties), new Item.Properties().stacksTo(1) ); public static final Item DARK_OAK_BOAT = registerItem( - "dark_oak_boat", properties -> new BoatItem(EntityType.DARK_OAK_BOAT, properties), new Properties().stacksTo(1) + "dark_oak_boat", properties -> new BoatItem(EntityType.DARK_OAK_BOAT, properties), new Item.Properties().stacksTo(1) ); public static final Item DARK_OAK_CHEST_BOAT = registerItem( - "dark_oak_chest_boat", properties -> new BoatItem(EntityType.DARK_OAK_CHEST_BOAT, properties), new Properties().stacksTo(1) + "dark_oak_chest_boat", properties -> new BoatItem(EntityType.DARK_OAK_CHEST_BOAT, properties), new Item.Properties().stacksTo(1) ); public static final Item PALE_OAK_BOAT = registerItem( - "pale_oak_boat", properties -> new BoatItem(EntityType.PALE_OAK_BOAT, properties), new Properties().stacksTo(1) + "pale_oak_boat", properties -> new BoatItem(EntityType.PALE_OAK_BOAT, properties), new Item.Properties().stacksTo(1) ); public static final Item PALE_OAK_CHEST_BOAT = registerItem( - "pale_oak_chest_boat", properties -> new BoatItem(EntityType.PALE_OAK_CHEST_BOAT, properties), new Properties().stacksTo(1) + "pale_oak_chest_boat", properties -> new BoatItem(EntityType.PALE_OAK_CHEST_BOAT, properties), new Item.Properties().stacksTo(1) ); public static final Item MANGROVE_BOAT = registerItem( - "mangrove_boat", properties -> new BoatItem(EntityType.MANGROVE_BOAT, properties), new Properties().stacksTo(1) + "mangrove_boat", properties -> new BoatItem(EntityType.MANGROVE_BOAT, properties), new Item.Properties().stacksTo(1) ); public static final Item MANGROVE_CHEST_BOAT = registerItem( - "mangrove_chest_boat", properties -> new BoatItem(EntityType.MANGROVE_CHEST_BOAT, properties), new Properties().stacksTo(1) + "mangrove_chest_boat", properties -> new BoatItem(EntityType.MANGROVE_CHEST_BOAT, properties), new Item.Properties().stacksTo(1) ); public static final Item BAMBOO_RAFT = registerItem( - "bamboo_raft", properties -> new BoatItem(EntityType.BAMBOO_RAFT, properties), new Properties().stacksTo(1) + "bamboo_raft", properties -> new BoatItem(EntityType.BAMBOO_RAFT, properties), new Item.Properties().stacksTo(1) ); public static final Item BAMBOO_CHEST_RAFT = registerItem( - "bamboo_chest_raft", properties -> new BoatItem(EntityType.BAMBOO_CHEST_RAFT, properties), new Properties().stacksTo(1) + "bamboo_chest_raft", properties -> new BoatItem(EntityType.BAMBOO_CHEST_RAFT, properties), new Item.Properties().stacksTo(1) ); - public static final Item STRUCTURE_BLOCK = registerBlock(Blocks.STRUCTURE_BLOCK, GameMasterBlockItem::new, new Properties().rarity(Rarity.EPIC)); - public static final Item JIGSAW = registerBlock(Blocks.JIGSAW, GameMasterBlockItem::new, new Properties().rarity(Rarity.EPIC)); + public static final Item STRUCTURE_BLOCK = registerBlock(Blocks.STRUCTURE_BLOCK, GameMasterBlockItem::new, new Item.Properties().rarity(Rarity.EPIC)); + public static final Item JIGSAW = registerBlock(Blocks.JIGSAW, GameMasterBlockItem::new, new Item.Properties().rarity(Rarity.EPIC)); public static final Item TEST_BLOCK = registerBlock( Blocks.TEST_BLOCK, GameMasterBlockItem::new, - new Properties().rarity(Rarity.EPIC).component(DataComponents.BLOCK_STATE, BlockItemStateProperties.EMPTY.with(TestBlock.MODE, TestBlockMode.START)) + new Item.Properties().rarity(Rarity.EPIC).component(DataComponents.BLOCK_STATE, BlockItemStateProperties.EMPTY.with(TestBlock.MODE, TestBlockMode.START)) ); - public static final Item TEST_INSTANCE_BLOCK = registerBlock(Blocks.TEST_INSTANCE_BLOCK, GameMasterBlockItem::new, new Properties().rarity(Rarity.EPIC)); - public static final Item TURTLE_HELMET = registerItem("turtle_helmet", new Properties().humanoidArmor(ArmorMaterials.TURTLE_SCUTE, ArmorType.HELMET)); + public static final Item TEST_INSTANCE_BLOCK = registerBlock(Blocks.TEST_INSTANCE_BLOCK, GameMasterBlockItem::new, new Item.Properties().rarity(Rarity.EPIC)); + public static final Item TURTLE_HELMET = registerItem("turtle_helmet", new Item.Properties().humanoidArmor(ArmorMaterials.TURTLE_SCUTE, ArmorType.HELMET)); public static final Item TURTLE_SCUTE = registerItem("turtle_scute"); public static final Item ARMADILLO_SCUTE = registerItem("armadillo_scute"); - public static final Item WOLF_ARMOR = registerItem("wolf_armor", new Properties().wolfArmor(ArmorMaterials.ARMADILLO_SCUTE)); - public static final Item FLINT_AND_STEEL = registerItem("flint_and_steel", FlintAndSteelItem::new, new Properties().durability(64)); + public static final Item WOLF_ARMOR = registerItem("wolf_armor", new Item.Properties().wolfArmor(ArmorMaterials.ARMADILLO_SCUTE)); + public static final Item FLINT_AND_STEEL = registerItem("flint_and_steel", FlintAndSteelItem::new, new Item.Properties().durability(64)); public static final Item BOWL = registerItem("bowl"); - public static final Item APPLE = registerItem("apple", new Properties().food(Foods.APPLE)); - public static final Item BOW = registerItem("bow", BowItem::new, new Properties().durability(384).enchantable(1)); + public static final Item APPLE = registerItem("apple", new Item.Properties().food(Foods.APPLE)); + public static final Item BOW = registerItem("bow", BowItem::new, new Item.Properties().durability(384).enchantable(1)); public static final Item ARROW = registerItem("arrow", ArrowItem::new); public static final Item COAL = registerItem("coal"); public static final Item CHARCOAL = registerItem("charcoal"); - public static final Item DIAMOND = registerItem("diamond", new Properties().trimMaterial(TrimMaterials.DIAMOND)); - public static final Item EMERALD = registerItem("emerald", new Properties().trimMaterial(TrimMaterials.EMERALD)); - public static final Item LAPIS_LAZULI = registerItem("lapis_lazuli", new Properties().trimMaterial(TrimMaterials.LAPIS)); - public static final Item QUARTZ = registerItem("quartz", new Properties().trimMaterial(TrimMaterials.QUARTZ)); - public static final Item AMETHYST_SHARD = registerItem("amethyst_shard", new Properties().trimMaterial(TrimMaterials.AMETHYST)); + public static final Item DIAMOND = registerItem("diamond", new Item.Properties().trimMaterial(TrimMaterials.DIAMOND)); + public static final Item EMERALD = registerItem("emerald", new Item.Properties().trimMaterial(TrimMaterials.EMERALD)); + public static final Item LAPIS_LAZULI = registerItem("lapis_lazuli", new Item.Properties().trimMaterial(TrimMaterials.LAPIS)); + public static final Item QUARTZ = registerItem("quartz", new Item.Properties().trimMaterial(TrimMaterials.QUARTZ)); + public static final Item AMETHYST_SHARD = registerItem("amethyst_shard", new Item.Properties().trimMaterial(TrimMaterials.AMETHYST)); public static final Item RAW_IRON = registerItem("raw_iron"); - public static final Item IRON_INGOT = registerItem("iron_ingot", new Properties().trimMaterial(TrimMaterials.IRON)); + public static final Item IRON_INGOT = registerItem("iron_ingot", new Item.Properties().trimMaterial(TrimMaterials.IRON)); public static final Item RAW_COPPER = registerItem("raw_copper"); - public static final Item COPPER_INGOT = registerItem("copper_ingot", new Properties().trimMaterial(TrimMaterials.COPPER)); + public static final Item COPPER_INGOT = registerItem("copper_ingot", new Item.Properties().trimMaterial(TrimMaterials.COPPER)); public static final Item RAW_GOLD = registerItem("raw_gold"); - public static final Item GOLD_INGOT = registerItem("gold_ingot", new Properties().trimMaterial(TrimMaterials.GOLD)); - public static final Item NETHERITE_INGOT = registerItem("netherite_ingot", new Properties().fireResistant().trimMaterial(TrimMaterials.NETHERITE)); - public static final Item NETHERITE_SCRAP = registerItem("netherite_scrap", new Properties().fireResistant()); - public static final Item WOODEN_SWORD = registerItem("wooden_sword", new Properties().sword(ToolMaterial.WOOD, 3.0F, -2.4F)); + public static final Item GOLD_INGOT = registerItem("gold_ingot", new Item.Properties().trimMaterial(TrimMaterials.GOLD)); + public static final Item NETHERITE_INGOT = registerItem("netherite_ingot", new Item.Properties().fireResistant().trimMaterial(TrimMaterials.NETHERITE)); + public static final Item NETHERITE_SCRAP = registerItem("netherite_scrap", new Item.Properties().fireResistant()); + public static final Item WOODEN_SWORD = registerItem("wooden_sword", new Item.Properties().sword(ToolMaterial.WOOD, 3.0F, -2.4F)); public static final Item WOODEN_SHOVEL = registerItem("wooden_shovel", properties -> new ShovelItem(ToolMaterial.WOOD, 1.5F, -3.0F, properties)); - public static final Item WOODEN_PICKAXE = registerItem("wooden_pickaxe", new Properties().pickaxe(ToolMaterial.WOOD, 1.0F, -2.8F)); + public static final Item WOODEN_PICKAXE = registerItem("wooden_pickaxe", new Item.Properties().pickaxe(ToolMaterial.WOOD, 1.0F, -2.8F)); public static final Item WOODEN_AXE = registerItem("wooden_axe", properties -> new AxeItem(ToolMaterial.WOOD, 6.0F, -3.2F, properties)); public static final Item WOODEN_HOE = registerItem("wooden_hoe", properties -> new HoeItem(ToolMaterial.WOOD, 0.0F, -3.0F, properties)); - public static final Item STONE_SWORD = registerItem("stone_sword", new Properties().sword(ToolMaterial.STONE, 3.0F, -2.4F)); + public static final Item STONE_SWORD = registerItem("stone_sword", new Item.Properties().sword(ToolMaterial.STONE, 3.0F, -2.4F)); public static final Item STONE_SHOVEL = registerItem("stone_shovel", properties -> new ShovelItem(ToolMaterial.STONE, 1.5F, -3.0F, properties)); - public static final Item STONE_PICKAXE = registerItem("stone_pickaxe", new Properties().pickaxe(ToolMaterial.STONE, 1.0F, -2.8F)); + public static final Item STONE_PICKAXE = registerItem("stone_pickaxe", new Item.Properties().pickaxe(ToolMaterial.STONE, 1.0F, -2.8F)); public static final Item STONE_AXE = registerItem("stone_axe", properties -> new AxeItem(ToolMaterial.STONE, 7.0F, -3.2F, properties)); public static final Item STONE_HOE = registerItem("stone_hoe", properties -> new HoeItem(ToolMaterial.STONE, -1.0F, -2.0F, properties)); - public static final Item GOLDEN_SWORD = registerItem("golden_sword", new Properties().sword(ToolMaterial.GOLD, 3.0F, -2.4F)); + public static final Item GOLDEN_SWORD = registerItem("golden_sword", new Item.Properties().sword(ToolMaterial.GOLD, 3.0F, -2.4F)); public static final Item GOLDEN_SHOVEL = registerItem("golden_shovel", properties -> new ShovelItem(ToolMaterial.GOLD, 1.5F, -3.0F, properties)); - public static final Item GOLDEN_PICKAXE = registerItem("golden_pickaxe", new Properties().pickaxe(ToolMaterial.GOLD, 1.0F, -2.8F)); + public static final Item GOLDEN_PICKAXE = registerItem("golden_pickaxe", new Item.Properties().pickaxe(ToolMaterial.GOLD, 1.0F, -2.8F)); public static final Item GOLDEN_AXE = registerItem("golden_axe", properties -> new AxeItem(ToolMaterial.GOLD, 6.0F, -3.0F, properties)); public static final Item GOLDEN_HOE = registerItem("golden_hoe", properties -> new HoeItem(ToolMaterial.GOLD, 0.0F, -3.0F, properties)); - public static final Item IRON_SWORD = registerItem("iron_sword", new Properties().sword(ToolMaterial.IRON, 3.0F, -2.4F)); + public static final Item IRON_SWORD = registerItem("iron_sword", new Item.Properties().sword(ToolMaterial.IRON, 3.0F, -2.4F)); public static final Item IRON_SHOVEL = registerItem("iron_shovel", properties -> new ShovelItem(ToolMaterial.IRON, 1.5F, -3.0F, properties)); - public static final Item IRON_PICKAXE = registerItem("iron_pickaxe", new Properties().pickaxe(ToolMaterial.IRON, 1.0F, -2.8F)); + public static final Item IRON_PICKAXE = registerItem("iron_pickaxe", new Item.Properties().pickaxe(ToolMaterial.IRON, 1.0F, -2.8F)); public static final Item IRON_AXE = registerItem("iron_axe", properties -> new AxeItem(ToolMaterial.IRON, 6.0F, -3.1F, properties)); public static final Item IRON_HOE = registerItem("iron_hoe", properties -> new HoeItem(ToolMaterial.IRON, -2.0F, -1.0F, properties)); - public static final Item DIAMOND_SWORD = registerItem("diamond_sword", new Properties().sword(ToolMaterial.DIAMOND, 3.0F, -2.4F)); + public static final Item DIAMOND_SWORD = registerItem("diamond_sword", new Item.Properties().sword(ToolMaterial.DIAMOND, 3.0F, -2.4F)); public static final Item DIAMOND_SHOVEL = registerItem("diamond_shovel", properties -> new ShovelItem(ToolMaterial.DIAMOND, 1.5F, -3.0F, properties)); - public static final Item DIAMOND_PICKAXE = registerItem("diamond_pickaxe", new Properties().pickaxe(ToolMaterial.DIAMOND, 1.0F, -2.8F)); + public static final Item DIAMOND_PICKAXE = registerItem("diamond_pickaxe", new Item.Properties().pickaxe(ToolMaterial.DIAMOND, 1.0F, -2.8F)); public static final Item DIAMOND_AXE = registerItem("diamond_axe", properties -> new AxeItem(ToolMaterial.DIAMOND, 5.0F, -3.0F, properties)); public static final Item DIAMOND_HOE = registerItem("diamond_hoe", properties -> new HoeItem(ToolMaterial.DIAMOND, -3.0F, 0.0F, properties)); - public static final Item NETHERITE_SWORD = registerItem("netherite_sword", new Properties().sword(ToolMaterial.NETHERITE, 3.0F, -2.4F).fireResistant()); + public static final Item NETHERITE_SWORD = registerItem("netherite_sword", new Item.Properties().sword(ToolMaterial.NETHERITE, 3.0F, -2.4F).fireResistant()); public static final Item NETHERITE_SHOVEL = registerItem( - "netherite_shovel", properties -> new ShovelItem(ToolMaterial.NETHERITE, 1.5F, -3.0F, properties), new Properties().fireResistant() + "netherite_shovel", properties -> new ShovelItem(ToolMaterial.NETHERITE, 1.5F, -3.0F, properties), new Item.Properties().fireResistant() + ); + public static final Item NETHERITE_PICKAXE = registerItem( + "netherite_pickaxe", new Item.Properties().pickaxe(ToolMaterial.NETHERITE, 1.0F, -2.8F).fireResistant() ); - public static final Item NETHERITE_PICKAXE = registerItem("netherite_pickaxe", new Properties().pickaxe(ToolMaterial.NETHERITE, 1.0F, -2.8F).fireResistant()); public static final Item NETHERITE_AXE = registerItem( - "netherite_axe", properties -> new AxeItem(ToolMaterial.NETHERITE, 5.0F, -3.0F, properties), new Properties().fireResistant() + "netherite_axe", properties -> new AxeItem(ToolMaterial.NETHERITE, 5.0F, -3.0F, properties), new Item.Properties().fireResistant() ); public static final Item NETHERITE_HOE = registerItem( - "netherite_hoe", properties -> new HoeItem(ToolMaterial.NETHERITE, -4.0F, 0.0F, properties), new Properties().fireResistant() + "netherite_hoe", properties -> new HoeItem(ToolMaterial.NETHERITE, -4.0F, 0.0F, properties), new Item.Properties().fireResistant() ); public static final Item STICK = registerItem("stick"); - public static final Item MUSHROOM_STEW = registerItem("mushroom_stew", new Properties().stacksTo(1).food(Foods.MUSHROOM_STEW).usingConvertsTo(BOWL)); + public static final Item MUSHROOM_STEW = registerItem("mushroom_stew", new Item.Properties().stacksTo(1).food(Foods.MUSHROOM_STEW).usingConvertsTo(BOWL)); public static final Item STRING = registerItem("string", createBlockItemWithCustomItemName(Blocks.TRIPWIRE)); public static final Item FEATHER = registerItem("feather"); public static final Item GUNPOWDER = registerItem("gunpowder"); public static final Item WHEAT_SEEDS = registerItem("wheat_seeds", createBlockItemWithCustomItemName(Blocks.WHEAT)); public static final Item WHEAT = registerItem("wheat"); - public static final Item BREAD = registerItem("bread", new Properties().food(Foods.BREAD)); - public static final Item LEATHER_HELMET = registerItem("leather_helmet", new Properties().humanoidArmor(ArmorMaterials.LEATHER, ArmorType.HELMET)); - public static final Item LEATHER_CHESTPLATE = registerItem("leather_chestplate", new Properties().humanoidArmor(ArmorMaterials.LEATHER, ArmorType.CHESTPLATE)); - public static final Item LEATHER_LEGGINGS = registerItem("leather_leggings", new Properties().humanoidArmor(ArmorMaterials.LEATHER, ArmorType.LEGGINGS)); - public static final Item LEATHER_BOOTS = registerItem("leather_boots", new Properties().humanoidArmor(ArmorMaterials.LEATHER, ArmorType.BOOTS)); + public static final Item BREAD = registerItem("bread", new Item.Properties().food(Foods.BREAD)); + public static final Item LEATHER_HELMET = registerItem("leather_helmet", new Item.Properties().humanoidArmor(ArmorMaterials.LEATHER, ArmorType.HELMET)); + public static final Item LEATHER_CHESTPLATE = registerItem( + "leather_chestplate", new Item.Properties().humanoidArmor(ArmorMaterials.LEATHER, ArmorType.CHESTPLATE) + ); + public static final Item LEATHER_LEGGINGS = registerItem("leather_leggings", new Item.Properties().humanoidArmor(ArmorMaterials.LEATHER, ArmorType.LEGGINGS)); + public static final Item LEATHER_BOOTS = registerItem("leather_boots", new Item.Properties().humanoidArmor(ArmorMaterials.LEATHER, ArmorType.BOOTS)); public static final Item CHAINMAIL_HELMET = registerItem( - "chainmail_helmet", new Properties().humanoidArmor(ArmorMaterials.CHAINMAIL, ArmorType.HELMET).rarity(Rarity.UNCOMMON) + "chainmail_helmet", new Item.Properties().humanoidArmor(ArmorMaterials.CHAINMAIL, ArmorType.HELMET).rarity(Rarity.UNCOMMON) ); public static final Item CHAINMAIL_CHESTPLATE = registerItem( - "chainmail_chestplate", new Properties().humanoidArmor(ArmorMaterials.CHAINMAIL, ArmorType.CHESTPLATE).rarity(Rarity.UNCOMMON) + "chainmail_chestplate", new Item.Properties().humanoidArmor(ArmorMaterials.CHAINMAIL, ArmorType.CHESTPLATE).rarity(Rarity.UNCOMMON) ); public static final Item CHAINMAIL_LEGGINGS = registerItem( - "chainmail_leggings", new Properties().humanoidArmor(ArmorMaterials.CHAINMAIL, ArmorType.LEGGINGS).rarity(Rarity.UNCOMMON) + "chainmail_leggings", new Item.Properties().humanoidArmor(ArmorMaterials.CHAINMAIL, ArmorType.LEGGINGS).rarity(Rarity.UNCOMMON) ); public static final Item CHAINMAIL_BOOTS = registerItem( - "chainmail_boots", new Properties().humanoidArmor(ArmorMaterials.CHAINMAIL, ArmorType.BOOTS).rarity(Rarity.UNCOMMON) + "chainmail_boots", new Item.Properties().humanoidArmor(ArmorMaterials.CHAINMAIL, ArmorType.BOOTS).rarity(Rarity.UNCOMMON) ); - public static final Item IRON_HELMET = registerItem("iron_helmet", new Properties().humanoidArmor(ArmorMaterials.IRON, ArmorType.HELMET)); - public static final Item IRON_CHESTPLATE = registerItem("iron_chestplate", new Properties().humanoidArmor(ArmorMaterials.IRON, ArmorType.CHESTPLATE)); - public static final Item IRON_LEGGINGS = registerItem("iron_leggings", new Properties().humanoidArmor(ArmorMaterials.IRON, ArmorType.LEGGINGS)); - public static final Item IRON_BOOTS = registerItem("iron_boots", new Properties().humanoidArmor(ArmorMaterials.IRON, ArmorType.BOOTS)); - public static final Item DIAMOND_HELMET = registerItem("diamond_helmet", new Properties().humanoidArmor(ArmorMaterials.DIAMOND, ArmorType.HELMET)); - public static final Item DIAMOND_CHESTPLATE = registerItem("diamond_chestplate", new Properties().humanoidArmor(ArmorMaterials.DIAMOND, ArmorType.CHESTPLATE)); - public static final Item DIAMOND_LEGGINGS = registerItem("diamond_leggings", new Properties().humanoidArmor(ArmorMaterials.DIAMOND, ArmorType.LEGGINGS)); - public static final Item DIAMOND_BOOTS = registerItem("diamond_boots", new Properties().humanoidArmor(ArmorMaterials.DIAMOND, ArmorType.BOOTS)); - public static final Item GOLDEN_HELMET = registerItem("golden_helmet", new Properties().humanoidArmor(ArmorMaterials.GOLD, ArmorType.HELMET)); - public static final Item GOLDEN_CHESTPLATE = registerItem("golden_chestplate", new Properties().humanoidArmor(ArmorMaterials.GOLD, ArmorType.CHESTPLATE)); - public static final Item GOLDEN_LEGGINGS = registerItem("golden_leggings", new Properties().humanoidArmor(ArmorMaterials.GOLD, ArmorType.LEGGINGS)); - public static final Item GOLDEN_BOOTS = registerItem("golden_boots", new Properties().humanoidArmor(ArmorMaterials.GOLD, ArmorType.BOOTS)); + public static final Item IRON_HELMET = registerItem("iron_helmet", new Item.Properties().humanoidArmor(ArmorMaterials.IRON, ArmorType.HELMET)); + public static final Item IRON_CHESTPLATE = registerItem("iron_chestplate", new Item.Properties().humanoidArmor(ArmorMaterials.IRON, ArmorType.CHESTPLATE)); + public static final Item IRON_LEGGINGS = registerItem("iron_leggings", new Item.Properties().humanoidArmor(ArmorMaterials.IRON, ArmorType.LEGGINGS)); + public static final Item IRON_BOOTS = registerItem("iron_boots", new Item.Properties().humanoidArmor(ArmorMaterials.IRON, ArmorType.BOOTS)); + public static final Item DIAMOND_HELMET = registerItem("diamond_helmet", new Item.Properties().humanoidArmor(ArmorMaterials.DIAMOND, ArmorType.HELMET)); + public static final Item DIAMOND_CHESTPLATE = registerItem( + "diamond_chestplate", new Item.Properties().humanoidArmor(ArmorMaterials.DIAMOND, ArmorType.CHESTPLATE) + ); + public static final Item DIAMOND_LEGGINGS = registerItem("diamond_leggings", new Item.Properties().humanoidArmor(ArmorMaterials.DIAMOND, ArmorType.LEGGINGS)); + public static final Item DIAMOND_BOOTS = registerItem("diamond_boots", new Item.Properties().humanoidArmor(ArmorMaterials.DIAMOND, ArmorType.BOOTS)); + public static final Item GOLDEN_HELMET = registerItem("golden_helmet", new Item.Properties().humanoidArmor(ArmorMaterials.GOLD, ArmorType.HELMET)); + public static final Item GOLDEN_CHESTPLATE = registerItem("golden_chestplate", new Item.Properties().humanoidArmor(ArmorMaterials.GOLD, ArmorType.CHESTPLATE)); + public static final Item GOLDEN_LEGGINGS = registerItem("golden_leggings", new Item.Properties().humanoidArmor(ArmorMaterials.GOLD, ArmorType.LEGGINGS)); + public static final Item GOLDEN_BOOTS = registerItem("golden_boots", new Item.Properties().humanoidArmor(ArmorMaterials.GOLD, ArmorType.BOOTS)); public static final Item NETHERITE_HELMET = registerItem( - "netherite_helmet", new Properties().humanoidArmor(ArmorMaterials.NETHERITE, ArmorType.HELMET).fireResistant() + "netherite_helmet", new Item.Properties().humanoidArmor(ArmorMaterials.NETHERITE, ArmorType.HELMET).fireResistant() ); public static final Item NETHERITE_CHESTPLATE = registerItem( - "netherite_chestplate", new Properties().humanoidArmor(ArmorMaterials.NETHERITE, ArmorType.CHESTPLATE).fireResistant() + "netherite_chestplate", new Item.Properties().humanoidArmor(ArmorMaterials.NETHERITE, ArmorType.CHESTPLATE).fireResistant() ); public static final Item NETHERITE_LEGGINGS = registerItem( - "netherite_leggings", new Properties().humanoidArmor(ArmorMaterials.NETHERITE, ArmorType.LEGGINGS).fireResistant() + "netherite_leggings", new Item.Properties().humanoidArmor(ArmorMaterials.NETHERITE, ArmorType.LEGGINGS).fireResistant() ); public static final Item NETHERITE_BOOTS = registerItem( - "netherite_boots", new Properties().humanoidArmor(ArmorMaterials.NETHERITE, ArmorType.BOOTS).fireResistant() + "netherite_boots", new Item.Properties().humanoidArmor(ArmorMaterials.NETHERITE, ArmorType.BOOTS).fireResistant() ); public static final Item FLINT = registerItem("flint"); - public static final Item PORKCHOP = registerItem("porkchop", new Properties().food(Foods.PORKCHOP)); - public static final Item COOKED_PORKCHOP = registerItem("cooked_porkchop", new Properties().food(Foods.COOKED_PORKCHOP)); + public static final Item PORKCHOP = registerItem("porkchop", new Item.Properties().food(Foods.PORKCHOP)); + public static final Item COOKED_PORKCHOP = registerItem("cooked_porkchop", new Item.Properties().food(Foods.COOKED_PORKCHOP)); public static final Item PAINTING = registerItem("painting", properties -> new HangingEntityItem(EntityType.PAINTING, properties)); - public static final Item GOLDEN_APPLE = registerItem("golden_apple", new Properties().food(Foods.GOLDEN_APPLE, Consumables.GOLDEN_APPLE)); + public static final Item GOLDEN_APPLE = registerItem("golden_apple", new Item.Properties().food(Foods.GOLDEN_APPLE, Consumables.GOLDEN_APPLE)); public static final Item ENCHANTED_GOLDEN_APPLE = registerItem( "enchanted_golden_apple", - new Properties() + new Item.Properties() .rarity(Rarity.RARE) .food(Foods.ENCHANTED_GOLDEN_APPLE, Consumables.ENCHANTED_GOLDEN_APPLE) .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) ); public static final Item OAK_SIGN = registerBlock( - Blocks.OAK_SIGN, (block, properties) -> new SignItem(block, Blocks.OAK_WALL_SIGN, properties), new Properties().stacksTo(16) + Blocks.OAK_SIGN, (block, properties) -> new SignItem(block, Blocks.OAK_WALL_SIGN, properties), new Item.Properties().stacksTo(16) ); public static final Item SPRUCE_SIGN = registerBlock( - Blocks.SPRUCE_SIGN, (block, properties) -> new SignItem(block, Blocks.SPRUCE_WALL_SIGN, properties), new Properties().stacksTo(16) + Blocks.SPRUCE_SIGN, (block, properties) -> new SignItem(block, Blocks.SPRUCE_WALL_SIGN, properties), new Item.Properties().stacksTo(16) ); public static final Item BIRCH_SIGN = registerBlock( - Blocks.BIRCH_SIGN, (block, properties) -> new SignItem(block, Blocks.BIRCH_WALL_SIGN, properties), new Properties().stacksTo(16) + Blocks.BIRCH_SIGN, (block, properties) -> new SignItem(block, Blocks.BIRCH_WALL_SIGN, properties), new Item.Properties().stacksTo(16) ); public static final Item JUNGLE_SIGN = registerBlock( - Blocks.JUNGLE_SIGN, (block, properties) -> new SignItem(block, Blocks.JUNGLE_WALL_SIGN, properties), new Properties().stacksTo(16) + Blocks.JUNGLE_SIGN, (block, properties) -> new SignItem(block, Blocks.JUNGLE_WALL_SIGN, properties), new Item.Properties().stacksTo(16) ); public static final Item ACACIA_SIGN = registerBlock( - Blocks.ACACIA_SIGN, (block, properties) -> new SignItem(block, Blocks.ACACIA_WALL_SIGN, properties), new Properties().stacksTo(16) + Blocks.ACACIA_SIGN, (block, properties) -> new SignItem(block, Blocks.ACACIA_WALL_SIGN, properties), new Item.Properties().stacksTo(16) ); public static final Item CHERRY_SIGN = registerBlock( - Blocks.CHERRY_SIGN, (block, properties) -> new SignItem(block, Blocks.CHERRY_WALL_SIGN, properties), new Properties().stacksTo(16) + Blocks.CHERRY_SIGN, (block, properties) -> new SignItem(block, Blocks.CHERRY_WALL_SIGN, properties), new Item.Properties().stacksTo(16) ); public static final Item DARK_OAK_SIGN = registerBlock( - Blocks.DARK_OAK_SIGN, (block, properties) -> new SignItem(block, Blocks.DARK_OAK_WALL_SIGN, properties), new Properties().stacksTo(16) + Blocks.DARK_OAK_SIGN, (block, properties) -> new SignItem(block, Blocks.DARK_OAK_WALL_SIGN, properties), new Item.Properties().stacksTo(16) ); public static final Item PALE_OAK_SIGN = registerBlock( - Blocks.PALE_OAK_SIGN, (block, properties) -> new SignItem(block, Blocks.PALE_OAK_WALL_SIGN, properties), new Properties().stacksTo(16) + Blocks.PALE_OAK_SIGN, (block, properties) -> new SignItem(block, Blocks.PALE_OAK_WALL_SIGN, properties), new Item.Properties().stacksTo(16) ); public static final Item MANGROVE_SIGN = registerBlock( - Blocks.MANGROVE_SIGN, (block, properties) -> new SignItem(block, Blocks.MANGROVE_WALL_SIGN, properties), new Properties().stacksTo(16) + Blocks.MANGROVE_SIGN, (block, properties) -> new SignItem(block, Blocks.MANGROVE_WALL_SIGN, properties), new Item.Properties().stacksTo(16) ); public static final Item BAMBOO_SIGN = registerBlock( - Blocks.BAMBOO_SIGN, (block, properties) -> new SignItem(block, Blocks.BAMBOO_WALL_SIGN, properties), new Properties().stacksTo(16) + Blocks.BAMBOO_SIGN, (block, properties) -> new SignItem(block, Blocks.BAMBOO_WALL_SIGN, properties), new Item.Properties().stacksTo(16) ); public static final Item CRIMSON_SIGN = registerBlock( - Blocks.CRIMSON_SIGN, (block, properties) -> new SignItem(block, Blocks.CRIMSON_WALL_SIGN, properties), new Properties().stacksTo(16) + Blocks.CRIMSON_SIGN, (block, properties) -> new SignItem(block, Blocks.CRIMSON_WALL_SIGN, properties), new Item.Properties().stacksTo(16) ); public static final Item WARPED_SIGN = registerBlock( - Blocks.WARPED_SIGN, (block, properties) -> new SignItem(block, Blocks.WARPED_WALL_SIGN, properties), new Properties().stacksTo(16) + Blocks.WARPED_SIGN, (block, properties) -> new SignItem(block, Blocks.WARPED_WALL_SIGN, properties), new Item.Properties().stacksTo(16) ); public static final Item OAK_HANGING_SIGN = registerBlock( - Blocks.OAK_HANGING_SIGN, (block, properties) -> new HangingSignItem(block, Blocks.OAK_WALL_HANGING_SIGN, properties), new Properties().stacksTo(16) + Blocks.OAK_HANGING_SIGN, (block, properties) -> new HangingSignItem(block, Blocks.OAK_WALL_HANGING_SIGN, properties), new Item.Properties().stacksTo(16) ); public static final Item SPRUCE_HANGING_SIGN = registerBlock( - Blocks.SPRUCE_HANGING_SIGN, (block, properties) -> new HangingSignItem(block, Blocks.SPRUCE_WALL_HANGING_SIGN, properties), new Properties().stacksTo(16) + Blocks.SPRUCE_HANGING_SIGN, + (block, properties) -> new HangingSignItem(block, Blocks.SPRUCE_WALL_HANGING_SIGN, properties), + new Item.Properties().stacksTo(16) ); public static final Item BIRCH_HANGING_SIGN = registerBlock( - Blocks.BIRCH_HANGING_SIGN, (block, properties) -> new HangingSignItem(block, Blocks.BIRCH_WALL_HANGING_SIGN, properties), new Properties().stacksTo(16) + Blocks.BIRCH_HANGING_SIGN, (block, properties) -> new HangingSignItem(block, Blocks.BIRCH_WALL_HANGING_SIGN, properties), new Item.Properties().stacksTo(16) ); public static final Item JUNGLE_HANGING_SIGN = registerBlock( - Blocks.JUNGLE_HANGING_SIGN, (block, properties) -> new HangingSignItem(block, Blocks.JUNGLE_WALL_HANGING_SIGN, properties), new Properties().stacksTo(16) + Blocks.JUNGLE_HANGING_SIGN, + (block, properties) -> new HangingSignItem(block, Blocks.JUNGLE_WALL_HANGING_SIGN, properties), + new Item.Properties().stacksTo(16) ); public static final Item ACACIA_HANGING_SIGN = registerBlock( - Blocks.ACACIA_HANGING_SIGN, (block, properties) -> new HangingSignItem(block, Blocks.ACACIA_WALL_HANGING_SIGN, properties), new Properties().stacksTo(16) + Blocks.ACACIA_HANGING_SIGN, + (block, properties) -> new HangingSignItem(block, Blocks.ACACIA_WALL_HANGING_SIGN, properties), + new Item.Properties().stacksTo(16) ); public static final Item CHERRY_HANGING_SIGN = registerBlock( - Blocks.CHERRY_HANGING_SIGN, (block, properties) -> new HangingSignItem(block, Blocks.CHERRY_WALL_HANGING_SIGN, properties), new Properties().stacksTo(16) + Blocks.CHERRY_HANGING_SIGN, + (block, properties) -> new HangingSignItem(block, Blocks.CHERRY_WALL_HANGING_SIGN, properties), + new Item.Properties().stacksTo(16) ); public static final Item DARK_OAK_HANGING_SIGN = registerBlock( - Blocks.DARK_OAK_HANGING_SIGN, (block, properties) -> new HangingSignItem(block, Blocks.DARK_OAK_WALL_HANGING_SIGN, properties), new Properties().stacksTo(16) + Blocks.DARK_OAK_HANGING_SIGN, + (block, properties) -> new HangingSignItem(block, Blocks.DARK_OAK_WALL_HANGING_SIGN, properties), + new Item.Properties().stacksTo(16) ); public static final Item PALE_OAK_HANGING_SIGN = registerBlock( - Blocks.PALE_OAK_HANGING_SIGN, (block, properties) -> new HangingSignItem(block, Blocks.PALE_OAK_WALL_HANGING_SIGN, properties), new Properties().stacksTo(16) + Blocks.PALE_OAK_HANGING_SIGN, + (block, properties) -> new HangingSignItem(block, Blocks.PALE_OAK_WALL_HANGING_SIGN, properties), + new Item.Properties().stacksTo(16) ); public static final Item MANGROVE_HANGING_SIGN = registerBlock( - Blocks.MANGROVE_HANGING_SIGN, (block, properties) -> new HangingSignItem(block, Blocks.MANGROVE_WALL_HANGING_SIGN, properties), new Properties().stacksTo(16) + Blocks.MANGROVE_HANGING_SIGN, + (block, properties) -> new HangingSignItem(block, Blocks.MANGROVE_WALL_HANGING_SIGN, properties), + new Item.Properties().stacksTo(16) ); public static final Item BAMBOO_HANGING_SIGN = registerBlock( - Blocks.BAMBOO_HANGING_SIGN, (block, properties) -> new HangingSignItem(block, Blocks.BAMBOO_WALL_HANGING_SIGN, properties), new Properties().stacksTo(16) + Blocks.BAMBOO_HANGING_SIGN, + (block, properties) -> new HangingSignItem(block, Blocks.BAMBOO_WALL_HANGING_SIGN, properties), + new Item.Properties().stacksTo(16) ); public static final Item CRIMSON_HANGING_SIGN = registerBlock( - Blocks.CRIMSON_HANGING_SIGN, (block, properties) -> new HangingSignItem(block, Blocks.CRIMSON_WALL_HANGING_SIGN, properties), new Properties().stacksTo(16) + Blocks.CRIMSON_HANGING_SIGN, + (block, properties) -> new HangingSignItem(block, Blocks.CRIMSON_WALL_HANGING_SIGN, properties), + new Item.Properties().stacksTo(16) ); public static final Item WARPED_HANGING_SIGN = registerBlock( - Blocks.WARPED_HANGING_SIGN, (block, properties) -> new HangingSignItem(block, Blocks.WARPED_WALL_HANGING_SIGN, properties), new Properties().stacksTo(16) + Blocks.WARPED_HANGING_SIGN, + (block, properties) -> new HangingSignItem(block, Blocks.WARPED_WALL_HANGING_SIGN, properties), + new Item.Properties().stacksTo(16) ); - public static final Item BUCKET = registerItem("bucket", properties -> new BucketItem(Fluids.EMPTY, properties), new Properties().stacksTo(16)); + public static final Item BUCKET = registerItem("bucket", properties -> new BucketItem(Fluids.EMPTY, properties), new Item.Properties().stacksTo(16)); public static final Item WATER_BUCKET = registerItem( - "water_bucket", properties -> new BucketItem(Fluids.WATER, properties), new Properties().craftRemainder(BUCKET).stacksTo(1) + "water_bucket", properties -> new BucketItem(Fluids.WATER, properties), new Item.Properties().craftRemainder(BUCKET).stacksTo(1) ); public static final Item LAVA_BUCKET = registerItem( - "lava_bucket", properties -> new BucketItem(Fluids.LAVA, properties), new Properties().craftRemainder(BUCKET).stacksTo(1) + "lava_bucket", properties -> new BucketItem(Fluids.LAVA, properties), new Item.Properties().craftRemainder(BUCKET).stacksTo(1) ); public static final Item POWDER_SNOW_BUCKET = registerItem( "powder_snow_bucket", properties -> new SolidBucketItem(Blocks.POWDER_SNOW, SoundEvents.BUCKET_EMPTY_POWDER_SNOW, properties), - new Properties().stacksTo(1).useItemDescriptionPrefix() + new Item.Properties().stacksTo(1).useItemDescriptionPrefix() ); - public static final Item SNOWBALL = registerItem("snowball", SnowballItem::new, new Properties().stacksTo(16)); + public static final Item SNOWBALL = registerItem("snowball", SnowballItem::new, new Item.Properties().stacksTo(16)); public static final Item LEATHER = registerItem("leather"); public static final Item MILK_BUCKET = registerItem( - "milk_bucket", new Properties().craftRemainder(BUCKET).component(DataComponents.CONSUMABLE, Consumables.MILK_BUCKET).usingConvertsTo(BUCKET).stacksTo(1) + "milk_bucket", new Item.Properties().craftRemainder(BUCKET).component(DataComponents.CONSUMABLE, Consumables.MILK_BUCKET).usingConvertsTo(BUCKET).stacksTo(1) ); public static final Item PUFFERFISH_BUCKET = registerItem( "pufferfish_bucket", properties -> new MobBucketItem(EntityType.PUFFERFISH, Fluids.WATER, SoundEvents.BUCKET_EMPTY_FISH, properties), - new Properties().stacksTo(1).component(DataComponents.BUCKET_ENTITY_DATA, CustomData.EMPTY) + new Item.Properties().stacksTo(1).component(DataComponents.BUCKET_ENTITY_DATA, CustomData.EMPTY) ); public static final Item SALMON_BUCKET = registerItem( "salmon_bucket", properties -> new MobBucketItem(EntityType.SALMON, Fluids.WATER, SoundEvents.BUCKET_EMPTY_FISH, properties), - new Properties().stacksTo(1).component(DataComponents.BUCKET_ENTITY_DATA, CustomData.EMPTY) + new Item.Properties().stacksTo(1).component(DataComponents.BUCKET_ENTITY_DATA, CustomData.EMPTY) ); public static final Item COD_BUCKET = registerItem( "cod_bucket", properties -> new MobBucketItem(EntityType.COD, Fluids.WATER, SoundEvents.BUCKET_EMPTY_FISH, properties), - new Properties().stacksTo(1).component(DataComponents.BUCKET_ENTITY_DATA, CustomData.EMPTY) + new Item.Properties().stacksTo(1).component(DataComponents.BUCKET_ENTITY_DATA, CustomData.EMPTY) ); public static final Item TROPICAL_FISH_BUCKET = registerItem( "tropical_fish_bucket", properties -> new MobBucketItem(EntityType.TROPICAL_FISH, Fluids.WATER, SoundEvents.BUCKET_EMPTY_FISH, properties), - new Properties().stacksTo(1).component(DataComponents.BUCKET_ENTITY_DATA, CustomData.EMPTY) + new Item.Properties().stacksTo(1).component(DataComponents.BUCKET_ENTITY_DATA, CustomData.EMPTY) ); public static final Item AXOLOTL_BUCKET = registerItem( "axolotl_bucket", properties -> new MobBucketItem(EntityType.AXOLOTL, Fluids.WATER, SoundEvents.BUCKET_EMPTY_AXOLOTL, properties), - new Properties().stacksTo(1).component(DataComponents.BUCKET_ENTITY_DATA, CustomData.EMPTY) + new Item.Properties().stacksTo(1).component(DataComponents.BUCKET_ENTITY_DATA, CustomData.EMPTY) ); public static final Item TADPOLE_BUCKET = registerItem( "tadpole_bucket", properties -> new MobBucketItem(EntityType.TADPOLE, Fluids.WATER, SoundEvents.BUCKET_EMPTY_TADPOLE, properties), - new Properties().stacksTo(1).component(DataComponents.BUCKET_ENTITY_DATA, CustomData.EMPTY) + new Item.Properties().stacksTo(1).component(DataComponents.BUCKET_ENTITY_DATA, CustomData.EMPTY) ); public static final Item BRICK = registerItem("brick"); public static final Item CLAY_BALL = registerItem("clay_ball"); public static final Item DRIED_KELP_BLOCK = registerBlock(Blocks.DRIED_KELP_BLOCK); public static final Item PAPER = registerItem("paper"); - public static final Item BOOK = registerItem("book", new Properties().enchantable(1)); + public static final Item BOOK = registerItem("book", new Item.Properties().enchantable(1)); public static final Item SLIME_BALL = registerItem("slime_ball"); public static final Item EGG = registerItem( - "egg", EggItem::new, new Properties().stacksTo(16).component(DataComponents.CHICKEN_VARIANT, new EitherHolder<>(ChickenVariants.TEMPERATE)) + "egg", EggItem::new, new Item.Properties().stacksTo(16).component(DataComponents.CHICKEN_VARIANT, new EitherHolder<>(ChickenVariants.TEMPERATE)) ); public static final Item BLUE_EGG = registerItem( - "blue_egg", EggItem::new, new Properties().stacksTo(16).component(DataComponents.CHICKEN_VARIANT, new EitherHolder<>(ChickenVariants.COLD)) + "blue_egg", EggItem::new, new Item.Properties().stacksTo(16).component(DataComponents.CHICKEN_VARIANT, new EitherHolder<>(ChickenVariants.COLD)) ); public static final Item BROWN_EGG = registerItem( - "brown_egg", EggItem::new, new Properties().stacksTo(16).component(DataComponents.CHICKEN_VARIANT, new EitherHolder<>(ChickenVariants.WARM)) + "brown_egg", EggItem::new, new Item.Properties().stacksTo(16).component(DataComponents.CHICKEN_VARIANT, new EitherHolder<>(ChickenVariants.WARM)) ); public static final Item COMPASS = registerItem("compass", CompassItem::new); - public static final Item RECOVERY_COMPASS = registerItem("recovery_compass", new Properties().rarity(Rarity.UNCOMMON)); + public static final Item RECOVERY_COMPASS = registerItem("recovery_compass", new Item.Properties().rarity(Rarity.UNCOMMON)); public static final Item BUNDLE = registerItem( - "bundle", BundleItem::new, new Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) + "bundle", BundleItem::new, new Item.Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) ); public static final Item WHITE_BUNDLE = registerItem( - "white_bundle", BundleItem::new, new Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) + "white_bundle", BundleItem::new, new Item.Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) ); public static final Item ORANGE_BUNDLE = registerItem( - "orange_bundle", BundleItem::new, new Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) + "orange_bundle", BundleItem::new, new Item.Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) ); public static final Item MAGENTA_BUNDLE = registerItem( - "magenta_bundle", BundleItem::new, new Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) + "magenta_bundle", BundleItem::new, new Item.Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) ); public static final Item LIGHT_BLUE_BUNDLE = registerItem( - "light_blue_bundle", BundleItem::new, new Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) + "light_blue_bundle", BundleItem::new, new Item.Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) ); public static final Item YELLOW_BUNDLE = registerItem( - "yellow_bundle", BundleItem::new, new Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) + "yellow_bundle", BundleItem::new, new Item.Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) ); public static final Item LIME_BUNDLE = registerItem( - "lime_bundle", BundleItem::new, new Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) + "lime_bundle", BundleItem::new, new Item.Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) ); public static final Item PINK_BUNDLE = registerItem( - "pink_bundle", BundleItem::new, new Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) + "pink_bundle", BundleItem::new, new Item.Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) ); public static final Item GRAY_BUNDLE = registerItem( - "gray_bundle", BundleItem::new, new Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) + "gray_bundle", BundleItem::new, new Item.Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) ); public static final Item LIGHT_GRAY_BUNDLE = registerItem( - "light_gray_bundle", BundleItem::new, new Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) + "light_gray_bundle", BundleItem::new, new Item.Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) ); public static final Item CYAN_BUNDLE = registerItem( - "cyan_bundle", BundleItem::new, new Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) + "cyan_bundle", BundleItem::new, new Item.Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) ); public static final Item PURPLE_BUNDLE = registerItem( - "purple_bundle", BundleItem::new, new Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) + "purple_bundle", BundleItem::new, new Item.Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) ); public static final Item BLUE_BUNDLE = registerItem( - "blue_bundle", BundleItem::new, new Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) + "blue_bundle", BundleItem::new, new Item.Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) ); public static final Item BROWN_BUNDLE = registerItem( - "brown_bundle", BundleItem::new, new Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) + "brown_bundle", BundleItem::new, new Item.Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) ); public static final Item GREEN_BUNDLE = registerItem( - "green_bundle", BundleItem::new, new Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) + "green_bundle", BundleItem::new, new Item.Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) ); public static final Item RED_BUNDLE = registerItem( - "red_bundle", BundleItem::new, new Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) + "red_bundle", BundleItem::new, new Item.Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) ); public static final Item BLACK_BUNDLE = registerItem( - "black_bundle", BundleItem::new, new Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) + "black_bundle", BundleItem::new, new Item.Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY) ); - public static final Item FISHING_ROD = registerItem("fishing_rod", FishingRodItem::new, new Properties().durability(64).enchantable(1)); + public static final Item FISHING_ROD = registerItem("fishing_rod", FishingRodItem::new, new Item.Properties().durability(64).enchantable(1)); public static final Item CLOCK = registerItem("clock"); - public static final Item SPYGLASS = registerItem("spyglass", SpyglassItem::new, new Properties().stacksTo(1)); + public static final Item SPYGLASS = registerItem("spyglass", SpyglassItem::new, new Item.Properties().stacksTo(1)); public static final Item GLOWSTONE_DUST = registerItem("glowstone_dust"); - public static final Item COD = registerItem("cod", new Properties().food(Foods.COD)); - public static final Item SALMON = registerItem("salmon", new Properties().food(Foods.SALMON)); - public static final Item TROPICAL_FISH = registerItem("tropical_fish", new Properties().food(Foods.TROPICAL_FISH)); - public static final Item PUFFERFISH = registerItem("pufferfish", new Properties().food(Foods.PUFFERFISH, Consumables.PUFFERFISH)); - public static final Item COOKED_COD = registerItem("cooked_cod", new Properties().food(Foods.COOKED_COD)); - public static final Item COOKED_SALMON = registerItem("cooked_salmon", new Properties().food(Foods.COOKED_SALMON)); + public static final Item COD = registerItem("cod", new Item.Properties().food(Foods.COD)); + public static final Item SALMON = registerItem("salmon", new Item.Properties().food(Foods.SALMON)); + public static final Item TROPICAL_FISH = registerItem("tropical_fish", new Item.Properties().food(Foods.TROPICAL_FISH)); + public static final Item PUFFERFISH = registerItem("pufferfish", new Item.Properties().food(Foods.PUFFERFISH, Consumables.PUFFERFISH)); + public static final Item COOKED_COD = registerItem("cooked_cod", new Item.Properties().food(Foods.COOKED_COD)); + public static final Item COOKED_SALMON = registerItem("cooked_salmon", new Item.Properties().food(Foods.COOKED_SALMON)); public static final Item INK_SAC = registerItem("ink_sac", InkSacItem::new); public static final Item GLOW_INK_SAC = registerItem("glow_ink_sac", GlowInkSacItem::new); public static final Item COCOA_BEANS = registerItem("cocoa_beans", createBlockItemWithCustomItemName(Blocks.COCOA)); @@ -1488,45 +1526,45 @@ public class Items { public static final Item BONE_MEAL = registerItem("bone_meal", BoneMealItem::new); public static final Item BONE = registerItem("bone"); public static final Item SUGAR = registerItem("sugar"); - public static final Item CAKE = registerBlock(Blocks.CAKE, new Properties().stacksTo(1)); - public static final Item WHITE_BED = registerBlock(Blocks.WHITE_BED, BedItem::new, new Properties().stacksTo(1)); - public static final Item ORANGE_BED = registerBlock(Blocks.ORANGE_BED, BedItem::new, new Properties().stacksTo(1)); - public static final Item MAGENTA_BED = registerBlock(Blocks.MAGENTA_BED, BedItem::new, new Properties().stacksTo(1)); - public static final Item LIGHT_BLUE_BED = registerBlock(Blocks.LIGHT_BLUE_BED, BedItem::new, new Properties().stacksTo(1)); - public static final Item YELLOW_BED = registerBlock(Blocks.YELLOW_BED, BedItem::new, new Properties().stacksTo(1)); - public static final Item LIME_BED = registerBlock(Blocks.LIME_BED, BedItem::new, new Properties().stacksTo(1)); - public static final Item PINK_BED = registerBlock(Blocks.PINK_BED, BedItem::new, new Properties().stacksTo(1)); - public static final Item GRAY_BED = registerBlock(Blocks.GRAY_BED, BedItem::new, new Properties().stacksTo(1)); - public static final Item LIGHT_GRAY_BED = registerBlock(Blocks.LIGHT_GRAY_BED, BedItem::new, new Properties().stacksTo(1)); - public static final Item CYAN_BED = registerBlock(Blocks.CYAN_BED, BedItem::new, new Properties().stacksTo(1)); - public static final Item PURPLE_BED = registerBlock(Blocks.PURPLE_BED, BedItem::new, new Properties().stacksTo(1)); - public static final Item BLUE_BED = registerBlock(Blocks.BLUE_BED, BedItem::new, new Properties().stacksTo(1)); - public static final Item BROWN_BED = registerBlock(Blocks.BROWN_BED, BedItem::new, new Properties().stacksTo(1)); - public static final Item GREEN_BED = registerBlock(Blocks.GREEN_BED, BedItem::new, new Properties().stacksTo(1)); - public static final Item RED_BED = registerBlock(Blocks.RED_BED, BedItem::new, new Properties().stacksTo(1)); - public static final Item BLACK_BED = registerBlock(Blocks.BLACK_BED, BedItem::new, new Properties().stacksTo(1)); - public static final Item COOKIE = registerItem("cookie", new Properties().food(Foods.COOKIE)); + public static final Item CAKE = registerBlock(Blocks.CAKE, new Item.Properties().stacksTo(1)); + public static final Item WHITE_BED = registerBlock(Blocks.WHITE_BED, BedItem::new, new Item.Properties().stacksTo(1)); + public static final Item ORANGE_BED = registerBlock(Blocks.ORANGE_BED, BedItem::new, new Item.Properties().stacksTo(1)); + public static final Item MAGENTA_BED = registerBlock(Blocks.MAGENTA_BED, BedItem::new, new Item.Properties().stacksTo(1)); + public static final Item LIGHT_BLUE_BED = registerBlock(Blocks.LIGHT_BLUE_BED, BedItem::new, new Item.Properties().stacksTo(1)); + public static final Item YELLOW_BED = registerBlock(Blocks.YELLOW_BED, BedItem::new, new Item.Properties().stacksTo(1)); + public static final Item LIME_BED = registerBlock(Blocks.LIME_BED, BedItem::new, new Item.Properties().stacksTo(1)); + public static final Item PINK_BED = registerBlock(Blocks.PINK_BED, BedItem::new, new Item.Properties().stacksTo(1)); + public static final Item GRAY_BED = registerBlock(Blocks.GRAY_BED, BedItem::new, new Item.Properties().stacksTo(1)); + public static final Item LIGHT_GRAY_BED = registerBlock(Blocks.LIGHT_GRAY_BED, BedItem::new, new Item.Properties().stacksTo(1)); + public static final Item CYAN_BED = registerBlock(Blocks.CYAN_BED, BedItem::new, new Item.Properties().stacksTo(1)); + public static final Item PURPLE_BED = registerBlock(Blocks.PURPLE_BED, BedItem::new, new Item.Properties().stacksTo(1)); + public static final Item BLUE_BED = registerBlock(Blocks.BLUE_BED, BedItem::new, new Item.Properties().stacksTo(1)); + public static final Item BROWN_BED = registerBlock(Blocks.BROWN_BED, BedItem::new, new Item.Properties().stacksTo(1)); + public static final Item GREEN_BED = registerBlock(Blocks.GREEN_BED, BedItem::new, new Item.Properties().stacksTo(1)); + public static final Item RED_BED = registerBlock(Blocks.RED_BED, BedItem::new, new Item.Properties().stacksTo(1)); + public static final Item BLACK_BED = registerBlock(Blocks.BLACK_BED, BedItem::new, new Item.Properties().stacksTo(1)); + public static final Item COOKIE = registerItem("cookie", new Item.Properties().food(Foods.COOKIE)); public static final Item CRAFTER = registerBlock( - Blocks.CRAFTER, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) + Blocks.CRAFTER, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) ); public static final Item FILLED_MAP = registerItem( "filled_map", MapItem::new, - new Properties().component(DataComponents.MAP_COLOR, MapItemColor.DEFAULT).component(DataComponents.MAP_DECORATIONS, MapDecorations.EMPTY) + new Item.Properties().component(DataComponents.MAP_COLOR, MapItemColor.DEFAULT).component(DataComponents.MAP_DECORATIONS, MapDecorations.EMPTY) ); public static final Item SHEARS = registerItem( - "shears", ShearsItem::new, new Properties().durability(238).component(DataComponents.TOOL, ShearsItem.createToolProperties()) + "shears", ShearsItem::new, new Item.Properties().durability(238).component(DataComponents.TOOL, ShearsItem.createToolProperties()) ); - public static final Item MELON_SLICE = registerItem("melon_slice", new Properties().food(Foods.MELON_SLICE)); - public static final Item DRIED_KELP = registerItem("dried_kelp", new Properties().food(Foods.DRIED_KELP, Consumables.DRIED_KELP)); + public static final Item MELON_SLICE = registerItem("melon_slice", new Item.Properties().food(Foods.MELON_SLICE)); + public static final Item DRIED_KELP = registerItem("dried_kelp", new Item.Properties().food(Foods.DRIED_KELP, Consumables.DRIED_KELP)); public static final Item PUMPKIN_SEEDS = registerItem(net.minecraft.references.Items.PUMPKIN_SEEDS, createBlockItemWithCustomItemName(Blocks.PUMPKIN_STEM)); public static final Item MELON_SEEDS = registerItem(net.minecraft.references.Items.MELON_SEEDS, createBlockItemWithCustomItemName(Blocks.MELON_STEM)); - public static final Item BEEF = registerItem("beef", new Properties().food(Foods.BEEF)); - public static final Item COOKED_BEEF = registerItem("cooked_beef", new Properties().food(Foods.COOKED_BEEF)); - public static final Item CHICKEN = registerItem("chicken", new Properties().food(Foods.CHICKEN, Consumables.CHICKEN)); - public static final Item COOKED_CHICKEN = registerItem("cooked_chicken", new Properties().food(Foods.COOKED_CHICKEN)); - public static final Item ROTTEN_FLESH = registerItem("rotten_flesh", new Properties().food(Foods.ROTTEN_FLESH, Consumables.ROTTEN_FLESH)); - public static final Item ENDER_PEARL = registerItem("ender_pearl", EnderpearlItem::new, new Properties().stacksTo(16).useCooldown(1.0F)); + public static final Item BEEF = registerItem("beef", new Item.Properties().food(Foods.BEEF)); + public static final Item COOKED_BEEF = registerItem("cooked_beef", new Item.Properties().food(Foods.COOKED_BEEF)); + public static final Item CHICKEN = registerItem("chicken", new Item.Properties().food(Foods.CHICKEN, Consumables.CHICKEN)); + public static final Item COOKED_CHICKEN = registerItem("cooked_chicken", new Item.Properties().food(Foods.COOKED_CHICKEN)); + public static final Item ROTTEN_FLESH = registerItem("rotten_flesh", new Item.Properties().food(Foods.ROTTEN_FLESH, Consumables.ROTTEN_FLESH)); + public static final Item ENDER_PEARL = registerItem("ender_pearl", EnderpearlItem::new, new Item.Properties().stacksTo(16).useCooldown(1.0F)); public static final Item BLAZE_ROD = registerItem("blaze_rod"); public static final Item GHAST_TEAR = registerItem("ghast_tear"); public static final Item GOLD_NUGGET = registerItem("gold_nugget"); @@ -1535,18 +1573,18 @@ public class Items { public static final Item POTION = registerItem( "potion", PotionItem::new, - new Properties() + new Item.Properties() .stacksTo(1) .component(DataComponents.POTION_CONTENTS, PotionContents.EMPTY) .component(DataComponents.CONSUMABLE, Consumables.DEFAULT_DRINK) .usingConvertsTo(GLASS_BOTTLE) ); - public static final Item SPIDER_EYE = registerItem("spider_eye", new Properties().food(Foods.SPIDER_EYE, Consumables.SPIDER_EYE)); + public static final Item SPIDER_EYE = registerItem("spider_eye", new Item.Properties().food(Foods.SPIDER_EYE, Consumables.SPIDER_EYE)); public static final Item FERMENTED_SPIDER_EYE = registerItem("fermented_spider_eye"); public static final Item BLAZE_POWDER = registerItem("blaze_powder"); public static final Item MAGMA_CREAM = registerItem("magma_cream"); public static final Item BREWING_STAND = registerBlock( - Blocks.BREWING_STAND, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) + Blocks.BREWING_STAND, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) ); public static final Item CAULDRON = registerBlock(Blocks.CAULDRON, Blocks.WATER_CAULDRON, Blocks.LAVA_CAULDRON, Blocks.POWDER_SNOW_CAULDRON); public static final Item ENDER_EYE = registerItem("ender_eye", EnderEyeItem::new); @@ -1648,21 +1686,21 @@ public class Items { "zombified_piglin_spawn_egg", properties -> new SpawnEggItem(EntityType.ZOMBIFIED_PIGLIN, properties) ); public static final Item EXPERIENCE_BOTTLE = registerItem( - "experience_bottle", ExperienceBottleItem::new, new Properties().rarity(Rarity.UNCOMMON).component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) + "experience_bottle", ExperienceBottleItem::new, new Item.Properties().rarity(Rarity.UNCOMMON).component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) ); public static final Item FIRE_CHARGE = registerItem("fire_charge", FireChargeItem::new); - public static final Item WIND_CHARGE = registerItem("wind_charge", WindChargeItem::new, new Properties().useCooldown(0.5F)); + public static final Item WIND_CHARGE = registerItem("wind_charge", WindChargeItem::new, new Item.Properties().useCooldown(0.5F)); public static final Item WRITABLE_BOOK = registerItem( - "writable_book", WritableBookItem::new, new Properties().stacksTo(1).component(DataComponents.WRITABLE_BOOK_CONTENT, WritableBookContent.EMPTY) + "writable_book", WritableBookItem::new, new Item.Properties().stacksTo(1).component(DataComponents.WRITABLE_BOOK_CONTENT, WritableBookContent.EMPTY) ); public static final Item WRITTEN_BOOK = registerItem( - "written_book", WrittenBookItem::new, new Properties().stacksTo(16).component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) + "written_book", WrittenBookItem::new, new Item.Properties().stacksTo(16).component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) ); public static final Item BREEZE_ROD = registerItem("breeze_rod"); public static final Item MACE = registerItem( "mace", MaceItem::new, - new Properties() + new Item.Properties() .rarity(Rarity.EPIC) .durability(500) .component(DataComponents.TOOL, MaceItem.createToolProperties()) @@ -1674,197 +1712,201 @@ public class Items { public static final Item ITEM_FRAME = registerItem("item_frame", properties -> new ItemFrameItem(EntityType.ITEM_FRAME, properties)); public static final Item GLOW_ITEM_FRAME = registerItem("glow_item_frame", properties -> new ItemFrameItem(EntityType.GLOW_ITEM_FRAME, properties)); public static final Item FLOWER_POT = registerBlock(Blocks.FLOWER_POT); - public static final Item CARROT = registerItem("carrot", createBlockItemWithCustomItemName(Blocks.CARROTS), new Properties().food(Foods.CARROT)); - public static final Item POTATO = registerItem("potato", createBlockItemWithCustomItemName(Blocks.POTATOES), new Properties().food(Foods.POTATO)); - public static final Item BAKED_POTATO = registerItem("baked_potato", new Properties().food(Foods.BAKED_POTATO)); - public static final Item POISONOUS_POTATO = registerItem("poisonous_potato", new Properties().food(Foods.POISONOUS_POTATO, Consumables.POISONOUS_POTATO)); + public static final Item CARROT = registerItem("carrot", createBlockItemWithCustomItemName(Blocks.CARROTS), new Item.Properties().food(Foods.CARROT)); + public static final Item POTATO = registerItem("potato", createBlockItemWithCustomItemName(Blocks.POTATOES), new Item.Properties().food(Foods.POTATO)); + public static final Item BAKED_POTATO = registerItem("baked_potato", new Item.Properties().food(Foods.BAKED_POTATO)); + public static final Item POISONOUS_POTATO = registerItem("poisonous_potato", new Item.Properties().food(Foods.POISONOUS_POTATO, Consumables.POISONOUS_POTATO)); public static final Item MAP = registerItem("map", EmptyMapItem::new); - public static final Item GOLDEN_CARROT = registerItem("golden_carrot", new Properties().food(Foods.GOLDEN_CARROT)); + public static final Item GOLDEN_CARROT = registerItem("golden_carrot", new Item.Properties().food(Foods.GOLDEN_CARROT)); public static final Item SKELETON_SKULL = registerBlock( Blocks.SKELETON_SKULL, (block, properties) -> new StandingAndWallBlockItem(block, Blocks.SKELETON_WALL_SKULL, Direction.DOWN, Waypoint.addHideAttribute(properties)), - new Properties().rarity(Rarity.UNCOMMON).equippableUnswappable(EquipmentSlot.HEAD) + new Item.Properties().rarity(Rarity.UNCOMMON).equippableUnswappable(EquipmentSlot.HEAD) ); public static final Item WITHER_SKELETON_SKULL = registerBlock( Blocks.WITHER_SKELETON_SKULL, (block, properties) -> new StandingAndWallBlockItem(block, Blocks.WITHER_SKELETON_WALL_SKULL, Direction.DOWN, Waypoint.addHideAttribute(properties)), - new Properties().rarity(Rarity.RARE).equippableUnswappable(EquipmentSlot.HEAD) + new Item.Properties().rarity(Rarity.RARE).equippableUnswappable(EquipmentSlot.HEAD) ); public static final Item PLAYER_HEAD = registerBlock( Blocks.PLAYER_HEAD, (block, properties) -> new PlayerHeadItem(block, Blocks.PLAYER_WALL_HEAD, Waypoint.addHideAttribute(properties)), - new Properties().rarity(Rarity.UNCOMMON).equippableUnswappable(EquipmentSlot.HEAD) + new Item.Properties().rarity(Rarity.UNCOMMON).equippableUnswappable(EquipmentSlot.HEAD) ); public static final Item ZOMBIE_HEAD = registerBlock( Blocks.ZOMBIE_HEAD, (block, properties) -> new StandingAndWallBlockItem(block, Blocks.ZOMBIE_WALL_HEAD, Direction.DOWN, Waypoint.addHideAttribute(properties)), - new Properties().rarity(Rarity.UNCOMMON).equippableUnswappable(EquipmentSlot.HEAD) + new Item.Properties().rarity(Rarity.UNCOMMON).equippableUnswappable(EquipmentSlot.HEAD) ); public static final Item CREEPER_HEAD = registerBlock( Blocks.CREEPER_HEAD, (block, properties) -> new StandingAndWallBlockItem(block, Blocks.CREEPER_WALL_HEAD, Direction.DOWN, Waypoint.addHideAttribute(properties)), - new Properties().rarity(Rarity.UNCOMMON).equippableUnswappable(EquipmentSlot.HEAD) + new Item.Properties().rarity(Rarity.UNCOMMON).equippableUnswappable(EquipmentSlot.HEAD) ); public static final Item DRAGON_HEAD = registerBlock( Blocks.DRAGON_HEAD, (block, properties) -> new StandingAndWallBlockItem(block, Blocks.DRAGON_WALL_HEAD, Direction.DOWN, Waypoint.addHideAttribute(properties)), - new Properties().rarity(Rarity.EPIC).equippableUnswappable(EquipmentSlot.HEAD) + new Item.Properties().rarity(Rarity.EPIC).equippableUnswappable(EquipmentSlot.HEAD) ); public static final Item PIGLIN_HEAD = registerBlock( Blocks.PIGLIN_HEAD, (block, properties) -> new StandingAndWallBlockItem(block, Blocks.PIGLIN_WALL_HEAD, Direction.DOWN, Waypoint.addHideAttribute(properties)), - new Properties().rarity(Rarity.UNCOMMON).equippableUnswappable(EquipmentSlot.HEAD) + new Item.Properties().rarity(Rarity.UNCOMMON).equippableUnswappable(EquipmentSlot.HEAD) ); public static final Item NETHER_STAR = registerItem( "nether_star", - new Properties() + new Item.Properties() .rarity(Rarity.RARE) .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) .component(DataComponents.DAMAGE_RESISTANT, new DamageResistant(DamageTypeTags.IS_EXPLOSION)) ); - public static final Item PUMPKIN_PIE = registerItem("pumpkin_pie", new Properties().food(Foods.PUMPKIN_PIE)); + public static final Item PUMPKIN_PIE = registerItem("pumpkin_pie", new Item.Properties().food(Foods.PUMPKIN_PIE)); public static final Item FIREWORK_ROCKET = registerItem( - "firework_rocket", FireworkRocketItem::new, new Properties().component(DataComponents.FIREWORKS, new Fireworks(1, List.of())) + "firework_rocket", FireworkRocketItem::new, new Item.Properties().component(DataComponents.FIREWORKS, new Fireworks(1, List.of())) ); public static final Item FIREWORK_STAR = registerItem("firework_star"); public static final Item ENCHANTED_BOOK = registerItem( "enchanted_book", - new Properties() + new Item.Properties() .stacksTo(1) .rarity(Rarity.UNCOMMON) .component(DataComponents.STORED_ENCHANTMENTS, ItemEnchantments.EMPTY) .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) ); public static final Item NETHER_BRICK = registerItem("nether_brick"); - public static final Item RESIN_BRICK = registerItem("resin_brick", new Properties().trimMaterial(TrimMaterials.RESIN)); + public static final Item RESIN_BRICK = registerItem("resin_brick", new Item.Properties().trimMaterial(TrimMaterials.RESIN)); public static final Item PRISMARINE_SHARD = registerItem("prismarine_shard"); public static final Item PRISMARINE_CRYSTALS = registerItem("prismarine_crystals"); - public static final Item RABBIT = registerItem("rabbit", new Properties().food(Foods.RABBIT)); - public static final Item COOKED_RABBIT = registerItem("cooked_rabbit", new Properties().food(Foods.COOKED_RABBIT)); - public static final Item RABBIT_STEW = registerItem("rabbit_stew", new Properties().stacksTo(1).food(Foods.RABBIT_STEW).usingConvertsTo(BOWL)); + public static final Item RABBIT = registerItem("rabbit", new Item.Properties().food(Foods.RABBIT)); + public static final Item COOKED_RABBIT = registerItem("cooked_rabbit", new Item.Properties().food(Foods.COOKED_RABBIT)); + public static final Item RABBIT_STEW = registerItem("rabbit_stew", new Item.Properties().stacksTo(1).food(Foods.RABBIT_STEW).usingConvertsTo(BOWL)); public static final Item RABBIT_FOOT = registerItem("rabbit_foot"); public static final Item RABBIT_HIDE = registerItem("rabbit_hide"); - public static final Item ARMOR_STAND = registerItem("armor_stand", ArmorStandItem::new, new Properties().stacksTo(16)); - public static final Item IRON_HORSE_ARMOR = registerItem("iron_horse_armor", new Properties().horseArmor(ArmorMaterials.IRON)); - public static final Item GOLDEN_HORSE_ARMOR = registerItem("golden_horse_armor", new Properties().horseArmor(ArmorMaterials.GOLD)); - public static final Item DIAMOND_HORSE_ARMOR = registerItem("diamond_horse_armor", new Properties().horseArmor(ArmorMaterials.DIAMOND)); - public static final Item LEATHER_HORSE_ARMOR = registerItem("leather_horse_armor", new Properties().horseArmor(ArmorMaterials.LEATHER)); + public static final Item ARMOR_STAND = registerItem("armor_stand", ArmorStandItem::new, new Item.Properties().stacksTo(16)); + public static final Item IRON_HORSE_ARMOR = registerItem("iron_horse_armor", new Item.Properties().horseArmor(ArmorMaterials.IRON)); + public static final Item GOLDEN_HORSE_ARMOR = registerItem("golden_horse_armor", new Item.Properties().horseArmor(ArmorMaterials.GOLD)); + public static final Item DIAMOND_HORSE_ARMOR = registerItem("diamond_horse_armor", new Item.Properties().horseArmor(ArmorMaterials.DIAMOND)); + public static final Item LEATHER_HORSE_ARMOR = registerItem("leather_horse_armor", new Item.Properties().horseArmor(ArmorMaterials.LEATHER)); public static final Item LEAD = registerItem("lead", LeadItem::new); public static final Item NAME_TAG = registerItem("name_tag", NameTagItem::new); public static final Item COMMAND_BLOCK_MINECART = registerItem( - "command_block_minecart", properties -> new MinecartItem(EntityType.COMMAND_BLOCK_MINECART, properties), new Properties().stacksTo(1).rarity(Rarity.EPIC) + "command_block_minecart", + properties -> new MinecartItem(EntityType.COMMAND_BLOCK_MINECART, properties), + new Item.Properties().stacksTo(1).rarity(Rarity.EPIC) ); - public static final Item MUTTON = registerItem("mutton", new Properties().food(Foods.MUTTON)); - public static final Item COOKED_MUTTON = registerItem("cooked_mutton", new Properties().food(Foods.COOKED_MUTTON)); + public static final Item MUTTON = registerItem("mutton", new Item.Properties().food(Foods.MUTTON)); + public static final Item COOKED_MUTTON = registerItem("cooked_mutton", new Item.Properties().food(Foods.COOKED_MUTTON)); public static final Item WHITE_BANNER = registerBlock( Blocks.WHITE_BANNER, (block, properties) -> new BannerItem(block, Blocks.WHITE_WALL_BANNER, properties), - new Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) + new Item.Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) ); public static final Item ORANGE_BANNER = registerBlock( Blocks.ORANGE_BANNER, (block, properties) -> new BannerItem(block, Blocks.ORANGE_WALL_BANNER, properties), - new Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) + new Item.Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) ); public static final Item MAGENTA_BANNER = registerBlock( Blocks.MAGENTA_BANNER, (block, properties) -> new BannerItem(block, Blocks.MAGENTA_WALL_BANNER, properties), - new Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) + new Item.Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) ); public static final Item LIGHT_BLUE_BANNER = registerBlock( Blocks.LIGHT_BLUE_BANNER, (block, properties) -> new BannerItem(block, Blocks.LIGHT_BLUE_WALL_BANNER, properties), - new Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) + new Item.Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) ); public static final Item YELLOW_BANNER = registerBlock( Blocks.YELLOW_BANNER, (block, properties) -> new BannerItem(block, Blocks.YELLOW_WALL_BANNER, properties), - new Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) + new Item.Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) ); public static final Item LIME_BANNER = registerBlock( Blocks.LIME_BANNER, (block, properties) -> new BannerItem(block, Blocks.LIME_WALL_BANNER, properties), - new Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) + new Item.Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) ); public static final Item PINK_BANNER = registerBlock( Blocks.PINK_BANNER, (block, properties) -> new BannerItem(block, Blocks.PINK_WALL_BANNER, properties), - new Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) + new Item.Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) ); public static final Item GRAY_BANNER = registerBlock( Blocks.GRAY_BANNER, (block, properties) -> new BannerItem(block, Blocks.GRAY_WALL_BANNER, properties), - new Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) + new Item.Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) ); public static final Item LIGHT_GRAY_BANNER = registerBlock( Blocks.LIGHT_GRAY_BANNER, (block, properties) -> new BannerItem(block, Blocks.LIGHT_GRAY_WALL_BANNER, properties), - new Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) + new Item.Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) ); public static final Item CYAN_BANNER = registerBlock( Blocks.CYAN_BANNER, (block, properties) -> new BannerItem(block, Blocks.CYAN_WALL_BANNER, properties), - new Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) + new Item.Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) ); public static final Item PURPLE_BANNER = registerBlock( Blocks.PURPLE_BANNER, (block, properties) -> new BannerItem(block, Blocks.PURPLE_WALL_BANNER, properties), - new Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) + new Item.Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) ); public static final Item BLUE_BANNER = registerBlock( Blocks.BLUE_BANNER, (block, properties) -> new BannerItem(block, Blocks.BLUE_WALL_BANNER, properties), - new Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) + new Item.Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) ); public static final Item BROWN_BANNER = registerBlock( Blocks.BROWN_BANNER, (block, properties) -> new BannerItem(block, Blocks.BROWN_WALL_BANNER, properties), - new Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) + new Item.Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) ); public static final Item GREEN_BANNER = registerBlock( Blocks.GREEN_BANNER, (block, properties) -> new BannerItem(block, Blocks.GREEN_WALL_BANNER, properties), - new Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) + new Item.Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) ); public static final Item RED_BANNER = registerBlock( Blocks.RED_BANNER, (block, properties) -> new BannerItem(block, Blocks.RED_WALL_BANNER, properties), - new Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) + new Item.Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) ); public static final Item BLACK_BANNER = registerBlock( Blocks.BLACK_BANNER, (block, properties) -> new BannerItem(block, Blocks.BLACK_WALL_BANNER, properties), - new Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) + new Item.Properties().stacksTo(16).component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) ); public static final Item END_CRYSTAL = registerItem( - "end_crystal", EndCrystalItem::new, new Properties().component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) + "end_crystal", EndCrystalItem::new, new Item.Properties().component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) + ); + public static final Item CHORUS_FRUIT = registerItem( + "chorus_fruit", new Item.Properties().food(Foods.CHORUS_FRUIT, Consumables.CHORUS_FRUIT).useCooldown(1.0F) ); - public static final Item CHORUS_FRUIT = registerItem("chorus_fruit", new Properties().food(Foods.CHORUS_FRUIT, Consumables.CHORUS_FRUIT).useCooldown(1.0F)); public static final Item POPPED_CHORUS_FRUIT = registerItem("popped_chorus_fruit"); public static final Item TORCHFLOWER_SEEDS = registerItem("torchflower_seeds", createBlockItemWithCustomItemName(Blocks.TORCHFLOWER_CROP)); public static final Item PITCHER_POD = registerItem("pitcher_pod", createBlockItemWithCustomItemName(Blocks.PITCHER_CROP)); - public static final Item BEETROOT = registerItem("beetroot", new Properties().food(Foods.BEETROOT)); + public static final Item BEETROOT = registerItem("beetroot", new Item.Properties().food(Foods.BEETROOT)); public static final Item BEETROOT_SEEDS = registerItem("beetroot_seeds", createBlockItemWithCustomItemName(Blocks.BEETROOTS)); - public static final Item BEETROOT_SOUP = registerItem("beetroot_soup", new Properties().stacksTo(1).food(Foods.BEETROOT_SOUP).usingConvertsTo(BOWL)); - public static final Item DRAGON_BREATH = registerItem("dragon_breath", new Properties().craftRemainder(GLASS_BOTTLE).rarity(Rarity.UNCOMMON)); + public static final Item BEETROOT_SOUP = registerItem("beetroot_soup", new Item.Properties().stacksTo(1).food(Foods.BEETROOT_SOUP).usingConvertsTo(BOWL)); + public static final Item DRAGON_BREATH = registerItem("dragon_breath", new Item.Properties().craftRemainder(GLASS_BOTTLE).rarity(Rarity.UNCOMMON)); public static final Item SPLASH_POTION = registerItem( - "splash_potion", SplashPotionItem::new, new Properties().stacksTo(1).component(DataComponents.POTION_CONTENTS, PotionContents.EMPTY) + "splash_potion", SplashPotionItem::new, new Item.Properties().stacksTo(1).component(DataComponents.POTION_CONTENTS, PotionContents.EMPTY) ); public static final Item SPECTRAL_ARROW = registerItem("spectral_arrow", SpectralArrowItem::new); public static final Item TIPPED_ARROW = registerItem( "tipped_arrow", TippedArrowItem::new, - new Properties().component(DataComponents.POTION_CONTENTS, PotionContents.EMPTY).component(DataComponents.POTION_DURATION_SCALE, 0.125F) + new Item.Properties().component(DataComponents.POTION_CONTENTS, PotionContents.EMPTY).component(DataComponents.POTION_DURATION_SCALE, 0.125F) ); public static final Item LINGERING_POTION = registerItem( "lingering_potion", LingeringPotionItem::new, - new Properties().stacksTo(1).component(DataComponents.POTION_CONTENTS, PotionContents.EMPTY).component(DataComponents.POTION_DURATION_SCALE, 0.25F) + new Item.Properties().stacksTo(1).component(DataComponents.POTION_CONTENTS, PotionContents.EMPTY).component(DataComponents.POTION_DURATION_SCALE, 0.25F) ); public static final Item SHIELD = registerItem( "shield", ShieldItem::new, - new Properties() + new Item.Properties() .durability(336) .component(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY) .repairable(ItemTags.WOODEN_TOOL_MATERIALS) @@ -1874,8 +1916,8 @@ public class Items { new BlocksAttacks( 0.25F, 1.0F, - List.of(new DamageReduction(90.0F, Optional.empty(), 0.0F, 1.0F)), - new ItemDamageFunction(3.0F, 1.0F, 1.0F), + List.of(new BlocksAttacks.DamageReduction(90.0F, Optional.empty(), 0.0F, 1.0F)), + new BlocksAttacks.ItemDamageFunction(3.0F, 1.0F, 1.0F), Optional.of(DamageTypeTags.BYPASSES_SHIELD), Optional.of(SoundEvents.SHIELD_BLOCK), Optional.of(SoundEvents.SHIELD_BREAK) @@ -1884,88 +1926,87 @@ public class Items { .component(DataComponents.BREAK_SOUND, SoundEvents.SHIELD_BREAK) ); public static final Item TOTEM_OF_UNDYING = registerItem( - "totem_of_undying", new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).component(DataComponents.DEATH_PROTECTION, DeathProtection.TOTEM_OF_UNDYING) + "totem_of_undying", new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).component(DataComponents.DEATH_PROTECTION, DeathProtection.TOTEM_OF_UNDYING) ); public static final Item SHULKER_SHELL = registerItem("shulker_shell"); public static final Item IRON_NUGGET = registerItem("iron_nugget"); public static final Item KNOWLEDGE_BOOK = registerItem( - "knowledge_book", KnowledgeBookItem::new, new Properties().stacksTo(1).rarity(Rarity.EPIC).component(DataComponents.RECIPES, List.of()) + "knowledge_book", KnowledgeBookItem::new, new Item.Properties().stacksTo(1).rarity(Rarity.EPIC).component(DataComponents.RECIPES, List.of()) ); public static final Item DEBUG_STICK = registerItem( "debug_stick", DebugStickItem::new, - new Properties() + new Item.Properties() .stacksTo(1) .rarity(Rarity.EPIC) .component(DataComponents.DEBUG_STICK_STATE, DebugStickState.EMPTY) .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) ); public static final Item MUSIC_DISC_13 = registerItem( - "music_disc_13", new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.THIRTEEN) + "music_disc_13", new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.THIRTEEN) ); public static final Item MUSIC_DISC_CAT = registerItem( - "music_disc_cat", new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.CAT) + "music_disc_cat", new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.CAT) ); public static final Item MUSIC_DISC_BLOCKS = registerItem( - "music_disc_blocks", new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.BLOCKS) + "music_disc_blocks", new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.BLOCKS) ); public static final Item MUSIC_DISC_CHIRP = registerItem( - "music_disc_chirp", new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.CHIRP) + "music_disc_chirp", new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.CHIRP) ); public static final Item MUSIC_DISC_CREATOR = registerItem( - "music_disc_creator", new Properties().stacksTo(1).rarity(Rarity.RARE).jukeboxPlayable(JukeboxSongs.CREATOR) + "music_disc_creator", new Item.Properties().stacksTo(1).rarity(Rarity.RARE).jukeboxPlayable(JukeboxSongs.CREATOR) ); public static final Item MUSIC_DISC_CREATOR_MUSIC_BOX = registerItem( - "music_disc_creator_music_box", new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.CREATOR_MUSIC_BOX) + "music_disc_creator_music_box", new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.CREATOR_MUSIC_BOX) ); public static final Item MUSIC_DISC_FAR = registerItem( - "music_disc_far", new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.FAR) - ); - public static final Item MUSIC_DISC_LAVA_CHICKEN = registerItem( - "music_disc_lava_chicken", new Properties().stacksTo(1).rarity(Rarity.RARE).jukeboxPlayable(JukeboxSongs.LAVA_CHICKEN) + "music_disc_far", new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.FAR) ); public static final Item MUSIC_DISC_MALL = registerItem( - "music_disc_mall", new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.MALL) + "music_disc_mall", new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.MALL) ); public static final Item MUSIC_DISC_MELLOHI = registerItem( - "music_disc_mellohi", new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.MELLOHI) + "music_disc_mellohi", new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.MELLOHI) ); public static final Item MUSIC_DISC_STAL = registerItem( - "music_disc_stal", new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.STAL) + "music_disc_stal", new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.STAL) ); public static final Item MUSIC_DISC_STRAD = registerItem( - "music_disc_strad", new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.STRAD) + "music_disc_strad", new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.STRAD) ); public static final Item MUSIC_DISC_WARD = registerItem( - "music_disc_ward", new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.WARD) + "music_disc_ward", new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.WARD) ); public static final Item MUSIC_DISC_11 = registerItem( - "music_disc_11", new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.ELEVEN) + "music_disc_11", new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.ELEVEN) ); public static final Item MUSIC_DISC_WAIT = registerItem( - "music_disc_wait", new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.WAIT) + "music_disc_wait", new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.WAIT) ); public static final Item MUSIC_DISC_OTHERSIDE = registerItem( - "music_disc_otherside", new Properties().stacksTo(1).rarity(Rarity.RARE).jukeboxPlayable(JukeboxSongs.OTHERSIDE) + "music_disc_otherside", new Item.Properties().stacksTo(1).rarity(Rarity.RARE).jukeboxPlayable(JukeboxSongs.OTHERSIDE) ); public static final Item MUSIC_DISC_RELIC = registerItem( - "music_disc_relic", new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.RELIC) + "music_disc_relic", new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.RELIC) + ); + public static final Item MUSIC_DISC_5 = registerItem( + "music_disc_5", new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.FIVE) ); - public static final Item MUSIC_DISC_5 = registerItem("music_disc_5", new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.FIVE)); public static final Item MUSIC_DISC_PIGSTEP = registerItem( - "music_disc_pigstep", new Properties().stacksTo(1).rarity(Rarity.RARE).jukeboxPlayable(JukeboxSongs.PIGSTEP) + "music_disc_pigstep", new Item.Properties().stacksTo(1).rarity(Rarity.RARE).jukeboxPlayable(JukeboxSongs.PIGSTEP) ); public static final Item MUSIC_DISC_PRECIPICE = registerItem( - "music_disc_precipice", new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.PRECIPICE) + "music_disc_precipice", new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.PRECIPICE) ); public static final Item MUSIC_DISC_TEARS = registerItem( - "music_disc_tears", new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.TEARS) + "music_disc_tears", new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).jukeboxPlayable(JukeboxSongs.TEARS) ); - public static final Item DISC_FRAGMENT_5 = registerItem("disc_fragment_5", DiscFragmentItem::new, new Properties().rarity(Rarity.UNCOMMON)); + public static final Item DISC_FRAGMENT_5 = registerItem("disc_fragment_5", DiscFragmentItem::new, new Item.Properties().rarity(Rarity.UNCOMMON)); public static final Item TRIDENT = registerItem( "trident", TridentItem::new, - new Properties() + new Item.Properties() .rarity(Rarity.RARE) .durability(250) .attributes(TridentItem.createAttributes()) @@ -1973,69 +2014,74 @@ public class Items { .enchantable(1) .component(DataComponents.WEAPON, new Weapon(1)) ); - public static final Item NAUTILUS_SHELL = registerItem("nautilus_shell", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item HEART_OF_THE_SEA = registerItem("heart_of_the_sea", new Properties().rarity(Rarity.UNCOMMON)); + public static final Item NAUTILUS_SHELL = registerItem("nautilus_shell", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item HEART_OF_THE_SEA = registerItem("heart_of_the_sea", new Item.Properties().rarity(Rarity.UNCOMMON)); public static final Item CROSSBOW = registerItem( "crossbow", CrossbowItem::new, - new Properties().stacksTo(1).durability(465).component(DataComponents.CHARGED_PROJECTILES, ChargedProjectiles.EMPTY).enchantable(1) + new Item.Properties().stacksTo(1).durability(465).component(DataComponents.CHARGED_PROJECTILES, ChargedProjectiles.EMPTY).enchantable(1) ); public static final Item SUSPICIOUS_STEW = registerItem( "suspicious_stew", - new Properties().stacksTo(1).food(Foods.SUSPICIOUS_STEW).component(DataComponents.SUSPICIOUS_STEW_EFFECTS, SuspiciousStewEffects.EMPTY).usingConvertsTo(BOWL) + new Item.Properties() + .stacksTo(1) + .food(Foods.SUSPICIOUS_STEW) + .component(DataComponents.SUSPICIOUS_STEW_EFFECTS, SuspiciousStewEffects.EMPTY) + .usingConvertsTo(BOWL) ); public static final Item LOOM = registerBlock(Blocks.LOOM); public static final Item FLOWER_BANNER_PATTERN = registerItem( - "flower_banner_pattern", new Properties().stacksTo(1).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_FLOWER) + "flower_banner_pattern", new Item.Properties().stacksTo(1).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_FLOWER) ); public static final Item CREEPER_BANNER_PATTERN = registerItem( "creeper_banner_pattern", - new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_CREEPER) + new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_CREEPER) ); public static final Item SKULL_BANNER_PATTERN = registerItem( "skull_banner_pattern", - new Properties().stacksTo(1).rarity(Rarity.RARE).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_SKULL) + new Item.Properties().stacksTo(1).rarity(Rarity.RARE).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_SKULL) ); public static final Item MOJANG_BANNER_PATTERN = registerItem( "mojang_banner_pattern", - new Properties().stacksTo(1).rarity(Rarity.RARE).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_MOJANG) + new Item.Properties().stacksTo(1).rarity(Rarity.RARE).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_MOJANG) ); public static final Item GLOBE_BANNER_PATTERN = registerItem( - "globe_banner_pattern", new Properties().stacksTo(1).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_GLOBE) + "globe_banner_pattern", new Item.Properties().stacksTo(1).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_GLOBE) ); public static final Item PIGLIN_BANNER_PATTERN = registerItem( "piglin_banner_pattern", - new Properties().stacksTo(1).rarity(Rarity.UNCOMMON).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_PIGLIN) + new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_PIGLIN) ); public static final Item FLOW_BANNER_PATTERN = registerItem( "flow_banner_pattern", - new Properties().stacksTo(1).rarity(Rarity.RARE).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_FLOW) + new Item.Properties().stacksTo(1).rarity(Rarity.RARE).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_FLOW) ); public static final Item GUSTER_BANNER_PATTERN = registerItem( "guster_banner_pattern", - new Properties().stacksTo(1).rarity(Rarity.RARE).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_GUSTER) + new Item.Properties().stacksTo(1).rarity(Rarity.RARE).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_GUSTER) ); public static final Item FIELD_MASONED_BANNER_PATTERN = registerItem( - "field_masoned_banner_pattern", new Properties().stacksTo(1).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_FIELD_MASONED) + "field_masoned_banner_pattern", + new Item.Properties().stacksTo(1).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_FIELD_MASONED) ); public static final Item BORDURE_INDENTED_BANNER_PATTERN = registerItem( "bordure_indented_banner_pattern", - new Properties().stacksTo(1).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_BORDURE_INDENTED) + new Item.Properties().stacksTo(1).component(DataComponents.PROVIDES_BANNER_PATTERNS, BannerPatternTags.PATTERN_ITEM_BORDURE_INDENTED) ); public static final Item GOAT_HORN = registerItem( "goat_horn", InstrumentItem::new, - new Properties().rarity(Rarity.UNCOMMON).stacksTo(1).component(DataComponents.INSTRUMENT, new InstrumentComponent(Instruments.PONDER_GOAT_HORN)) + new Item.Properties().rarity(Rarity.UNCOMMON).stacksTo(1).component(DataComponents.INSTRUMENT, new InstrumentComponent(Instruments.PONDER_GOAT_HORN)) ); public static final Item COMPOSTER = registerBlock(Blocks.COMPOSTER); public static final Item BARREL = registerBlock( - Blocks.BARREL, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) + Blocks.BARREL, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) ); public static final Item SMOKER = registerBlock( - Blocks.SMOKER, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) + Blocks.SMOKER, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) ); public static final Item BLAST_FURNACE = registerBlock( - Blocks.BLAST_FURNACE, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) + Blocks.BLAST_FURNACE, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) ); public static final Item CARTOGRAPHY_TABLE = registerBlock(Blocks.CARTOGRAPHY_TABLE); public static final Item FLETCHING_TABLE = registerBlock(Blocks.FLETCHING_TABLE); @@ -2046,33 +2092,34 @@ public class Items { public static final Item LANTERN = registerBlock(Blocks.LANTERN); public static final Item SOUL_LANTERN = registerBlock(Blocks.SOUL_LANTERN); public static final Item SWEET_BERRIES = registerItem( - "sweet_berries", createBlockItemWithCustomItemName(Blocks.SWEET_BERRY_BUSH), new Properties().food(Foods.SWEET_BERRIES) + "sweet_berries", createBlockItemWithCustomItemName(Blocks.SWEET_BERRY_BUSH), new Item.Properties().food(Foods.SWEET_BERRIES) ); public static final Item GLOW_BERRIES = registerItem( - "glow_berries", createBlockItemWithCustomItemName(Blocks.CAVE_VINES), new Properties().food(Foods.GLOW_BERRIES) + "glow_berries", createBlockItemWithCustomItemName(Blocks.CAVE_VINES), new Item.Properties().food(Foods.GLOW_BERRIES) ); public static final Item CAMPFIRE = registerBlock( - Blocks.CAMPFIRE, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) + Blocks.CAMPFIRE, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) ); public static final Item SOUL_CAMPFIRE = registerBlock( - Blocks.SOUL_CAMPFIRE, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) + Blocks.SOUL_CAMPFIRE, (UnaryOperator)(properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)) ); public static final Item SHROOMLIGHT = registerBlock(Blocks.SHROOMLIGHT); public static final Item HONEYCOMB = registerItem("honeycomb", HoneycombItem::new); public static final Item BEE_NEST = registerBlock( Blocks.BEE_NEST, - new Properties() + new Item.Properties() .component(DataComponents.BEES, Bees.EMPTY) .component(DataComponents.BLOCK_STATE, BlockItemStateProperties.EMPTY.with(BeehiveBlock.HONEY_LEVEL, 0)) ); public static final Item BEEHIVE = registerBlock( Blocks.BEEHIVE, - new Properties() + new Item.Properties() .component(DataComponents.BEES, Bees.EMPTY) .component(DataComponents.BLOCK_STATE, BlockItemStateProperties.EMPTY.with(BeehiveBlock.HONEY_LEVEL, 0)) ); public static final Item HONEY_BOTTLE = registerItem( - "honey_bottle", new Properties().craftRemainder(GLASS_BOTTLE).food(Foods.HONEY_BOTTLE, Consumables.HONEY_BOTTLE).usingConvertsTo(GLASS_BOTTLE).stacksTo(16) + "honey_bottle", + new Item.Properties().craftRemainder(GLASS_BOTTLE).food(Foods.HONEY_BOTTLE, Consumables.HONEY_BOTTLE).usingConvertsTo(GLASS_BOTTLE).stacksTo(16) ); public static final Item HONEYCOMB_BLOCK = registerBlock(Blocks.HONEYCOMB_BLOCK); public static final Item LODESTONE = registerBlock(Blocks.LODESTONE); @@ -2116,88 +2163,88 @@ public class Items { public static final Item VERDANT_FROGLIGHT = registerBlock(Blocks.VERDANT_FROGLIGHT); public static final Item PEARLESCENT_FROGLIGHT = registerBlock(Blocks.PEARLESCENT_FROGLIGHT); public static final Item FROGSPAWN = registerBlock(Blocks.FROGSPAWN, PlaceOnWaterBlockItem::new); - public static final Item ECHO_SHARD = registerItem("echo_shard", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item BRUSH = registerItem("brush", BrushItem::new, new Properties().durability(64)); + public static final Item ECHO_SHARD = registerItem("echo_shard", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item BRUSH = registerItem("brush", BrushItem::new, new Item.Properties().durability(64)); public static final Item NETHERITE_UPGRADE_SMITHING_TEMPLATE = registerItem( - "netherite_upgrade_smithing_template", SmithingTemplateItem::createNetheriteUpgradeTemplate, new Properties().rarity(Rarity.UNCOMMON) + "netherite_upgrade_smithing_template", SmithingTemplateItem::createNetheriteUpgradeTemplate, new Item.Properties().rarity(Rarity.UNCOMMON) ); public static final Item SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE = registerItem( - "sentry_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Properties().rarity(Rarity.UNCOMMON) + "sentry_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Item.Properties().rarity(Rarity.UNCOMMON) ); public static final Item DUNE_ARMOR_TRIM_SMITHING_TEMPLATE = registerItem( - "dune_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Properties().rarity(Rarity.UNCOMMON) + "dune_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Item.Properties().rarity(Rarity.UNCOMMON) ); public static final Item COAST_ARMOR_TRIM_SMITHING_TEMPLATE = registerItem( - "coast_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Properties().rarity(Rarity.UNCOMMON) + "coast_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Item.Properties().rarity(Rarity.UNCOMMON) ); public static final Item WILD_ARMOR_TRIM_SMITHING_TEMPLATE = registerItem( - "wild_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Properties().rarity(Rarity.UNCOMMON) + "wild_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Item.Properties().rarity(Rarity.UNCOMMON) ); public static final Item WARD_ARMOR_TRIM_SMITHING_TEMPLATE = registerItem( - "ward_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Properties().rarity(Rarity.RARE) + "ward_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Item.Properties().rarity(Rarity.RARE) ); public static final Item EYE_ARMOR_TRIM_SMITHING_TEMPLATE = registerItem( - "eye_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Properties().rarity(Rarity.RARE) + "eye_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Item.Properties().rarity(Rarity.RARE) ); public static final Item VEX_ARMOR_TRIM_SMITHING_TEMPLATE = registerItem( - "vex_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Properties().rarity(Rarity.RARE) + "vex_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Item.Properties().rarity(Rarity.RARE) ); public static final Item TIDE_ARMOR_TRIM_SMITHING_TEMPLATE = registerItem( - "tide_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Properties().rarity(Rarity.UNCOMMON) + "tide_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Item.Properties().rarity(Rarity.UNCOMMON) ); public static final Item SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE = registerItem( - "snout_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Properties().rarity(Rarity.UNCOMMON) + "snout_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Item.Properties().rarity(Rarity.UNCOMMON) ); public static final Item RIB_ARMOR_TRIM_SMITHING_TEMPLATE = registerItem( - "rib_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Properties().rarity(Rarity.UNCOMMON) + "rib_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Item.Properties().rarity(Rarity.UNCOMMON) ); public static final Item SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE = registerItem( - "spire_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Properties().rarity(Rarity.RARE) + "spire_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Item.Properties().rarity(Rarity.RARE) ); public static final Item WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE = registerItem( - "wayfinder_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Properties().rarity(Rarity.UNCOMMON) + "wayfinder_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Item.Properties().rarity(Rarity.UNCOMMON) ); public static final Item SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE = registerItem( - "shaper_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Properties().rarity(Rarity.UNCOMMON) + "shaper_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Item.Properties().rarity(Rarity.UNCOMMON) ); public static final Item SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE = registerItem( - "silence_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Properties().rarity(Rarity.EPIC) + "silence_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Item.Properties().rarity(Rarity.EPIC) ); public static final Item RAISER_ARMOR_TRIM_SMITHING_TEMPLATE = registerItem( - "raiser_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Properties().rarity(Rarity.UNCOMMON) + "raiser_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Item.Properties().rarity(Rarity.UNCOMMON) ); public static final Item HOST_ARMOR_TRIM_SMITHING_TEMPLATE = registerItem( - "host_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Properties().rarity(Rarity.UNCOMMON) + "host_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Item.Properties().rarity(Rarity.UNCOMMON) ); public static final Item FLOW_ARMOR_TRIM_SMITHING_TEMPLATE = registerItem( - "flow_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Properties().rarity(Rarity.UNCOMMON) + "flow_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Item.Properties().rarity(Rarity.UNCOMMON) ); public static final Item BOLT_ARMOR_TRIM_SMITHING_TEMPLATE = registerItem( - "bolt_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Properties().rarity(Rarity.UNCOMMON) + "bolt_armor_trim_smithing_template", SmithingTemplateItem::createArmorTrimTemplate, new Item.Properties().rarity(Rarity.UNCOMMON) ); - public static final Item ANGLER_POTTERY_SHERD = registerItem("angler_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item ARCHER_POTTERY_SHERD = registerItem("archer_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item ARMS_UP_POTTERY_SHERD = registerItem("arms_up_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item BLADE_POTTERY_SHERD = registerItem("blade_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item BREWER_POTTERY_SHERD = registerItem("brewer_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item BURN_POTTERY_SHERD = registerItem("burn_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item DANGER_POTTERY_SHERD = registerItem("danger_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item EXPLORER_POTTERY_SHERD = registerItem("explorer_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item FLOW_POTTERY_SHERD = registerItem("flow_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item FRIEND_POTTERY_SHERD = registerItem("friend_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item GUSTER_POTTERY_SHERD = registerItem("guster_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item HEART_POTTERY_SHERD = registerItem("heart_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item HEARTBREAK_POTTERY_SHERD = registerItem("heartbreak_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item HOWL_POTTERY_SHERD = registerItem("howl_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item MINER_POTTERY_SHERD = registerItem("miner_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item MOURNER_POTTERY_SHERD = registerItem("mourner_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item PLENTY_POTTERY_SHERD = registerItem("plenty_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item PRIZE_POTTERY_SHERD = registerItem("prize_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item SCRAPE_POTTERY_SHERD = registerItem("scrape_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item SHEAF_POTTERY_SHERD = registerItem("sheaf_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item SHELTER_POTTERY_SHERD = registerItem("shelter_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item SKULL_POTTERY_SHERD = registerItem("skull_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); - public static final Item SNORT_POTTERY_SHERD = registerItem("snort_pottery_sherd", new Properties().rarity(Rarity.UNCOMMON)); + public static final Item ANGLER_POTTERY_SHERD = registerItem("angler_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item ARCHER_POTTERY_SHERD = registerItem("archer_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item ARMS_UP_POTTERY_SHERD = registerItem("arms_up_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item BLADE_POTTERY_SHERD = registerItem("blade_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item BREWER_POTTERY_SHERD = registerItem("brewer_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item BURN_POTTERY_SHERD = registerItem("burn_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item DANGER_POTTERY_SHERD = registerItem("danger_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item EXPLORER_POTTERY_SHERD = registerItem("explorer_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item FLOW_POTTERY_SHERD = registerItem("flow_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item FRIEND_POTTERY_SHERD = registerItem("friend_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item GUSTER_POTTERY_SHERD = registerItem("guster_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item HEART_POTTERY_SHERD = registerItem("heart_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item HEARTBREAK_POTTERY_SHERD = registerItem("heartbreak_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item HOWL_POTTERY_SHERD = registerItem("howl_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item MINER_POTTERY_SHERD = registerItem("miner_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item MOURNER_POTTERY_SHERD = registerItem("mourner_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item PLENTY_POTTERY_SHERD = registerItem("plenty_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item PRIZE_POTTERY_SHERD = registerItem("prize_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item SCRAPE_POTTERY_SHERD = registerItem("scrape_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item SHEAF_POTTERY_SHERD = registerItem("sheaf_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item SHELTER_POTTERY_SHERD = registerItem("shelter_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item SKULL_POTTERY_SHERD = registerItem("skull_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final Item SNORT_POTTERY_SHERD = registerItem("snort_pottery_sherd", new Item.Properties().rarity(Rarity.UNCOMMON)); public static final Item COPPER_GRATE = registerBlock(Blocks.COPPER_GRATE); public static final Item EXPOSED_COPPER_GRATE = registerBlock(Blocks.EXPOSED_COPPER_GRATE); public static final Item WEATHERED_COPPER_GRATE = registerBlock(Blocks.WEATHERED_COPPER_GRATE); @@ -2220,13 +2267,13 @@ public class Items { public static final Item VAULT = registerBlock(Blocks.VAULT); public static final Item OMINOUS_BOTTLE = registerItem( "ominous_bottle", - new Properties() + new Item.Properties() .rarity(Rarity.UNCOMMON) .component(DataComponents.CONSUMABLE, Consumables.OMINOUS_BOTTLE) .component(DataComponents.OMINOUS_BOTTLE_AMPLIFIER, new OminousBottleAmplifier(0)) ); - private static Function createBlockItemWithCustomItemName(Block block) { + private static Function createBlockItemWithCustomItemName(Block block) { return properties -> new BlockItem(block, properties.useItemDescriptionPrefix()); } @@ -2242,13 +2289,13 @@ public class Items { return registerBlock(block, BlockItem::new); } - public static Item registerBlock(Block block, Properties properties) { + public static Item registerBlock(Block block, Item.Properties properties) { return registerBlock(block, BlockItem::new, properties); } - public static Item registerBlock(Block block, UnaryOperator propertiesModifier) { + public static Item registerBlock(Block block, UnaryOperator propertiesModifier) { return registerBlock( - block, (BiFunction)((blockx, properties) -> new BlockItem(blockx, (Properties)propertiesModifier.apply(properties))) + block, (BiFunction)((blockx, properties) -> new BlockItem(blockx, (Item.Properties)propertiesModifier.apply(properties))) ); } @@ -2262,37 +2309,37 @@ public class Items { return item; } - public static Item registerBlock(Block block, BiFunction factory) { - return registerBlock(block, factory, new Properties()); + public static Item registerBlock(Block block, BiFunction factory) { + return registerBlock(block, factory, new Item.Properties()); } - public static Item registerBlock(Block block, BiFunction factory, Properties properties) { + public static Item registerBlock(Block block, BiFunction factory, Item.Properties properties) { return registerItem( blockIdToItemId(block.builtInRegistryHolder().key()), propertiesx -> (Item)factory.apply(block, propertiesx), properties.useBlockDescriptionPrefix() ); } - public static Item registerItem(String name, Function factory) { - return registerItem(vanillaItemId(name), factory, new Properties()); + public static Item registerItem(String name, Function factory) { + return registerItem(vanillaItemId(name), factory, new Item.Properties()); } - public static Item registerItem(String name, Function factory, Properties properties) { + public static Item registerItem(String name, Function factory, Item.Properties properties) { return registerItem(vanillaItemId(name), factory, properties); } - public static Item registerItem(String name, Properties properties) { + public static Item registerItem(String name, Item.Properties properties) { return registerItem(vanillaItemId(name), Item::new, properties); } public static Item registerItem(String name) { - return registerItem(vanillaItemId(name), Item::new, new Properties()); + return registerItem(vanillaItemId(name), Item::new, new Item.Properties()); } - public static Item registerItem(ResourceKey key, Function factory) { - return registerItem(key, factory, new Properties()); + public static Item registerItem(ResourceKey key, Function factory) { + return registerItem(key, factory, new Item.Properties()); } - public static Item registerItem(ResourceKey key, Function factory, Properties properties) { + public static Item registerItem(ResourceKey key, Function factory, Item.Properties properties) { Item item = (Item)factory.apply(properties.setId(key)); if (item instanceof BlockItem blockItem) { blockItem.registerBlocks(Item.BY_BLOCK, item); diff --git a/net/minecraft/world/item/JukeboxSongs.java b/net/minecraft/world/item/JukeboxSongs.java index 53955aae..50e6e6d6 100644 --- a/net/minecraft/world/item/JukeboxSongs.java +++ b/net/minecraft/world/item/JukeboxSongs.java @@ -1,7 +1,7 @@ package net.minecraft.world.item; import net.minecraft.Util; -import net.minecraft.core.Holder.Reference; +import net.minecraft.core.Holder; import net.minecraft.core.registries.Registries; import net.minecraft.data.worldgen.BootstrapContext; import net.minecraft.network.chat.Component; @@ -31,14 +31,13 @@ public interface JukeboxSongs { ResourceKey CREATOR = create("creator"); ResourceKey CREATOR_MUSIC_BOX = create("creator_music_box"); ResourceKey TEARS = create("tears"); - ResourceKey LAVA_CHICKEN = create("lava_chicken"); private static ResourceKey create(String name) { return ResourceKey.create(Registries.JUKEBOX_SONG, ResourceLocation.withDefaultNamespace(name)); } private static void register( - BootstrapContext context, ResourceKey key, Reference soundEvent, int lengthInSeconds, int comparatorOutput + BootstrapContext context, ResourceKey key, Holder.Reference soundEvent, int lengthInSeconds, int comparatorOutput ) { context.register( key, new JukeboxSong(soundEvent, Component.translatable(Util.makeDescriptionId("jukebox_song", key.location())), lengthInSeconds, comparatorOutput) @@ -66,6 +65,5 @@ public interface JukeboxSongs { register(context, CREATOR, SoundEvents.MUSIC_DISC_CREATOR, 176, 12); register(context, CREATOR_MUSIC_BOX, SoundEvents.MUSIC_DISC_CREATOR_MUSIC_BOX, 73, 11); register(context, TEARS, SoundEvents.MUSIC_DISC_TEARS, 175, 10); - register(context, LAVA_CHICKEN, SoundEvents.MUSIC_DISC_LAVA_CHICKEN, 134, 9); } } diff --git a/net/minecraft/world/item/component/Consumable.java b/net/minecraft/world/item/component/Consumable.java index e0bcd374..8048d788 100644 --- a/net/minecraft/world/item/component/Consumable.java +++ b/net/minecraft/world/item/component/Consumable.java @@ -139,8 +139,8 @@ public record Consumable( Builder() { } - public Consumable.Builder consumeSeconds(float consumeSeconds) { - this.consumeSeconds = consumeSeconds; + public Consumable.Builder consumeSeconds(float consumeSounds) { + this.consumeSeconds = consumeSounds; return this; } diff --git a/net/minecraft/world/level/block/AbstractChestBlock.java b/net/minecraft/world/level/block/AbstractChestBlock.java index 484ed736..2e241685 100644 --- a/net/minecraft/world/level/block/AbstractChestBlock.java +++ b/net/minecraft/world/level/block/AbstractChestBlock.java @@ -4,7 +4,6 @@ import com.mojang.serialization.MapCodec; import java.util.function.Supplier; import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.DoubleBlockCombiner.NeighborCombineResult; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.ChestBlockEntity; @@ -22,5 +21,5 @@ public abstract class AbstractChestBlock extends BaseEnti @Override protected abstract MapCodec> codec(); - public abstract NeighborCombineResult combine(BlockState state, Level level, BlockPos pos, boolean override); + public abstract DoubleBlockCombiner.NeighborCombineResult combine(BlockState state, Level level, BlockPos pos, boolean override); } diff --git a/net/minecraft/world/level/block/AbstractFurnaceBlock.java b/net/minecraft/world/level/block/AbstractFurnaceBlock.java index 92e91b51..6fde7a44 100644 --- a/net/minecraft/world/level/block/AbstractFurnaceBlock.java +++ b/net/minecraft/world/level/block/AbstractFurnaceBlock.java @@ -16,7 +16,7 @@ import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; @@ -82,7 +82,7 @@ public abstract class AbstractFurnaceBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(FACING, LIT); } diff --git a/net/minecraft/world/level/block/AbstractSkullBlock.java b/net/minecraft/world/level/block/AbstractSkullBlock.java index 83992ef1..cd6bb5fa 100644 --- a/net/minecraft/world/level/block/AbstractSkullBlock.java +++ b/net/minecraft/world/level/block/AbstractSkullBlock.java @@ -4,14 +4,13 @@ import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.SkullBlock.Type; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.SkullBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.pathfinder.PathComputationType; @@ -20,9 +19,9 @@ import org.jetbrains.annotations.Nullable; public abstract class AbstractSkullBlock extends BaseEntityBlock { public static final BooleanProperty POWERED = BlockStateProperties.POWERED; - private final Type type; + private final SkullBlock.Type type; - public AbstractSkullBlock(Type type, BlockBehaviour.Properties properties) { + public AbstractSkullBlock(SkullBlock.Type type, BlockBehaviour.Properties properties) { super(properties); this.type = type; this.registerDefaultState(this.stateDefinition.any().setValue(POWERED, false)); @@ -49,7 +48,7 @@ public abstract class AbstractSkullBlock extends BaseEntityBlock { return null; } - public Type getType() { + public SkullBlock.Type getType() { return this.type; } @@ -59,7 +58,7 @@ public abstract class AbstractSkullBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(POWERED); } diff --git a/net/minecraft/world/level/block/BarrelBlock.java b/net/minecraft/world/level/block/BarrelBlock.java index 0fbbca84..9bd35b02 100644 --- a/net/minecraft/world/level/block/BarrelBlock.java +++ b/net/minecraft/world/level/block/BarrelBlock.java @@ -17,7 +17,7 @@ import net.minecraft.world.level.block.entity.BarrelBlockEntity; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; @@ -90,7 +90,7 @@ public class BarrelBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(FACING, OPEN); } diff --git a/net/minecraft/world/level/block/BaseEntityBlock.java b/net/minecraft/world/level/block/BaseEntityBlock.java index c3f24241..a6f555bd 100644 --- a/net/minecraft/world/level/block/BaseEntityBlock.java +++ b/net/minecraft/world/level/block/BaseEntityBlock.java @@ -35,8 +35,8 @@ public abstract class BaseEntityBlock extends Block implements EntityBlock { @Nullable protected static BlockEntityTicker createTickerHelper( - BlockEntityType actualType, BlockEntityType expectedType, BlockEntityTicker ticker + BlockEntityType serverType, BlockEntityType clientType, BlockEntityTicker ticker ) { - return expectedType == actualType ? ticker : null; + return clientType == serverType ? ticker : null; } } diff --git a/net/minecraft/world/level/block/BeehiveBlock.java b/net/minecraft/world/level/block/BeehiveBlock.java index 7173c4aa..2eeada4b 100644 --- a/net/minecraft/world/level/block/BeehiveBlock.java +++ b/net/minecraft/world/level/block/BeehiveBlock.java @@ -7,7 +7,6 @@ import net.minecraft.Util; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.Direction.Axis; import net.minecraft.core.component.DataComponents; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.server.level.ServerLevel; @@ -47,14 +46,14 @@ import net.minecraft.world.level.block.entity.BeehiveBlockEntity; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.entity.BeehiveBlockEntity.BeeReleaseStatus; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.level.gameevent.GameEvent; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; @@ -93,7 +92,7 @@ public class BeehiveBlock extends BaseEntityBlock { super.playerDestroy(level, player, pos, state, blockEntity, tool); if (!level.isClientSide && blockEntity instanceof BeehiveBlockEntity beehiveBlockEntity) { if (!EnchantmentHelper.hasTag(tool, EnchantmentTags.PREVENTS_BEE_SPAWNS_WHEN_MINING)) { - beehiveBlockEntity.emptyAllLivingFromHive(player, state, BeeReleaseStatus.EMERGENCY); + beehiveBlockEntity.emptyAllLivingFromHive(player, state, BeehiveBlockEntity.BeeReleaseStatus.EMERGENCY); Containers.updateNeighboursAfterDestroy(state, level, pos); this.angerNearbyBees(level, pos); } @@ -168,7 +167,7 @@ public class BeehiveBlock extends BaseEntityBlock { this.angerNearbyBees(level, pos); } - this.releaseBeesAndResetHoneyLevel(level, state, pos, player, BeeReleaseStatus.EMERGENCY); + this.releaseBeesAndResetHoneyLevel(level, state, pos, player, BeehiveBlockEntity.BeeReleaseStatus.EMERGENCY); } else { this.resetHoneyLevel(level, state, pos); } @@ -183,7 +182,9 @@ public class BeehiveBlock extends BaseEntityBlock { return level.getBlockEntity(pos) instanceof BeehiveBlockEntity beehiveBlockEntity ? !beehiveBlockEntity.isEmpty() : false; } - public void releaseBeesAndResetHoneyLevel(Level level, BlockState state, BlockPos pos, @Nullable Player player, BeeReleaseStatus beeReleaseStatus) { + public void releaseBeesAndResetHoneyLevel( + Level level, BlockState state, BlockPos pos, @Nullable Player player, BeehiveBlockEntity.BeeReleaseStatus beeReleaseStatus + ) { this.resetHoneyLevel(level, state, pos); if (level.getBlockEntity(pos) instanceof BeehiveBlockEntity beehiveBlockEntity) { beehiveBlockEntity.emptyAllLivingFromHive(player, state, beeReleaseStatus); @@ -206,16 +207,16 @@ public class BeehiveBlock extends BaseEntityBlock { private void trySpawnDripParticles(Level level, BlockPos pos, BlockState state) { if (state.getFluidState().isEmpty() && !(level.random.nextFloat() < 0.3F)) { VoxelShape voxelShape = state.getCollisionShape(level, pos); - double d = voxelShape.max(Axis.Y); + double d = voxelShape.max(Direction.Axis.Y); if (d >= 1.0 && !state.is(BlockTags.IMPERMEABLE)) { - double e = voxelShape.min(Axis.Y); + double e = voxelShape.min(Direction.Axis.Y); if (e > 0.0) { this.spawnParticle(level, pos, voxelShape, pos.getY() + e - 0.05); } else { BlockPos blockPos = pos.below(); BlockState blockState = level.getBlockState(blockPos); VoxelShape voxelShape2 = blockState.getCollisionShape(level, blockPos); - double f = voxelShape2.max(Axis.Y); + double f = voxelShape2.max(Direction.Axis.Y); if ((f < 1.0 || !blockState.isCollisionShapeFullBlock(level, blockPos)) && blockState.getFluidState().isEmpty()) { this.spawnParticle(level, pos, voxelShape, pos.getY() - 0.05); } @@ -226,7 +227,12 @@ public class BeehiveBlock extends BaseEntityBlock { private void spawnParticle(Level level, BlockPos pos, VoxelShape shape, double y) { this.spawnFluidParticle( - level, pos.getX() + shape.min(Axis.X), pos.getX() + shape.max(Axis.X), pos.getZ() + shape.min(Axis.Z), pos.getZ() + shape.max(Axis.Z), y + level, + pos.getX() + shape.min(Direction.Axis.X), + pos.getX() + shape.max(Direction.Axis.X), + pos.getZ() + shape.min(Direction.Axis.Z), + pos.getZ() + shape.max(Direction.Axis.Z), + y ); } @@ -242,7 +248,7 @@ public class BeehiveBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(HONEY_LEVEL, FACING); } @@ -280,7 +286,7 @@ public class BeehiveBlock extends BaseEntityBlock { } @Override - protected List getDrops(BlockState state, net.minecraft.world.level.storage.loot.LootParams.Builder params) { + protected List getDrops(BlockState state, LootParams.Builder params) { Entity entity = params.getOptionalParameter(LootContextParams.THIS_ENTITY); if (entity instanceof PrimedTnt || entity instanceof Creeper @@ -289,7 +295,7 @@ public class BeehiveBlock extends BaseEntityBlock { || entity instanceof MinecartTNT) { BlockEntity blockEntity = params.getOptionalParameter(LootContextParams.BLOCK_ENTITY); if (blockEntity instanceof BeehiveBlockEntity beehiveBlockEntity) { - beehiveBlockEntity.emptyAllLivingFromHive(null, state, BeeReleaseStatus.EMERGENCY); + beehiveBlockEntity.emptyAllLivingFromHive(null, state, BeehiveBlockEntity.BeeReleaseStatus.EMERGENCY); } } @@ -318,7 +324,7 @@ public class BeehiveBlock extends BaseEntityBlock { RandomSource random ) { if (level.getBlockState(neighborPos).getBlock() instanceof FireBlock && level.getBlockEntity(pos) instanceof BeehiveBlockEntity beehiveBlockEntity) { - beehiveBlockEntity.emptyAllLivingFromHive(null, state, BeeReleaseStatus.EMERGENCY); + beehiveBlockEntity.emptyAllLivingFromHive(null, state, BeehiveBlockEntity.BeeReleaseStatus.EMERGENCY); } return super.updateShape(state, level, scheduledTickAccess, pos, direction, neighborPos, neighborState, random); diff --git a/net/minecraft/world/level/block/BellBlock.java b/net/minecraft/world/level/block/BellBlock.java index 5ed4708f..b478ed60 100644 --- a/net/minecraft/world/level/block/BellBlock.java +++ b/net/minecraft/world/level/block/BellBlock.java @@ -5,7 +5,6 @@ import java.util.Map; import java.util.function.BiConsumer; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.Direction.Axis; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -28,7 +27,7 @@ import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BellAttachType; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; @@ -49,8 +48,10 @@ public class BellBlock extends BaseEntityBlock { public static final BooleanProperty POWERED = BlockStateProperties.POWERED; private static final VoxelShape BELL_SHAPE = Shapes.or(Block.column(6.0, 6.0, 13.0), Block.column(8.0, 4.0, 6.0)); private static final VoxelShape SHAPE_CEILING = Shapes.or(BELL_SHAPE, Block.column(2.0, 13.0, 16.0)); - private static final Map SHAPE_FLOOR = Shapes.rotateHorizontalAxis(Block.cube(16.0, 16.0, 8.0)); - private static final Map SHAPE_DOUBLE_WALL = Shapes.rotateHorizontalAxis(Shapes.or(BELL_SHAPE, Block.column(2.0, 16.0, 13.0, 15.0))); + private static final Map SHAPE_FLOOR = Shapes.rotateHorizontalAxis(Block.cube(16.0, 16.0, 8.0)); + private static final Map SHAPE_DOUBLE_WALL = Shapes.rotateHorizontalAxis( + Shapes.or(BELL_SHAPE, Block.column(2.0, 16.0, 13.0, 15.0)) + ); private static final Map SHAPE_SINGLE_WALL = Shapes.rotateHorizontal(Shapes.or(BELL_SHAPE, Block.boxZ(2.0, 13.0, 15.0, 0.0, 13.0))); public static final int EVENT_BELL_RING = 1; @@ -107,7 +108,7 @@ public class BellBlock extends BaseEntityBlock { * @return true if the bell can be rung from the given side and vertical position. For example, bells attached to their northern neighbor cannot be rung from the south face, since it can't swing north-south. */ private boolean isProperHit(BlockState pos, Direction direction, double distanceY) { - if (direction.getAxis() != Axis.Y && !(distanceY > 0.8124F)) { + if (direction.getAxis() != Direction.Axis.Y && !(distanceY > 0.8124F)) { Direction direction2 = pos.getValue(FACING); BellAttachType bellAttachType = pos.getValue(ATTACHMENT); switch (bellAttachType) { @@ -173,8 +174,8 @@ public class BellBlock extends BaseEntityBlock { Direction direction = context.getClickedFace(); BlockPos blockPos = context.getClickedPos(); Level level = context.getLevel(); - Axis axis = direction.getAxis(); - if (axis == Axis.Y) { + Direction.Axis axis = direction.getAxis(); + if (axis == Direction.Axis.Y) { BlockState blockState = this.defaultBlockState() .setValue(ATTACHMENT, direction == Direction.DOWN ? BellAttachType.CEILING : BellAttachType.FLOOR) .setValue(FACING, context.getHorizontalDirection()); @@ -182,10 +183,10 @@ public class BellBlock extends BaseEntityBlock { return blockState; } } else { - boolean bl = axis == Axis.X + boolean bl = axis == Direction.Axis.X && level.getBlockState(blockPos.west()).isFaceSturdy(level, blockPos.west(), Direction.EAST) && level.getBlockState(blockPos.east()).isFaceSturdy(level, blockPos.east(), Direction.WEST) - || axis == Axis.Z + || axis == Direction.Axis.Z && level.getBlockState(blockPos.north()).isFaceSturdy(level, blockPos.north(), Direction.SOUTH) && level.getBlockState(blockPos.south()).isFaceSturdy(level, blockPos.south(), Direction.NORTH); BlockState blockState = this.defaultBlockState() @@ -266,7 +267,7 @@ public class BellBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(FACING, ATTACHMENT, POWERED); } diff --git a/net/minecraft/world/level/block/BrewingStandBlock.java b/net/minecraft/world/level/block/BrewingStandBlock.java index 0ad887d3..355b7277 100644 --- a/net/minecraft/world/level/block/BrewingStandBlock.java +++ b/net/minecraft/world/level/block/BrewingStandBlock.java @@ -18,7 +18,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.BrewingStandBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.pathfinder.PathComputationType; @@ -95,7 +95,7 @@ public class BrewingStandBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(HAS_BOTTLE[0], HAS_BOTTLE[1], HAS_BOTTLE[2]); } diff --git a/net/minecraft/world/level/block/BrushableBlock.java b/net/minecraft/world/level/block/BrushableBlock.java index 0fb539e9..8ffd0f6a 100644 --- a/net/minecraft/world/level/block/BrushableBlock.java +++ b/net/minecraft/world/level/block/BrushableBlock.java @@ -18,7 +18,7 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BrushableBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.level.gameevent.GameEvent; @@ -55,7 +55,7 @@ public class BrushableBlock extends BaseEntityBlock implements Fallable { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(DUSTED); } diff --git a/net/minecraft/world/level/block/CampfireBlock.java b/net/minecraft/world/level/block/CampfireBlock.java index 03a0265d..7a4988e5 100644 --- a/net/minecraft/world/level/block/CampfireBlock.java +++ b/net/minecraft/world/level/block/CampfireBlock.java @@ -27,7 +27,6 @@ import net.minecraft.world.item.crafting.RecipeManager; import net.minecraft.world.item.crafting.RecipePropertySet; import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.item.crafting.SingleRecipeInput; -import net.minecraft.world.item.crafting.RecipeManager.CachedCheck; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; @@ -39,7 +38,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.CampfireBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; @@ -290,7 +289,7 @@ public class CampfireBlock extends BaseEntityBlock implements SimpleWaterloggedB } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(LIT, SIGNAL_FIRE, WATERLOGGED, FACING); } @@ -304,7 +303,7 @@ public class CampfireBlock extends BaseEntityBlock implements SimpleWaterloggedB public BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType blockEntityType) { if (level instanceof ServerLevel serverLevel) { if ((Boolean)state.getValue(LIT)) { - CachedCheck cachedCheck = RecipeManager.createCheck(RecipeType.CAMPFIRE_COOKING); + RecipeManager.CachedCheck cachedCheck = RecipeManager.createCheck(RecipeType.CAMPFIRE_COOKING); return createTickerHelper( blockEntityType, BlockEntityType.CAMPFIRE, diff --git a/net/minecraft/world/level/block/ChiseledBookShelfBlock.java b/net/minecraft/world/level/block/ChiseledBookShelfBlock.java index bab63cef..8285188f 100644 --- a/net/minecraft/world/level/block/ChiseledBookShelfBlock.java +++ b/net/minecraft/world/level/block/ChiseledBookShelfBlock.java @@ -24,7 +24,7 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.ChiseledBookShelfBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.Property; @@ -172,7 +172,7 @@ public class ChiseledBookShelfBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(HorizontalDirectionalBlock.FACING); SLOT_OCCUPIED_PROPERTIES.forEach(property -> builder.add(property)); } diff --git a/net/minecraft/world/level/block/CommandBlock.java b/net/minecraft/world/level/block/CommandBlock.java index 1648a395..3b399bc9 100644 --- a/net/minecraft/world/level/block/CommandBlock.java +++ b/net/minecraft/world/level/block/CommandBlock.java @@ -6,7 +6,6 @@ import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.BlockPos.MutableBlockPos; import net.minecraft.core.component.DataComponents; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.RandomSource; @@ -21,10 +20,9 @@ import net.minecraft.world.level.GameRules; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.CommandBlockEntity; -import net.minecraft.world.level.block.entity.CommandBlockEntity.Mode; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; @@ -75,7 +73,7 @@ public class CommandBlock extends BaseEntityBlock implements GameMasterBlock { if (powered != bl) { blockEntity.setPowered(powered); if (powered) { - if (blockEntity.isAutomatic() || blockEntity.getMode() == Mode.SEQUENCE) { + if (blockEntity.isAutomatic() || blockEntity.getMode() == CommandBlockEntity.Mode.SEQUENCE) { return; } @@ -90,9 +88,9 @@ public class CommandBlock extends BaseEntityBlock implements GameMasterBlock { if (level.getBlockEntity(pos) instanceof CommandBlockEntity commandBlockEntity) { BaseCommandBlock baseCommandBlock = commandBlockEntity.getCommandBlock(); boolean bl = !StringUtil.isNullOrEmpty(baseCommandBlock.getCommand()); - Mode mode = commandBlockEntity.getMode(); + CommandBlockEntity.Mode mode = commandBlockEntity.getMode(); boolean bl2 = commandBlockEntity.wasConditionMet(); - if (mode == Mode.AUTO) { + if (mode == CommandBlockEntity.Mode.AUTO) { commandBlockEntity.markConditionMet(); if (bl2) { this.execute(state, level, pos, baseCommandBlock, bl); @@ -103,7 +101,7 @@ public class CommandBlock extends BaseEntityBlock implements GameMasterBlock { if (commandBlockEntity.isPowered() || commandBlockEntity.isAutomatic()) { level.scheduleTick(pos, this, 1); } - } else if (mode == Mode.REDSTONE) { + } else if (mode == CommandBlockEntity.Mode.REDSTONE) { if (bl2) { this.execute(state, level, pos, baseCommandBlock, bl); } else if (commandBlockEntity.isConditional()) { @@ -174,7 +172,7 @@ public class CommandBlock extends BaseEntityBlock implements GameMasterBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(FACING, CONDITIONAL); } @@ -184,7 +182,7 @@ public class CommandBlock extends BaseEntityBlock implements GameMasterBlock { } private static void executeChain(ServerLevel level, BlockPos pos, Direction direction) { - MutableBlockPos mutableBlockPos = pos.mutable(); + BlockPos.MutableBlockPos mutableBlockPos = pos.mutable(); GameRules gameRules = level.getGameRules(); int i = gameRules.getInt(GameRules.RULE_MAX_COMMAND_CHAIN_LENGTH); @@ -194,7 +192,7 @@ public class CommandBlock extends BaseEntityBlock implements GameMasterBlock { Block block = blockState.getBlock(); if (!blockState.is(Blocks.CHAIN_COMMAND_BLOCK) || !(level.getBlockEntity(mutableBlockPos) instanceof CommandBlockEntity commandBlockEntity) - || commandBlockEntity.getMode() != Mode.SEQUENCE) { + || commandBlockEntity.getMode() != CommandBlockEntity.Mode.SEQUENCE) { break; } diff --git a/net/minecraft/world/level/block/ConduitBlock.java b/net/minecraft/world/level/block/ConduitBlock.java index cd0a59fa..86ef042a 100644 --- a/net/minecraft/world/level/block/ConduitBlock.java +++ b/net/minecraft/world/level/block/ConduitBlock.java @@ -16,7 +16,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.ConduitBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.material.FluidState; @@ -42,7 +42,7 @@ public class ConduitBlock extends BaseEntityBlock implements SimpleWaterloggedBl } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(WATERLOGGED); } diff --git a/net/minecraft/world/level/block/CrafterBlock.java b/net/minecraft/world/level/block/CrafterBlock.java index ce80f1cd..62e45bce 100644 --- a/net/minecraft/world/level/block/CrafterBlock.java +++ b/net/minecraft/world/level/block/CrafterBlock.java @@ -29,7 +29,7 @@ import net.minecraft.world.level.block.entity.CrafterBlockEntity; import net.minecraft.world.level.block.entity.HopperBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; @@ -230,7 +230,7 @@ public class CrafterBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(ORIENTATION, TRIGGERED, CRAFTING); } } diff --git a/net/minecraft/world/level/block/CreakingHeartBlock.java b/net/minecraft/world/level/block/CreakingHeartBlock.java index 0e864cec..65aefffc 100644 --- a/net/minecraft/world/level/block/CreakingHeartBlock.java +++ b/net/minecraft/world/level/block/CreakingHeartBlock.java @@ -4,7 +4,6 @@ import com.mojang.serialization.MapCodec; import java.util.function.BiConsumer; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.Direction.Axis; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -26,7 +25,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.CreakingHeartBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.CreakingHeartState; @@ -36,7 +35,7 @@ import org.jetbrains.annotations.Nullable; public class CreakingHeartBlock extends BaseEntityBlock { public static final MapCodec CODEC = simpleCodec(CreakingHeartBlock::new); - public static final EnumProperty AXIS = BlockStateProperties.AXIS; + public static final EnumProperty AXIS = BlockStateProperties.AXIS; public static final EnumProperty STATE = BlockStateProperties.CREAKING_HEART_STATE; public static final BooleanProperty NATURAL = BlockStateProperties.NATURAL; @@ -47,7 +46,7 @@ public class CreakingHeartBlock extends BaseEntityBlock { protected CreakingHeartBlock(BlockBehaviour.Properties properties) { super(properties); - this.registerDefaultState(this.defaultBlockState().setValue(AXIS, Axis.Y).setValue(STATE, CreakingHeartState.UPROOTED).setValue(NATURAL, false)); + this.registerDefaultState(this.defaultBlockState().setValue(AXIS, Direction.Axis.Y).setValue(STATE, CreakingHeartState.UPROOTED).setValue(NATURAL, false)); } @Override @@ -112,7 +111,7 @@ public class CreakingHeartBlock extends BaseEntityBlock { } public static boolean hasRequiredLogs(BlockState state, LevelReader level, BlockPos pos) { - Axis axis = state.getValue(AXIS); + Direction.Axis axis = state.getValue(AXIS); for (Direction direction : axis.getDirections()) { BlockState blockState = level.getBlockState(pos.relative(direction)); @@ -148,7 +147,7 @@ public class CreakingHeartBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(AXIS, STATE, NATURAL); } diff --git a/net/minecraft/world/level/block/DaylightDetectorBlock.java b/net/minecraft/world/level/block/DaylightDetectorBlock.java index 17d3bee3..a09749b8 100644 --- a/net/minecraft/world/level/block/DaylightDetectorBlock.java +++ b/net/minecraft/world/level/block/DaylightDetectorBlock.java @@ -15,12 +15,11 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.DaylightDetectorBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.level.gameevent.GameEvent; -import net.minecraft.world.level.gameevent.GameEvent.Context; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; @@ -83,7 +82,7 @@ public class DaylightDetectorBlock extends BaseEntityBlock { if (!level.isClientSide) { BlockState blockState = state.cycle(INVERTED); level.setBlock(pos, blockState, 2); - level.gameEvent(GameEvent.BLOCK_CHANGE, pos, Context.of(player, blockState)); + level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(player, blockState)); updateSignalStrength(blockState, level, pos); } @@ -116,7 +115,7 @@ public class DaylightDetectorBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(POWER, INVERTED); } } diff --git a/net/minecraft/world/level/block/DecoratedPotBlock.java b/net/minecraft/world/level/block/DecoratedPotBlock.java index bde0df50..84884019 100644 --- a/net/minecraft/world/level/block/DecoratedPotBlock.java +++ b/net/minecraft/world/level/block/DecoratedPotBlock.java @@ -30,10 +30,9 @@ import net.minecraft.world.level.ScheduledTickAccess; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.DecoratedPotBlockEntity; import net.minecraft.world.level.block.entity.PotDecorations; -import net.minecraft.world.level.block.entity.DecoratedPotBlockEntity.WobbleStyle; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; @@ -41,6 +40,7 @@ import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; import net.minecraft.world.level.pathfinder.PathComputationType; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; @@ -104,7 +104,7 @@ public class DecoratedPotBlock extends BaseEntityBlock implements SimpleWaterlog if (!stack.isEmpty() && (itemStack.isEmpty() || ItemStack.isSameItemSameComponents(itemStack, stack) && itemStack.getCount() < itemStack.getMaxStackSize()) ) { - decoratedPotBlockEntity.wobble(WobbleStyle.POSITIVE); + decoratedPotBlockEntity.wobble(DecoratedPotBlockEntity.WobbleStyle.POSITIVE); player.awardStat(Stats.ITEM_USED.get(stack.getItem())); ItemStack itemStack2 = stack.consumeAndReturn(1, player); float f; @@ -137,7 +137,7 @@ public class DecoratedPotBlock extends BaseEntityBlock implements SimpleWaterlog protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) { if (level.getBlockEntity(pos) instanceof DecoratedPotBlockEntity decoratedPotBlockEntity) { level.playSound(null, pos, SoundEvents.DECORATED_POT_INSERT_FAIL, SoundSource.BLOCKS, 1.0F, 1.0F); - decoratedPotBlockEntity.wobble(WobbleStyle.NEGATIVE); + decoratedPotBlockEntity.wobble(DecoratedPotBlockEntity.WobbleStyle.NEGATIVE); level.gameEvent(player, GameEvent.BLOCK_CHANGE, pos); return InteractionResult.SUCCESS; } else { @@ -156,7 +156,7 @@ public class DecoratedPotBlock extends BaseEntityBlock implements SimpleWaterlog } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(HORIZONTAL_FACING, WATERLOGGED, CRACKED); } @@ -172,7 +172,7 @@ public class DecoratedPotBlock extends BaseEntityBlock implements SimpleWaterlog } @Override - protected List getDrops(BlockState state, net.minecraft.world.level.storage.loot.LootParams.Builder params) { + protected List getDrops(BlockState state, LootParams.Builder params) { BlockEntity blockEntity = params.getOptionalParameter(LootContextParams.BLOCK_ENTITY); if (blockEntity instanceof DecoratedPotBlockEntity decoratedPotBlockEntity) { params.withDynamicDrop(SHERDS_DYNAMIC_DROP_ID, consumer -> { diff --git a/net/minecraft/world/level/block/DispenserBlock.java b/net/minecraft/world/level/block/DispenserBlock.java index 64a3e162..63724810 100644 --- a/net/minecraft/world/level/block/DispenserBlock.java +++ b/net/minecraft/world/level/block/DispenserBlock.java @@ -31,12 +31,11 @@ import net.minecraft.world.level.block.entity.DispenserBlockEntity; import net.minecraft.world.level.block.entity.DropperBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.level.gameevent.GameEvent; -import net.minecraft.world.level.gameevent.GameEvent.Context; import net.minecraft.world.level.redstone.Orientation; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; @@ -92,7 +91,7 @@ public class DispenserBlock extends BaseEntityBlock { int i = dispenserBlockEntity.getRandomSlot(level.random); if (i < 0) { level.levelEvent(1001, pos, 0); - level.gameEvent(GameEvent.BLOCK_ACTIVATE, pos, Context.of(dispenserBlockEntity.getBlockState())); + level.gameEvent(GameEvent.BLOCK_ACTIVATE, pos, GameEvent.Context.of(dispenserBlockEntity.getBlockState())); } else { ItemStack itemStack = dispenserBlockEntity.getItem(i); DispenseItemBehavior dispenseItemBehavior = this.getDispenseMethod(level, itemStack); @@ -179,7 +178,7 @@ public class DispenserBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(FACING, TRIGGERED); } } diff --git a/net/minecraft/world/level/block/HopperBlock.java b/net/minecraft/world/level/block/HopperBlock.java index ea8f2f4f..34e46b63 100644 --- a/net/minecraft/world/level/block/HopperBlock.java +++ b/net/minecraft/world/level/block/HopperBlock.java @@ -6,7 +6,6 @@ import java.util.Map; import java.util.function.Function; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.Direction.Axis; import net.minecraft.server.level.ServerLevel; import net.minecraft.stats.Stats; import net.minecraft.world.Containers; @@ -24,7 +23,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.HopperBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; @@ -84,7 +83,7 @@ public class HopperBlock extends BaseEntityBlock { @Override public BlockState getStateForPlacement(BlockPlaceContext context) { Direction direction = context.getClickedFace().getOpposite(); - return this.defaultBlockState().setValue(FACING, direction.getAxis() == Axis.Y ? Direction.DOWN : direction).setValue(ENABLED, true); + return this.defaultBlockState().setValue(FACING, direction.getAxis() == Direction.Axis.Y ? Direction.DOWN : direction).setValue(ENABLED, true); } @Override @@ -153,7 +152,7 @@ public class HopperBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(FACING, ENABLED); } diff --git a/net/minecraft/world/level/block/JukeboxBlock.java b/net/minecraft/world/level/block/JukeboxBlock.java index a6abc46c..506bb179 100644 --- a/net/minecraft/world/level/block/JukeboxBlock.java +++ b/net/minecraft/world/level/block/JukeboxBlock.java @@ -21,7 +21,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.JukeboxBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.phys.BlockHitResult; @@ -104,7 +104,7 @@ public class JukeboxBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(HAS_RECORD); } diff --git a/net/minecraft/world/level/block/LecternBlock.java b/net/minecraft/world/level/block/LecternBlock.java index 1e5b493f..c52ba316 100644 --- a/net/minecraft/world/level/block/LecternBlock.java +++ b/net/minecraft/world/level/block/LecternBlock.java @@ -26,12 +26,11 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.LecternBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.level.gameevent.GameEvent; -import net.minecraft.world.level.gameevent.GameEvent.Context; import net.minecraft.world.level.pathfinder.PathComputationType; import net.minecraft.world.level.redstone.ExperimentalRedstoneUtils; import net.minecraft.world.level.redstone.Orientation; @@ -111,7 +110,7 @@ public class LecternBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(FACING, POWERED, HAS_BOOK); } @@ -143,7 +142,7 @@ public class LecternBlock extends BaseEntityBlock { public static void resetBookState(@Nullable Entity entity, Level level, BlockPos pos, BlockState state, boolean hasBook) { BlockState blockState = state.setValue(POWERED, false).setValue(HAS_BOOK, hasBook); level.setBlock(pos, blockState, 3); - level.gameEvent(GameEvent.BLOCK_CHANGE, pos, Context.of(entity, blockState)); + level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(entity, blockState)); updateBelow(level, pos, state); } diff --git a/net/minecraft/world/level/block/SculkCatalystBlock.java b/net/minecraft/world/level/block/SculkCatalystBlock.java index 95280ec9..a2e67660 100644 --- a/net/minecraft/world/level/block/SculkCatalystBlock.java +++ b/net/minecraft/world/level/block/SculkCatalystBlock.java @@ -14,7 +14,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.SculkCatalystBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import org.jetbrains.annotations.Nullable; @@ -35,7 +35,7 @@ public class SculkCatalystBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(PULSE); } diff --git a/net/minecraft/world/level/block/SculkSensorBlock.java b/net/minecraft/world/level/block/SculkSensorBlock.java index 63211f58..d45ed8e6 100644 --- a/net/minecraft/world/level/block/SculkSensorBlock.java +++ b/net/minecraft/world/level/block/SculkSensorBlock.java @@ -26,16 +26,14 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.SculkSensorBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.level.block.state.properties.SculkSensorPhase; import net.minecraft.world.level.gameevent.GameEvent; -import net.minecraft.world.level.gameevent.GameEvent.Context; import net.minecraft.world.level.gameevent.vibrations.VibrationSystem; -import net.minecraft.world.level.gameevent.vibrations.VibrationSystem.Ticker; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; import net.minecraft.world.level.pathfinder.PathComputationType; @@ -103,8 +101,8 @@ public class SculkSensorBlock extends BaseEntityBlock implements SimpleWaterlogg && entity.getType() != EntityType.WARDEN && level.getBlockEntity(pos) instanceof SculkSensorBlockEntity sculkSensorBlockEntity && level instanceof ServerLevel serverLevel - && sculkSensorBlockEntity.getVibrationUser().canReceiveVibration(serverLevel, pos, GameEvent.STEP, Context.of(state))) { - sculkSensorBlockEntity.getListener().forceScheduleVibration(serverLevel, GameEvent.STEP, Context.of(entity), entity.position()); + && sculkSensorBlockEntity.getVibrationUser().canReceiveVibration(serverLevel, pos, GameEvent.STEP, GameEvent.Context.of(state))) { + sculkSensorBlockEntity.getListener().forceScheduleVibration(serverLevel, GameEvent.STEP, GameEvent.Context.of(entity), entity.position()); } super.stepOn(level, pos, state, entity); @@ -163,7 +161,7 @@ public class SculkSensorBlock extends BaseEntityBlock implements SimpleWaterlogg ? createTickerHelper( blockEntityType, BlockEntityType.SCULK_SENSOR, - (levelx, blockPos, blockState, sculkSensorBlockEntity) -> Ticker.tick( + (levelx, blockPos, blockState, sculkSensorBlockEntity) -> VibrationSystem.Ticker.tick( levelx, sculkSensorBlockEntity.getVibrationData(), sculkSensorBlockEntity.getVibrationUser() ) ) @@ -227,7 +225,7 @@ public class SculkSensorBlock extends BaseEntityBlock implements SimpleWaterlogg BlockPos blockPos = pos.relative(direction); BlockState blockState = level.getBlockState(blockPos); if (blockState.is(BlockTags.VIBRATION_RESONATORS)) { - level.gameEvent(VibrationSystem.getResonanceEventByFrequency(frequency), blockPos, Context.of(entity, blockState)); + level.gameEvent(VibrationSystem.getResonanceEventByFrequency(frequency), blockPos, GameEvent.Context.of(entity, blockState)); float f = RESONANCE_PITCH_BEND[frequency]; level.playSound(null, blockPos, SoundEvents.AMETHYST_BLOCK_RESONATE, SoundSource.BLOCKS, 1.0F, f); } @@ -249,7 +247,7 @@ public class SculkSensorBlock extends BaseEntityBlock implements SimpleWaterlogg } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(PHASE, POWER, WATERLOGGED); } diff --git a/net/minecraft/world/level/block/SculkShriekerBlock.java b/net/minecraft/world/level/block/SculkShriekerBlock.java index d4c6797f..0ef08aa6 100644 --- a/net/minecraft/world/level/block/SculkShriekerBlock.java +++ b/net/minecraft/world/level/block/SculkShriekerBlock.java @@ -3,7 +3,6 @@ package net.minecraft.world.level.block; import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.Direction.Axis; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.RandomSource; @@ -21,10 +20,10 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.SculkShriekerBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; -import net.minecraft.world.level.gameevent.vibrations.VibrationSystem.Ticker; +import net.minecraft.world.level.gameevent.vibrations.VibrationSystem; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; import net.minecraft.world.phys.shapes.CollisionContext; @@ -37,7 +36,7 @@ public class SculkShriekerBlock extends BaseEntityBlock implements SimpleWaterlo public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; public static final BooleanProperty CAN_SUMMON = BlockStateProperties.CAN_SUMMON; private static final VoxelShape SHAPE_COLLISION = Block.column(16.0, 0.0, 8.0); - public static final double TOP_Y = SHAPE_COLLISION.max(Axis.Y); + public static final double TOP_Y = SHAPE_COLLISION.max(Direction.Axis.Y); @Override public MapCodec codec() { @@ -50,7 +49,7 @@ public class SculkShriekerBlock extends BaseEntityBlock implements SimpleWaterlo } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(SHRIEKING); builder.add(WATERLOGGED); builder.add(CAN_SUMMON); @@ -142,7 +141,7 @@ public class SculkShriekerBlock extends BaseEntityBlock implements SimpleWaterlo ? BaseEntityBlock.createTickerHelper( blockEntityType, BlockEntityType.SCULK_SHRIEKER, - (levelx, blockPos, blockState, sculkShriekerBlockEntity) -> Ticker.tick( + (levelx, blockPos, blockState, sculkShriekerBlockEntity) -> VibrationSystem.Ticker.tick( levelx, sculkShriekerBlockEntity.getVibrationData(), sculkShriekerBlockEntity.getVibrationUser() ) ) diff --git a/net/minecraft/world/level/block/ShulkerBoxBlock.java b/net/minecraft/world/level/block/ShulkerBoxBlock.java index fd84a15f..042caf35 100644 --- a/net/minecraft/world/level/block/ShulkerBoxBlock.java +++ b/net/minecraft/world/level/block/ShulkerBoxBlock.java @@ -26,11 +26,11 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity; -import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity.AnimationStatus; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.EnumProperty; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; @@ -88,7 +88,7 @@ public class ShulkerBoxBlock extends BaseEntityBlock { } private static boolean canOpen(BlockState state, Level level, BlockPos pos, ShulkerBoxBlockEntity blockEntity) { - if (blockEntity.getAnimationStatus() != AnimationStatus.CLOSED) { + if (blockEntity.getAnimationStatus() != ShulkerBoxBlockEntity.AnimationStatus.CLOSED) { return true; } else { AABB aABB = Shulker.getProgressDeltaAabb(1.0F, state.getValue(FACING), 0.0F, 0.5F, pos.getBottomCenter()).deflate(1.0E-6); @@ -102,7 +102,7 @@ public class ShulkerBoxBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(FACING); } @@ -125,7 +125,7 @@ public class ShulkerBoxBlock extends BaseEntityBlock { } @Override - protected List getDrops(BlockState state, net.minecraft.world.level.storage.loot.LootParams.Builder params) { + protected List getDrops(BlockState state, LootParams.Builder params) { BlockEntity blockEntity = params.getOptionalParameter(LootContextParams.BLOCK_ENTITY); if (blockEntity instanceof ShulkerBoxBlockEntity shulkerBoxBlockEntity) { params = params.withDynamicDrop(CONTENTS, consumer -> { diff --git a/net/minecraft/world/level/block/SignBlock.java b/net/minecraft/world/level/block/SignBlock.java index 4a421792..955338c5 100644 --- a/net/minecraft/world/level/block/SignBlock.java +++ b/net/minecraft/world/level/block/SignBlock.java @@ -32,7 +32,6 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.WoodType; import net.minecraft.world.level.gameevent.GameEvent; -import net.minecraft.world.level.gameevent.GameEvent.Context; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; import net.minecraft.world.phys.BlockHitResult; @@ -100,7 +99,7 @@ public abstract class SignBlock extends BaseEntityBlock implements SimpleWaterlo if (signApplicator2.canApplyToSign(signBlockEntity.getText(bl2), player) && signApplicator2.tryApplyToSign(serverLevel, signBlockEntity, bl2, player)) { signBlockEntity.executeClickCommandsIfPresent(serverLevel, player, pos, bl2); player.awardStat(Stats.ITEM_USED.get(stack.getItem())); - serverLevel.gameEvent(GameEvent.BLOCK_CHANGE, signBlockEntity.getBlockPos(), Context.of(player, signBlockEntity.getBlockState())); + serverLevel.gameEvent(GameEvent.BLOCK_CHANGE, signBlockEntity.getBlockPos(), GameEvent.Context.of(player, signBlockEntity.getBlockState())); stack.consume(1, player); return InteractionResult.SUCCESS; } else { diff --git a/net/minecraft/world/level/block/StructureBlock.java b/net/minecraft/world/level/block/StructureBlock.java index 116ccea9..2df4c461 100644 --- a/net/minecraft/world/level/block/StructureBlock.java +++ b/net/minecraft/world/level/block/StructureBlock.java @@ -12,7 +12,7 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.StructureBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.level.block.state.properties.StructureMode; @@ -62,7 +62,7 @@ public class StructureBlock extends BaseEntityBlock implements GameMasterBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(MODE); } diff --git a/net/minecraft/world/level/block/TestBlock.java b/net/minecraft/world/level/block/TestBlock.java index 5bc9d761..2ba38152 100644 --- a/net/minecraft/world/level/block/TestBlock.java +++ b/net/minecraft/world/level/block/TestBlock.java @@ -18,7 +18,7 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.TestBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.level.block.state.properties.TestBlockMode; @@ -55,7 +55,7 @@ public class TestBlock extends BaseEntityBlock implements GameMasterBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(MODE); } diff --git a/net/minecraft/world/level/block/TrialSpawnerBlock.java b/net/minecraft/world/level/block/TrialSpawnerBlock.java index 48fa07e2..1f57178b 100644 --- a/net/minecraft/world/level/block/TrialSpawnerBlock.java +++ b/net/minecraft/world/level/block/TrialSpawnerBlock.java @@ -11,7 +11,7 @@ import net.minecraft.world.level.block.entity.TrialSpawnerBlockEntity; import net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerState; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; @@ -33,7 +33,7 @@ public class TrialSpawnerBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(STATE, OMINOUS); } diff --git a/net/minecraft/world/level/block/VaultBlock.java b/net/minecraft/world/level/block/VaultBlock.java index a2346619..ff5a0c92 100644 --- a/net/minecraft/world/level/block/VaultBlock.java +++ b/net/minecraft/world/level/block/VaultBlock.java @@ -15,11 +15,9 @@ import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.vault.VaultBlockEntity; import net.minecraft.world.level.block.entity.vault.VaultState; -import net.minecraft.world.level.block.entity.vault.VaultBlockEntity.Client; -import net.minecraft.world.level.block.entity.vault.VaultBlockEntity.Server; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; @@ -51,7 +49,7 @@ public class VaultBlock extends BaseEntityBlock { return InteractionResult.TRY_WITH_EMPTY_HAND; } - Server.tryInsertKey( + VaultBlockEntity.Server.tryInsertKey( serverLevel, pos, state, vaultBlockEntity.getConfig(), vaultBlockEntity.getServerData(), vaultBlockEntity.getSharedData(), player, stack ); } @@ -69,7 +67,7 @@ public class VaultBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(FACING, STATE, OMINOUS); } @@ -80,14 +78,14 @@ public class VaultBlock extends BaseEntityBlock { ? createTickerHelper( blockEntityType, BlockEntityType.VAULT, - (levelx, blockPos, blockState, vaultBlockEntity) -> Server.tick( + (levelx, blockPos, blockState, vaultBlockEntity) -> VaultBlockEntity.Server.tick( serverLevel, blockPos, blockState, vaultBlockEntity.getConfig(), vaultBlockEntity.getServerData(), vaultBlockEntity.getSharedData() ) ) : createTickerHelper( blockEntityType, BlockEntityType.VAULT, - (levelx, blockPos, blockState, vaultBlockEntity) -> Client.tick( + (levelx, blockPos, blockState, vaultBlockEntity) -> VaultBlockEntity.Client.tick( levelx, blockPos, blockState, vaultBlockEntity.getClientData(), vaultBlockEntity.getSharedData() ) ); diff --git a/net/minecraft/world/level/block/piston/MovingPistonBlock.java b/net/minecraft/world/level/block/piston/MovingPistonBlock.java index eb100861..878ff3d2 100644 --- a/net/minecraft/world/level/block/piston/MovingPistonBlock.java +++ b/net/minecraft/world/level/block/piston/MovingPistonBlock.java @@ -22,10 +22,11 @@ import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.level.block.state.properties.PistonType; import net.minecraft.world.level.pathfinder.PathComputationType; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; @@ -86,7 +87,7 @@ public class MovingPistonBlock extends BaseEntityBlock { } @Override - protected List getDrops(BlockState state, net.minecraft.world.level.storage.loot.LootParams.Builder params) { + protected List getDrops(BlockState state, LootParams.Builder params) { PistonMovingBlockEntity pistonMovingBlockEntity = this.getBlockEntity(params.getLevel(), BlockPos.containing(params.getParameter(LootContextParams.ORIGIN))); return pistonMovingBlockEntity == null ? Collections.emptyList() : pistonMovingBlockEntity.getMovedState().getDrops(params); } @@ -129,7 +130,7 @@ public class MovingPistonBlock extends BaseEntityBlock { } @Override - protected void createBlockStateDefinition(Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(FACING, TYPE); } diff --git a/net/minecraft/world/level/block/state/BlockBehaviour.java b/net/minecraft/world/level/block/state/BlockBehaviour.java index e817f238..add1452f 100644 --- a/net/minecraft/world/level/block/state/BlockBehaviour.java +++ b/net/minecraft/world/level/block/state/BlockBehaviour.java @@ -7,6 +7,7 @@ import it.unimi.dsi.fastutil.objects.Reference2ObjectArrayMap; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Locale; import java.util.Objects; import java.util.Optional; import java.util.function.BiConsumer; @@ -20,7 +21,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Holder; import net.minecraft.core.HolderSet; -import net.minecraft.core.BlockPos.MutableBlockPos; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.network.protocol.game.DebugPackets; import net.minecraft.resources.DependantName; @@ -53,7 +54,6 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.ScheduledTickAccess; -import net.minecraft.world.level.Explosion.BlockInteraction; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.EntityBlock; @@ -65,7 +65,6 @@ import net.minecraft.world.level.block.SupportType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockBehaviour.BlockStateBase.Cache; import net.minecraft.world.level.block.state.properties.NoteBlockInstrument; import net.minecraft.world.level.block.state.properties.Property; import net.minecraft.world.level.material.Fluid; @@ -77,7 +76,6 @@ import net.minecraft.world.level.pathfinder.PathComputationType; import net.minecraft.world.level.redstone.Orientation; import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.LootTable; -import net.minecraft.world.level.storage.loot.LootParams.Builder; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.AABB; @@ -193,17 +191,17 @@ public abstract class BlockBehaviour implements FeatureElement { } protected void onExplosionHit(BlockState state, ServerLevel level, BlockPos pos, Explosion explosion, BiConsumer dropConsumer) { - if (!state.isAir() && explosion.getBlockInteraction() != BlockInteraction.TRIGGER_BLOCK) { + if (!state.isAir() && explosion.getBlockInteraction() != Explosion.BlockInteraction.TRIGGER_BLOCK) { Block block = state.getBlock(); boolean bl = explosion.getIndirectSourceEntity() instanceof Player; if (block.dropFromExplosion(explosion)) { BlockEntity blockEntity = state.hasBlockEntity() ? level.getBlockEntity(pos) : null; - Builder builder = new Builder(level) + LootParams.Builder builder = new LootParams.Builder(level) .withParameter(LootContextParams.ORIGIN, Vec3.atCenterOf(pos)) .withParameter(LootContextParams.TOOL, ItemStack.EMPTY) .withOptionalParameter(LootContextParams.BLOCK_ENTITY, blockEntity) .withOptionalParameter(LootContextParams.THIS_ENTITY, explosion.getDirectSourceEntity()); - if (explosion.getBlockInteraction() == BlockInteraction.DESTROY_WITH_DECAY) { + if (explosion.getBlockInteraction() == Explosion.BlockInteraction.DESTROY_WITH_DECAY) { builder.withParameter(LootContextParams.EXPLOSION_RADIUS, explosion.radius()); } @@ -294,7 +292,7 @@ public abstract class BlockBehaviour implements FeatureElement { return state.canBeReplaced() || !state.isSolid(); } - protected List getDrops(BlockState state, Builder params) { + protected List getDrops(BlockState state, LootParams.Builder params) { if (this.drops.isEmpty()) { return Collections.emptyList(); } else { @@ -499,7 +497,7 @@ public abstract class BlockBehaviour implements FeatureElement { private final NoteBlockInstrument instrument; private final boolean replaceable; @Nullable - private Cache cache; + private BlockBehaviour.BlockStateBase.Cache cache; private FluidState fluidState = Fluids.EMPTY.defaultFluidState(); private boolean isRandomlyTicking; private boolean solidRender; @@ -554,7 +552,7 @@ public abstract class BlockBehaviour implements FeatureElement { this.fluidState = this.owner.getFluidState(this.asState()); this.isRandomlyTicking = this.owner.isRandomlyTicking(this.asState()); if (!this.getBlock().hasDynamicShape()) { - this.cache = new Cache(this.asState()); + this.cache = new BlockBehaviour.BlockStateBase.Cache(this.asState()); } this.legacySolid = this.calculateSolid(); @@ -784,7 +782,7 @@ public abstract class BlockBehaviour implements FeatureElement { } public final void updateNeighbourShapes(LevelAccessor level, BlockPos pos, int flags, int recursionLeft) { - MutableBlockPos mutableBlockPos = new MutableBlockPos(); + BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos(); for (Direction direction : BlockBehaviour.UPDATE_SHAPE_ORDER) { mutableBlockPos.setWithOffset(pos, direction); @@ -828,7 +826,7 @@ public abstract class BlockBehaviour implements FeatureElement { this.getBlock().spawnAfterBreak(this.asState(), level, pos, stack, dropExperience); } - public List getDrops(Builder lootParams) { + public List getDrops(LootParams.Builder lootParams) { return this.getBlock().getDrops(this.asState(), lootParams); } @@ -979,6 +977,47 @@ public abstract class BlockBehaviour implements FeatureElement { public NoteBlockInstrument instrument() { return this.instrument; } + + static final class Cache { + private static final Direction[] DIRECTIONS = Direction.values(); + private static final int SUPPORT_TYPE_COUNT = SupportType.values().length; + protected final VoxelShape collisionShape; + protected final boolean largeCollisionShape; + private final boolean[] faceSturdy; + protected final boolean isCollisionShapeFullBlock; + + Cache(BlockState state) { + Block block = state.getBlock(); + this.collisionShape = block.getCollisionShape(state, EmptyBlockGetter.INSTANCE, BlockPos.ZERO, CollisionContext.empty()); + if (!this.collisionShape.isEmpty() && state.hasOffsetFunction()) { + throw new IllegalStateException( + String.format( + Locale.ROOT, "%s has a collision shape and an offset type, but is not marked as dynamicShape in its properties.", BuiltInRegistries.BLOCK.getKey(block) + ) + ); + } else { + this.largeCollisionShape = Arrays.stream(Direction.Axis.values()) + .anyMatch(axis -> this.collisionShape.min(axis) < 0.0 || this.collisionShape.max(axis) > 1.0); + this.faceSturdy = new boolean[DIRECTIONS.length * SUPPORT_TYPE_COUNT]; + + for (Direction direction : DIRECTIONS) { + for (SupportType supportType : SupportType.values()) { + this.faceSturdy[getFaceSupportIndex(direction, supportType)] = supportType.isSupporting(state, EmptyBlockGetter.INSTANCE, BlockPos.ZERO, direction); + } + } + + this.isCollisionShapeFullBlock = Block.isShapeFullBlock(state.getCollisionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO)); + } + } + + public boolean isFaceSturdy(Direction direction, SupportType supportType) { + return this.faceSturdy[getFaceSupportIndex(direction, supportType)]; + } + + private static int getFaceSupportIndex(Direction direction, SupportType supportType) { + return direction.ordinal() * SUPPORT_TYPE_COUNT + supportType.ordinal(); + } + } } @FunctionalInterface diff --git a/net/minecraft/world/level/block/state/StateHolder.java b/net/minecraft/world/level/block/state/StateHolder.java index 641b39c0..2897d666 100644 --- a/net/minecraft/world/level/block/state/StateHolder.java +++ b/net/minecraft/world/level/block/state/StateHolder.java @@ -161,12 +161,12 @@ public abstract class StateHolder { return this.values; } - protected static > Codec codec(Codec ownerCodec, Function defaultStateGetter) { - return ownerCodec.dispatch( + protected static > Codec codec(Codec propertyMap, Function holderFunction) { + return propertyMap.dispatch( "Name", stateHolder -> stateHolder.owner, object -> { - S stateHolder = (S)defaultStateGetter.apply(object); + S stateHolder = (S)holderFunction.apply(object); return stateHolder.getValues().isEmpty() ? MapCodec.unit(stateHolder) : stateHolder.propertiesCodec.codec().lenientOptionalFieldOf("Properties").xmap(optional -> (StateHolder)optional.orElse(stateHolder), Optional::of); diff --git a/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java b/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java index f2cd51f6..0c74a6e3 100644 --- a/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java +++ b/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java @@ -34,8 +34,7 @@ public class SimpleRegionStorage implements AutoCloseable { public CompoundTag upgradeChunkTag(CompoundTag tag, int version) { int i = NbtUtils.getDataVersion(tag, version); - CompoundTag compoundTag = this.dataFixType.updateToCurrentVersion(this.fixerUpper, tag, i); - return NbtUtils.addCurrentDataVersion(compoundTag); + return this.dataFixType.updateToCurrentVersion(this.fixerUpper, tag, i); } public Dynamic upgradeChunkTag(Dynamic tag, int version) { diff --git a/version.json b/version.json index 91e9ed7b..85f7e576 100644 --- a/version.json +++ b/version.json @@ -1,14 +1,14 @@ { - "id": "1.21.8", - "name": "1.21.8", - "world_version": 4440, + "id": "1.21.6", + "name": "1.21.6", + "world_version": 4435, "series_id": "main", - "protocol_version": 772, + "protocol_version": 771, "pack_version": { - "resource": 64, - "data": 81 + "resource": 63, + "data": 80 }, - "build_time": "2025-07-17T12:00:57+00:00", + "build_time": "2025-06-17T11:07:28+00:00", "java_component": "java-runtime-delta", "java_version": 21, "stable": true,