From 2b92e2e73b7b303393ad0cbd5d2a3f7246484578 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sat, 25 Dec 2021 01:04:19 -0700 Subject: [PATCH] getKey -> key --- .../biome/image/ImageBiomeProviderAddon.java | 2 +- .../biome/pipeline/BiomePipelineAddon.java | 16 ++--- .../single/SingleBiomeProviderAddon.java | 2 +- .../NoiseChunkGenerator3DAddon.java | 2 +- .../dfsek/terra/addons/biome/BiomeAddon.java | 2 +- .../feature/distributor/DistributorAddon.java | 12 ++-- .../terra/addons/feature/FeatureAddon.java | 2 +- .../dfsek/terra/addons/flora/FloraAddon.java | 2 +- .../addons/feature/locator/LocatorAddon.java | 30 ++++----- .../dfsek/terra/addons/noise/NoiseAddon.java | 62 +++++++++---------- .../com/dfsek/terra/addons/ore/OreAddon.java | 2 +- .../terra/addons/palette/PaletteAddon.java | 2 +- .../addons/structure/StructureAddon.java | 2 +- .../feature/FeatureGenerationAddon.java | 2 +- .../structure/StructureGenerationAddon.java | 2 +- .../addons/sponge/SpongeSchematicAddon.java | 2 +- .../addons/terrascript/TerraScriptAddon.java | 7 +-- .../check/TerraScriptCheckFunctionAddon.java | 2 +- .../terra/api/registry/key/Namespaced.java | 2 +- .../com/dfsek/terra/AbstractPlatform.java | 2 +- .../terra/config/pack/ConfigPackImpl.java | 2 +- .../fabric/generation/TerraBiomeSource.java | 2 +- 22 files changed, 78 insertions(+), 83 deletions(-) diff --git a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java index 9404bf9eb..684e2af84 100644 --- a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java +++ b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java @@ -41,7 +41,7 @@ public class ImageBiomeProviderAddon implements AddonInitializer { .then(event -> { CheckedRegistry>> providerRegistry = event.getPack().getOrCreateRegistry( PROVIDER_REGISTRY_KEY); - providerRegistry.register(addon.getKey("IMAGE"), () -> new ImageProviderTemplate(event.getPack().getRegistry(Biome.class))); + providerRegistry.register(addon.key("IMAGE"), () -> new ImageProviderTemplate(event.getPack().getRegistry(Biome.class))); }) .failThrough(); } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java index 3064c8fb9..42aa95b0e 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java @@ -60,22 +60,22 @@ public class BiomePipelineAddon implements AddonInitializer { .then(event -> { CheckedRegistry>> providerRegistry = event.getPack().getOrCreateRegistry( PROVIDER_REGISTRY_KEY); - providerRegistry.register(addon.getKey("PIPELINE"), BiomePipelineTemplate::new); + providerRegistry.register(addon.key("PIPELINE"), BiomePipelineTemplate::new); }) .then(event -> { CheckedRegistry>> sourceRegistry = event.getPack().getOrCreateRegistry( SOURCE_REGISTRY_KEY); - sourceRegistry.register(addon.getKey("SAMPLER"), SamplerSourceTemplate::new); + sourceRegistry.register(addon.key("SAMPLER"), SamplerSourceTemplate::new); }) .then(event -> { CheckedRegistry>> stageRegistry = event.getPack().getOrCreateRegistry( STAGE_REGISTRY_KEY); - stageRegistry.register(addon.getKey("FRACTAL_EXPAND"), ExpanderStageTemplate::new); - stageRegistry.register(addon.getKey("SMOOTH"), SmoothMutatorTemplate::new); - stageRegistry.register(addon.getKey("REPLACE"), ReplaceMutatorTemplate::new); - stageRegistry.register(addon.getKey("REPLACE_LIST"), ReplaceListMutatorTemplate::new); - stageRegistry.register(addon.getKey("BORDER"), BorderMutatorTemplate::new); - stageRegistry.register(addon.getKey("BORDER_LIST"), BorderListMutatorTemplate::new); + stageRegistry.register(addon.key("FRACTAL_EXPAND"), ExpanderStageTemplate::new); + stageRegistry.register(addon.key("SMOOTH"), SmoothMutatorTemplate::new); + stageRegistry.register(addon.key("REPLACE"), ReplaceMutatorTemplate::new); + stageRegistry.register(addon.key("REPLACE_LIST"), ReplaceListMutatorTemplate::new); + stageRegistry.register(addon.key("BORDER"), BorderMutatorTemplate::new); + stageRegistry.register(addon.key("BORDER_LIST"), BorderListMutatorTemplate::new); }) .failThrough(); platform.getEventManager() diff --git a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java index f4eda81a0..ecf4a9c7b 100644 --- a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java +++ b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java @@ -40,7 +40,7 @@ public class SingleBiomeProviderAddon implements AddonInitializer { .then(event -> { CheckedRegistry>> providerRegistry = event.getPack().getOrCreateRegistry( PROVIDER_REGISTRY_KEY); - providerRegistry.register(addon.getKey("SINGLE"), SingleBiomeProviderTemplate::new); + providerRegistry.register(addon.key("SINGLE"), SingleBiomeProviderTemplate::new); }) .failThrough(); } diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java index 145de089e..dbb9cfcad 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java @@ -40,7 +40,7 @@ public class NoiseChunkGenerator3DAddon implements AddonInitializer { event.getPack() .getOrCreateRegistry(ChunkGeneratorProvider.class) - .register(addon.getKey("NOISE_3D"), + .register(addon.key("NOISE_3D"), pack -> new NoiseChunkGenerator3D(pack, platform, config.getElevationBlend(), config.getHorizontalRes(), config.getVerticalRes())); event.getPack() diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeAddon.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeAddon.java index b8e9d14a0..99f26b395 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeAddon.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeAddon.java @@ -30,7 +30,7 @@ public class BiomeAddon implements AddonInitializer { .getHandler(FunctionalEventHandler.class) .register(addon, ConfigPackPreLoadEvent.class) .then(event -> { - event.getPack().registerConfigType(new BiomeConfigType(event.getPack()), addon.getKey("BIOME"), 5); + event.getPack().registerConfigType(new BiomeConfigType(event.getPack()), addon.key("BIOME"), 5); event.getPack().applyLoader(PaletteHolder.class, new PaletteHolderLoader()); }) .failThrough(); diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java index 6424ed25a..182cc935c 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java @@ -47,12 +47,12 @@ public class DistributorAddon implements AddonInitializer { .then(event -> { CheckedRegistry>> distributorRegistry = event.getPack().getOrCreateRegistry( DISTRIBUTOR_TOKEN); - distributorRegistry.register(addon.getKey("SAMPLER"), SamplerDistributorTemplate::new); - distributorRegistry.register(addon.getKey("POINTS"), PointSetDistributorTemplate::new); - distributorRegistry.register(addon.getKey("AND"), AndDistributorTemplate::new); - distributorRegistry.register(addon.getKey("OR"), OrDistributorTemplate::new); - distributorRegistry.register(addon.getKey("YES"), YesDistributorTemplate::new); - distributorRegistry.register(addon.getKey("NO"), NoDistributorTemplate::new); + distributorRegistry.register(addon.key("SAMPLER"), SamplerDistributorTemplate::new); + distributorRegistry.register(addon.key("POINTS"), PointSetDistributorTemplate::new); + distributorRegistry.register(addon.key("AND"), AndDistributorTemplate::new); + distributorRegistry.register(addon.key("OR"), OrDistributorTemplate::new); + distributorRegistry.register(addon.key("YES"), YesDistributorTemplate::new); + distributorRegistry.register(addon.key("NO"), NoDistributorTemplate::new); event.getPack() .applyLoader(Point.class, PointTemplate::new); diff --git a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureAddon.java b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureAddon.java index bfd2ef7d7..67ae07506 100644 --- a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureAddon.java +++ b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureAddon.java @@ -27,7 +27,7 @@ public class FeatureAddon implements AddonInitializer { platform.getEventManager() .getHandler(FunctionalEventHandler.class) .register(addon, ConfigPackPreLoadEvent.class) - .then(event -> event.getPack().registerConfigType(new FeatureConfigType(), addon.getKey("FEATURE"), 3)) + .then(event -> event.getPack().registerConfigType(new FeatureConfigType(), addon.key("FEATURE"), 3)) .failThrough(); } } diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraAddon.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraAddon.java index f1a74c3a1..68b43b364 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraAddon.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraAddon.java @@ -30,7 +30,7 @@ public class FloraAddon implements AddonInitializer { .getHandler(FunctionalEventHandler.class) .register(addon, ConfigPackPreLoadEvent.class) .then(event -> { - event.getPack().registerConfigType(new FloraConfigType(), addon.getKey("FLORA"), 2); + event.getPack().registerConfigType(new FloraConfigType(), addon.key("FLORA"), 2); event.getPack().applyLoader(BlockLayer.class, BlockLayerTemplate::new); }) .failThrough(); diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java index 3b68215c7..5be5bd21d 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java @@ -57,29 +57,29 @@ public class LocatorAddon implements AddonInitializer { .register(addon, ConfigPackPreLoadEvent.class) .then(event -> { CheckedRegistry>> locatorRegistry = event.getPack().getOrCreateRegistry(LOCATOR_TOKEN); - locatorRegistry.register(addon.getKey("SURFACE"), () -> new SurfaceLocatorTemplate(platform)); + locatorRegistry.register(addon.key("SURFACE"), () -> new SurfaceLocatorTemplate(platform)); - locatorRegistry.register(addon.getKey("RANDOM"), RandomLocatorTemplate::new); - locatorRegistry.register(addon.getKey("GAUSSIAN_RANDOM"), GaussianRandomLocatorTemplate::new); + locatorRegistry.register(addon.key("RANDOM"), RandomLocatorTemplate::new); + locatorRegistry.register(addon.key("GAUSSIAN_RANDOM"), GaussianRandomLocatorTemplate::new); - locatorRegistry.register(addon.getKey("PATTERN"), PatternLocatorTemplate::new); + locatorRegistry.register(addon.key("PATTERN"), PatternLocatorTemplate::new); - locatorRegistry.register(addon.getKey("SAMPLER"), SamplerLocatorTemplate::new); - locatorRegistry.register(addon.getKey("SAMPLER_3D"), Sampler3DLocatorTemplate::new); + locatorRegistry.register(addon.key("SAMPLER"), SamplerLocatorTemplate::new); + locatorRegistry.register(addon.key("SAMPLER_3D"), Sampler3DLocatorTemplate::new); - locatorRegistry.register(addon.getKey("AND"), AndLocatorTemplate::new); - locatorRegistry.register(addon.getKey("OR"), OrLocatorTemplate::new); + locatorRegistry.register(addon.key("AND"), AndLocatorTemplate::new); + locatorRegistry.register(addon.key("OR"), OrLocatorTemplate::new); }) .then(event -> { CheckedRegistry>> patternRegistry = event.getPack().getOrCreateRegistry(PATTERN_TOKEN); - patternRegistry.register(addon.getKey("MATCH_AIR"), AirMatchPatternTemplate::new); - patternRegistry.register(addon.getKey("MATCH_SOLID"), SolidMatchPatternTemplate::new); - patternRegistry.register(addon.getKey("MATCH"), SingleBlockMatchPatternTemplate::new); - patternRegistry.register(addon.getKey("MATCH_SET"), BlockSetMatchPatternTemplate::new); + patternRegistry.register(addon.key("MATCH_AIR"), AirMatchPatternTemplate::new); + patternRegistry.register(addon.key("MATCH_SOLID"), SolidMatchPatternTemplate::new); + patternRegistry.register(addon.key("MATCH"), SingleBlockMatchPatternTemplate::new); + patternRegistry.register(addon.key("MATCH_SET"), BlockSetMatchPatternTemplate::new); - patternRegistry.register(addon.getKey("AND"), AndPatternTemplate::new); - patternRegistry.register(addon.getKey("OR"), OrPatternTemplate::new); - patternRegistry.register(addon.getKey("NOT"), NotPatternTemplate::new); + patternRegistry.register(addon.key("AND"), AndPatternTemplate::new); + patternRegistry.register(addon.key("OR"), OrPatternTemplate::new); + patternRegistry.register(addon.key("NOT"), NotPatternTemplate::new); }) .failThrough(); } diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java index 8fdb93256..9fbc0330b 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java @@ -84,54 +84,54 @@ public class NoiseAddon implements AddonInitializer { .applyLoader(DimensionApplicableNoiseSampler.class, DimensionApplicableNoiseSampler::new) .applyLoader(FunctionTemplate.class, FunctionTemplate::new); - noiseRegistry.register(addon.getKey("LINEAR"), LinearNormalizerTemplate::new); - noiseRegistry.register(addon.getKey("NORMAL"), NormalNormalizerTemplate::new); - noiseRegistry.register(addon.getKey("CLAMP"), ClampNormalizerTemplate::new); - noiseRegistry.register(addon.getKey("PROBABILITY"), ProbabilityNormalizerTemplate::new); - noiseRegistry.register(addon.getKey("SCALE"), ScaleNormalizerTemplate::new); + noiseRegistry.register(addon.key("LINEAR"), LinearNormalizerTemplate::new); + noiseRegistry.register(addon.key("NORMAL"), NormalNormalizerTemplate::new); + noiseRegistry.register(addon.key("CLAMP"), ClampNormalizerTemplate::new); + noiseRegistry.register(addon.key("PROBABILITY"), ProbabilityNormalizerTemplate::new); + noiseRegistry.register(addon.key("SCALE"), ScaleNormalizerTemplate::new); - noiseRegistry.register(addon.getKey("IMAGE"), ImageSamplerTemplate::new); + noiseRegistry.register(addon.key("IMAGE"), ImageSamplerTemplate::new); - noiseRegistry.register(addon.getKey("DOMAIN_WARP"), DomainWarpTemplate::new); + noiseRegistry.register(addon.key("DOMAIN_WARP"), DomainWarpTemplate::new); - noiseRegistry.register(addon.getKey("FBM"), BrownianMotionTemplate::new); - noiseRegistry.register(addon.getKey("PING_PONG"), PingPongTemplate::new); - noiseRegistry.register(addon.getKey("RIDGED"), RidgedFractalTemplate::new); + noiseRegistry.register(addon.key("FBM"), BrownianMotionTemplate::new); + noiseRegistry.register(addon.key("PING_PONG"), PingPongTemplate::new); + noiseRegistry.register(addon.key("RIDGED"), RidgedFractalTemplate::new); - noiseRegistry.register(addon.getKey("OPEN_SIMPLEX_2"), () -> new SimpleNoiseTemplate(OpenSimplex2Sampler::new)); - noiseRegistry.register(addon.getKey("OPEN_SIMPLEX_2S"), () -> new SimpleNoiseTemplate(OpenSimplex2SSampler::new)); - noiseRegistry.register(addon.getKey("PERLIN"), () -> new SimpleNoiseTemplate(PerlinSampler::new)); - noiseRegistry.register(addon.getKey("SIMPLEX"), () -> new SimpleNoiseTemplate(SimplexSampler::new)); - noiseRegistry.register(addon.getKey("GABOR"), GaborNoiseTemplate::new); + noiseRegistry.register(addon.key("OPEN_SIMPLEX_2"), () -> new SimpleNoiseTemplate(OpenSimplex2Sampler::new)); + noiseRegistry.register(addon.key("OPEN_SIMPLEX_2S"), () -> new SimpleNoiseTemplate(OpenSimplex2SSampler::new)); + noiseRegistry.register(addon.key("PERLIN"), () -> new SimpleNoiseTemplate(PerlinSampler::new)); + noiseRegistry.register(addon.key("SIMPLEX"), () -> new SimpleNoiseTemplate(SimplexSampler::new)); + noiseRegistry.register(addon.key("GABOR"), GaborNoiseTemplate::new); - noiseRegistry.register(addon.getKey("VALUE"), () -> new SimpleNoiseTemplate(ValueSampler::new)); - noiseRegistry.register(addon.getKey("VALUE_CUBIC"), () -> new SimpleNoiseTemplate(ValueCubicSampler::new)); + noiseRegistry.register(addon.key("VALUE"), () -> new SimpleNoiseTemplate(ValueSampler::new)); + noiseRegistry.register(addon.key("VALUE_CUBIC"), () -> new SimpleNoiseTemplate(ValueCubicSampler::new)); - noiseRegistry.register(addon.getKey("CELLULAR"), CellularNoiseTemplate::new); + noiseRegistry.register(addon.key("CELLULAR"), CellularNoiseTemplate::new); - noiseRegistry.register(addon.getKey("WHITE_NOISE"), () -> new SimpleNoiseTemplate(WhiteNoiseSampler::new)); - noiseRegistry.register(addon.getKey("POSITIVE_WHITE_NOISE"), () -> new SimpleNoiseTemplate(PositiveWhiteNoiseSampler::new)); - noiseRegistry.register(addon.getKey("GAUSSIAN"), () -> new SimpleNoiseTemplate(GaussianNoiseSampler::new)); + noiseRegistry.register(addon.key("WHITE_NOISE"), () -> new SimpleNoiseTemplate(WhiteNoiseSampler::new)); + noiseRegistry.register(addon.key("POSITIVE_WHITE_NOISE"), () -> new SimpleNoiseTemplate(PositiveWhiteNoiseSampler::new)); + noiseRegistry.register(addon.key("GAUSSIAN"), () -> new SimpleNoiseTemplate(GaussianNoiseSampler::new)); - noiseRegistry.register(addon.getKey("CONSTANT"), ConstantNoiseTemplate::new); + noiseRegistry.register(addon.key("CONSTANT"), ConstantNoiseTemplate::new); - noiseRegistry.register(addon.getKey("KERNEL"), KernelTemplate::new); + noiseRegistry.register(addon.key("KERNEL"), KernelTemplate::new); - noiseRegistry.register(addon.getKey("LINEAR_HEIGHTMAP"), LinearHeightmapSamplerTemplate::new); + noiseRegistry.register(addon.key("LINEAR_HEIGHTMAP"), LinearHeightmapSamplerTemplate::new); - noiseRegistry.register(addon.getKey("ADD"), () -> new BinaryArithmeticTemplate<>(AdditionSampler::new)); - noiseRegistry.register(addon.getKey("SUB"), () -> new BinaryArithmeticTemplate<>(SubtractionSampler::new)); - noiseRegistry.register(addon.getKey("MUL"), () -> new BinaryArithmeticTemplate<>(MultiplicationSampler::new)); - noiseRegistry.register(addon.getKey("DIV"), () -> new BinaryArithmeticTemplate<>(DivisionSampler::new)); - noiseRegistry.register(addon.getKey("MAX"), () -> new BinaryArithmeticTemplate<>(MaxSampler::new)); - noiseRegistry.register(addon.getKey("MIN"), () -> new BinaryArithmeticTemplate<>(MinSampler::new)); + noiseRegistry.register(addon.key("ADD"), () -> new BinaryArithmeticTemplate<>(AdditionSampler::new)); + noiseRegistry.register(addon.key("SUB"), () -> new BinaryArithmeticTemplate<>(SubtractionSampler::new)); + noiseRegistry.register(addon.key("MUL"), () -> new BinaryArithmeticTemplate<>(MultiplicationSampler::new)); + noiseRegistry.register(addon.key("DIV"), () -> new BinaryArithmeticTemplate<>(DivisionSampler::new)); + noiseRegistry.register(addon.key("MAX"), () -> new BinaryArithmeticTemplate<>(MaxSampler::new)); + noiseRegistry.register(addon.key("MIN"), () -> new BinaryArithmeticTemplate<>(MinSampler::new)); Map packSamplers = new LinkedHashMap<>(); Map packFunctions = new LinkedHashMap<>(); - noiseRegistry.register(addon.getKey("EXPRESSION"), () -> new ExpressionFunctionTemplate(packSamplers, packFunctions)); + noiseRegistry.register(addon.key("EXPRESSION"), () -> new ExpressionFunctionTemplate(packSamplers, packFunctions)); NoiseConfigPackTemplate template = event.loadTemplate(new NoiseConfigPackTemplate()); diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java index 01097e6c5..4e6f1751b 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java @@ -27,7 +27,7 @@ public class OreAddon implements AddonInitializer { platform.getEventManager() .getHandler(FunctionalEventHandler.class) .register(addon, ConfigPackPreLoadEvent.class) - .then(event -> event.getPack().registerConfigType(new OreConfigType(), addon.getKey("ORE"), 1)) + .then(event -> event.getPack().registerConfigType(new OreConfigType(), addon.key("ORE"), 1)) .failThrough(); } } diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteAddon.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteAddon.java index 0f538c66d..687d9bf84 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteAddon.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteAddon.java @@ -30,7 +30,7 @@ public class PaletteAddon implements AddonInitializer { .getHandler(FunctionalEventHandler.class) .register(addon, ConfigPackPreLoadEvent.class) .then(event -> { - event.getPack().registerConfigType(new PaletteConfigType(platform), addon.getKey("PALETTE"), 2); + event.getPack().registerConfigType(new PaletteConfigType(platform), addon.key("PALETTE"), 2); event.getPack().applyLoader(PaletteLayerHolder.class, new PaletteLayerLoader()); }) .failThrough(); diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java index 740e9cd7a..d578b7721 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java @@ -27,7 +27,7 @@ public class StructureAddon implements AddonInitializer { platform.getEventManager() .getHandler(FunctionalEventHandler.class) .register(addon, ConfigPackPreLoadEvent.class) - .then(event -> event.getPack().registerConfigType(new StructureConfigType(), addon.getKey("STRUCTURE"), 2)) + .then(event -> event.getPack().registerConfigType(new StructureConfigType(), addon.key("STRUCTURE"), 2)) .failThrough(); } } diff --git a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java index 9caea4965..c3db72aac 100644 --- a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java +++ b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java @@ -54,7 +54,7 @@ public class FeatureGenerationAddon implements AddonInitializer { .register(addon, ConfigPackPreLoadEvent.class) .then(event -> event.getPack() .getOrCreateRegistry(STAGE_TYPE_KEY) - .register(addon.getKey("FEATURE"), () -> new FeatureStageTemplate(platform))) + .register(addon.key("FEATURE"), () -> new FeatureStageTemplate(platform))) .failThrough(); platform.getEventManager() diff --git a/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationAddon.java b/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationAddon.java index 6fd9cb14e..1837bc3e3 100644 --- a/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationAddon.java +++ b/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationAddon.java @@ -26,7 +26,7 @@ public class StructureGenerationAddon implements AddonInitializer { .register(addon, ConfigPackPreLoadEvent.class) .then(event -> event.getPack() .getOrCreateRegistry(GenerationStageProvider.class) - .register(addon.getKey("STRUCTURE"), pack -> new StructureGenerationStage(platform))) + .register(addon.key("STRUCTURE"), pack -> new StructureGenerationStage(platform))) .failThrough(); platform.getEventManager() diff --git a/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java b/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java index 20fcb420b..a5dcdce08 100644 --- a/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java +++ b/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java @@ -60,7 +60,7 @@ public class SpongeSchematicAddon implements AddonInitializer { event.getPack().getLoader().open("", ".schem").thenEntries(entries -> { for(Map.Entry entry : entries) { String id = StringUtil.fileName(entry.getKey()); - structureRegistry.register(addon.getKey(id), convert(entry.getValue(), id)); + structureRegistry.register(addon.key(id), convert(entry.getValue(), id)); } }).close(); }) diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java index 66924ed4b..b24b08c3b 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java @@ -9,10 +9,6 @@ package com.dfsek.terra.addons.terrascript; import com.dfsek.tectonic.api.exception.LoadException; -import java.io.InputStream; -import java.lang.reflect.Type; -import java.util.Map; - import com.dfsek.terra.addons.manifest.api.AddonInitializer; import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder; @@ -26,7 +22,6 @@ import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.structure.LootTable; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.util.StringUtil; -import com.dfsek.terra.api.util.reflection.TypeKey; public class TerraScriptAddon implements AddonInitializer { @@ -62,7 +57,7 @@ public class TerraScriptAddon implements AddonInitializer { } }) .toList() - .forEach(structureScript -> structureRegistry.register(addon.getKey(structureScript.getID()), + .forEach(structureScript -> structureRegistry.register(addon.key(structureScript.getID()), structureScript))) .close(); }) diff --git a/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/TerraScriptCheckFunctionAddon.java b/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/TerraScriptCheckFunctionAddon.java index 3bb6e8180..27d4d4d57 100644 --- a/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/TerraScriptCheckFunctionAddon.java +++ b/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/TerraScriptCheckFunctionAddon.java @@ -23,7 +23,7 @@ public class TerraScriptCheckFunctionAddon implements AddonInitializer { .register(addon, ConfigPackPreLoadEvent.class) .priority(1) .then(event -> { - event.getPack().getOrCreateRegistry(FunctionBuilder.class).register(addon.getKey("check"), new CheckFunctionBuilder(platform)); + event.getPack().getOrCreateRegistry(FunctionBuilder.class).register(addon.key("check"), new CheckFunctionBuilder(platform)); }) .failThrough(); } diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/key/Namespaced.java b/common/api/src/main/java/com/dfsek/terra/api/registry/key/Namespaced.java index 5d1bad946..0c4e33c22 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/registry/key/Namespaced.java +++ b/common/api/src/main/java/com/dfsek/terra/api/registry/key/Namespaced.java @@ -3,7 +3,7 @@ package com.dfsek.terra.api.registry.key; public interface Namespaced { String getNamespace(); - default RegistryKey getKey(String id) { + default RegistryKey key(String id) { return RegistryKey.of(getNamespace(), id); } } diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java b/common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java index 98318c7e0..05e9a1260 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java @@ -209,7 +209,7 @@ public abstract class AbstractPlatform implements Platform { platformInjector.inject(addon); addon.initialize(); if(!(addon instanceof EphemeralAddon)) { // ephemeral addons exist only for version checking - addonRegistry.register(addon.getKey(addon.getID()), addon); + addonRegistry.register(addon.key(addon.getID()), addon); } }); diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java index c028c91c5..5a6537398 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java @@ -220,7 +220,7 @@ public class ConfigPackImpl implements ConfigPack { return Pair.of(configuration.getID(), loaded); }) .toList() - .forEach(pair -> registry.register(getKey(pair.getLeft()), pair.getRight())); + .forEach(pair -> registry.register(key(pair.getLeft()), pair.getRight())); platform.getEventManager().callEvent(new ConfigTypePostLoadEvent(configType, registry, this)); }); diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java index f722b77e5..6c1ebd390 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java @@ -73,7 +73,7 @@ public class TerraBiomeSource extends BiomeSource { public net.minecraft.world.biome.Biome getBiome(int biomeX, int biomeY, int biomeZ, MultiNoiseSampler noiseSampler) { Biome biome = pack.getBiomeProvider().getBiome(biomeX << 2, biomeZ << 2, seed); return terraToMinecraft.computeIfAbsent(biome, b -> biomeRegistry - .get(new Identifier("terra", FabricUtil.createBiomeID(pack, pack.getKey(b.getID()))))); + .get(new Identifier("terra", FabricUtil.createBiomeID(pack, pack.key(b.getID()))))); } public BiomeProvider getProvider() {