From d04e785d1ece581af49000003a7b05b287521ef2 Mon Sep 17 00:00:00 2001 From: SD Date: Sat, 12 Sep 2020 14:22:54 +0530 Subject: [PATCH] FIxed names Changes o be committed: modified: src/main/java/org/dimdev/dimcore/schematic/v2/SchematicBlockPalette.java modified: src/main/java/org/dimdev/dimdoors/world/feature/ModFeatures.java --- .../dimdev/dimcore/schematic/v2/SchematicBlockPalette.java | 2 +- .../java/org/dimdev/dimdoors/world/feature/ModFeatures.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/dimdev/dimcore/schematic/v2/SchematicBlockPalette.java b/src/main/java/org/dimdev/dimcore/schematic/v2/SchematicBlockPalette.java index ccc53528..39f550f2 100644 --- a/src/main/java/org/dimdev/dimcore/schematic/v2/SchematicBlockPalette.java +++ b/src/main/java/org/dimdev/dimcore/schematic/v2/SchematicBlockPalette.java @@ -23,7 +23,7 @@ public class SchematicBlockPalette { public interface Entry { Codec CODEC = Codec.STRING.comapFlatMap(Entry::to, Entry::from); - static > DataResult to(String string) { + static DataResult to(String string) { if (!string.contains("[") && !string.contains("]")) { BlockState state = Registry.BLOCK.get(new Identifier(string)).getDefaultState(); return DataResult.success(state); diff --git a/src/main/java/org/dimdev/dimdoors/world/feature/ModFeatures.java b/src/main/java/org/dimdev/dimdoors/world/feature/ModFeatures.java index 815aa2cf..a3ffcd94 100644 --- a/src/main/java/org/dimdev/dimdoors/world/feature/ModFeatures.java +++ b/src/main/java/org/dimdev/dimdoors/world/feature/ModFeatures.java @@ -20,7 +20,7 @@ import net.minecraft.world.gen.feature.Feature; public final class ModFeatures { public static final Feature GATEWAY_FEATURE = Registry.register(Registry.FEATURE, new Identifier("dimdoors", "gateway"), new SchematicGatewayFeature(SchematicGatewayFeatureConfig.CODEC)); - public static final Feature GATEWAY_FEATURE_V2 = Registry.register(Registry.FEATURE, new Identifier("dimdoors", "gateway"), new SchematicV2GatewayFeature(SchematicV2GatewayFeatureConfig.CODEC)); + public static final Feature GATEWAY_FEATURE_V2 = Registry.register(Registry.FEATURE, new Identifier("dimdoors", "gateway_v2"), new SchematicV2GatewayFeature(SchematicV2GatewayFeatureConfig.CODEC)); public static final SchematicGateway SANDSTONE_PILLARS_GATEWAY = new SandstonePillarsGateway(); public static final SchematicGateway TWO_PILLARS_GATEWAY = new TwoPillarsGateway(); public static final SchematicV2Gateway SANDSTONE_PILLARS_GATEWAY_V2 = new SandstonePillarsV2Gateway(); @@ -35,7 +35,7 @@ public final class ModFeatures { } static { - SANDSTONE_PILLARS_FEATURE_V2 = GATEWAY_FEATURE_V2.configure(new SchematicV2GatewayFeatureConfig(SchematicGateway.SCHEMATIC_ID_MAP.get(SANDSTONE_PILLARS_GATEWAY))) + SANDSTONE_PILLARS_FEATURE_V2 = GATEWAY_FEATURE_V2.configure(new SchematicV2GatewayFeatureConfig(SchematicV2Gateway.SCHEMATIC_ID_MAP.get(SANDSTONE_PILLARS_GATEWAY_V2))) .decorate(ConfiguredFeatures.Decorators.SQUARE_TOP_SOLID_HEIGHTMAP .applyChance(ModConfig.WORLD.gatewayGenChance)); SANDSTONE_PILLARS_FEATURE = GATEWAY_FEATURE.configure(new SchematicGatewayFeatureConfig(SchematicGateway.SCHEMATIC_ID_MAP.get(SANDSTONE_PILLARS_GATEWAY)))