From ae72d29ec34b6984b4d4b28d76359a6aa90e65ec Mon Sep 17 00:00:00 2001 From: Adubbz Date: Tue, 20 Jan 2015 19:06:10 +1100 Subject: [PATCH] Removed the current properties system whilst it's being redone --- .../api/biome/BiomeProperty.java | 34 ------------------- .../api/biome/IExtendedBiome.java | 3 -- .../config/BiomeConfigurationHandler.java | 20 ----------- .../common/mixin/biome/MixinBiomeGenBase.java | 25 -------------- .../common/util/config/JsonBiome.java | 5 --- 5 files changed, 87 deletions(-) delete mode 100644 src/main/java/biomesoplenty/api/biome/BiomeProperty.java diff --git a/src/main/java/biomesoplenty/api/biome/BiomeProperty.java b/src/main/java/biomesoplenty/api/biome/BiomeProperty.java deleted file mode 100644 index f46e4a995..000000000 --- a/src/main/java/biomesoplenty/api/biome/BiomeProperty.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright 2014-2015, the Biomes O' Plenty Team - * - * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License. - * - * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. - ******************************************************************************/ - -package biomesoplenty.api.biome; - -public enum BiomeProperty -{ - GRASS_PER_CHUNK(1), - FLOWERS_PER_CHUNK(2); - - private Object defaultValue; - - private BiomeProperty() {} - - private BiomeProperty(Object defaultValue) - { - this.defaultValue = defaultValue; - } - - public String getName() - { - return this.name().toLowerCase(); - } - - public Object getDefaultValue() - { - return this.defaultValue; - } -} diff --git a/src/main/java/biomesoplenty/api/biome/IExtendedBiome.java b/src/main/java/biomesoplenty/api/biome/IExtendedBiome.java index 9bb4d20dd..58ff601f9 100644 --- a/src/main/java/biomesoplenty/api/biome/IExtendedBiome.java +++ b/src/main/java/biomesoplenty/api/biome/IExtendedBiome.java @@ -13,7 +13,4 @@ import java.util.Map; public interface IExtendedBiome { public BiomeOwner getBiomeOwner(); - public void setProperty(BiomeProperty property, Object value); - public Object getProperty(BiomeProperty property); - public Map getPropertyMap(); } diff --git a/src/main/java/biomesoplenty/common/config/BiomeConfigurationHandler.java b/src/main/java/biomesoplenty/common/config/BiomeConfigurationHandler.java index 3b1fca5f9..cec9130bd 100644 --- a/src/main/java/biomesoplenty/common/config/BiomeConfigurationHandler.java +++ b/src/main/java/biomesoplenty/common/config/BiomeConfigurationHandler.java @@ -18,7 +18,6 @@ import net.minecraft.world.biome.BiomeGenBase; import org.apache.commons.io.FileUtils; import biomesoplenty.api.biome.BiomeOwner; -import biomesoplenty.api.biome.BiomeProperty; import biomesoplenty.api.biome.IExtendedBiome; import biomesoplenty.common.util.config.JsonBiome; import biomesoplenty.common.util.config.JsonEntitySpawn; @@ -130,11 +129,6 @@ public class BiomeConfigurationHandler if (extendedBiome.getBiomeOwner() == BiomeOwner.OTHER) { - extendedBiome.setProperty(BiomeProperty.GRASS_PER_CHUNK, biome.theBiomeDecorator.grassPerChunk); - //TODO: Create our own implementations - //biome.theBiomeDecorator.grassPerChunk = 0; - extendedBiome.setProperty(BiomeProperty.FLOWERS_PER_CHUNK, biome.theBiomeDecorator.flowersPerChunk); - //biome.theBiomeDecorator.flowersPerChunk = 0; } } @@ -153,19 +147,5 @@ public class BiomeConfigurationHandler JsonEntitySpawn.addBiomeEntitySpawns(biome, jsonBiome); IExtendedBiome extendedBiome = (IExtendedBiome)biome; - - if (!jsonBiome.decorationProperties.isEmpty()) - { - for (Entry entry : jsonBiome.decorationProperties.entrySet()) - { - BiomeProperty property = entry.getKey(); - Object value = entry.getValue(); - - if (property != null) - { - extendedBiome.setProperty(property, value); - } - } - } } } diff --git a/src/main/java/biomesoplenty/common/mixin/biome/MixinBiomeGenBase.java b/src/main/java/biomesoplenty/common/mixin/biome/MixinBiomeGenBase.java index 567de02d1..f406b5d0d 100644 --- a/src/main/java/biomesoplenty/common/mixin/biome/MixinBiomeGenBase.java +++ b/src/main/java/biomesoplenty/common/mixin/biome/MixinBiomeGenBase.java @@ -8,9 +8,6 @@ package biomesoplenty.common.mixin.biome; -import java.util.HashMap; -import java.util.Map; - import net.minecraft.world.biome.BiomeGenBase; import org.spongepowered.asm.mixin.Mixin; @@ -19,20 +16,17 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import biomesoplenty.api.biome.BiomeOwner; -import biomesoplenty.api.biome.BiomeProperty; import biomesoplenty.api.biome.IExtendedBiome; @Mixin(BiomeGenBase.class) public abstract class MixinBiomeGenBase implements IExtendedBiome { private BiomeOwner biomeOwner; - private HashMap properties; @Inject(method = "(IZ)V", at = @At("RETURN")) private void onConstructed(int biomeId, boolean register, CallbackInfo callbackInfo) { this.biomeOwner = BiomeOwner.OTHER; - this.properties = new HashMap(); } @Override @@ -40,23 +34,4 @@ public abstract class MixinBiomeGenBase implements IExtendedBiome { return biomeOwner; } - - @Override - public void setProperty(BiomeProperty property, Object value) - { - if (property.getDefaultValue() != value) - this.properties.put(property, value); - } - - @Override - public Object getProperty(BiomeProperty property) - { - return this.properties.get(property); - } - - @Override - public Map getPropertyMap() - { - return properties; - } } diff --git a/src/main/java/biomesoplenty/common/util/config/JsonBiome.java b/src/main/java/biomesoplenty/common/util/config/JsonBiome.java index ae479624f..f3fbb777e 100644 --- a/src/main/java/biomesoplenty/common/util/config/JsonBiome.java +++ b/src/main/java/biomesoplenty/common/util/config/JsonBiome.java @@ -9,12 +9,9 @@ package biomesoplenty.common.util.config; import java.util.ArrayList; -import java.util.Map; import net.minecraft.block.state.IBlockState; import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.api.biome.BiomeProperty; -import biomesoplenty.api.biome.IExtendedBiome; import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; @@ -37,7 +34,6 @@ public class JsonBiome public int color; public int waterColorMultiplier; public ArrayList entities; - public Map decorationProperties; public static JsonBiome createFromBiomeGenBase(BiomeGenBase baseBiome) { @@ -54,7 +50,6 @@ public class JsonBiome biome.color = baseBiome.color; biome.waterColorMultiplier = baseBiome.waterColorMultiplier; biome.entities = JsonEntitySpawn.getBiomeEntitySpawns(baseBiome); - biome.decorationProperties = ((IExtendedBiome)baseBiome).getPropertyMap(); return biome; }