tilera/classic-worldgen
2
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: move registries out of worldtype

Browse source
This commit is contained in:
Timo Ley 2024-11-09 20:41:40 +01:00
parent 55c39659af
commit d1442fe35a
5 changed files with 198 additions and 170 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/dev/tilera/cwg/ClassicWorldgen.java
View file

@ -10,6 +10,7 @@ import cpw.mods.fml.common.event.FMLServerStoppedEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import dev.tilera.cwg.api.CwgGlobals;
import dev.tilera.cwg.api.hooks.IHookProvider;
import dev.tilera.cwg.api.options.IGeneratorOptionRegistry;
import dev.tilera.cwg.api.utils.BooleanOption;
import dev.tilera.cwg.api.utils.IntOption;
import dev.tilera.cwg.api.utils.StringOption;
@ -26,6 +27,8 @@ import dev.tilera.cwg.hooks.SwissCavegenHook;
import dev.tilera.cwg.noisegen.NoiseGeneratorOctavesFarlands;
import dev.tilera.cwg.options.ChunkManagerOption;
import dev.tilera.cwg.options.ConfigProvider;
import dev.tilera.cwg.options.GeneratorRegistry;
import dev.tilera.cwg.options.OptionRegistry;
import dev.tilera.cwg.proxy.CommonProxy;
import dev.tilera.cwg.vanilla.SingleBiomeChunkManagerFactory;
import dev.tilera.cwg.vanilla.VanillaChunkManagerFactory;
@ -42,7 +45,7 @@ public class ClassicWorldgen {
public static final WorldTypeCustom CUSTOM = new WorldTypeCustom();
public static final WorldTypeClassic CLASSIC = new WorldTypeClassic();
public static final ConfigProvider CONFIG = new ConfigProvider(CUSTOM);
public static ConfigProvider CONFIG;
public static BiomeGenBase[] biomeCache = new BiomeGenBase[256];
@Mod.Instance
@ -53,10 +56,12 @@ public class ClassicWorldgen {
@EventHandler
public void preInit(FMLPreInitializationEvent event) {
Config.initConfig();
CustomDimensions.INSTANCE = new CustomDimensions(CUSTOM);
CwgGlobals.setOptionRegistry(CUSTOM);
IGeneratorOptionRegistry optionRegistry = new OptionRegistry();
CONFIG = new ConfigProvider(optionRegistry);
CustomDimensions.INSTANCE = new CustomDimensions(optionRegistry);
CwgGlobals.setOptionRegistry(optionRegistry);
CwgGlobals.setDefaultProvider(CONFIG);
CwgGlobals.setGeneratorRegistry(CUSTOM);
CwgGlobals.setGeneratorRegistry(new GeneratorRegistry());
CwgGlobals.setHookRegistry(new HookRegistry());
CwgGlobals.setCurrentState(null);
}

171
src/main/java/dev/tilera/cwg/WorldTypeCustom.java
View file

@ -1,37 +1,16 @@
package dev.tilera.cwg;
import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
import java.util.stream.Collectors;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import dev.tilera.cwg.api.CwgGlobals;
import dev.tilera.cwg.api.generator.AbstractChunkManager;
import dev.tilera.cwg.api.generator.IChunkManagerFactory;
import dev.tilera.cwg.api.generator.IChunkManagerRegistry;
import dev.tilera.cwg.api.options.IGeneratorOptionProvider;
import dev.tilera.cwg.api.options.IGeneratorOptionRegistry;
import dev.tilera.cwg.api.options.IOption;
import dev.tilera.cwg.options.OptionProvider;
import net.minecraft.world.World;
import net.minecraft.world.WorldType;
import net.minecraft.world.biome.WorldChunkManager;
import net.minecraft.world.chunk.IChunkProvider;
public class WorldTypeCustom extends WorldType implements IGeneratorOptionRegistry, IChunkManagerRegistry {
private Map<String, IOption<?>> optionRegistry = new HashMap<>();
private Map<String, IChunkManagerFactory> chunkManagerRegistry = new HashMap<>();
private Gson gson = new GsonBuilder().create();
public class WorldTypeCustom extends WorldType {
public WorldTypeCustom() {
super("cwg");
@ -39,16 +18,17 @@ public class WorldTypeCustom extends WorldType implements IGeneratorOptionRegist
@Override
public WorldChunkManager getChunkManager(World world) {
IGeneratorOptionRegistry registry = CwgGlobals.getOptionRegistry();
String opts = world.getWorldInfo().getGeneratorOptions();
IGeneratorOptionProvider options;
if (opts.isEmpty()) {
options = this;
options = registry;
} else {
try {
options = decodeOptions(opts);
options = registry.decodeOptions(opts);
} catch (Exception e) {
e.printStackTrace();
options = this;
options = registry;
}
}
AbstractChunkManager manager = options.getValue("cwg:generator", IChunkManagerFactory.class).createChunkManager(options, world);
@ -65,145 +45,4 @@ public class WorldTypeCustom extends WorldType implements IGeneratorOptionRegist
}
}
@Override
public void registerOption(IOption<?> option) {
optionRegistry.put(option.getID(), option);
}
@Override
public Set<String> getRegisteredOptions() {
return optionRegistry.keySet();
}
@Override
public String encodeOptions(IGeneratorOptionProvider provider) {
JsonObject json = new JsonObject();
IChunkManagerFactory generator = provider.getValue("cwg:generator", IChunkManagerFactory.class);
for (String id : this.getRegisteredOptions()) {
IOption<?> o = optionRegistry.get(id);
if (o == null) {
continue;
} else if (generator != null && o.isGeneratorSpecific() && !generator.hasSpecificOption(o)) {
continue;
} else if (o.getType() == Integer.class) {
json.add(id, new JsonPrimitive(provider.getInt(id)));
} else if (o.getType() == Double.class) {
json.add(id, new JsonPrimitive(provider.getDouble(id)));
} else if (o.getType() == Boolean.class) {
json.add(id, new JsonPrimitive(provider.getBoolean(id)));
} else if (o.getType() == String.class) {
json.add(id, new JsonPrimitive(provider.getString(id)));
} else {
String enc = o.toRepresentation(id, provider);
json.add(id, new JsonPrimitive(enc));
}
}
String jsn = gson.toJson(json);
return Base64.getEncoder().encodeToString(jsn.getBytes());
}
@Override
public IGeneratorOptionProvider decodeOptions(String options) {
String jsn = new String(Base64.getDecoder().decode(options));
JsonObject json = gson.fromJson(jsn, JsonObject.class);
OptionProvider provider = new OptionProvider(this);
for (Entry<String, JsonElement> e : json.entrySet()) {
if (!e.getValue().isJsonPrimitive()) continue;
JsonPrimitive value = e.getValue().getAsJsonPrimitive();
IOption<?> o = optionRegistry.get(e.getKey());
if (o == null) {
continue;
} else if (o.getType() == Integer.class && value.isNumber()) {
provider.putInt(o.getID(), value.getAsInt());
} else if (o.getType() == Double.class && value.isNumber()) {
provider.putDouble(o.getID(), value.getAsDouble());
} else if (o.getType() == Boolean.class && value.isBoolean()) {
provider.putBoolean(o.getID(), value.getAsBoolean());
} else if (o.getType() == String.class && value.isString()) {
provider.putString(o.getID(), value.getAsString());
} else if (value.isString()) {
provider.putValue(o.getID(), o.fromRepresentation(value.getAsString()));
}
}
return provider;
}
@Override
public <T> boolean isRegistered(String id, Class<T> type) {
IOption<?> o = optionRegistry.get(id);
return o != null && o.getType() == type;
}
@SuppressWarnings("unchecked")
private <T> T getOption(String id, Class<T> type, T defaultValue) {
IOption<?> o = optionRegistry.get(id);
if (o == null) {
return defaultValue;
} else if (o.getType().isAssignableFrom(type)) {
return (T) o.getDefault();
}
return defaultValue;
}
@Override
public Integer getInt(String id) {
return getOption(id, Integer.class, null);
}
@Override
public String getString(String id) {
return getOption(id, String.class, null);
}
@Override
public Double getDouble(String id) {
return getOption(id, Double.class, null);
}
@Override
public Boolean getBoolean(String id) {
return getOption(id, Boolean.class, false);
}
@Override
public <T> T getValue(String id, Class<T> type) {
return getOption(id, type, null);
}
@Override
public void registerChunkManager(IChunkManagerFactory factory) {
chunkManagerRegistry.put(factory.getID(), factory);
}
@Override
public IChunkManagerFactory getFactory(String id) {
return chunkManagerRegistry.get(id);
}
@Override
public List<IChunkManagerFactory> getChunkManagers() {
return chunkManagerRegistry.values().stream().collect(Collectors.toList());
}
@SuppressWarnings("unchecked")
@Override
public <T> IOption<T> getOption(String id, Class<T> type) {
IOption<?> opt = optionRegistry.get(id);
if (opt != null && opt.getType() == type) {
return (IOption<T>) optionRegistry.get(id);
} else {
return null;
}
}
@Override
public Class<?> getOptionType(String id) {
IOption<?> opt = optionRegistry.get(id);
if (opt != null) {
return opt.getType();
} else {
return null;
}
}
}

2
src/main/java/dev/tilera/cwg/api/generator/IChunkManagerFactory.java
View file

@ -14,4 +14,6 @@ public interface IChunkManagerFactory {
boolean hasSpecificOption(IOption<?> option);
default void onRegister() {}
}

31
src/main/java/dev/tilera/cwg/options/GeneratorRegistry.java Normal file
View file

@ -0,0 +1,31 @@
package dev.tilera.cwg.options;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import dev.tilera.cwg.api.generator.IChunkManagerFactory;
import dev.tilera.cwg.api.generator.IChunkManagerRegistry;
public class GeneratorRegistry implements IChunkManagerRegistry {
private Map<String, IChunkManagerFactory> registry = new HashMap<>();
@Override
public void registerChunkManager(IChunkManagerFactory factory) {
registry.put(factory.getID(), factory);
factory.onRegister();
}
@Override
public IChunkManagerFactory getFactory(String id) {
return registry.get(id);
}
@Override
public List<IChunkManagerFactory> getChunkManagers() {
return registry.values().stream().collect(Collectors.toList());
}
}

151
src/main/java/dev/tilera/cwg/options/OptionRegistry.java Normal file
View file

@ -0,0 +1,151 @@
package dev.tilera.cwg.options;
import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import dev.tilera.cwg.api.generator.IChunkManagerFactory;
import dev.tilera.cwg.api.options.IGeneratorOptionProvider;
import dev.tilera.cwg.api.options.IGeneratorOptionRegistry;
import dev.tilera.cwg.api.options.IOption;
public class OptionRegistry implements IGeneratorOptionRegistry {
private Map<String, IOption<?>> registry = new HashMap<>();
private Gson gson = new GsonBuilder().create();
@Override
public void registerOption(IOption<?> option) {
registry.put(option.getID(), option);
}
@Override
public Set<String> getRegisteredOptions() {
return registry.keySet();
}
@Override
public String encodeOptions(IGeneratorOptionProvider provider) {
JsonObject json = new JsonObject();
IChunkManagerFactory generator = provider.getValue("cwg:generator", IChunkManagerFactory.class);
for (String id : this.getRegisteredOptions()) {
IOption<?> o = registry.get(id);
if (o == null) {
continue;
} else if (generator != null && o.isGeneratorSpecific() && !generator.hasSpecificOption(o)) {
continue;
} else if (o.getType() == Integer.class) {
json.add(id, new JsonPrimitive(provider.getInt(id)));
} else if (o.getType() == Double.class) {
json.add(id, new JsonPrimitive(provider.getDouble(id)));
} else if (o.getType() == Boolean.class) {
json.add(id, new JsonPrimitive(provider.getBoolean(id)));
} else if (o.getType() == String.class) {
json.add(id, new JsonPrimitive(provider.getString(id)));
} else {
String enc = o.toRepresentation(id, provider);
json.add(id, new JsonPrimitive(enc));
}
}
String jsn = gson.toJson(json);
return Base64.getEncoder().encodeToString(jsn.getBytes());
}
@Override
public IGeneratorOptionProvider decodeOptions(String options) {
String jsn = new String(Base64.getDecoder().decode(options));
JsonObject json = gson.fromJson(jsn, JsonObject.class);
OptionProvider provider = new OptionProvider(this);
for (Entry<String, JsonElement> e : json.entrySet()) {
if (!e.getValue().isJsonPrimitive()) continue;
JsonPrimitive value = e.getValue().getAsJsonPrimitive();
IOption<?> o = registry.get(e.getKey());
if (o == null) {
continue;
} else if (o.getType() == Integer.class && value.isNumber()) {
provider.putInt(o.getID(), value.getAsInt());
} else if (o.getType() == Double.class && value.isNumber()) {
provider.putDouble(o.getID(), value.getAsDouble());
} else if (o.getType() == Boolean.class && value.isBoolean()) {
provider.putBoolean(o.getID(), value.getAsBoolean());
} else if (o.getType() == String.class && value.isString()) {
provider.putString(o.getID(), value.getAsString());
} else if (value.isString()) {
provider.putValue(o.getID(), o.fromRepresentation(value.getAsString()));
}
}
return provider;
}
@Override
public <T> boolean isRegistered(String id, Class<T> type) {
IOption<?> o = registry.get(id);
return o != null && o.getType() == type;
}
@SuppressWarnings("unchecked")
private <T> T getOption(String id, Class<T> type, T defaultValue) {
IOption<?> o = registry.get(id);
if (o == null) {
return defaultValue;
} else if (o.getType().isAssignableFrom(type)) {
return (T) o.getDefault();
}
return defaultValue;
}
@Override
public Integer getInt(String id) {
return getOption(id, Integer.class, null);
}
@Override
public String getString(String id) {
return getOption(id, String.class, null);
}
@Override
public Double getDouble(String id) {
return getOption(id, Double.class, null);
}
@Override
public Boolean getBoolean(String id) {
return getOption(id, Boolean.class, false);
}
@Override
public <T> T getValue(String id, Class<T> type) {
return getOption(id, type, null);
}
@SuppressWarnings("unchecked")
@Override
public <T> IOption<T> getOption(String id, Class<T> type) {
IOption<?> opt = registry.get(id);
if (opt != null && opt.getType() == type) {
return (IOption<T>) registry.get(id);
} else {
return null;
}
}
@Override
public Class<?> getOptionType(String id) {
IOption<?> opt = registry.get(id);
if (opt != null) {
return opt.getType();
} else {
return null;
}
}
}