mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-24 00:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename TerraPlugin to Platform

Browse Source
This commit is contained in:
dfsek
2021-09-26 13:02:19 -07:00
parent e7b13d2063
commit 3de02c5d63
124 changed files with 314 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitAddon.java
View File

@@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.Platform;
import com.dfsek.terra.api.addon.TerraAddon;
import com.dfsek.terra.api.addon.annotations.Addon;
import com.dfsek.terra.api.addon.annotations.Author;
@@ -11,9 +11,9 @@ import com.dfsek.terra.api.addon.annotations.Version;
@Version("1.0.0")
@Author("Terra")
final class BukkitAddon extends TerraAddon {
private final TerraPlugin main;
private final Platform main;
public BukkitAddon(TerraPlugin main) {
public BukkitAddon(Platform main) {
this.main = main;
}

6
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraPluginImpl.java → platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java
View File

@@ -9,7 +9,7 @@ import java.io.File;
import java.util.Locale;
import java.util.Optional;
import com.dfsek.terra.AbstractTerraPlugin;
import com.dfsek.terra.AbstractPlatform;
import com.dfsek.terra.api.util.Logger;
import com.dfsek.terra.api.addon.TerraAddon;
import com.dfsek.terra.api.block.state.BlockState;
@@ -22,14 +22,14 @@ import com.dfsek.terra.bukkit.world.BukkitBiome;
import com.dfsek.terra.util.logging.JavaLogger;
public class TerraPluginImpl extends AbstractTerraPlugin {
public class PlatformImpl extends AbstractPlatform {
private final ItemHandle itemHandle = new BukkitItemHandle();
private final WorldHandle handle = new BukkitWorldHandle();
private final TerraBukkitPlugin plugin;
public TerraPluginImpl(TerraBukkitPlugin plugin) {
public PlatformImpl(TerraBukkitPlugin plugin) {
this.plugin = plugin;
load();
}

2
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
View File

@@ -42,7 +42,7 @@ public class TerraBukkitPlugin extends JavaPlugin {
else BUKKIT_VERSION = BukkitVersion.UNKNOWN;
}
private final TerraPluginImpl terraPlugin = new TerraPluginImpl(this);
private final PlatformImpl terraPlugin = new PlatformImpl(this);
private final Map<String, com.dfsek.terra.api.world.generator.ChunkGenerator> generatorMap = new HashMap<>();
private final Map<String, ConfigPack> worlds = new HashMap<>();

4
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java
View File

@@ -12,7 +12,7 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.Platform;
import com.dfsek.terra.api.config.WorldConfig;
import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.world.generator.ChunkGenerator;
@@ -30,7 +30,7 @@ public class BukkitChunkGeneratorWrapper extends org.bukkit.generator.ChunkGener
private final ChunkGenerator delegate;
private final TerraPlugin main;
private final Platform main;
private boolean needsLoad = true;

6
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java
View File

@@ -9,7 +9,7 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.world.StructureGrowEvent;
import com.dfsek.terra.api.TerraPlugin;
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,9 +34,9 @@ public class CommonListener implements Listener {
.add(TreeType.MEGA_REDWOOD, "MEGA_SPRUCE")
.add(TreeType.SWAMP, "SWAMP_OAK"))
.addTransform(TreeType::toString).build();
private final TerraPlugin main;
private final Platform main;
public CommonListener(TerraPlugin main) {
public CommonListener(Platform main) {
this.main = main;
}

6
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java
View File

@@ -4,13 +4,13 @@ import io.papermc.paper.event.world.StructureLocateEvent;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.Platform;
public class PaperListener implements Listener {
private final TerraPlugin main;
private final Platform main;
public PaperListener(TerraPlugin main) {
public PaperListener(Platform main) {
this.main = main;
}

6
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java
View File

@@ -8,7 +8,7 @@ import org.bukkit.event.entity.EntitySpawnEvent;
import org.bukkit.event.entity.VillagerAcquireTradeEvent;
import org.bukkit.event.entity.VillagerCareerChangeEvent;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.Platform;
/**
@@ -18,9 +18,9 @@ import com.dfsek.terra.api.TerraPlugin;
* StructureLocateEvent).
*/
public class SpigotListener implements Listener {
private final TerraPlugin main;
private final Platform main;
public SpigotListener(TerraPlugin main) {
public SpigotListener(Platform main) {
this.main = main;
}

10
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java
View File

@@ -8,13 +8,13 @@ import java.io.IOException;
import java.util.HashSet;
import java.util.Random;
import com.dfsek.terra.api.TerraPlugin;
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;
import com.dfsek.terra.api.world.generator.ChunkGenerator;
import com.dfsek.terra.api.world.generator.Chunkified;
import com.dfsek.terra.bukkit.TerraPluginImpl;
import com.dfsek.terra.bukkit.PlatformImpl;
import com.dfsek.terra.bukkit.world.BukkitAdapter;
import com.dfsek.terra.bukkit.world.BukkitWorld;
import com.dfsek.terra.util.FastRandom;
@@ -26,9 +26,9 @@ import com.dfsek.terra.util.FastRandom;
public class PopulationManager extends BlockPopulator {
private final ChunkGenerator generator;
private final HashSet<ChunkCoordinate> needsPop = new HashSet<>();
private final TerraPlugin main;
private final Platform main;
public PopulationManager(ChunkGenerator generator, TerraPlugin main) {
public PopulationManager(ChunkGenerator generator, Platform main) {
this.generator = generator;
this.main = main;
}
@@ -82,7 +82,7 @@ public class PopulationManager extends BlockPopulator {
needsPop.add(new ChunkCoordinate(chunk));
int x = chunk.getX();
int z = chunk.getZ();
if(((TerraPluginImpl) main).getPlugin().isEnabled()) {
if(((PlatformImpl) main).getPlugin().isEnabled()) {
for(int xi = -1; xi <= 1; xi++) {
for(int zi = -1; zi <= 1; zi++) {
if(xi == 0 && zi == 0) continue;

6
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java
View File

@@ -5,7 +5,7 @@ import org.bukkit.TreeType;
import java.util.Locale;
import java.util.Random;
import com.dfsek.terra.api.TerraPlugin;
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,9 +17,9 @@ import com.dfsek.terra.api.world.World;
public class BukkitTree implements Tree {
private final TreeType delegate;
private final MaterialSet spawnable;
private final TerraPlugin main;
private final Platform main;
public BukkitTree(TreeType delegate, TerraPlugin main) {
public BukkitTree(TreeType delegate, Platform main) {
this.delegate = delegate;
this.main = main;
this.spawnable = getSpawnable(delegate);

4
platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricAddon.java
View File

@@ -33,10 +33,10 @@ import com.dfsek.terra.fabric.util.FabricUtil;
@Author("Terra")
@Version("1.0.0")
public final class FabricAddon extends TerraAddon {
private final TerraPluginImpl terraFabricPlugin;
private final PlatformImpl terraFabricPlugin;
private final Map<ConfigPack, Pair<PreLoadCompatibilityOptions, PostLoadCompatibilityOptions>> templates = new HashMap<>();
public FabricAddon(TerraPluginImpl terraFabricPlugin) {
public FabricAddon(PlatformImpl terraFabricPlugin) {
this.terraFabricPlugin = terraFabricPlugin;
}

4
platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricEntryPoint.java
View File

@@ -20,9 +20,9 @@ public class FabricEntryPoint implements ModInitializer {
public static final PopulatorFeature POPULATOR_FEATURE = new PopulatorFeature(DefaultFeatureConfig.CODEC);
public static final ConfiguredFeature<?, ?> POPULATOR_CONFIGURED_FEATURE = POPULATOR_FEATURE.configure(FeatureConfig.DEFAULT).decorate(
Decorator.NOPE.configure(NopeDecoratorConfig.INSTANCE));
private static final TerraPluginImpl TERRA_PLUGIN = new TerraPluginImpl();
private static final PlatformImpl TERRA_PLUGIN = new PlatformImpl();
public static TerraPluginImpl getTerraPlugin() {
public static PlatformImpl getTerraPlugin() {
return TERRA_PLUGIN;
}

6
platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraPluginImpl.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/PlatformImpl.java
View File

@@ -10,7 +10,7 @@ import org.apache.logging.log4j.LogManager;
import java.io.File;
import java.util.Optional;
import com.dfsek.terra.AbstractTerraPlugin;
import com.dfsek.terra.AbstractPlatform;
import com.dfsek.terra.api.util.Logger;
import com.dfsek.terra.api.addon.TerraAddon;
import com.dfsek.terra.api.handle.ItemHandle;
@@ -22,13 +22,13 @@ import com.dfsek.terra.fabric.handle.FabricWorldHandle;
import com.dfsek.terra.fabric.util.ProtoBiome;
public class TerraPluginImpl extends AbstractTerraPlugin {
public class PlatformImpl extends AbstractPlatform {
private final ItemHandle itemHandle = new FabricItemHandle();
private final WorldHandle worldHandle = new FabricWorldHandle();
private final Lazy<File> dataFolder = Lazy.lazy(() -> new File(FabricLoader.getInstance().getConfigDir().toFile(), "Terra"));
public TerraPluginImpl() {
public PlatformImpl() {
load();
}

4
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java
View File

@@ -19,7 +19,7 @@ import java.util.Random;
import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.fabric.FabricEntryPoint;
import com.dfsek.terra.fabric.TerraPluginImpl;
import com.dfsek.terra.fabric.PlatformImpl;
import com.dfsek.terra.fabric.event.BiomeRegistrationEvent;
import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
import com.dfsek.terra.fabric.generation.TerraBiomeSource;
@@ -37,7 +37,7 @@ public abstract class GeneratorOptionsMixin {
return;
}
TerraPluginImpl main = FabricEntryPoint.getTerraPlugin();
PlatformImpl main = FabricEntryPoint.getTerraPlugin();
String prop = properties.get("level-type").toString().trim();
if(prop.startsWith("Terra")) {

6
platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraPluginImpl.java → platforms/sponge/src/main/java/com/dfsek/terra/sponge/PlatformImpl.java
View File

@@ -4,18 +4,18 @@ import org.spongepowered.api.Sponge;
import java.io.File;
import com.dfsek.terra.AbstractTerraPlugin;
import com.dfsek.terra.AbstractPlatform;
import com.dfsek.terra.api.util.Logger;
import com.dfsek.terra.api.handle.ItemHandle;
import com.dfsek.terra.api.handle.WorldHandle;
import com.dfsek.terra.sponge.handle.SpongeWorldHandle;
public class TerraPluginImpl extends AbstractTerraPlugin {
public class PlatformImpl extends AbstractPlatform {
private final TerraSpongePlugin plugin;
private final SpongeWorldHandle worldHandle = new SpongeWorldHandle();
public TerraPluginImpl(TerraSpongePlugin plugin) {
public PlatformImpl(TerraSpongePlugin plugin) {
this.plugin = plugin;
load();
}

6
platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java
View File

@@ -9,12 +9,12 @@ import org.spongepowered.plugin.builtin.jvm.Plugin;
@Plugin("terra")
public class TerraSpongePlugin {
private final PluginContainer plugin;
private final TerraPluginImpl terraPlugin;
private final PlatformImpl terraPlugin;
@Inject
public TerraSpongePlugin(PluginContainer plugin, Game game) {
this.plugin = plugin;
this.terraPlugin = new TerraPluginImpl(this);
this.terraPlugin = new PlatformImpl(this);
game.eventManager().registerListeners(plugin, new SpongeListener(this));
}
@@ -22,7 +22,7 @@ public class TerraSpongePlugin {
return plugin;
}
public TerraPluginImpl getTerraPlugin() {
public PlatformImpl getTerraPlugin() {
return terraPlugin;
}
}