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

Biome -> PlatformBiome

Browse Source
This commit is contained in:
dfsek
2021-12-04 17:46:26 -07:00
parent 4d2639207d
commit 16c80a0976
10 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,10 +29,10 @@ import com.dfsek.terra.AbstractPlatform;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.handle.ItemHandle;
import com.dfsek.terra.api.handle.WorldHandle;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.PlatformBiome;
import com.dfsek.terra.bukkit.handles.BukkitItemHandle;
import com.dfsek.terra.bukkit.handles.BukkitWorldHandle;
import com.dfsek.terra.bukkit.world.BukkitBiome;
import com.dfsek.terra.bukkit.world.BukkitPlatformBiome;
import org.jetbrains.annotations.NotNull;
@@ -87,13 +87,13 @@ public class PlatformImpl extends AbstractPlatform {
public void register(TypeRegistry registry) {
super.register(registry);
registry.registerLoader(BlockState.class, (t, o, l) -> handle.createBlockData((String) o))
.registerLoader(Biome.class, (t, o, l) -> parseBiome((String) o))
.registerLoader(PlatformBiome.class, (t, o, l) -> parseBiome((String) o))
.registerLoader(EntityType.class, (t, o, l) -> EntityType.valueOf((String) o));
}
private BukkitBiome parseBiome(String id) throws LoadException {
private BukkitPlatformBiome parseBiome(String id) throws LoadException {
if(!id.startsWith("minecraft:")) throw new LoadException("Invalid biome identifier " + id);
return new BukkitBiome(org.bukkit.block.Biome.valueOf(id.toUpperCase(Locale.ROOT).substring(10)));
return new BukkitPlatformBiome(org.bukkit.block.Biome.valueOf(id.toUpperCase(Locale.ROOT).substring(10)));
}
}

6
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiome.java → platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitPlatformBiome.java
View File

@@ -17,13 +17,13 @@
package com.dfsek.terra.bukkit.world;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.PlatformBiome;
public class BukkitBiome implements Biome {
public class BukkitPlatformBiome implements PlatformBiome {
private final org.bukkit.block.Biome biome;
public BukkitBiome(org.bukkit.block.Biome biome) {
public BukkitPlatformBiome(org.bukkit.block.Biome biome) {
this.biome = biome;
}

11
platforms/fabric/src/main/java/com/dfsek/terra/fabric/PlatformImpl.java
View File

@@ -22,6 +22,9 @@ import ca.solostudios.strata.parser.tokenizer.ParseException;
import ca.solostudios.strata.version.Version;
import com.dfsek.tectonic.exception.LoadException;
import com.dfsek.tectonic.loading.TypeRegistry;
import com.dfsek.terra.api.world.biome.PlatformBiome;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.MinecraftVersion;
import net.minecraft.server.world.ServerWorld;
@@ -46,7 +49,7 @@ import com.dfsek.terra.api.util.generic.Lazy;
import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
import com.dfsek.terra.fabric.handle.FabricItemHandle;
import com.dfsek.terra.fabric.handle.FabricWorldHandle;
import com.dfsek.terra.fabric.util.ProtoBiome;
import com.dfsek.terra.fabric.util.ProtoPlatformBiome;
public class PlatformImpl extends AbstractPlatform {
@@ -135,7 +138,7 @@ public class PlatformImpl extends AbstractPlatform {
@Override
public void register(TypeRegistry registry) {
super.register(registry);
registry.registerLoader(com.dfsek.terra.api.world.biome.Biome.class, (t, o, l) -> parseBiome((String) o))
registry.registerLoader(PlatformBiome.class, (t, o, l) -> parseBiome((String) o))
.registerLoader(Identifier.class, (t, o, l) -> {
Identifier identifier = Identifier.tryParse((String) o);
if(identifier == null)
@@ -145,9 +148,9 @@ public class PlatformImpl extends AbstractPlatform {
}
private ProtoBiome parseBiome(String id) throws LoadException {
private ProtoPlatformBiome parseBiome(String id) throws LoadException {
Identifier identifier = Identifier.tryParse(id);
if(BuiltinRegistries.BIOME.get(identifier) == null) throw new LoadException("Invalid Biome ID: " + identifier); // failure.
return new ProtoBiome(identifier);
return new ProtoPlatformBiome(identifier);
}
}

4
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/BiomeMixin.java
View File

@@ -17,6 +17,8 @@
package com.dfsek.terra.fabric.mixin.implementations;
import com.dfsek.terra.api.world.biome.PlatformBiome;
import net.minecraft.world.biome.Biome;
import org.spongepowered.asm.mixin.Implements;
import org.spongepowered.asm.mixin.Interface;
@@ -25,7 +27,7 @@ import org.spongepowered.asm.mixin.Mixin;
@Mixin(Biome.class)
@Implements(@Interface(iface = com.dfsek.terra.api.world.biome.Biome.class, prefix = "terra$", remap = Interface.Remap.NONE))
@Implements(@Interface(iface = PlatformBiome.class, prefix = "terra$", remap = Interface.Remap.NONE))
public abstract class BiomeMixin {
@Intrinsic
public Object terra$getHandle() {

3
platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java
View File

@@ -46,7 +46,6 @@ import com.dfsek.terra.api.block.entity.MobSpawner;
import com.dfsek.terra.api.block.entity.Sign;
import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.fabric.FabricEntryPoint;
import com.dfsek.terra.fabric.mixin.access.BiomeEffectsAccessor;
@@ -70,7 +69,7 @@ public final class FabricUtil {
//TerraFabricPlugin.FabricAddon fabricAddon = TerraFabricPlugin.getInstance().getFabricAddon();
Registry<Biome> biomeRegistry = registryManager.get(Registry.BIOME_KEY);
Biome vanilla = ((ProtoBiome) (new ArrayList<>(biome.getVanillaBiomes().getContents()).get(0))).get(biomeRegistry);
Biome vanilla = ((ProtoPlatformBiome) (new ArrayList<>(biome.getVanillaBiomes().getContents()).get(0))).get(biomeRegistry);
GenerationSettings.Builder generationSettings = new GenerationSettings.Builder();

6
platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/ProtoBiome.java → platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/ProtoPlatformBiome.java
View File

@@ -20,13 +20,13 @@ package com.dfsek.terra.fabric.util;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.PlatformBiome;
public class ProtoBiome implements Biome {
public class ProtoPlatformBiome implements PlatformBiome {
private final Identifier identifier;
public ProtoBiome(Identifier identifier) {
public ProtoPlatformBiome(Identifier identifier) {
this.identifier = identifier;
}