diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md index 9a1b69189..c498f6f5e 100644 --- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md @@ -21,8 +21,8 @@ assignees: "" - You must be on the LATEST version of Terra to receive any support. There is no support for older versions of Terra. - Make sure that this is not a *specific* compatibility issue with another terrain generation mod. Do not request *specific* compatibility with mods or plugins (e.g. "Compatibility with TechCraft v7"). - That should be implemented in an addon, **not** in the main project. - *General* compatibility (e.g. "Ability to pull Vanilla/Modded features from parent biomes") will be considered in the main project. + That should be implemented in an addon, **not** in the platform project. + *General* compatibility (e.g. "Ability to pull Vanilla/Modded features from parent biomes") will be considered in the platform project. - Make sure that there are no already existing issues open with your problem. If you open a duplicate, it will be closed as such. - Make sure that it is actually Terra causing the issue, and not another mod/plugin. You can do this by testing to see if you can recreate the issue without Terra installed. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3c2c62467..ddcac2710 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -114,9 +114,9 @@ please [include as many details as possible](#how-do-i-submit-a-good-bug-report) - Make sure that this is not a *specific* compatibility issue with another terrain generation mod. Do not request *specific* compatibility with mods or plugins (e.g. "Compatibility with TechCraft v7"). That should be implemented - in an addon, **not** in the main project. + in an addon, **not** in the platform project. *General* compatibility (e.g. "Ability to pull Vanilla/Modded features from - parent biomes") will be considered in the main project. + parent biomes") will be considered in the platform project. - Search for any [already existing issues](https://github.com/PolyhedralDev/Terra/issues?q=is%3Aissue+) open with your problem. If you open a duplicate, it will be closed as such. @@ -200,7 +200,7 @@ please [include as many details as possible](#how-do-i-submit-a-good-enhancement Enhancement suggestions are tracked as [GitHub issues](https://guides.github.com/features/issues/). Create an issue -on our main repository and provide the following information: +on our platform repository and provide the following information: - **Use a clear and descriptive title** for the issue to identify the suggestion. @@ -243,7 +243,7 @@ accepted. Pull Requests are tracked as [GitHub Pull Requests](https://guides.github.com/activities/forking/#making-a-pull-request) -. Create a pr on our main repository and provide the following information: +. Create a pr on our platform repository and provide the following information: - **Use a clear and descriptive title** to identify the pull request. - **State what this pull request adds/fixes**. @@ -347,7 +347,7 @@ TODO #### General Compatibility General compatibility (example: injection of Vanilla structures/features/carvers -into packs) is acceptable in the main project. +into packs) is acceptable in the platform project. - General compatibility features should be *disabled by default*. Having things auto-injected causes unpredictable behaviour that is annoying to diagnose. @@ -365,7 +365,7 @@ into packs) is acceptable in the main project. #### Specific Compatibility -Specific compatibility should *not* be put in the main project. (Example: Adding +Specific compatibility should *not* be put in the platform project. (Example: Adding the ability to generate TechCraft v7's doo-dads with a TerraScript function) Having specific compatibilities leads to tons of extra dependencies to keep 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 e61538679..e2cf15bae 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 @@ -26,18 +26,18 @@ public class ImageBiomeProviderAddon extends TerraAddon { }; @Inject - private Platform main; + private Platform platform; @Override public void initialize() { - main.getEventManager() - .getHandler(FunctionalEventHandler.class) - .register(this, ConfigPackPreLoadEvent.class) - .then(event -> { - CheckedRegistry>> providerRegistry = event.getPack().getOrCreateRegistry( - PROVIDER_REGISTRY_KEY); - providerRegistry.register("IMAGE", () -> new ImageProviderTemplate(event.getPack().getRegistry(TerraBiome.class))); - }) - .failThrough(); + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(this, ConfigPackPreLoadEvent.class) + .then(event -> { + CheckedRegistry>> providerRegistry = event.getPack().getOrCreateRegistry( + PROVIDER_REGISTRY_KEY); + providerRegistry.register("IMAGE", () -> new ImageProviderTemplate(event.getPack().getRegistry(TerraBiome.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 cd63d7870..6b32bd6f9 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 @@ -40,24 +40,24 @@ public class BiomePipelineAddon extends TerraAddon { public static final TypeKey>> PROVIDER_REGISTRY_KEY = new TypeKey<>() { }; @Inject - private Platform main; + private Platform platform; @Override public void initialize() { - main.getEventManager() - .getHandler(FunctionalEventHandler.class) - .register(this, ConfigPackPreLoadEvent.class) - .then(event -> { + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(this, ConfigPackPreLoadEvent.class) + .then(event -> { CheckedRegistry>> providerRegistry = event.getPack().getOrCreateRegistry( PROVIDER_REGISTRY_KEY); - providerRegistry.register("PIPELINE", () -> new BiomePipelineTemplate(main)); + providerRegistry.register("PIPELINE", () -> new BiomePipelineTemplate(platform)); }) - .then(event -> { + .then(event -> { CheckedRegistry>> sourceRegistry = event.getPack().getOrCreateRegistry( SOURCE_REGISTRY_KEY); sourceRegistry.register("NOISE", NoiseSourceTemplate::new); }) - .then(event -> { + .then(event -> { CheckedRegistry>> stageRegistry = event.getPack().getOrCreateRegistry(STAGE_REGISTRY_KEY); stageRegistry.register("FRACTAL_EXPAND", ExpanderStageTemplate::new); stageRegistry.register("SMOOTH", SmoothMutatorTemplate::new); @@ -66,6 +66,6 @@ public class BiomePipelineAddon extends TerraAddon { stageRegistry.register("BORDER", BorderMutatorTemplate::new); stageRegistry.register("BORDER_LIST", BorderListMutatorTemplate::new); }) - .failThrough(); + .failThrough(); } } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java index 6112ebe6a..64fbeed18 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java @@ -20,12 +20,12 @@ public class BiomePipelineProvider implements BiomeProvider { private final NoiseSampler mutator; private final double noiseAmp; - public BiomePipelineProvider(BiomePipeline pipeline, Platform main, int resolution, NoiseSampler mutator, double noiseAmp) { + public BiomePipelineProvider(BiomePipeline pipeline, Platform platform, int resolution, NoiseSampler mutator, double noiseAmp) { this.resolution = resolution; this.mutator = mutator; this.noiseAmp = noiseAmp; holderCache = CacheBuilder.newBuilder() - .maximumSize(main == null ? 32 : main.getTerraConfig().getProviderCache()) + .maximumSize(platform == null ? 32 : platform.getTerraConfig().getProviderCache()) .build( new CacheLoader<>() { @Override diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java index 85b57829d..84548fbef 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java @@ -16,7 +16,7 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider; @SuppressWarnings({ "FieldMayBeFinal", "unused" }) public class BiomePipelineTemplate extends BiomeProviderTemplate { - private final Platform main; + private final Platform platform; @Value("pipeline.initial-size") @Default private @Meta int initialSize = 2; @@ -27,8 +27,8 @@ public class BiomePipelineTemplate extends BiomeProviderTemplate { @Value("pipeline.source") private @Meta BiomeSource source; - public BiomePipelineTemplate(Platform main) { - this.main = main; + public BiomePipelineTemplate(Platform platform) { + this.platform = platform; } @Override @@ -36,6 +36,6 @@ public class BiomePipelineTemplate extends BiomeProviderTemplate { BiomePipeline.BiomePipelineBuilder biomePipelineBuilder = new BiomePipeline.BiomePipelineBuilder(initialSize); stages.forEach(biomePipelineBuilder::addStage); BiomePipeline pipeline = biomePipelineBuilder.build(source); - return new BiomePipelineProvider(pipeline, main, resolution, blend, blendAmp); + return new BiomePipelineProvider(pipeline, platform, resolution, blend, blendAmp); } } 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 f64343263..d5ea2cee7 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 @@ -25,18 +25,18 @@ public class SingleBiomeProviderAddon extends TerraAddon { }; @Inject - private Platform main; + private Platform platform; @Override public void initialize() { - main.getEventManager() - .getHandler(FunctionalEventHandler.class) - .register(this, ConfigPackPreLoadEvent.class) - .then(event -> { + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(this, ConfigPackPreLoadEvent.class) + .then(event -> { CheckedRegistry>> providerRegistry = event.getPack().getOrCreateRegistry( PROVIDER_REGISTRY_KEY); providerRegistry.register("SINGLE", SingleBiomeProviderTemplate::new); }) - .failThrough(); + .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 78fea8055..a488049cb 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 @@ -23,30 +23,31 @@ import com.dfsek.terra.api.world.generator.ChunkGeneratorProvider; @Version("1.0.0") public class NoiseChunkGenerator3DAddon extends TerraAddon { @Inject - private Platform main; + private Platform platform; @Override public void initialize() { - main.getEventManager() - .getHandler(FunctionalEventHandler.class) - .register(this, ConfigPackPreLoadEvent.class) - .then(event -> { + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(this, ConfigPackPreLoadEvent.class) + .then(event -> { event.getPack().getOrCreateRegistry(ChunkGeneratorProvider.class).register("NOISE_3D", - pack -> new NoiseChunkGenerator3D(pack, main)); + pack -> new NoiseChunkGenerator3D(pack, + platform)); event.getPack() .applyLoader(SlantHolder.class, new SlantHolderLoader()) .applyLoader(PaletteHolder.class, new PaletteHolderLoader()); }) - .failThrough(); + .failThrough(); - main.getEventManager() - .getHandler(FunctionalEventHandler.class) - .register(this, ConfigurationLoadEvent.class) - .then(event -> { + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(this, ConfigurationLoadEvent.class) + .then(event -> { if(event.is(TerraBiome.class)) { event.getLoadedObject(TerraBiome.class).getContext().put(event.load(new BiomePaletteTemplate()).get()); } }) - .failThrough(); + .failThrough(); } } diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java index 02dd5bd5d..400e51acd 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java @@ -1,5 +1,7 @@ package com.dfsek.terra.addons.chunkgenerator.generation.generators; +import com.dfsek.terra.api.Platform; + import net.jafama.FastMath; import org.jetbrains.annotations.NotNull; @@ -10,7 +12,6 @@ import java.util.Random; import com.dfsek.terra.addons.chunkgenerator.PaletteUtil; import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D; import com.dfsek.terra.addons.chunkgenerator.palette.PaletteInfo; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.properties.base.Properties; import com.dfsek.terra.api.block.state.properties.enums.Direction; @@ -31,21 +32,21 @@ import com.dfsek.terra.api.util.math.Sampler; public class NoiseChunkGenerator3D implements ChunkGenerator { private final ConfigPack configPack; - private final Platform main; + private final Platform platform; private final List generationStages = new ArrayList<>(); private final BlockState air; - public NoiseChunkGenerator3D(ConfigPack c, Platform main) { + public NoiseChunkGenerator3D(ConfigPack c, Platform platform) { this.configPack = c; - this.main = main; - this.air = main.getWorldHandle().air(); + this.platform = platform; + this.air = platform.getWorldHandle().air(); c.getStages().forEach(stage -> generationStages.add(stage.newInstance(c))); } @SuppressWarnings("try") - static void biomes(@NotNull World world, int chunkX, int chunkZ, @NotNull BiomeGrid biome, Platform main) { - try(ProfileFrame ignore = main.getProfiler().profile("biomes")) { + static void biomes(@NotNull World world, int chunkX, int chunkZ, @NotNull BiomeGrid biome, Platform platform) { + try(ProfileFrame ignore = platform.getProfiler().profile("biomes")) { int xOrig = (chunkX << 4); int zOrig = (chunkZ << 4); long seed = world.getSeed(); @@ -65,7 +66,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator { @Override @SuppressWarnings("try") public ChunkData generateChunkData(@NotNull World world, Random random, int chunkX, int chunkZ, ChunkData chunk) { - try(ProfileFrame ignore = main.getProfiler().profile("chunk_base_3d")) { + try(ProfileFrame ignore = platform.getProfiler().profile("chunk_base_3d")) { BiomeProvider grid = world.getBiomeProvider(); int xOrig = (chunkX << 4); @@ -87,7 +88,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator { PaletteInfo paletteInfo = biome.getContext().get(PaletteInfo.class); if(paletteInfo == null) { - main.logger().info("null palette: " + biome.getID()); + platform.logger().info("null palette: " + biome.getID()); } GenerationSettings generationSettings = biome.getGenerator(); @@ -125,7 +126,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator { @Override public void generateBiomes(@NotNull World world, @NotNull Random random, int chunkX, int chunkZ, @NotNull BiomeGrid biome) { - biomes(world, chunkX, chunkZ, biome, main); + biomes(world, chunkX, chunkZ, biome, platform); } @Override @@ -139,8 +140,8 @@ public class NoiseChunkGenerator3D implements ChunkGenerator { } @Override - public Platform getMain() { - return main; + public Platform getPlatform() { + return platform; } @Override 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 2ce65208b..ff9ac1f2a 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 @@ -17,17 +17,17 @@ import com.dfsek.terra.api.inject.annotations.Inject; @Version("1.0.0") public class BiomeAddon extends TerraAddon { @Inject - private Platform main; + private Platform platform; @Override public void initialize() { - main.getEventManager() - .getHandler(FunctionalEventHandler.class) - .register(this, ConfigPackPreLoadEvent.class) - .then(event -> { + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(this, ConfigPackPreLoadEvent.class) + .then(event -> { event.getPack().registerConfigType(new BiomeConfigType(event.getPack()), "BIOME", 5); event.getPack().applyLoader(PaletteHolder.class, new PaletteHolderLoader()); }) - .failThrough(); + .failThrough(); } } diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java index 4f44f4247..8dd3b65d2 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java @@ -35,8 +35,8 @@ public class BiomeConfigType implements ConfigType { } @Override - public BiomeTemplate getTemplate(ConfigPack pack, Platform main) { - return new BiomeTemplate(pack, main); + public BiomeTemplate getTemplate(ConfigPack pack, Platform platform) { + return new BiomeTemplate(pack, platform); } @Override diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeFactory.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeFactory.java index 11e7d7daa..8fb31ebb1 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeFactory.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeFactory.java @@ -14,7 +14,7 @@ public class BiomeFactory implements ConfigFactory { } @Override - public TerraBiome build(BiomeTemplate template, Platform main) { + public TerraBiome build(BiomeTemplate template, Platform platform) { UserDefinedGenerationSettings generator = new UserDefinedGenerationSettings(template.getNoiseEquation(), template.getElevationEquation(), template.getCarvingEquation(), template.getBiomeNoise(), diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java index b5c250b78..013b3cfc1 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java @@ -113,7 +113,7 @@ public class BiomeTemplate implements AbstractableTemplate, ValidatedConfigTempl private @Meta Map colors = new HashMap<>(); // Plain ol' map, so platforms can decide what to do with colors (if anything). - public BiomeTemplate(ConfigPack pack, Platform main) { + public BiomeTemplate(ConfigPack pack, Platform platform) { this.pack = pack; } diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java index cd7ce1448..c6f7ed919 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java @@ -1,10 +1,11 @@ package com.dfsek.terra.addons.biome.command.biome; +import com.dfsek.terra.api.Platform; + import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.TerraBiome; @@ -23,15 +24,15 @@ public class AsyncBiomeFinder implements Runnable { protected final int centerX; protected final int centerZ; protected final World world; - protected final Platform main; + protected final Platform platform; private final Consumer callback; protected int searchSize = 1; public AsyncBiomeFinder(BiomeProvider provider, TerraBiome target, @NotNull Vector3 origin, World world, int startRadius, int maxRadius, - Consumer callback, Platform main) { + Consumer callback, Platform platform) { this.provider = provider; this.target = target; - this.main = main; + this.platform = platform; this.startRadius = startRadius; this.maxRadius = maxRadius; this.centerX = origin.getBlockX(); @@ -41,7 +42,7 @@ public class AsyncBiomeFinder implements Runnable { } public Vector3 finalizeVector(Vector3 orig) { - return orig.multiply(main.getTerraConfig().getBiomeSearchResolution()); + return orig.multiply(platform.getTerraConfig().getBiomeSearchResolution()); } @Override @@ -90,7 +91,7 @@ public class AsyncBiomeFinder implements Runnable { * @return TerraBiome at coordinates */ public boolean isValid(int x, int z, TerraBiome target) { - int res = main.getTerraConfig().getBiomeSearchResolution(); + int res = platform.getTerraConfig().getBiomeSearchResolution(); return getProvider().getBiome(x * res, z * res, world.getSeed()).equals(target); } diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeCommand.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeCommand.java index b13fe9a04..35497035e 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeCommand.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeCommand.java @@ -24,7 +24,7 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider; @PlayerCommand public class BiomeCommand implements CommandTemplate { @Inject - private Platform main; + private Platform platform; @Override public void execute(CommandSender sender) { diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeLocateCommand.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeLocateCommand.java index 8f9e61c52..4bdcdad0a 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeLocateCommand.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeLocateCommand.java @@ -51,7 +51,7 @@ public class BiomeLocateCommand implements CommandTemplate { private boolean teleport; @Inject - private Platform main; + private Platform platform; @Override public void execute(CommandSender sender) { @@ -59,7 +59,7 @@ public class BiomeLocateCommand implements CommandTemplate { Player player = (Player) sender; new Thread(new AsyncBiomeFinder(player.world().getBiomeProvider(), biome, - player.position().clone().multiply((1D / main.getTerraConfig().getBiomeSearchResolution())), + player.position().clone().multiply((1D / platform.getTerraConfig().getBiomeSearchResolution())), player.world(), 0, radius, location -> { if(location != null) { sender.sendMessage( @@ -67,11 +67,11 @@ public class BiomeLocateCommand implements CommandTemplate { location.getBlockX(), location.getBlockZ(), location.add(new Vector3(0, player.position().getY(), 0)).distance(player.position()))); if(teleport) { - main.runPossiblyUnsafeTask( + platform.runPossiblyUnsafeTask( () -> player.position(new Vector3(location.getX(), player.position().getY(), location.getZ()))); } } else sender.sendMessage("Unable to locate biome \"" + biome.getID() + "\""); - }, main), "Biome Location Thread").start(); + }, platform), "Biome Location Thread").start(); } } diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/arg/BiomeArgumentParser.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/arg/BiomeArgumentParser.java index b694c8985..9cd0cdbc9 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/arg/BiomeArgumentParser.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/arg/BiomeArgumentParser.java @@ -10,7 +10,7 @@ import com.dfsek.terra.api.world.biome.TerraBiome; public class BiomeArgumentParser implements ArgumentParser { @Inject - private Platform main; + private Platform platform; @Override public TerraBiome parse(CommandSender sender, String arg) { diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/tab/BiomeTabCompleter.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/tab/BiomeTabCompleter.java index 0e127df1a..6dc1baac9 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/tab/BiomeTabCompleter.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/tab/BiomeTabCompleter.java @@ -13,7 +13,7 @@ import com.dfsek.terra.api.world.biome.TerraBiome; public class BiomeTabCompleter implements TabCompleter { @Inject - private Platform main; + private Platform platform; @Override public List complete(CommandSender sender) { diff --git a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CarverCache.java b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CarverCache.java index fb651a8c9..d0cad3be9 100644 --- a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CarverCache.java +++ b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CarverCache.java @@ -1,5 +1,7 @@ package com.dfsek.terra.addons.carver; +import com.dfsek.terra.api.Platform; + import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -11,7 +13,6 @@ import java.util.List; import java.util.Random; import com.dfsek.terra.addons.carver.carving.Worm; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.util.PopulationUtil; import com.dfsek.terra.api.util.vector.Vector3; @@ -25,9 +26,9 @@ public class CarverCache { private final LoadingCache> cache; private final UserDefinedCarver carver; - public CarverCache(World w, Platform main, UserDefinedCarver carver) { + public CarverCache(World w, Platform platform, UserDefinedCarver carver) { this.carver = carver; - cache = CacheBuilder.newBuilder().maximumSize(main.getTerraConfig().getCarverCacheSize()) + cache = CacheBuilder.newBuilder().maximumSize(platform.getTerraConfig().getCarverCacheSize()) .build(new CacheLoader<>() { @Override public List load(@NotNull Long key) { diff --git a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CarverFactory.java b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CarverFactory.java index b10c9b1ce..9af80f7aa 100644 --- a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CarverFactory.java +++ b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CarverFactory.java @@ -21,7 +21,7 @@ public class CarverFactory implements ConfigFactory radius = Arrays.asList(config.getRadMX(), config.getRadMY(), config.getRadMZ()); @@ -29,7 +29,7 @@ public class CarverFactory implements ConfigFactory shiftStorage = new HashMap<>(); // Persist BlockData created for shifts, to avoid re-calculating each time. - private final Platform main; + private final Platform platform; - public CavePopulator(Platform main) { - this.main = main; + public CavePopulator(Platform platform) { + this.platform = platform; } @SuppressWarnings("try") @Override public void populate(@NotNull World world, @NotNull Chunk chunk) { - try(ProfileFrame ignore = main.getProfiler().profile("carving")) { + try(ProfileFrame ignore = platform.getProfiler().profile("carving")) { Random random = PopulationUtil.getRandom(chunk); WorldConfig config = world.getConfig(); if(config.disableCarving()) return; @@ -40,7 +40,7 @@ public class CavePopulator implements GenerationStage, Chunkified { CarverTemplate template = c.getConfig(); Map shiftCandidate = new HashMap<>(); c.carve(chunk.getX(), chunk.getZ(), world, (v, type) -> { - try(ProfileFrame ignored = main.getProfiler().profile("carving:" + c.getConfig().getID())) { + try(ProfileFrame ignored = platform.getProfiler().profile("carving:" + c.getConfig().getID())) { BlockState m = chunk.getBlock(v.getBlockX(), v.getBlockY(), v.getBlockZ()); BlockType re = m.getBlockType(); switch(type) { diff --git a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/UserDefinedCarver.java b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/UserDefinedCarver.java index 313a0e0dd..bfac24cd1 100644 --- a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/UserDefinedCarver.java +++ b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/UserDefinedCarver.java @@ -34,13 +34,13 @@ public class UserDefinedCarver extends Carver { private final Expression zRad; private final Map cacheMap = new ConcurrentHashMap<>(); - private final Platform main; + private final Platform platform; private double step = 2; private Range recalc = new ConstantRange(8, 10); private double recalcMagnitude = 3; public UserDefinedCarver(Range height, Range length, double[] start, double[] mutate, List radii, Scope parent, long hash, - int topCut, int bottomCut, CarverTemplate config, Platform main) throws ParseException { + int topCut, int bottomCut, CarverTemplate config, Platform platform) throws ParseException { super(height.getMin(), height.getMax()); this.length = length; this.start = start; @@ -49,7 +49,7 @@ public class UserDefinedCarver extends Carver { this.topCut = topCut; this.bottomCut = bottomCut; this.config = config; - this.main = main; + this.platform = platform; Parser p = new Parser(); @@ -74,7 +74,7 @@ public class UserDefinedCarver extends Carver { @Override public void carve(int chunkX, int chunkZ, World w, BiConsumer consumer) { synchronized(cacheMap) { - CarverCache cache = cacheMap.computeIfAbsent(w.getSeed(), world -> new CarverCache(w, main, this)); + CarverCache cache = cacheMap.computeIfAbsent(w.getSeed(), world -> new CarverCache(w, platform, this)); int carvingRadius = getCarvingRadius(); for(int x = chunkX - carvingRadius; x <= chunkX + carvingRadius; x++) { for(int z = chunkZ - carvingRadius; z <= chunkZ + carvingRadius; z++) { 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 87607e298..0a64b1386 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 @@ -31,14 +31,14 @@ public class DistributorAddon extends TerraAddon { public static final TypeKey>> DISTRIBUTOR_TOKEN = new TypeKey<>() { }; @Inject - private Platform main; + private Platform platform; @Override public void initialize() { - main.getEventManager() - .getHandler(FunctionalEventHandler.class) - .register(this, ConfigPackPreLoadEvent.class) - .then(event -> { + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(this, ConfigPackPreLoadEvent.class) + .then(event -> { CheckedRegistry>> distributorRegistry = event.getPack().getOrCreateRegistry( DISTRIBUTOR_TOKEN); distributorRegistry.register("NOISE", NoiseDistributorTemplate::new); @@ -51,6 +51,6 @@ public class DistributorAddon extends TerraAddon { event.getPack() .applyLoader(Point.class, PointTemplate::new); }) - .failThrough(); + .failThrough(); } } 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 58d991c9d..64568b40a 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 @@ -15,14 +15,14 @@ import com.dfsek.terra.api.inject.annotations.Inject; @Author("Terra") public class FeatureAddon extends TerraAddon { @Inject - private Platform main; + private Platform platform; @Override public void initialize() { - main.getEventManager() - .getHandler(FunctionalEventHandler.class) - .register(this, ConfigPackPreLoadEvent.class) - .then(event -> event.getPack().registerConfigType(new FeatureConfigType(), "FEATURE", 3)) - .failThrough(); + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(this, ConfigPackPreLoadEvent.class) + .then(event -> event.getPack().registerConfigType(new FeatureConfigType(), "FEATURE", 3)) + .failThrough(); } } diff --git a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java index 7bbf246d5..cb761e5e2 100644 --- a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java +++ b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java @@ -23,7 +23,7 @@ public class FeatureConfigType implements ConfigType { } @Override - public FeatureTemplate getTemplate(ConfigPack pack, Platform main) { + public FeatureTemplate getTemplate(ConfigPack pack, Platform platform) { return new FeatureTemplate(); } diff --git a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureFactory.java b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureFactory.java index 8219cc342..7ad615929 100644 --- a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureFactory.java +++ b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureFactory.java @@ -9,7 +9,7 @@ import com.dfsek.terra.api.structure.feature.Feature; public class FeatureFactory implements ConfigFactory { @Override - public Feature build(FeatureTemplate config, Platform main) throws LoadException { + public Feature build(FeatureTemplate config, Platform platform) throws LoadException { return new ConfiguredFeature(config.getStructures(), config.getStructureNoise(), config.getDistributor(), config.getLocator()); } } 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 31b2e8765..142924e7b 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 @@ -17,17 +17,17 @@ import com.dfsek.terra.api.inject.annotations.Inject; @Version("0.1.0") public class FloraAddon extends TerraAddon { @Inject - private Platform main; + private Platform platform; @Override public void initialize() { - main.getEventManager() - .getHandler(FunctionalEventHandler.class) - .register(this, ConfigPackPreLoadEvent.class) - .then(event -> { + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(this, ConfigPackPreLoadEvent.class) + .then(event -> { event.getPack().registerConfigType(new FloraConfigType(), "FLORA", 2); event.getPack().applyLoader(BlockLayer.class, BlockLayerTemplate::new); }) - .failThrough(); + .failThrough(); } } diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java index 4291c1a13..1d1a2934c 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java @@ -22,7 +22,7 @@ public class FloraConfigType implements ConfigType { } @Override - public FloraTemplate getTemplate(ConfigPack pack, Platform main) { + public FloraTemplate getTemplate(ConfigPack pack, Platform platform) { return new FloraTemplate(); } diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraFactory.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraFactory.java index 334d0201e..ce24a3672 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraFactory.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraFactory.java @@ -8,7 +8,7 @@ import com.dfsek.terra.api.structure.Structure; public class FloraFactory implements ConfigFactory { @Override - public TerraFlora build(FloraTemplate config, Platform main) { + public TerraFlora build(FloraTemplate config, Platform platform) { return new TerraFlora(config.getLayers(), config.doPhysics(), config.isCeiling(), config.getRotatable(), config.getNoiseDistribution(), config.getID()); 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 41495571b..bffc6a2d5 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 @@ -42,16 +42,16 @@ public class LocatorAddon extends TerraAddon { public static final TypeKey>> PATTERN_TOKEN = new TypeKey<>() { }; @Inject - private Platform main; + private Platform platform; @Override public void initialize() { - main.getEventManager() - .getHandler(FunctionalEventHandler.class) - .register(this, ConfigPackPreLoadEvent.class) - .then(event -> { + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(this, ConfigPackPreLoadEvent.class) + .then(event -> { CheckedRegistry>> locatorRegistry = event.getPack().getOrCreateRegistry(LOCATOR_TOKEN); - locatorRegistry.register("SURFACE", () -> new SurfaceLocatorTemplate(main)); + locatorRegistry.register("SURFACE", () -> new SurfaceLocatorTemplate(platform)); locatorRegistry.register("RANDOM", RandomLocatorTemplate::new); locatorRegistry.register("PATTERN", PatternLocatorTemplate::new); locatorRegistry.register("NOISE", NoiseLocatorTemplate::new); @@ -60,7 +60,7 @@ public class LocatorAddon extends TerraAddon { locatorRegistry.register("AND", AndLocatorTemplate::new); locatorRegistry.register("OR", OrLocatorTemplate::new); }) - .then(event -> { + .then(event -> { CheckedRegistry>> patternRegistry = event.getPack().getOrCreateRegistry(PATTERN_TOKEN); patternRegistry.register("MATCH_AIR", AirMatchPatternTemplate::new); patternRegistry.register("MATCH_SOLID", SolidMatchPatternTemplate::new); @@ -71,6 +71,6 @@ public class LocatorAddon extends TerraAddon { patternRegistry.register("OR", OrPatternTemplate::new); patternRegistry.register("NOT", NotPatternTemplate::new); }) - .failThrough(); + .failThrough(); } } diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SurfaceLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SurfaceLocatorTemplate.java index a5db20fef..fce147df8 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SurfaceLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SurfaceLocatorTemplate.java @@ -11,17 +11,17 @@ import com.dfsek.terra.api.util.Range; public class SurfaceLocatorTemplate implements ObjectTemplate { - private final Platform main; + private final Platform platform; @Value("range") private @Meta Range range; - public SurfaceLocatorTemplate(Platform main) { - this.main = main; + public SurfaceLocatorTemplate(Platform platform) { + this.platform = platform; } @Override public Locator get() { - return new SurfaceLocator(range, main); + return new SurfaceLocator(range, platform); } } diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java index e18ed9d40..942d45236 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java @@ -13,9 +13,9 @@ public class SurfaceLocator implements Locator { private final BlockState air; - public SurfaceLocator(Range search, Platform main) { + public SurfaceLocator(Range search, Platform platform) { this.search = search; - this.air = main.getWorldHandle().air(); + this.air = platform.getWorldHandle().air(); } @Override diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java index 1390e3051..c5ed8ea3e 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java @@ -333,7 +333,7 @@ public class CellularSampler extends NoiseFunction { distance1 = fastSqrt(distance1); } } - + return switch(returnType) { case CellValue -> closestHash * (1 / 2147483648.0); case Distance -> distance0 - 1; @@ -493,7 +493,7 @@ public class CellularSampler extends NoiseFunction { distance1 = fastSqrt(distance1); } } - + return switch(returnType) { case CellValue -> closestHash * (1 / 2147483648.0); case Distance -> distance0 - 1; 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 e9a56cdaa..4784f8686 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 @@ -16,17 +16,17 @@ import com.dfsek.terra.api.world.generator.GenerationStageProvider; @Version("1.0.0") public class OreAddon extends TerraAddon { @Inject - private Platform main; + private Platform platform; @Override public void initialize() { - main.getEventManager() - .getHandler(FunctionalEventHandler.class) - .register(this, ConfigPackPreLoadEvent.class) - .then(event -> { + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(this, ConfigPackPreLoadEvent.class) + .then(event -> { event.getPack().registerConfigType(new OreConfigType(), "ORE", 1); - event.getPack().getOrCreateRegistry(GenerationStageProvider.class).register("ORE", pack -> new OrePopulator(main)); + event.getPack().getOrCreateRegistry(GenerationStageProvider.class).register("ORE", pack -> new OrePopulator(platform)); }) - .failThrough(); + .failThrough(); } } diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java index 534c4d3b7..1719368c2 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java @@ -22,7 +22,7 @@ public class OreConfigType implements ConfigType { } @Override - public OreTemplate getTemplate(ConfigPack pack, Platform main) { + public OreTemplate getTemplate(ConfigPack pack, Platform platform) { return new OreTemplate(); } diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreFactory.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreFactory.java index 7ff979967..283ca9f19 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreFactory.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreFactory.java @@ -9,8 +9,8 @@ import com.dfsek.terra.api.config.ConfigFactory; public class OreFactory implements ConfigFactory { @Override - public Ore build(OreTemplate config, Platform main) { + public Ore build(OreTemplate config, Platform platform) { BlockState m = config.getMaterial(); - return new VanillaOre(m, config.getReplaceable(), config.doPhysics(), config.getSize(), main, config.getMaterialOverrides()); + return new VanillaOre(m, config.getReplaceable(), config.doPhysics(), config.getSize(), platform, config.getMaterialOverrides()); } } diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OrePopulator.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OrePopulator.java index c6765c664..7ca39e6c8 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OrePopulator.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OrePopulator.java @@ -14,16 +14,16 @@ import com.dfsek.terra.api.world.generator.GenerationStage; public class OrePopulator implements GenerationStage { - private final Platform main; + private final Platform platform; - public OrePopulator(Platform main) { - this.main = main; + public OrePopulator(Platform platform) { + this.platform = platform; } @SuppressWarnings("try") @Override public void populate(@NotNull World world, @NotNull Chunk chunk) { - try(ProfileFrame ignore = main.getProfiler().profile("ore")) { + try(ProfileFrame ignore = platform.getProfiler().profile("ore")) { if(world.getConfig().disableOres()) return; for(int cx = -1; cx <= 1; cx++) { diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/Ore.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/Ore.java index 3c279d370..5c4014cba 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/Ore.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/Ore.java @@ -17,13 +17,13 @@ public abstract class Ore { private final MaterialSet replaceable; private final boolean applyGravity; private final Map materials; - protected Platform main; + protected Platform platform; - public Ore(BlockState material, MaterialSet replaceable, boolean applyGravity, Platform main, Map materials) { + public Ore(BlockState material, MaterialSet replaceable, boolean applyGravity, Platform platform, Map materials) { this.material = material; this.replaceable = replaceable; this.applyGravity = applyGravity; - this.main = main; + this.platform = platform; this.materials = materials; } diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java index 7742dc221..78bcfc0a1 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java @@ -1,11 +1,12 @@ package com.dfsek.terra.addons.ore.ores; +import com.dfsek.terra.api.Platform; + import net.jafama.FastMath; import java.util.Map; import java.util.Random; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.util.Range; @@ -17,9 +18,9 @@ import com.dfsek.terra.api.world.Chunk; public class VanillaOre extends Ore { private final Range sizeRange; - public VanillaOre(BlockState material, MaterialSet replaceable, boolean applyGravity, Range size, Platform main, + public VanillaOre(BlockState material, MaterialSet replaceable, boolean applyGravity, Range size, Platform platform, Map materials) { - super(material, replaceable, applyGravity, main, materials); + super(material, replaceable, applyGravity, platform, materials); this.sizeRange = size; } 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 947ad118c..358196707 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 @@ -17,17 +17,17 @@ import com.dfsek.terra.api.inject.annotations.Inject; @Version("1.0.0") public class PaletteAddon extends TerraAddon { @Inject - private Platform main; + private Platform platform; @Override public void initialize() { - main.getEventManager() - .getHandler(FunctionalEventHandler.class) - .register(this, ConfigPackPreLoadEvent.class) - .then(event -> { - event.getPack().registerConfigType(new PaletteConfigType(main), "PALETTE", 2); + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(this, ConfigPackPreLoadEvent.class) + .then(event -> { + event.getPack().registerConfigType(new PaletteConfigType(platform), "PALETTE", 2); event.getPack().applyLoader(PaletteLayerHolder.class, new PaletteLayerLoader()); }) - .failThrough(); + .failThrough(); } } diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java index 92f054c64..37e7e934e 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java @@ -19,10 +19,10 @@ public class PaletteConfigType implements ConfigType { public static final TypeKey PALETTE_TYPE_TOKEN = new TypeKey<>() { }; private final PaletteFactory factory = new PaletteFactory(); - private final Platform main; + private final Platform platform; - public PaletteConfigType(Platform main) { - this.main = main; + public PaletteConfigType(Platform platform) { + this.platform = platform; } @Override @@ -30,7 +30,7 @@ public class PaletteConfigType implements ConfigType { return () -> pack.getRegistryFactory().create(registry -> (TypeLoader) (t, c, loader) -> { if(((String) c).startsWith("BLOCK:")) return new PaletteImpl.Singleton( - main.getWorldHandle().createBlockData(((String) c).substring(6))); // Return single palette for BLOCK: shortcut. + platform.getWorldHandle().createBlockData(((String) c).substring(6))); // Return single palette for BLOCK: shortcut. Palette obj = registry.get((String) c); if(obj == null) throw new LoadException("No such " + t.getType().getTypeName() + " matching \"" + c + "\" was found in this registry."); @@ -39,7 +39,7 @@ public class PaletteConfigType implements ConfigType { } @Override - public PaletteTemplate getTemplate(ConfigPack pack, Platform main) { + public PaletteTemplate getTemplate(ConfigPack pack, Platform platform) { return new PaletteTemplate(); } diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteFactory.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteFactory.java index 7c06cd360..3b66f8b22 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteFactory.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteFactory.java @@ -9,7 +9,7 @@ import com.dfsek.terra.api.world.generator.Palette; public class PaletteFactory implements ConfigFactory { @Override - public Palette build(PaletteTemplate config, Platform main) { + public Palette build(PaletteTemplate config, Platform platform) { NoisePalette palette = new NoisePalette(config.getNoise()); for(PaletteLayerHolder layer : config.getPalette()) { palette.add(layer.getLayer(), layer.getSize(), layer.getSampler()); 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 95758012f..0e1f46aca 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 @@ -16,14 +16,14 @@ import com.dfsek.terra.api.structure.configured.ConfiguredStructure; @Author("Terra") public class StructureAddon extends TerraAddon { @Inject - private Platform main; + private Platform platform; @Override public void initialize() { - main.getEventManager() - .getHandler(FunctionalEventHandler.class) - .register(this, ConfigPackPreLoadEvent.class) - .then(event -> event.getPack().applyLoader(ConfiguredStructure.class, (t, o, l) -> null)) - .failThrough(); + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(this, ConfigPackPreLoadEvent.class) + .then(event -> event.getPack().applyLoader(ConfiguredStructure.class, (t, o, l) -> null)) + .failThrough(); } } diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureFactory.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureFactory.java index 6c0c362ab..6989429dc 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureFactory.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureFactory.java @@ -7,7 +7,7 @@ import com.dfsek.terra.api.structure.configured.ConfiguredStructure; public class StructureFactory implements ConfigFactory { @Override - public ConfiguredStructure build(StructureTemplate config, Platform main) { + public ConfiguredStructure build(StructureTemplate config, Platform platform) { return new TerraStructure(config.getStructures(), config.getY(), config.getSpawn()); } } diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java index 8ab44e084..ca0ff0b65 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java @@ -1,11 +1,12 @@ package com.dfsek.terra.addons.structure; +import com.dfsek.terra.api.Platform; + import net.jafama.FastMath; import org.jetbrains.annotations.NotNull; import java.util.Random; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.config.WorldConfig; import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.structure.configured.ConfiguredStructure; @@ -20,16 +21,16 @@ import com.dfsek.terra.api.world.generator.GenerationStage; public class StructurePopulator implements GenerationStage, Chunkified { - private final Platform main; + private final Platform platform; - public StructurePopulator(Platform main) { - this.main = main; + public StructurePopulator(Platform platform) { + this.platform = platform; } @SuppressWarnings("try") @Override public void populate(@NotNull World world, @NotNull Chunk chunk) { - try(ProfileFrame ignore = main.getProfiler().profile("structure")) { + try(ProfileFrame ignore = platform.getProfiler().profile("structure")) { if(world.getConfig().disableStructures()) return; int cx = (chunk.getX() << 4); diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java index 9b9c87e8c..9cf44879e 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java @@ -1,10 +1,11 @@ package com.dfsek.terra.addons.structure.command; +import com.dfsek.terra.api.Platform; + import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.structure.configured.ConfiguredStructure; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; @@ -19,16 +20,16 @@ public class AsyncStructureFinder implements Runnable { protected final int centerX; protected final int centerZ; protected final World world; - protected final Platform main; + protected final Platform platform; private final Consumer callback; protected int searchSize = 1; public AsyncStructureFinder(BiomeProvider provider, ConfiguredStructure target, @NotNull Vector3 origin, World world, int startRadius, - int maxRadius, Consumer callback, Platform main) { + int maxRadius, Consumer callback, Platform platform) { //setSearchSize(target.getSpawn().getWidth() + 2 * target.getSpawn().getSeparation()); this.provider = provider; this.target = target; - this.main = main; + this.platform = platform; this.startRadius = startRadius; this.maxRadius = maxRadius; this.centerX = origin.getBlockX(); diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureExportCommand.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureExportCommand.java index d5a8d2960..5b67a9575 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureExportCommand.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureExportCommand.java @@ -29,7 +29,7 @@ import com.dfsek.terra.api.util.vector.Vector3; @Command(arguments = @Argument("id"), usage = "/terra structure export ") public class StructureExportCommand implements CommandTemplate { @Inject - private Platform main; + private Platform platform; @ArgumentTarget("id") private String id; @@ -38,7 +38,7 @@ public class StructureExportCommand implements CommandTemplate { public void execute(CommandSender sender) { Player player = (Player) sender; - Pair l = main.getWorldHandle().getSelectedLocation(player); + Pair l = platform.getWorldHandle().getSelectedLocation(player); Vector3 l1 = l.getLeft(); Vector3 l2 = l.getRight(); @@ -75,7 +75,7 @@ public class StructureExportCommand implements CommandTemplate { if(state instanceof Sign) { Sign sign = (Sign) state; if(sign.getLine(0).equals("[TERRA]")) { - data = main.getWorldHandle().createBlockData(sign.getLine(2) + sign.getLine(3)); + data = platform.getWorldHandle().createBlockData(sign.getLine(2) + sign.getLine(3)); } } if(!data.isStructureVoid()) { @@ -88,7 +88,7 @@ public class StructureExportCommand implements CommandTemplate { } } - File file = new File(main.getDataFolder() + File.separator + "export" + File.separator + "structures", id + ".tesf"); + File file = new File(platform.getDataFolder() + File.separator + "export" + File.separator + "structures", id + ".tesf"); try { file.getParentFile().mkdirs(); file.createNewFile(); diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLoadCommand.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLoadCommand.java index 033aabf52..8b2c6e3f1 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLoadCommand.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLoadCommand.java @@ -54,7 +54,7 @@ public class StructureLoadCommand implements CommandTemplate { private Structure script; @Inject - private Platform main; + private Platform platform; @Override public void execute(CommandSender sender) { diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLocateCommand.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLocateCommand.java index 98dfbd2b6..cede50303 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLocateCommand.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLocateCommand.java @@ -42,7 +42,7 @@ import com.dfsek.terra.api.util.vector.Vector3; )) public class StructureLocateCommand implements CommandTemplate { @Inject - private Platform main; + private Platform platform; @ArgumentTarget("structure") private ConfiguredStructure structure; @@ -58,7 +58,7 @@ public class StructureLocateCommand implements CommandTemplate { Player player = (Player) sender; new Thread(new AsyncStructureFinder(player.world().getBiomeProvider(), structure, - player.position().clone().multiply((1D / main.getTerraConfig().getBiomeSearchResolution())), + player.position().clone().multiply((1D / platform.getTerraConfig().getBiomeSearchResolution())), player.world(), 0, radius, location -> { if(location != null) { sender.sendMessage( @@ -66,10 +66,10 @@ public class StructureLocateCommand implements CommandTemplate { location.getBlockX(), location.getBlockZ(), location.add(new Vector3(0, player.position().getY(), 0)).distance(player.position()))); if(teleport) { - main.runPossiblyUnsafeTask( + platform.runPossiblyUnsafeTask( () -> player.position(new Vector3(location.getX(), player.position().getY(), location.getZ()))); } } //else LangUtil.send("command.biome.unable-to-locate", sender); - }, main), "Biome Location Thread").start(); + }, platform), "Biome Location Thread").start(); } } diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/ScriptArgumentParser.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/ScriptArgumentParser.java index bd923045d..b1ca7e2e7 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/ScriptArgumentParser.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/ScriptArgumentParser.java @@ -10,7 +10,7 @@ import com.dfsek.terra.api.structure.Structure; public class ScriptArgumentParser implements ArgumentParser { @Inject - private Platform main; + private Platform platform; @Override public Structure parse(CommandSender sender, String arg) { diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/StructureArgumentParser.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/StructureArgumentParser.java index 927ece372..5c53464e7 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/StructureArgumentParser.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/StructureArgumentParser.java @@ -10,7 +10,7 @@ import com.dfsek.terra.api.structure.configured.ConfiguredStructure; public class StructureArgumentParser implements ArgumentParser { @Inject - private Platform main; + private Platform platform; @Override public ConfiguredStructure parse(CommandSender sender, String arg) { diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/ScriptCompleter.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/ScriptCompleter.java index fb9770589..d48daf7a3 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/ScriptCompleter.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/ScriptCompleter.java @@ -13,7 +13,7 @@ import com.dfsek.terra.api.structure.Structure; public class ScriptCompleter implements TabCompleter { @Inject - private Platform main; + private Platform platform; @Override public List complete(CommandSender sender) { diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/StructureCompleter.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/StructureCompleter.java index fcf233b33..d5b1feb7e 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/StructureCompleter.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/StructureCompleter.java @@ -13,7 +13,7 @@ import com.dfsek.terra.api.structure.configured.ConfiguredStructure; public class StructureCompleter implements TabCompleter { @Inject - private Platform main; + private Platform platform; @Override public List complete(CommandSender sender) { diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Entry.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Entry.java index df54e7cef..c86959588 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Entry.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Entry.java @@ -1,5 +1,7 @@ package com.dfsek.terra.addons.structure.structures.loot; +import com.dfsek.terra.api.Platform; + import net.jafama.FastMath; import org.json.simple.JSONArray; import org.json.simple.JSONObject; @@ -12,7 +14,6 @@ import com.dfsek.terra.addons.structure.structures.loot.functions.AmountFunction import com.dfsek.terra.addons.structure.structures.loot.functions.DamageFunction; import com.dfsek.terra.addons.structure.structures.loot.functions.EnchantFunction; import com.dfsek.terra.addons.structure.structures.loot.functions.LootFunction; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.inventory.Item; import com.dfsek.terra.api.inventory.ItemStack; @@ -30,9 +31,9 @@ public class Entry { * * @param entry The JSON Object to instantiate from. */ - public Entry(JSONObject entry, Platform main) { + public Entry(JSONObject entry, Platform platform) { String id = entry.get("name").toString(); - this.item = main.getItemHandle().createItem(id); + this.item = platform.getItemHandle().createItem(id); long weight1; try { @@ -69,7 +70,7 @@ public class Entry { if(((JSONObject) function).containsKey("disabled_enchants")) disabled = (JSONArray) ((JSONObject) function).get("disabled_enchants"); functions.add( - new EnchantFunction(FastMath.toIntExact(minEnchant), FastMath.toIntExact(maxEnchant), disabled, main)); + new EnchantFunction(FastMath.toIntExact(minEnchant), FastMath.toIntExact(maxEnchant), disabled, platform)); } } } diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/LootTableImpl.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/LootTableImpl.java index 245f8ccdf..f32349a43 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/LootTableImpl.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/LootTableImpl.java @@ -27,12 +27,12 @@ public class LootTableImpl implements com.dfsek.terra.api.structure.LootTable { * * @throws ParseException if malformed JSON is passed. */ - public LootTableImpl(String json, Platform main) throws ParseException { + public LootTableImpl(String json, Platform platform) throws ParseException { JSONParser jsonParser = new JSONParser(); Object tableJSON = jsonParser.parse(json); JSONArray poolArray = (JSONArray) ((JSONObject) tableJSON).get("pools"); for(Object pool : poolArray) { - pools.add(new Pool((JSONObject) pool, main)); + pools.add(new Pool((JSONObject) pool, platform)); } } diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Pool.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Pool.java index 146fbf0c0..22473a722 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Pool.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Pool.java @@ -1,5 +1,7 @@ package com.dfsek.terra.addons.structure.structures.loot; +import com.dfsek.terra.api.Platform; + import net.jafama.FastMath; import org.json.simple.JSONArray; import org.json.simple.JSONObject; @@ -8,7 +10,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.inventory.ItemStack; import com.dfsek.terra.api.util.collection.ProbabilityCollection; @@ -26,7 +27,7 @@ public class Pool { * * @param pool The JSON Object to instantiate from. */ - public Pool(JSONObject pool, Platform main) { + public Pool(JSONObject pool, Platform platform) { entries = new ProbabilityCollection<>(); Object amount = pool.get("rolls"); if(amount instanceof Long) { @@ -38,7 +39,7 @@ public class Pool { } for(Object entryJSON : (JSONArray) pool.get("entries")) { - Entry entry = new Entry((JSONObject) entryJSON, main); + Entry entry = new Entry((JSONObject) entryJSON, platform); entries.add(entry, FastMath.toIntExact(entry.getWeight())); } } diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/EnchantFunction.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/EnchantFunction.java index f20335ff4..bf3c07a1d 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/EnchantFunction.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/EnchantFunction.java @@ -1,5 +1,7 @@ package com.dfsek.terra.addons.structure.structures.loot.functions; +import com.dfsek.terra.api.Platform; + import net.jafama.FastMath; import org.json.simple.JSONArray; @@ -8,7 +10,6 @@ import java.util.Collections; import java.util.List; import java.util.Random; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.inventory.ItemStack; import com.dfsek.terra.api.inventory.item.Enchantment; import com.dfsek.terra.api.inventory.item.ItemMeta; @@ -18,14 +19,14 @@ public class EnchantFunction implements LootFunction { private final int min; private final int max; private final JSONArray disabled; - private final Platform main; + private final Platform platform; - public EnchantFunction(int min, int max, JSONArray disabled, Platform main) { + public EnchantFunction(int min, int max, JSONArray disabled, Platform platform) { this.max = max; this.min = min; this.disabled = disabled; - this.main = main; + this.platform = platform; } /** @@ -42,7 +43,7 @@ public class EnchantFunction implements LootFunction { double enchant = (r.nextDouble() * (max - min)) + min; List possible = new ArrayList<>(); - for(Enchantment ench : main.getItemHandle().getEnchantments()) { + for(Enchantment ench : platform.getItemHandle().getEnchantments()) { if(ench.canEnchantItem(original) && (disabled == null || !this.disabled.contains(ench.getID()))) { possible.add(ench); } @@ -60,7 +61,7 @@ public class EnchantFunction implements LootFunction { try { meta.addEnchantment(chosen, FastMath.max(lvl, 1)); } catch(IllegalArgumentException e) { - main.logger().warning( + platform.logger().warning( "Attempted to enchant " + original.getType() + " with " + chosen + " at level " + FastMath.max(lvl, 1) + ", but an unexpected exception occurred! Usually this is caused by a misbehaving enchantment plugin."); } 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 713a59dd4..8016a58c0 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 @@ -19,26 +19,26 @@ import com.dfsek.terra.api.world.generator.GenerationStageProvider; @Author("Terra") public class FeatureGenerationAddon extends TerraAddon { @Inject - private Platform main; + private Platform platform; @Override public void initialize() { - main.getEventManager() - .getHandler(FunctionalEventHandler.class) - .register(this, ConfigPackPreLoadEvent.class) - .then(event -> event.getPack() + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(this, ConfigPackPreLoadEvent.class) + .then(event -> event.getPack() .getOrCreateRegistry(GenerationStageProvider.class) - .register("FEATURE", pack -> new FeatureGenerationStage(main))) - .failThrough(); + .register("FEATURE", pack -> new FeatureGenerationStage(platform))) + .failThrough(); - main.getEventManager() - .getHandler(FunctionalEventHandler.class) - .register(this, ConfigurationLoadEvent.class) - .then(event -> { + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(this, ConfigurationLoadEvent.class) + .then(event -> { if(event.is(TerraBiome.class)) { event.getLoadedObject(TerraBiome.class).getContext().put(event.load(new BiomeFeaturesTemplate()).get()); } }) - .failThrough(); + .failThrough(); } } diff --git a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java index 0ca6e3776..0b03ef29e 100644 --- a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java +++ b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java @@ -12,16 +12,16 @@ import com.dfsek.terra.api.world.generator.GenerationStage; public class FeatureGenerationStage implements GenerationStage { - private final Platform main; + private final Platform platform; - public FeatureGenerationStage(Platform main) { - this.main = main; + public FeatureGenerationStage(Platform platform) { + this.platform = platform; } @Override @SuppressWarnings("try") public void populate(World world, Chunk chunk) { - try(ProfileFrame ignore = main.getProfiler().profile("feature")) { + try(ProfileFrame ignore = platform.getProfiler().profile("feature")) { int cx = chunk.getX() << 4; int cz = chunk.getZ() << 4; long seed = world.getSeed(); diff --git a/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java b/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java index cea0d08ae..bd7bae689 100644 --- a/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java +++ b/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java @@ -17,17 +17,17 @@ import com.dfsek.terra.api.inject.annotations.Inject; @Author("Terra") public class YamlAddon extends TerraAddon { @Inject - private Platform main; + private Platform platform; @Override public void initialize() { - main.getEventManager() - .getHandler(FunctionalEventHandler.class) - .register(this, ConfigurationDiscoveryEvent.class) - .then(event -> event.getLoader().open("", ".yml").thenEntries(entries -> entries.forEach(entry -> { - main.getDebugLogger().info("Discovered config " + entry.getKey()); + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(this, ConfigurationDiscoveryEvent.class) + .then(event -> event.getLoader().open("", ".yml").thenEntries(entries -> entries.forEach(entry -> { + platform.getDebugLogger().info("Discovered config " + entry.getKey()); event.register(entry.getKey(), new YamlConfiguration(entry.getValue(), entry.getKey())); }))) - .failThrough(); + .failThrough(); } } 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 f97624700..dcf77e4a7 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 @@ -25,20 +25,20 @@ import com.dfsek.terra.api.structure.Structure; @Version("1.0.0") public class TerraScriptAddon extends TerraAddon { @Inject - private Platform main; + private Platform platform; @Override public void initialize() { - main.getEventManager() - .getHandler(FunctionalEventHandler.class) - .register(this, ConfigPackPreLoadEvent.class) - .then(event -> { + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(this, ConfigPackPreLoadEvent.class) + .then(event -> { CheckedRegistry structureRegistry = event.getPack().getOrCreateRegistry(Structure.class); CheckedRegistry lootRegistry = event.getPack().getOrCreateRegistry(LootTable.class); event.getPack().getLoader().open("", ".tesf").thenEntries(entries -> { for(Map.Entry entry : entries) { try { - StructureScript structureScript = new StructureScript(entry.getValue(), main, structureRegistry, lootRegistry, + StructureScript structureScript = new StructureScript(entry.getValue(), platform, structureRegistry, lootRegistry, event.getPack().getRegistryFactory().create()); structureRegistry.register(structureScript.getID(), structureScript); } catch(ParseException e) { @@ -47,6 +47,6 @@ public class TerraScriptAddon extends TerraAddon { } }).close(); }) - .failThrough(); + .failThrough(); } } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedBlock.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedBlock.java index 799e7a530..369922ecb 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedBlock.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedBlock.java @@ -11,13 +11,13 @@ import com.dfsek.terra.api.world.World; public class BufferedBlock implements BufferedItem { private final BlockState data; private final boolean overwrite; - private final Platform main; + private final Platform platform; private final boolean waterlog; - public BufferedBlock(BlockState data, boolean overwrite, Platform main, boolean waterlog) { + public BufferedBlock(BlockState data, boolean overwrite, Platform platform, boolean waterlog) { this.data = data; this.overwrite = overwrite; - this.main = main; + this.platform = platform; this.waterlog = waterlog; } @@ -32,8 +32,8 @@ public class BufferedBlock implements BufferedItem { world.setBlockData(origin, data); } } catch(RuntimeException e) { - main.logger().severe("Failed to place block at location " + origin + ": " + e.getMessage()); - main.getDebugLogger().stack(e); + platform.logger().severe("Failed to place block at location " + origin + ": " + e.getMessage()); + platform.getDebugLogger().stack(e); } } } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedEntity.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedEntity.java index 873fa44bf..7676c088f 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedEntity.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedEntity.java @@ -12,16 +12,16 @@ import com.dfsek.terra.api.world.World; public class BufferedEntity implements BufferedItem { private final EntityType type; - private final Platform main; + private final Platform platform; - public BufferedEntity(EntityType type, Platform main) { + public BufferedEntity(EntityType type, Platform platform) { this.type = type; - this.main = main; + this.platform = platform; } @Override public void paste(Vector3 origin, World world) { Entity entity = world.spawnEntity(origin.clone().add(0.5, 0, 0.5), type); - main.getEventManager().callEvent(new EntitySpawnEvent(entity.world().getConfig().getPack(), entity)); + platform.getEventManager().callEvent(new EntitySpawnEvent(entity.world().getConfig().getPack(), entity)); } } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java index a8a7809f9..98e82c736 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java @@ -15,12 +15,12 @@ import com.dfsek.terra.api.world.World; public class BufferedLootApplication implements BufferedItem { private final LootTable table; - private final Platform main; + private final Platform platform; private final StructureScript structure; - public BufferedLootApplication(LootTable table, Platform main, StructureScript structure) { + public BufferedLootApplication(LootTable table, Platform platform, StructureScript structure) { this.table = table; - this.main = main; + this.platform = platform; this.structure = structure; } @@ -29,19 +29,19 @@ public class BufferedLootApplication implements BufferedItem { try { BlockEntity data = world.getBlockState(origin); if(!(data instanceof Container)) { - main.logger().severe("Failed to place loot at " + origin + "; block " + data + " is not container."); + platform.logger().severe("Failed to place loot at " + origin + "; block " + data + " is not container."); return; } Container container = (Container) data; LootPopulateEvent event = new LootPopulateEvent(container, table, world.getConfig().getPack(), structure); - main.getEventManager().callEvent(event); + platform.getEventManager().callEvent(event); if(event.isCancelled()) return; event.getTable().fillInventory(container.getInventory(), new Random(origin.hashCode())); data.update(false); } catch(Exception e) { - main.logger().warning("Could not apply loot at " + origin + ": " + e.getMessage()); + platform.logger().warning("Could not apply loot at " + origin + ": " + e.getMessage()); e.printStackTrace(); } } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java index bf142a23f..5d863f0cb 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java @@ -8,11 +8,11 @@ import com.dfsek.terra.api.world.World; public class BufferedStateManipulator implements BufferedItem { - private final Platform main; + private final Platform platform; private final String data; - public BufferedStateManipulator(Platform main, String state) { - this.main = main; + public BufferedStateManipulator(Platform platform, String state) { + this.platform = platform; this.data = state; } @@ -23,7 +23,7 @@ public class BufferedStateManipulator implements BufferedItem { state.applyState(data); state.update(false); } catch(Exception e) { - main.logger().warning("Could not apply BlockState at " + origin + ": " + e.getMessage()); + platform.logger().warning("Could not apply BlockState at " + origin + ": " + e.getMessage()); e.printStackTrace(); } } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java index f092832ff..7317ad726 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java @@ -52,10 +52,10 @@ public class StructureScript implements Structure { private final Block block; private final String id; private final Cache cache; - private final Platform main; + private final Platform platform; private String tempID; - public StructureScript(InputStream inputStream, Platform main, Registry registry, Registry lootRegistry, + public StructureScript(InputStream inputStream, Platform platform, Registry registry, Registry lootRegistry, Registry> functionRegistry) throws ParseException { Parser parser; try { @@ -67,20 +67,20 @@ public class StructureScript implements Structure { functionRegistry.forEach(parser::registerFunction); // Register registry functions. parser - .registerFunction("block", new BlockFunctionBuilder(main)) - .registerFunction("debugBlock", new BlockFunctionBuilder(main)) - .registerFunction("check", new CheckFunctionBuilder(main)) - .registerFunction("structure", new StructureFunctionBuilder(registry, main)) + .registerFunction("block", new BlockFunctionBuilder(platform)) + .registerFunction("debugBlock", new BlockFunctionBuilder(platform)) + .registerFunction("check", new CheckFunctionBuilder(platform)) + .registerFunction("structure", new StructureFunctionBuilder(registry, platform)) .registerFunction("randomInt", new RandomFunctionBuilder()) .registerFunction("recursions", new RecursionsFunctionBuilder()) .registerFunction("setMark", new SetMarkFunctionBuilder()) .registerFunction("getMark", new GetMarkFunctionBuilder()) - .registerFunction("pull", new PullFunctionBuilder(main)) - .registerFunction("loot", new LootFunctionBuilder(main, lootRegistry, this)) - .registerFunction("entity", new EntityFunctionBuilder(main)) - .registerFunction("getBiome", new BiomeFunctionBuilder(main)) + .registerFunction("pull", new PullFunctionBuilder(platform)) + .registerFunction("loot", new LootFunctionBuilder(platform, lootRegistry, this)) + .registerFunction("entity", new EntityFunctionBuilder(platform)) + .registerFunction("getBiome", new BiomeFunctionBuilder(platform)) .registerFunction("getBlock", new CheckBlockFunctionBuilder()) - .registerFunction("state", new StateFunctionBuilder(main)) + .registerFunction("state", new StateFunctionBuilder(platform)) .registerFunction("setWaterlog", new UnaryBooleanFunctionBuilder((waterlog, args) -> args.setWaterlog(waterlog))) .registerFunction("originX", new ZeroArgFunctionBuilder(arguments -> arguments.getBuffer().getOrigin().getX(), Returnable.ReturnType.NUMBER)) @@ -93,7 +93,7 @@ public class StructureScript implements Structure { .registerFunction("rotationDegrees", new ZeroArgFunctionBuilder<>(arguments -> arguments.getRotation().getDegrees(), Returnable.ReturnType.NUMBER)) .registerFunction("print", - new UnaryStringFunctionBuilder(string -> main.getDebugLogger().info("[" + tempID + "] " + string))) + new UnaryStringFunctionBuilder(string -> platform.getDebugLogger().info("[" + tempID + "] " + string))) .registerFunction("abs", new UnaryNumberFunctionBuilder(number -> FastMath.abs(number.doubleValue()))) .registerFunction("pow", new BinaryNumberFunctionBuilder( (number, number2) -> FastMath.pow(number.doubleValue(), number2.doubleValue()))) @@ -113,21 +113,21 @@ public class StructureScript implements Structure { .registerFunction("min", new BinaryNumberFunctionBuilder( (number, number2) -> FastMath.min(number.doubleValue(), number2.doubleValue()))); - if(!main.getTerraConfig().isDebugScript()) { + if(!platform.getTerraConfig().isDebugScript()) { parser.ignoreFunction("debugBlock"); } block = parser.parse(); this.id = parser.getID(); tempID = id; - this.main = main; - this.cache = CacheBuilder.newBuilder().maximumSize(main.getTerraConfig().getStructureCache()).build(); + this.platform = platform; + this.cache = CacheBuilder.newBuilder().maximumSize(platform.getTerraConfig().getStructureCache()).build(); } @Override @SuppressWarnings("try") public boolean generate(Vector3 location, World world, Chunk chunk, Random random, Rotation rotation) { - try(ProfileFrame ignore = main.getProfiler().profile("terrascript_chunk:" + id)) { + try(ProfileFrame ignore = platform.getProfiler().profile("terrascript_chunk:" + id)) { StructureBuffer buffer = computeBuffer(location, world, random, rotation); buffer.paste(location, chunk); return buffer.succeeded(); @@ -137,7 +137,7 @@ public class StructureScript implements Structure { @Override @SuppressWarnings("try") public boolean generate(Buffer buffer, World world, Random random, Rotation rotation, int recursions) { - try(ProfileFrame ignore = main.getProfiler().profile("terrascript_recursive:" + id)) { + try(ProfileFrame ignore = platform.getProfiler().profile("terrascript_recursive:" + id)) { return applyBlock(new TerraImplementationArguments(buffer, rotation, random, world, recursions)); } } @@ -145,7 +145,7 @@ public class StructureScript implements Structure { @Override @SuppressWarnings("try") public boolean generate(Vector3 location, World world, Random random, Rotation rotation) { - try(ProfileFrame ignore = main.getProfiler().profile("terrascript_direct:" + id)) { + try(ProfileFrame ignore = platform.getProfiler().profile("terrascript_direct:" + id)) { DirectBuffer buffer = new DirectBuffer(location, world); return applyBlock(new TerraImplementationArguments(buffer, rotation, random, world, 0)); } @@ -153,7 +153,7 @@ public class StructureScript implements Structure { @SuppressWarnings("try") public boolean test(Vector3 location, World world, Random random, Rotation rotation) { - try(ProfileFrame ignore = main.getProfiler().profile("terrascript_test:" + id)) { + try(ProfileFrame ignore = platform.getProfiler().profile("terrascript_test:" + id)) { StructureBuffer buffer = computeBuffer(location, world, random, rotation); return buffer.succeeded(); } @@ -175,8 +175,8 @@ public class StructureScript implements Structure { try { return block.apply(arguments).getLevel() != Block.ReturnLevel.FAIL; } catch(RuntimeException e) { - main.logger().severe("Failed to generate structure at " + arguments.getBuffer().getOrigin() + ": " + e.getMessage()); - main.getDebugLogger().stack(e); + platform.logger().severe("Failed to generate structure at " + arguments.getBuffer().getOrigin() + ": " + e.getMessage()); + platform.getDebugLogger().stack(e); return false; } } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BiomeFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BiomeFunctionBuilder.java index 766ff7dce..7b085b892 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BiomeFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BiomeFunctionBuilder.java @@ -10,16 +10,16 @@ import com.dfsek.terra.api.Platform; public class BiomeFunctionBuilder implements FunctionBuilder { - private final Platform main; + private final Platform platform; - public BiomeFunctionBuilder(Platform main) { - this.main = main; + public BiomeFunctionBuilder(Platform platform) { + this.platform = platform; } @SuppressWarnings("unchecked") @Override public BiomeFunction build(List> argumentList, Position position) { - return new BiomeFunction(main, (Returnable) argumentList.get(0), (Returnable) argumentList.get(1), + return new BiomeFunction(platform, (Returnable) argumentList.get(0), (Returnable) argumentList.get(1), (Returnable) argumentList.get(2), position); } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java index eb6bbfcfd..543feb5a8 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java @@ -13,10 +13,10 @@ import com.dfsek.terra.api.Platform; public class BlockFunctionBuilder implements FunctionBuilder { - private final Platform main; + private final Platform platform; - public BlockFunctionBuilder(Platform main) { - this.main = main; + public BlockFunctionBuilder(Platform platform) { + this.platform = platform; } @SuppressWarnings("unchecked") @@ -28,11 +28,11 @@ public class BlockFunctionBuilder implements FunctionBuilder { if(argumentList.get(3) instanceof StringConstant) { return new BlockFunction.Constant((Returnable) argumentList.get(0), (Returnable) argumentList.get(1), (Returnable) argumentList.get(2), (StringConstant) argumentList.get(3), - booleanReturnable, main, position); + booleanReturnable, platform, position); } return new BlockFunction((Returnable) argumentList.get(0), (Returnable) argumentList.get(1), (Returnable) argumentList.get(2), (Returnable) argumentList.get(3), booleanReturnable, - main, position); + platform, position); } @Override diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckFunctionBuilder.java index 7c10fde63..f6e3eae13 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckFunctionBuilder.java @@ -11,16 +11,16 @@ import com.dfsek.terra.api.Platform; public class CheckFunctionBuilder implements FunctionBuilder { - private final Platform main; + private final Platform platform; - public CheckFunctionBuilder(Platform main) { - this.main = main; + public CheckFunctionBuilder(Platform platform) { + this.platform = platform; } @SuppressWarnings("unchecked") @Override public CheckFunction build(List> argumentList, Position position) throws ParseException { - return new CheckFunction(main, (Returnable) argumentList.get(0), (Returnable) argumentList.get(1), + return new CheckFunction(platform, (Returnable) argumentList.get(0), (Returnable) argumentList.get(1), (Returnable) argumentList.get(2), position); } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java index 3830d7493..43546ee17 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java @@ -11,17 +11,17 @@ import com.dfsek.terra.api.Platform; public class EntityFunctionBuilder implements FunctionBuilder { - private final Platform main; + private final Platform platform; - public EntityFunctionBuilder(Platform main) { - this.main = main; + public EntityFunctionBuilder(Platform platform) { + this.platform = platform; } @SuppressWarnings("unchecked") @Override public EntityFunction build(List> argumentList, Position position) throws ParseException { return new EntityFunction((Returnable) argumentList.get(0), (Returnable) argumentList.get(1), - (Returnable) argumentList.get(2), (Returnable) argumentList.get(3), main, position); + (Returnable) argumentList.get(2), (Returnable) argumentList.get(3), platform, position); } @Override diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/LootFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/LootFunctionBuilder.java index 6e65a8ac7..619be08ab 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/LootFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/LootFunctionBuilder.java @@ -13,12 +13,12 @@ import com.dfsek.terra.api.structure.LootTable; public class LootFunctionBuilder implements FunctionBuilder { - private final Platform main; + private final Platform platform; private final Registry registry; private final StructureScript script; - public LootFunctionBuilder(Platform main, Registry registry, StructureScript script) { - this.main = main; + public LootFunctionBuilder(Platform platform, Registry registry, StructureScript script) { + this.platform = platform; this.registry = registry; this.script = script; } @@ -27,7 +27,7 @@ public class LootFunctionBuilder implements FunctionBuilder { @Override public LootFunction build(List> argumentList, Position position) { return new LootFunction(registry, (Returnable) argumentList.get(0), (Returnable) argumentList.get(1), - (Returnable) argumentList.get(2), (Returnable) argumentList.get(3), main, position, script); + (Returnable) argumentList.get(2), (Returnable) argumentList.get(3), platform, position, script); } @Override diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java index 4d7e72e72..7cdaf8935 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java @@ -11,17 +11,17 @@ import com.dfsek.terra.api.Platform; public class PullFunctionBuilder implements FunctionBuilder { - private final Platform main; + private final Platform platform; - public PullFunctionBuilder(Platform main) { - this.main = main; + public PullFunctionBuilder(Platform platform) { + this.platform = platform; } @SuppressWarnings("unchecked") @Override public PullFunction build(List> argumentList, Position position) throws ParseException { return new PullFunction((Returnable) argumentList.get(0), (Returnable) argumentList.get(1), - (Returnable) argumentList.get(2), (Returnable) argumentList.get(3), main, position); + (Returnable) argumentList.get(2), (Returnable) argumentList.get(3), platform, position); } @Override diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java index 7f497334d..e8f90bb77 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java @@ -11,10 +11,10 @@ import com.dfsek.terra.api.Platform; public class StateFunctionBuilder implements FunctionBuilder { - private final Platform main; + private final Platform platform; - public StateFunctionBuilder(Platform main) { - this.main = main; + public StateFunctionBuilder(Platform platform) { + this.platform = platform; } @SuppressWarnings("unchecked") @@ -22,7 +22,7 @@ public class StateFunctionBuilder implements FunctionBuilder { public StateFunction build(List> argumentList, Position position) throws ParseException { if(argumentList.size() < 4) throw new ParseException("Expected data", position); return new StateFunction((Returnable) argumentList.get(0), (Returnable) argumentList.get(1), - (Returnable) argumentList.get(2), (Returnable) argumentList.get(3), main, position); + (Returnable) argumentList.get(2), (Returnable) argumentList.get(3), platform, position); } @Override diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java index 1fb868e38..51575849d 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java @@ -15,11 +15,11 @@ import com.dfsek.terra.api.structure.Structure; public class StructureFunctionBuilder implements FunctionBuilder { private final Registry registry; - private final Platform main; + private final Platform platform; - public StructureFunctionBuilder(Registry registry, Platform main) { + public StructureFunctionBuilder(Registry registry, Platform platform) { this.registry = registry; - this.main = main; + this.platform = platform; } @SuppressWarnings("unchecked") @@ -30,7 +30,7 @@ public class StructureFunctionBuilder implements FunctionBuilder) argumentList.remove(0), (Returnable) argumentList.remove(0), (Returnable) argumentList.remove(0), (Returnable) argumentList.remove(0), argumentList.stream().map(item -> ((Returnable) item)).collect(Collectors.toList()), registry, - position, main); + position, platform); } @Override diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java index 9d6b2611a..3619a02db 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java @@ -1,5 +1,7 @@ package com.dfsek.terra.addons.terrascript.script.functions; +import com.dfsek.terra.api.Platform; + import net.jafama.FastMath; import java.util.Map; @@ -10,7 +12,6 @@ import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.util.vector.Vector2; import com.dfsek.terra.api.util.vector.Vector3; @@ -18,13 +19,13 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider; public class BiomeFunction implements Function { - private final Platform main; + private final Platform platform; private final Returnable x, y, z; private final Position position; - public BiomeFunction(Platform main, Returnable x, Returnable y, Returnable z, Position position) { - this.main = main; + public BiomeFunction(Platform platform, Returnable x, Returnable y, Returnable z, Position position) { + this.platform = platform; this.x = x; this.y = y; this.z = z; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java index 2414bbfae..253d82093 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java @@ -1,5 +1,7 @@ package com.dfsek.terra.addons.terrascript.script.functions; +import com.dfsek.terra.api.Platform; + import net.jafama.FastMath; import java.util.HashMap; @@ -13,7 +15,6 @@ import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.util.vector.Vector2; @@ -23,19 +24,19 @@ import com.dfsek.terra.api.util.vector.Vector3; public class BlockFunction implements Function { protected final Returnable x, y, z; protected final Returnable blockData; - protected final Platform main; + protected final Platform platform; private final Map data = new HashMap<>(); private final Returnable overwrite; private final Position position; public BlockFunction(Returnable x, Returnable y, Returnable z, Returnable blockData, - Returnable overwrite, Platform main, Position position) { + Returnable overwrite, Platform platform, Position position) { this.x = x; this.y = y; this.z = z; this.blockData = blockData; this.overwrite = overwrite; - this.main = main; + this.platform = platform; this.position = position; } @@ -66,13 +67,13 @@ public class BlockFunction implements Function { RotationUtil.rotateBlockData(rot, arguments.getRotation().inverse()); arguments.getBuffer().addItem( - new BufferedBlock(rot, overwrite.apply(implementationArguments, variableMap), main, arguments.isWaterlog()), + new BufferedBlock(rot, overwrite.apply(implementationArguments, variableMap), platform, arguments.isWaterlog()), new Vector3(FastMath.roundToInt(xz.getX()), y.apply(implementationArguments, variableMap).doubleValue(), FastMath.roundToInt(xz.getZ()))); } protected BlockState getBlockState(ImplementationArguments arguments, Map> variableMap) { - return data.computeIfAbsent(blockData.apply(arguments, variableMap), main.getWorldHandle()::createBlockData); + return data.computeIfAbsent(blockData.apply(arguments, variableMap), platform.getWorldHandle()::createBlockData); } @@ -80,9 +81,9 @@ public class BlockFunction implements Function { private final BlockState state; public Constant(Returnable x, Returnable y, Returnable z, StringConstant blockData, - Returnable overwrite, Platform main, Position position) { - super(x, y, z, blockData, overwrite, main, position); - this.state = main.getWorldHandle().createBlockData(blockData.getConstant()); + Returnable overwrite, Platform platform, Position position) { + super(x, y, z, blockData, overwrite, platform, position); + this.state = platform.getWorldHandle().createBlockData(blockData.getConstant()); } @Override diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java index a5c1810d6..b975fa990 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java @@ -19,12 +19,12 @@ import com.dfsek.terra.api.world.generator.SamplerCache; public class CheckFunction implements Function { - private final Platform main; + private final Platform platform; private final Returnable x, y, z; private final Position position; - public CheckFunction(Platform main, Returnable x, Returnable y, Returnable z, Position position) { - this.main = main; + public CheckFunction(Platform platform, Returnable x, Returnable y, Returnable z, Position position) { + this.platform = platform; this.x = x; this.y = y; this.z = z; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java index 953c87739..420601b11 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java @@ -22,15 +22,15 @@ public class EntityFunction implements Function { private final EntityType data; private final Returnable x, y, z; private final Position position; - private final Platform main; + private final Platform platform; - public EntityFunction(Returnable x, Returnable y, Returnable z, Returnable data, Platform main, + public EntityFunction(Returnable x, Returnable y, Returnable z, Returnable data, Platform platform, Position position) throws ParseException { this.position = position; - this.main = main; + this.platform = platform; if(!(data instanceof ConstantExpression)) throw new ParseException("Entity data must be constant", data.getPosition()); - this.data = main.getWorldHandle().getEntity(((ConstantExpression) data).getConstant()); + this.data = platform.getWorldHandle().getEntity(((ConstantExpression) data).getConstant()); this.x = x; this.y = y; this.z = z; @@ -44,7 +44,7 @@ public class EntityFunction implements Function { RotationUtil.rotateVector(xz, arguments.getRotation()); - arguments.getBuffer().addItem(new BufferedEntity(data, main), + arguments.getBuffer().addItem(new BufferedEntity(data, platform), new Vector3(xz.getX(), y.apply(implementationArguments, variableMap).doubleValue(), xz.getZ())); return null; } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java index 0da1c892e..f0839ff10 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java @@ -25,18 +25,18 @@ public class LootFunction implements Function { private final Returnable data; private final Returnable x, y, z; private final Position position; - private final Platform main; + private final Platform platform; private final StructureScript script; public LootFunction(Registry registry, Returnable x, Returnable y, Returnable z, - Returnable data, Platform main, Position position, StructureScript script) { + Returnable data, Platform platform, Position position, StructureScript script) { this.registry = registry; this.position = position; this.data = data; this.x = x; this.y = y; this.z = z; - this.main = main; + this.platform = platform; this.script = script; } @@ -52,11 +52,11 @@ public class LootFunction implements Function { LootTable table = registry.get(id); if(table == null) { - main.logger().severe("No such loot table " + id); + platform.logger().severe("No such loot table " + id); return null; } - arguments.getBuffer().addItem(new BufferedLootApplication(table, main, script), + arguments.getBuffer().addItem(new BufferedLootApplication(table, platform, script), new Vector3(FastMath.roundToInt(xz.getX()), y.apply(implementationArguments, variableMap).intValue(), FastMath.roundToInt(xz.getZ()))); return null; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java index 4e022c158..8866c1edc 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java @@ -25,12 +25,12 @@ public class PullFunction implements Function { private final Returnable x, y, z; private final Position position; - public PullFunction(Returnable x, Returnable y, Returnable z, Returnable data, Platform main, + public PullFunction(Returnable x, Returnable y, Returnable z, Returnable data, Platform platform, Position position) throws ParseException { this.position = position; if(!(data instanceof ConstantExpression)) throw new ParseException("Block data must be constant", data.getPosition()); - this.data = main.getWorldHandle().createBlockData(((ConstantExpression) data).getConstant()); + this.data = platform.getWorldHandle().createBlockData(((ConstantExpression) data).getConstant()); this.x = x; this.y = y; this.z = z; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java index dce81acc2..26bc53ed5 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java @@ -21,12 +21,12 @@ public class StateFunction implements Function { private final Returnable data; private final Returnable x, y, z; private final Position position; - private final Platform main; + private final Platform platform; - public StateFunction(Returnable x, Returnable y, Returnable z, Returnable data, Platform main, + public StateFunction(Returnable x, Returnable y, Returnable z, Returnable data, Platform platform, Position position) { this.position = position; - this.main = main; + this.platform = platform; this.data = data; this.x = x; this.y = y; @@ -40,7 +40,7 @@ public class StateFunction implements Function { z.apply(implementationArguments, variableMap).doubleValue()); RotationUtil.rotateVector(xz, arguments.getRotation()); - arguments.getBuffer().addItem(new BufferedStateManipulator(main, data.apply(implementationArguments, variableMap)), + arguments.getBuffer().addItem(new BufferedStateManipulator(platform, data.apply(implementationArguments, variableMap)), new Vector3(FastMath.roundToInt(xz.getX()), y.apply(implementationArguments, variableMap).intValue(), FastMath.roundToInt(xz.getZ()))); return null; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java index 8eb169bc8..edcf262c1 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java @@ -26,18 +26,18 @@ public class StructureFunction implements Function { private final Returnable id; private final Returnable x, y, z; private final Position position; - private final Platform main; + private final Platform platform; private final List> rotations; public StructureFunction(Returnable x, Returnable y, Returnable z, Returnable id, - List> rotations, Registry registry, Position position, Platform main) { + List> rotations, Registry registry, Position position, Platform platform) { this.registry = registry; this.id = id; this.position = position; this.x = x; this.y = y; this.z = z; - this.main = main; + this.platform = platform; this.rotations = rotations; } @@ -50,7 +50,7 @@ public class StructureFunction implements Function { public Boolean apply(ImplementationArguments implementationArguments, Map> variableMap) { TerraImplementationArguments arguments = (TerraImplementationArguments) implementationArguments; - if(arguments.getRecursions() > main.getTerraConfig().getMaxRecursion()) + if(arguments.getRecursions() > platform.getTerraConfig().getMaxRecursion()) throw new RuntimeException("Structure recursion too deep: " + arguments.getRecursions()); Vector2 xz = new Vector2(x.apply(implementationArguments, variableMap).doubleValue(), @@ -61,7 +61,7 @@ public class StructureFunction implements Function { String app = id.apply(implementationArguments, variableMap); Structure script = registry.get(app); if(script == null) { - main.logger().severe("No such structure " + app); + platform.logger().severe("No such structure " + app); return null; } @@ -70,7 +70,7 @@ public class StructureFunction implements Function { try { rotation1 = Rotation.valueOf(rotString); } catch(IllegalArgumentException e) { - main.logger().severe("Invalid rotation " + rotString); + platform.logger().severe("Invalid rotation " + rotString); return null; } diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/addon/AddonLoader.java b/common/api/core/src/main/java/com/dfsek/terra/api/addon/AddonLoader.java index cf7702383..8d6f0c5f1 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/addon/AddonLoader.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/addon/AddonLoader.java @@ -7,7 +7,7 @@ import com.dfsek.terra.api.registry.CheckedRegistry; public interface AddonLoader { /** * Load all addons. - * @param main TerraPlugin instance. + * @param platform TerraPlugin instance. */ - void load(Platform main, CheckedRegistry addons); + void load(Platform platform, CheckedRegistry addons); } diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigFactory.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigFactory.java index 6b6c5fd22..533121bcf 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigFactory.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigFactory.java @@ -7,5 +7,5 @@ import com.dfsek.terra.api.Platform; public interface ConfigFactory { - O build(C config, Platform main) throws LoadException; + O build(C config, Platform platform) throws LoadException; } diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigType.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigType.java index 77599d498..6598cb01f 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigType.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigType.java @@ -10,7 +10,7 @@ import com.dfsek.terra.api.util.reflection.TypeKey; public interface ConfigType { Supplier> registrySupplier(ConfigPack pack); - T getTemplate(ConfigPack pack, Platform main); + T getTemplate(ConfigPack pack, Platform platform); ConfigFactory getFactory(); diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/config/PluginConfig.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/PluginConfig.java index 94f822b45..f661650e1 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/config/PluginConfig.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/PluginConfig.java @@ -4,7 +4,7 @@ import com.dfsek.terra.api.Platform; public interface PluginConfig { - void load(Platform main); + void load(Platform platform); boolean dumpDefaultConfig(); diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkGenerator.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkGenerator.java index 2269b825c..a4788a986 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkGenerator.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkGenerator.java @@ -24,7 +24,7 @@ public interface ChunkGenerator { ConfigPack getConfigPack(); - Platform getMain(); + Platform getPlatform(); List getGenerationStages(); diff --git a/common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java b/common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java index 32d5a0d2a..f16bae1c2 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java +++ b/common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java @@ -1,6 +1,9 @@ package com.dfsek.terra; import com.dfsek.tectonic.loading.TypeRegistry; + +import com.dfsek.terra.api.Platform; + import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.yaml.snakeyaml.Yaml; @@ -17,7 +20,6 @@ import java.util.Map; import java.util.Optional; import com.dfsek.terra.api.util.Logger; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.command.CommandManager; import com.dfsek.terra.api.command.exception.MalformedCommandException; diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/AddonsCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/AddonsCommand.java index cca2af60f..306afbf58 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/AddonsCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/AddonsCommand.java @@ -12,12 +12,12 @@ import com.dfsek.terra.api.inject.annotations.Inject; ) public class AddonsCommand implements CommandTemplate { @Inject - private Platform main; + private Platform platform; @Override public void execute(CommandSender sender) { sender.sendMessage("Installed Addons:"); - main.getAddons().forEach( + platform.getAddons().forEach( addon -> sender.sendMessage(" - " + addon.getName() + " v" + addon.getVersion() + " by " + addon.getAuthor())); } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/GetBlockCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/GetBlockCommand.java index 64f403ec8..2dae44768 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/GetBlockCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/GetBlockCommand.java @@ -19,7 +19,7 @@ import com.dfsek.terra.api.inject.annotations.Inject; ) public class GetBlockCommand implements CommandTemplate { @Inject - private Platform main; + private Platform platform; @Override public void execute(CommandSender sender) { diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java index 0b524ac13..5403ba14f 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java @@ -15,11 +15,11 @@ import com.dfsek.terra.config.lang.LangUtil; ) public class PacksCommand implements CommandTemplate { @Inject - private Platform main; + private Platform platform; @Override public void execute(CommandSender sender) { - CheckedRegistry registry = main.getConfigRegistry(); + CheckedRegistry registry = platform.getConfigRegistry(); if(registry.entries().size() == 0) { LangUtil.send("command.packs.none", sender); diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/ReloadCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/ReloadCommand.java index fc2f2474c..526151048 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/ReloadCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/ReloadCommand.java @@ -13,11 +13,11 @@ import com.dfsek.terra.config.lang.LangUtil; ) public class ReloadCommand implements CommandTemplate { @Inject - private Platform main; + private Platform platform; @Override public void execute(CommandSender sender) { - if(!main.reload()) { + if(!platform.reload()) { LangUtil.send("command.reload-error", sender); } else { LangUtil.send("command.reload", sender); diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java b/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java index 3b9360a9e..e12518106 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java @@ -1,5 +1,7 @@ package com.dfsek.terra.commands; +import com.dfsek.terra.api.Platform; + import net.jafama.FastMath; import java.lang.reflect.Field; @@ -12,7 +14,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.command.CommandManager; import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Argument; @@ -41,11 +42,11 @@ import com.dfsek.terra.inject.InjectorImpl; public class TerraCommandManager implements CommandManager { private final Map commands = new HashMap<>(); private final InjectorImpl pluginInjector; - private final Platform main; + private final Platform platform; - public TerraCommandManager(Platform main) { - this.main = main; - this.pluginInjector = new InjectorImpl<>(main); + public TerraCommandManager(Platform platform) { + this.platform = platform; + this.pluginInjector = new InjectorImpl<>(platform); pluginInjector.addExplicitTarget(Platform.class); } @@ -81,7 +82,7 @@ public class TerraCommandManager implements CommandManager { private void execute(CommandHolder commandHolder, CommandSender sender, List args) throws CommandException { Class commandClass = commandHolder.clazz; - if(commandClass.isAnnotationPresent(DebugCommand.class) && !main.getTerraConfig().isDebugCommands()) { + if(commandClass.isAnnotationPresent(DebugCommand.class) && !platform.getTerraConfig().isDebugCommands()) { sender.sendMessage("Command must be executed with debug commands enabled."); return; } diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/VersionCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/VersionCommand.java index 7197ac34f..1e213d6f8 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/VersionCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/VersionCommand.java @@ -13,11 +13,11 @@ import com.dfsek.terra.config.lang.LangUtil; ) public class VersionCommand implements CommandTemplate { @Inject - private Platform main; + private Platform platform; @Override public void execute(CommandSender sender) { - String terraVersion = main.getVersion(); - LangUtil.send("command.version", sender, terraVersion, main.platformName()); + String terraVersion = platform.getVersion(); + LangUtil.send("command.version", sender, terraVersion, platform.platformName()); } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileQueryCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileQueryCommand.java index 5aa8aad29..344e92492 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileQueryCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileQueryCommand.java @@ -12,13 +12,13 @@ import com.dfsek.terra.api.inject.annotations.Inject; @DebugCommand public class ProfileQueryCommand implements CommandTemplate { @Inject - private Platform main; + private Platform platform; @Override public void execute(CommandSender sender) { StringBuilder data = new StringBuilder("Terra Profiler data dump: \n"); - main.getProfiler().getTimings().forEach((id, timings) -> data.append(id).append(": ").append(timings.toString()).append('\n')); - main.logger().info(data.toString()); + platform.getProfiler().getTimings().forEach((id, timings) -> data.append(id).append(": ").append(timings.toString()).append('\n')); + platform.logger().info(data.toString()); sender.sendMessage("Profiler data dumped to console."); } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileResetCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileResetCommand.java index 2399b0435..13653496e 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileResetCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileResetCommand.java @@ -12,11 +12,11 @@ import com.dfsek.terra.api.inject.annotations.Inject; @DebugCommand public class ProfileResetCommand implements CommandTemplate { @Inject - private Platform main; + private Platform platform; @Override public void execute(CommandSender sender) { - main.getProfiler().reset(); + platform.getProfiler().reset(); sender.sendMessage("Profiler reset."); } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStartCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStartCommand.java index 62c844d32..54685095c 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStartCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStartCommand.java @@ -12,11 +12,11 @@ import com.dfsek.terra.api.inject.annotations.Inject; @DebugCommand public class ProfileStartCommand implements CommandTemplate { @Inject - private Platform main; + private Platform platform; @Override public void execute(CommandSender sender) { - main.getProfiler().start(); + platform.getProfiler().start(); sender.sendMessage("Profiling enabled."); } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStopCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStopCommand.java index c01529a92..313707ad5 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStopCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStopCommand.java @@ -12,11 +12,11 @@ import com.dfsek.terra.api.inject.annotations.Inject; @DebugCommand public class ProfileStopCommand implements CommandTemplate { @Inject - private Platform main; + private Platform platform; @Override public void execute(CommandSender sender) { - main.getProfiler().stop(); + platform.getProfiler().stop(); sender.sendMessage("Profiling disabled."); } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java b/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java index 4d119f478..3099119f0 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java @@ -19,10 +19,10 @@ import com.dfsek.terra.config.loaders.RangeLoader; public class GenericLoaders implements LoaderRegistrar { - private final Platform main; + private final Platform platform; - public GenericLoaders(Platform main) { - this.main = main; + public GenericLoaders(Platform platform) { + this.platform = platform; } @Override @@ -32,11 +32,11 @@ public class GenericLoaders implements LoaderRegistrar { .registerLoader(MaterialSet.class, new MaterialSetLoader()) .registerLoader(LinkedHashMap.class, new LinkedHashMapLoader()); - if(main != null) { - registry.registerLoader(TerraAddon.class, main.getAddons()) + if(platform != null) { + registry.registerLoader(TerraAddon.class, platform.getAddons()) .registerLoader(BlockType.class, - (t, object, cf) -> main.getWorldHandle().createBlockData((String) object).getBlockType()) - .registerLoader(BlockState.class, (t, object, cf) -> main.getWorldHandle().createBlockData((String) object)); + (t, object, cf) -> platform.getWorldHandle().createBlockData((String) object).getBlockType()) + .registerLoader(BlockState.class, (t, object, cf) -> platform.getWorldHandle().createBlockData((String) object)); } } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java b/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java index 4e2520d42..f9ce0043a 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java @@ -76,10 +76,10 @@ public class PluginConfigImpl implements ConfigTemplate, com.dfsek.terra.api.con private int maxRecursion = 1000; @Override - public void load(Platform main) { - Logger logger = main.logger(); + public void load(Platform platform) { + Logger logger = platform.logger(); logger.info("Loading config values"); - try(FileInputStream file = new FileInputStream(new File(main.getDataFolder(), "config.yml"))) { + try(FileInputStream file = new FileInputStream(new File(platform.getDataFolder(), "config.yml"))) { ConfigLoader loader = new ConfigLoader(); loader.load(this, new YamlConfiguration(file, "config.yml")); } catch(ConfigException | IOException | UncheckedIOException e) { diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java b/common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java index f02fc5d2a..4fca9b9b9 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java @@ -12,9 +12,9 @@ import com.dfsek.terra.api.lang.Language; public final class LangUtil { private static Language language; - public static void load(String langID, Platform main) { - Logger logger = main.logger(); - File file = new File(main.getDataFolder(), "lang"); + public static void load(String langID, Platform platform) { + Logger logger = platform.logger(); + File file = new File(platform.getDataFolder(), "lang"); try { File file1 = new File(file, langID + ".yml"); logger.info(file1.getAbsolutePath()); diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java index ea1913c95..c906b3aeb 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java @@ -85,7 +85,7 @@ public class ConfigPackImpl implements ConfigPack { private final AbstractConfigLoader abstractConfigLoader = new AbstractConfigLoader(); private final ConfigLoader selfLoader = new ConfigLoader(); private final Scope varScope = new Scope(); - private final Platform main; + private final Platform platform; private final Loader loader; private final Configuration configuration; @@ -101,18 +101,18 @@ public class ConfigPackImpl implements ConfigPack { private final TreeMap>>> configTypes = new TreeMap<>(); - public ConfigPackImpl(File folder, Platform main) throws ConfigException { + public ConfigPackImpl(File folder, Platform platform) throws ConfigException { try { this.loader = new FolderLoader(folder.toPath()); - this.main = main; + this.platform = platform; this.configTypeRegistry = createRegistry(); long l = System.nanoTime(); register(abstractConfigLoader); - main.register(abstractConfigLoader); + platform.register(abstractConfigLoader); register(selfLoader); - main.register(selfLoader); + platform.register(selfLoader); File pack = new File(folder, "pack.yml"); @@ -123,39 +123,39 @@ public class ConfigPackImpl implements ConfigPack { selfLoader.load(addonsTemplate, configuration); this.addons = addonsTemplate.getAddons(); - main.getEventManager().callEvent(new ConfigPackPreLoadEvent(this, template -> selfLoader.load(template, configuration))); + platform.getEventManager().callEvent(new ConfigPackPreLoadEvent(this, template -> selfLoader.load(template, configuration))); selfLoader.load(template, configuration); - main.logger().info("Loading config pack \"" + template.getID() + "\""); - load(l, main); + platform.logger().info("Loading config pack \"" + template.getID() + "\""); + load(l, platform); ConfigPackPostTemplate packPostTemplate = new ConfigPackPostTemplate(); selfLoader.load(packPostTemplate, configuration); seededBiomeProvider = packPostTemplate.getProviderBuilder(); - checkDeadEntries(main); + checkDeadEntries(platform); } catch(FileNotFoundException e) { throw new LoadException("No pack.yml file found in " + folder.getAbsolutePath(), e); } } catch(Exception e) { - main.logger().severe("Failed to load config pack from folder \"" + folder.getAbsolutePath() + "\""); + platform.logger().severe("Failed to load config pack from folder \"" + folder.getAbsolutePath() + "\""); throw e; } toWorldConfig(new DummyWorld()); // Build now to catch any errors immediately. } - public ConfigPackImpl(ZipFile file, Platform main) throws ConfigException { + public ConfigPackImpl(ZipFile file, Platform platform) throws ConfigException { try { this.loader = new ZIPLoader(file); - this.main = main; + this.platform = platform; this.configTypeRegistry = createRegistry(); long l = System.nanoTime(); register(selfLoader); - main.register(selfLoader); + platform.register(selfLoader); register(abstractConfigLoader); - main.register(abstractConfigLoader); + platform.register(abstractConfigLoader); try { ZipEntry pack = null; @@ -173,24 +173,24 @@ public class ConfigPackImpl implements ConfigPack { selfLoader.load(addonsTemplate, configuration); this.addons = addonsTemplate.getAddons(); - main.getEventManager().callEvent(new ConfigPackPreLoadEvent(this, template -> selfLoader.load(template, configuration))); + platform.getEventManager().callEvent(new ConfigPackPreLoadEvent(this, template -> selfLoader.load(template, configuration))); selfLoader.load(template, configuration); - main.logger().info("Loading config pack \"" + template.getID() + "\""); + platform.logger().info("Loading config pack \"" + template.getID() + "\""); - load(l, main); + load(l, platform); ConfigPackPostTemplate packPostTemplate = new ConfigPackPostTemplate(); selfLoader.load(packPostTemplate, configuration); seededBiomeProvider = packPostTemplate.getProviderBuilder(); - checkDeadEntries(main); + checkDeadEntries(platform); } catch(IOException e) { throw new LoadException("Unable to load pack.yml from ZIP file", e); } } catch(Exception e) { - main.logger().severe("Failed to load config pack from ZIP archive \"" + file.getName() + "\""); + platform.logger().severe("Failed to load config pack from ZIP archive \"" + file.getName() + "\""); throw e; } @@ -221,7 +221,7 @@ public class ConfigPackImpl implements ConfigPack { @Override public WorldConfigImpl toWorldConfig(World world) { - return new WorldConfigImpl(world, this, main); + return new WorldConfigImpl(world, this, platform); } @Override @@ -281,7 +281,7 @@ public class ConfigPackImpl implements ConfigPack { OpenRegistry registry = new OpenRegistryImpl<>(); selfLoader.registerLoader(c, registry); abstractConfigLoader.registerLoader(c, registry); - main.getDebugLogger().info("Registered loader for registry of class " + ReflectionUtil.typeToString(c)); + platform.getDebugLogger().info("Registered loader for registry of class " + ReflectionUtil.typeToString(c)); if(type instanceof ParameterizedType) { ParameterizedType param = (ParameterizedType) type; @@ -299,7 +299,7 @@ public class ConfigPackImpl implements ConfigPack { (Registry>>>>) registry); selfLoader.registerLoader(templateType, loader); abstractConfigLoader.registerLoader(templateType, loader); - main.getDebugLogger().info( + platform.getDebugLogger().info( "Registered template loader for registry of class " + ReflectionUtil.typeToString(templateType)); } } @@ -347,12 +347,12 @@ public class ConfigPackImpl implements ConfigPack { @SuppressWarnings("unchecked") private ConfigTypeRegistry createRegistry() { - return new ConfigTypeRegistry(main, (id, configType) -> { + return new ConfigTypeRegistry(platform, (id, configType) -> { OpenRegistry openRegistry = configType.registrySupplier(this).get(); if(registryMap.containsKey(configType.getTypeKey() .getType())) { // Someone already registered something; we need to copy things to the // new registry. - main.getDebugLogger().warning("Copying values from old registry for " + configType.getTypeKey()); + platform.getDebugLogger().warning("Copying values from old registry for " + configType.getTypeKey()); registryMap.get(configType.getTypeKey().getType()).getLeft().forEach(((OpenRegistry) openRegistry)::register); } selfLoader.registerLoader(configType.getTypeKey().getType(), openRegistry); @@ -361,10 +361,10 @@ public class ConfigPackImpl implements ConfigPack { }); } - private void checkDeadEntries(Platform main) { + private void checkDeadEntries(Platform platform) { registryMap.forEach((clazz, pair) -> ((OpenRegistryImpl) pair.getLeft()).getDeadEntries() - .forEach((id, value) -> main.getDebugLogger() - .warning("Dead entry in '" + + .forEach((id, value) -> platform.getDebugLogger() + .warning("Dead entry in '" + ReflectionUtil.typeToString( clazz) + "' registry: '" + @@ -372,7 +372,7 @@ public class ConfigPackImpl implements ConfigPack { } @SuppressWarnings({ "unchecked", "rawtypes" }) - private void load(long start, Platform main) throws ConfigException { + private void load(long start, Platform platform) throws ConfigException { configTypes.values().forEach(list -> list.forEach(pair -> configTypeRegistry.register(pair.getLeft(), pair.getRight()))); for(Map.Entry var : template.getVariables().entrySet()) { @@ -381,7 +381,7 @@ public class ConfigPackImpl implements ConfigPack { Map configurations = new HashMap<>(); - main.getEventManager().callEvent(new ConfigurationDiscoveryEvent(this, loader, configurations::put)); // Create all the configs. + platform.getEventManager().callEvent(new ConfigurationDiscoveryEvent(this, loader, configurations::put)); // Create all the configs. MetaStringPreprocessor stringPreprocessor = new MetaStringPreprocessor(configurations); selfLoader.registerPreprocessor(Meta.class, stringPreprocessor); @@ -415,24 +415,24 @@ public class ConfigPackImpl implements ConfigPack { for(ConfigType configType : configTypeRegistry.entries()) { // Load the configs CheckedRegistry registry = getCheckedRegistry(configType.getTypeKey()); - main.getEventManager().callEvent(new ConfigTypePreLoadEvent(configType, registry, this)); + platform.getEventManager().callEvent(new ConfigTypePreLoadEvent(configType, registry, this)); for(AbstractConfiguration config : abstractConfigLoader.loadConfigs( configs.getOrDefault(configType, Collections.emptyList()))) { try { Object loaded = ((ConfigFactory) configType.getFactory()).build( - selfLoader.load(configType.getTemplate(this, main), config), main); + selfLoader.load(configType.getTemplate(this, platform), config), platform); registry.register(config.getID(), loaded); - main.getEventManager().callEvent( + platform.getEventManager().callEvent( new ConfigurationLoadEvent(this, config, template -> selfLoader.load(template, config), configType, loaded)); } catch(DuplicateEntryException e) { throw new LoadException("Duplicate registry entry: ", e); } } - main.getEventManager().callEvent(new ConfigTypePostLoadEvent(configType, registry, this)); + platform.getEventManager().callEvent(new ConfigTypePostLoadEvent(configType, registry, this)); } - main.getEventManager().callEvent(new ConfigPackPostLoadEvent(this, template -> selfLoader.load(template, configuration))); - main.logger().info( + platform.getEventManager().callEvent(new ConfigPackPostLoadEvent(this, template -> selfLoader.load(template, configuration))); + platform.logger().info( "Loaded config pack \"" + template.getID() + "\" v" + template.getVersion() + " by " + template.getAuthor() + " in " + (System.nanoTime() - start) / 1000000D + "ms."); } diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/pack/WorldConfigImpl.java b/common/implementation/src/main/java/com/dfsek/terra/config/pack/WorldConfigImpl.java index 0eb4260a4..6b7de8bc1 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/pack/WorldConfigImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/pack/WorldConfigImpl.java @@ -25,10 +25,10 @@ public class WorldConfigImpl implements WorldConfig { private final Map> registryMap = new HashMap<>(); - public WorldConfigImpl(World world, ConfigPackImpl pack, Platform main) { + public WorldConfigImpl(World world, ConfigPackImpl pack, Platform platform) { this.world = world; this.pack = pack; - this.samplerCache = new SamplerCacheImpl(main, world); + this.samplerCache = new SamplerCacheImpl(platform, world); pack.getRegistryMap().forEach((clazz, pair) -> registryMap.put(clazz, new LockedRegistryImpl<>(pair.getLeft()))); diff --git a/common/implementation/src/main/java/com/dfsek/terra/event/EventManagerImpl.java b/common/implementation/src/main/java/com/dfsek/terra/event/EventManagerImpl.java index 1abcbbdde..8c2a3f367 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/event/EventManagerImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/event/EventManagerImpl.java @@ -12,11 +12,11 @@ import com.dfsek.terra.api.event.functional.FunctionalEventHandler; public class EventManagerImpl implements EventManager { private final Map, EventHandler> handlers = new HashMap<>(); - private final Platform main; + private final Platform platform; - public EventManagerImpl(Platform main) { - this.main = main; - registerHandler(FunctionalEventHandler.class, new FunctionalEventHandlerImpl(main)); // default handler + public EventManagerImpl(Platform platform) { + this.platform = platform; + registerHandler(FunctionalEventHandler.class, new FunctionalEventHandlerImpl(platform)); // default handler } @Override diff --git a/common/implementation/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java b/common/implementation/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java index 27bf99c7d..10daa2420 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java @@ -23,10 +23,10 @@ import com.dfsek.terra.api.util.reflection.TypeKey; public class FunctionalEventHandlerImpl implements FunctionalEventHandler { private final Map>> contextMap = new HashMap<>(); - private final Platform main; + private final Platform platform; - public FunctionalEventHandlerImpl(Platform main) { - this.main = main; + public FunctionalEventHandlerImpl(Platform platform) { + this.platform = platform; } @SuppressWarnings("unchecked") @@ -45,9 +45,9 @@ public class FunctionalEventHandlerImpl implements FunctionalEventHandler { if(context.isFailThrough() && event instanceof FailThroughEvent) throw e; // Rethrow if it's fail-through. StringWriter writer = new StringWriter(); e.printStackTrace(new PrintWriter(writer)); - main.logger().warning("Exception occurred during event handling:"); - main.logger().warning(writer.toString()); - main.logger().warning( + platform.logger().warning("Exception occurred during event handling:"); + platform.logger().warning(writer.toString()); + platform.logger().warning( "Report this to the maintainers of " + context.getAddon().getName() + ", " + context.getAddon().getAuthor()); } }); diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java b/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java index 0a5839e7e..1ff7aef57 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java @@ -12,19 +12,19 @@ import com.dfsek.terra.registry.OpenRegistryImpl; public class ConfigTypeRegistry extends OpenRegistryImpl> { private final BiConsumer> callback; - private final Platform main; + private final Platform platform; - public ConfigTypeRegistry(Platform main, BiConsumer> callback) { + public ConfigTypeRegistry(Platform platform, BiConsumer> callback) { super(new LinkedHashMap<>()); // Ordered this.callback = callback; - this.main = main; + this.platform = platform; } @Override public boolean register(String identifier, Entry> value) { callback.accept(identifier, value.getValue()); - main.getDebugLogger().info("Registered config registry with ID " + identifier + " to type " + - ReflectionUtil.typeToString(value.getValue().getTypeKey().getType())); + platform.getDebugLogger().info("Registered config registry with ID " + identifier + " to type " + + ReflectionUtil.typeToString(value.getValue().getTypeKey().getType())); return super.register(identifier, value); } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java b/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java index 905cdf76f..ca2aa3e5b 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java @@ -20,14 +20,14 @@ import com.dfsek.terra.registry.OpenRegistryImpl; public class AddonRegistry extends OpenRegistryImpl { - private final Platform main; + private final Platform platform; - public AddonRegistry(Platform main) { - this.main = main; + public AddonRegistry(Platform platform) { + this.platform = platform; } - public AddonRegistry(TerraAddon addon, Platform main) { - this.main = main; + public AddonRegistry(TerraAddon addon, Platform platform) { + this.platform = platform; register(addon); } @@ -35,7 +35,7 @@ public class AddonRegistry extends OpenRegistryImpl { public boolean register(String identifier, TerraAddon addon) { if(contains(identifier)) throw new IllegalArgumentException("Addon " + identifier + " is already registered."); addon.initialize(); - main.logger().info("Loaded addon " + addon.getName() + " v" + addon.getVersion() + ", by " + addon.getAuthor()); + platform.logger().info("Loaded addon " + addon.getName() + " v" + addon.getVersion() + ", by " + addon.getAuthor()); return super.register(identifier, addon); } @@ -53,18 +53,18 @@ public class AddonRegistry extends OpenRegistryImpl { } public boolean loadAll(ClassLoader parent) { - InjectorImpl pluginInjector = new InjectorImpl<>(main); + InjectorImpl pluginInjector = new InjectorImpl<>(platform); pluginInjector.addExplicitTarget(Platform.class); boolean valid = true; - File addonsFolder = new File(main.getDataFolder(), "addons"); + File addonsFolder = new File(platform.getDataFolder(), "addons"); addonsFolder.mkdirs(); AddonPool pool = new AddonPool(); try { for(File jar : addonsFolder.listFiles(file -> file.getName().endsWith(".jar"))) { - main.logger().info("Loading Addon(s) from: " + jar.getName()); + platform.logger().info("Loading Addon(s) from: " + jar.getName()); for(Class addonClass : AddonClassLoader.fetchAddonClasses(jar, parent)) { pool.add(new PreLoadAddon(addonClass, jar)); } @@ -103,9 +103,9 @@ public class AddonRegistry extends OpenRegistryImpl { registerChecked(loadedAddon.getName(), loadedAddon); } catch(DuplicateEntryException e) { valid = false; - main.logger().severe("Duplicate addon ID; addon with ID " + loadedAddon.getName() + " is already loaded."); - main.logger().severe("Existing addon class: " + get(loadedAddon.getName()).getClass().getCanonicalName()); - main.logger().severe("Duplicate addon class: " + addonClass.getCanonicalName()); + platform.logger().severe("Duplicate addon ID; addon with ID " + loadedAddon.getName() + " is already loaded."); + platform.logger().severe("Existing addon class: " + get(loadedAddon.getName()).getClass().getCanonicalName()); + platform.logger().severe("Duplicate addon class: " + addonClass.getCanonicalName()); } } } catch(AddonLoadException | IOException e) { diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/master/ConfigRegistry.java b/common/implementation/src/main/java/com/dfsek/terra/registry/master/ConfigRegistry.java index b968b8935..ce48c7087 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/master/ConfigRegistry.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/master/ConfigRegistry.java @@ -16,18 +16,18 @@ import com.dfsek.terra.registry.OpenRegistryImpl; * Class to hold config packs */ public class ConfigRegistry extends OpenRegistryImpl { - public void load(File folder, Platform main) throws ConfigException { - ConfigPack pack = new ConfigPackImpl(folder, main); + public void load(File folder, Platform platform) throws ConfigException { + ConfigPack pack = new ConfigPackImpl(folder, platform); register(pack.getID(), pack); } - public boolean loadAll(Platform main) { + public boolean loadAll(Platform platform) { boolean valid = true; - File packsFolder = new File(main.getDataFolder(), "packs"); + File packsFolder = new File(platform.getDataFolder(), "packs"); packsFolder.mkdirs(); for(File dir : packsFolder.listFiles(File::isDirectory)) { try { - load(dir, main); + load(dir, platform); } catch(ConfigException e) { e.printStackTrace(); valid = false; @@ -35,8 +35,8 @@ public class ConfigRegistry extends OpenRegistryImpl { } for(File zip : packsFolder.listFiles(file -> file.getName().endsWith(".zip") || file.getName().endsWith(".terra"))) { try { - main.getDebugLogger().info("Loading ZIP archive: " + zip.getName()); - load(new ZipFile(zip), main); + platform.getDebugLogger().info("Loading ZIP archive: " + zip.getName()); + load(new ZipFile(zip), platform); } catch(IOException | ConfigException e) { e.printStackTrace(); valid = false; @@ -45,8 +45,8 @@ public class ConfigRegistry extends OpenRegistryImpl { return valid; } - public void load(ZipFile file, Platform main) throws ConfigException { - ConfigPackImpl pack = new ConfigPackImpl(file, main); + public void load(ZipFile file, Platform platform) throws ConfigException { + ConfigPackImpl pack = new ConfigPackImpl(file, platform); register(pack.getTemplate().getID(), pack); } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/SamplerCacheImpl.java b/common/implementation/src/main/java/com/dfsek/terra/world/SamplerCacheImpl.java index 027ddc8ad..824ab6f90 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/SamplerCacheImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/SamplerCacheImpl.java @@ -1,12 +1,13 @@ package com.dfsek.terra.world; +import com.dfsek.terra.api.Platform; + import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import net.jafama.FastMath; import org.jetbrains.annotations.NotNull; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.util.math.Sampler; @@ -15,8 +16,8 @@ import com.dfsek.terra.api.util.math.Sampler; public class SamplerCacheImpl implements com.dfsek.terra.api.world.generator.SamplerCache { private final LoadingCache cache; - public SamplerCacheImpl(Platform main, World world) { - cache = CacheBuilder.newBuilder().maximumSize(main.getTerraConfig().getSamplerCache()) + public SamplerCacheImpl(Platform platform, World world) { + cache = CacheBuilder.newBuilder().maximumSize(platform.getTerraConfig().getSamplerCache()) .build(new CacheLoader<>() { @Override public Sampler load(@NotNull Long key) { diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitAddon.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitAddon.java index 26f873f8d..d032b11e3 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitAddon.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitAddon.java @@ -11,10 +11,10 @@ import com.dfsek.terra.api.addon.annotations.Version; @Version("1.0.0") @Author("Terra") final class BukkitAddon extends TerraAddon { - private final Platform main; + private final Platform platform; - public BukkitAddon(Platform main) { - this.main = main; + public BukkitAddon(Platform platform) { + this.platform = platform; } @Override diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java index 7c0750207..24afced54 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java @@ -30,7 +30,7 @@ public class BukkitChunkGeneratorWrapper extends org.bukkit.generator.ChunkGener private final ChunkGenerator delegate; - private final Platform main; + private final Platform platform; private boolean needsLoad = true; @@ -38,8 +38,8 @@ public class BukkitChunkGeneratorWrapper extends org.bukkit.generator.ChunkGener public BukkitChunkGeneratorWrapper(ChunkGenerator delegate) { this.delegate = delegate; - this.main = delegate.getMain(); - this.popMan = new PopulationManager(delegate, main); + this.platform = delegate.getPlatform(); + this.popMan = new PopulationManager(delegate, platform); } diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java index 3f28548c4..5561d6e8f 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java @@ -1,5 +1,7 @@ package com.dfsek.terra.bukkit.listeners; +import com.dfsek.terra.api.Platform; + import org.bukkit.Material; import org.bukkit.TreeType; import org.bukkit.block.Block; @@ -9,7 +11,6 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.world.StructureGrowEvent; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.config.WorldConfig; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Tree; @@ -34,10 +35,10 @@ public class CommonListener implements Listener { .add(TreeType.MEGA_REDWOOD, "MEGA_SPRUCE") .add(TreeType.SWAMP, "SWAMP_OAK")) .addTransform(TreeType::toString).build(); - private final Platform main; + private final Platform platform; - public CommonListener(Platform main) { - this.main = main; + public CommonListener(Platform platform) { + this.platform = platform; } @EventHandler(priority = EventPriority.HIGHEST) diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java index 359716539..8e224d110 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java @@ -1,17 +1,17 @@ package com.dfsek.terra.bukkit.listeners; +import com.dfsek.terra.api.Platform; + import io.papermc.paper.event.world.StructureLocateEvent; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; -import com.dfsek.terra.api.Platform; - public class PaperListener implements Listener { - private final Platform main; + private final Platform platform; - public PaperListener(Platform main) { - this.main = main; + public PaperListener(Platform platform) { + this.platform = platform; } @EventHandler diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java index f04fa48e7..86558b508 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java @@ -1,5 +1,7 @@ package com.dfsek.terra.bukkit.listeners; +import com.dfsek.terra.api.Platform; + import org.bukkit.entity.Villager; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -8,8 +10,6 @@ import org.bukkit.event.entity.EntitySpawnEvent; import org.bukkit.event.entity.VillagerAcquireTradeEvent; import org.bukkit.event.entity.VillagerCareerChangeEvent; -import com.dfsek.terra.api.Platform; - /** * Listener to load on Spigot servers, contains Villager crash prevention and hacky ender eye redirection. @@ -18,10 +18,10 @@ import com.dfsek.terra.api.Platform; * StructureLocateEvent). */ public class SpigotListener implements Listener { - private final Platform main; + private final Platform platform; - public SpigotListener(Platform main) { - this.main = main; + public SpigotListener(Platform platform) { + this.platform = platform; } @EventHandler(priority = EventPriority.NORMAL) @@ -53,9 +53,9 @@ public class SpigotListener implements Listener { public void onCartographerChange(VillagerAcquireTradeEvent e) { if(!(e.getEntity() instanceof Villager)) return; if(((Villager) e.getEntity()).getProfession().equals(Villager.Profession.CARTOGRAPHER)) { - main.logger().severe("Prevented server crash by stopping Cartographer villager from spawning."); - main.logger().severe("Please upgrade to Paper, which has a StructureLocateEvent that fixes this issue"); - main.logger().severe("at the source, and doesn't require us to do stupid band-aids."); + platform.logger().severe("Prevented server crash by stopping Cartographer villager from spawning."); + platform.logger().severe("Please upgrade to Paper, which has a StructureLocateEvent that fixes this issue"); + platform.logger().severe("at the source, and doesn't require us to do stupid band-aids."); e.setCancelled(true); // Cancel leveling if the villager is a Cartographer, to prevent crashing server. } } @@ -63,9 +63,9 @@ public class SpigotListener implements Listener { @EventHandler public void onCartographerLevel(VillagerCareerChangeEvent e) { if(e.getProfession().equals(Villager.Profession.CARTOGRAPHER)) { - main.logger().severe("Prevented server crash by stopping Cartographer villager from spawning."); - main.logger().severe("Please upgrade to Paper, which has a StructureLocateEvent that fixes this issue"); - main.logger().severe("at the source, and doesn't require us to do stupid band-aids."); + platform.logger().severe("Prevented server crash by stopping Cartographer villager from spawning."); + platform.logger().severe("Please upgrade to Paper, which has a StructureLocateEvent that fixes this issue"); + platform.logger().severe("at the source, and doesn't require us to do stupid band-aids."); e.getEntity().setProfession(Villager.Profession.NITWIT); // Give villager new profession to prevent server crash. e.setCancelled(true); } diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java index 4b13735db..c14e0c0ce 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java @@ -1,5 +1,7 @@ package com.dfsek.terra.bukkit.population; +import com.dfsek.terra.api.Platform; + import org.bukkit.generator.BlockPopulator; import org.jetbrains.annotations.NotNull; @@ -8,7 +10,6 @@ import java.io.IOException; import java.util.HashSet; import java.util.Random; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; @@ -26,11 +27,11 @@ import com.dfsek.terra.util.FastRandom; public class PopulationManager extends BlockPopulator { private final ChunkGenerator generator; private final HashSet needsPop = new HashSet<>(); - private final Platform main; + private final Platform platform; - public PopulationManager(ChunkGenerator generator, Platform main) { + public PopulationManager(ChunkGenerator generator, Platform platform) { this.generator = generator; - this.main = main; + this.platform = platform; } public static File getDataFolder(World w) { @@ -77,12 +78,12 @@ public class PopulationManager extends BlockPopulator { @Override @SuppressWarnings("try") public void populate(org.bukkit.@NotNull World world, @NotNull Random random, org.bukkit.@NotNull Chunk source) { - try(ProfileFrame ignore = main.getProfiler().profile("popman")) { + try(ProfileFrame ignore = platform.getProfiler().profile("popman")) { Chunk chunk = BukkitAdapter.adapt(source); needsPop.add(new ChunkCoordinate(chunk)); int x = chunk.getX(); int z = chunk.getZ(); - if(((PlatformImpl) main).getPlugin().isEnabled()) { + if(((PlatformImpl) platform).getPlugin().isEnabled()) { for(int xi = -1; xi <= 1; xi++) { for(int zi = -1; zi <= 1; zi++) { if(xi == 0 && zi == 0) continue; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java index a12605c80..65e4758dc 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java @@ -1,11 +1,12 @@ package com.dfsek.terra.bukkit.world; +import com.dfsek.terra.api.Platform; + import org.bukkit.TreeType; import java.util.Locale; import java.util.Random; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.util.collection.MaterialSet; @@ -17,16 +18,16 @@ import com.dfsek.terra.api.world.World; public class BukkitTree implements Tree { private final TreeType delegate; private final MaterialSet spawnable; - private final Platform main; + private final Platform platform; - public BukkitTree(TreeType delegate, Platform main) { + public BukkitTree(TreeType delegate, Platform platform) { this.delegate = delegate; - this.main = main; + this.platform = platform; this.spawnable = getSpawnable(delegate); } private MaterialSet getSpawnable(TreeType type) { - WorldHandle handle = main.getWorldHandle(); + WorldHandle handle = platform.getWorldHandle(); return switch(type) { case CRIMSON_FUNGUS -> MaterialSet.get(handle.createBlockData("minecraft:crimson_nylium")); case WARPED_FUNGUS -> MaterialSet.get(handle.createBlockData("minecraft:warped_nylium")); @@ -42,7 +43,7 @@ public class BukkitTree implements Tree { @Override @SuppressWarnings("try") public boolean plant(Vector3 l, World world, Random r) { - try(ProfileFrame ignore = main.getProfiler().profile("bukkit_tree:" + delegate.toString().toLowerCase(Locale.ROOT))) { + try(ProfileFrame ignore = platform.getProfiler().profile("bukkit_tree:" + delegate.toString().toLowerCase(Locale.ROOT))) { return BukkitAdapter.adapt(world).generateTree(BukkitAdapter.adapt(l).toLocation(BukkitAdapter.adapt(world)), delegate); } } diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java index 880246ed1..49c1fa60a 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java @@ -71,7 +71,7 @@ public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.C this.pack = configPack; this.delegate = pack.getGeneratorProvider().newInstance(pack); - delegate.getMain().logger().info("Loading world with config pack " + pack.getID()); + delegate.getPlatform().logger().info("Loading world with config pack " + pack.getID()); this.biomeSource = biomeSource; this.seed = seed;