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

rename main parameters/fields to platform

Browse Source
This commit is contained in:
dfsek
2021-09-26 13:22:45 -07:00
parent 8f51707505
commit 4945a3bbfa
117 changed files with 535 additions and 516 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

@@ -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

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

@@ -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);
}

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

@@ -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)

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

@@ -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

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

@@ -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);
}

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

@@ -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<ChunkCoordinate> 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;

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

@@ -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);
}
}

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java
View File

@@ -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;