From ba56fc7bd76e3aee101b46bba54c5857ea8c13f2 Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 4 Aug 2020 12:48:03 -0300 Subject: [PATCH] mapping --- gradle.properties | 2 +- src/main/java/carpet/helpers/FeatureGenerator.java | 4 ++-- src/main/java/carpet/script/utils/ShapesRenderer.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1610c0d4..cc2e6ee2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html minecraft_version=1.16.2-pre1 - yarn_mappings=1.16.2-pre1+build.1 + yarn_mappings=1.16.2-pre1+build.17 loader_version=0.9.0+build.204 # Mod Properties diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java index 03a34994..cdf9ca3d 100644 --- a/src/main/java/carpet/helpers/FeatureGenerator.java +++ b/src/main/java/carpet/helpers/FeatureGenerator.java @@ -140,7 +140,7 @@ public class FeatureGenerator private static ConfiguredStructureFeature getDefaultFeature(StructureFeature structure, ServerWorld world, BlockPos pos, boolean tryHard) { - ConfiguredStructureFeature configuredFeature = world.getBiome(pos).method_30970().method_30978(structure.configure(null)); + ConfiguredStructureFeature configuredFeature = world.getBiome(pos).getGenerationSettings().method_30978(structure.configure(null)); if (configuredFeature.config != null || !tryHard) return configuredFeature; return BuiltinRegistries.CONFIGURED_STRUCTURE_FEATURE.getEntries().stream(). filter(cS -> cS.getValue().feature == structure). @@ -159,7 +159,7 @@ public class FeatureGenerator ChunkRandom chunkRandom = new ChunkRandom(); ChunkPos chunkPos = new ChunkPos(pos); Biome biome = biomeAccess.getBiome(new BlockPos(chunkPos.getStartX() + 9, 0, chunkPos.getStartZ() + 9)); - ConfiguredStructureFeature configuredFeature = biome.method_30970().method_30978(structure.configure(null)); + ConfiguredStructureFeature configuredFeature = biome.getGenerationSettings().method_30978(structure.configure(null)); if (configuredFeature == null || configuredFeature.config == null) return null; ChunkPos chunkPos2 = structure.getStartChunk(params, seed, chunkRandom, chunkPos.x, chunkPos.z); //find some chunk I guess if (chunkPos.x == chunkPos2.x && chunkPos.z == chunkPos2.z && ((StructureFeatureInterface)structure).shouldStartPublicAt(generator, generator.getBiomeSource(), seed, chunkRandom, chunkPos.x, chunkPos.z, biome, chunkPos, configuredFeature.config)) // should start at diff --git a/src/main/java/carpet/script/utils/ShapesRenderer.java b/src/main/java/carpet/script/utils/ShapesRenderer.java index 049c4b0f..371b840d 100644 --- a/src/main/java/carpet/script/utils/ShapesRenderer.java +++ b/src/main/java/carpet/script/utils/ShapesRenderer.java @@ -283,7 +283,7 @@ public class ShapesRenderer text_x = (float)(-textRenderer.getWidth(shape.value.getString())); } VertexConsumerProvider.Immediate immediate = VertexConsumerProvider.immediate(Tessellator.getInstance().getBuffer()); - textRenderer.method_30882(shape.value, text_x, 0.0F, shape.textcolor, false, AffineTransformation.identity().getMatrix(), immediate, false, shape.textbck, 15728880); + textRenderer.draw(shape.value, text_x, 0.0F, shape.textcolor, false, AffineTransformation.identity().getMatrix(), immediate, false, shape.textbck, 15728880); immediate.draw(); RenderSystem.popMatrix(); RenderSystem.enableCull();