mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-03 08:25:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

pass pack to ConfigType#registrySupplier

Browse Source
This commit is contained in:
dfsek 2021-07-20 15:09:51 -07:00
parent c1dfcafa1d
commit d807abb165
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java
View File

@ -39,8 +39,8 @@ public class BiomeConfigType implements ConfigType<BiomeTemplate, TerraBiome> {
}
@Override
public Supplier<OpenRegistry<TerraBiome>> registrySupplier() {
return () -> pack.getRegistryFactory().create(registry -> (TypeLoader<TerraBiome>) (t, c, loader) -> {
public Supplier<OpenRegistry<TerraBiome>> registrySupplier(ConfigPack pack) {
return () -> this.pack.getRegistryFactory().create(registry -> (TypeLoader<TerraBiome>) (t, c, loader) -> {
if(c.equals("SELF")) return null;
TerraBiome obj = registry.get((String) c);
if(obj == null)

4
common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java
View File

@ -36,7 +36,7 @@ public class FloraConfigType implements ConfigType<FloraTemplate, Flora> {
}
@Override
public Supplier<OpenRegistry<Flora>> registrySupplier() {
return pack.getRegistryFactory()::create;
public Supplier<OpenRegistry<Flora>> registrySupplier(ConfigPack pack) {
return this.pack.getRegistryFactory()::create;
}
}

4
common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java
View File

@ -35,7 +35,7 @@ public class OreConfigType implements ConfigType<OreTemplate, Ore> {
}
@Override
public Supplier<OpenRegistry<Ore>> registrySupplier() {
return pack.getRegistryFactory()::create;
public Supplier<OpenRegistry<Ore>> registrySupplier(ConfigPack pack) {
return this.pack.getRegistryFactory()::create;
}
}

4
common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java
View File

@ -41,8 +41,8 @@ public class PaletteConfigType implements ConfigType<PaletteTemplate, Palette> {
}
@Override
public Supplier<OpenRegistry<Palette>> registrySupplier() {
return () -> pack.getRegistryFactory().create(registry -> (TypeLoader<Palette>) (t, c, loader) -> {
public Supplier<OpenRegistry<Palette>> registrySupplier(ConfigPack pack) {
return () -> this.pack.getRegistryFactory().create(registry -> (TypeLoader<Palette>) (t, c, loader) -> {
if(((String) c).startsWith("BLOCK:"))
return new PaletteImpl.Singleton(main.getWorldHandle().createBlockData(((String) c).substring(6))); // Return single palette for BLOCK: shortcut.
Palette obj = registry.get((String) c);

4
common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeConfigType.java
View File

@ -35,7 +35,7 @@ public class TreeConfigType implements ConfigType<TreeTemplate, Tree> {
}
@Override
public Supplier<OpenRegistry<Tree>> registrySupplier() {
return pack.getRegistryFactory()::create;
public Supplier<OpenRegistry<Tree>> registrySupplier(ConfigPack pack) {
return this.pack.getRegistryFactory()::create;
}
}

2
common/api/src/main/java/com/dfsek/terra/api/config/ConfigType.java
View File

@ -13,5 +13,5 @@ public interface ConfigType<T extends AbstractableTemplate, R> {
TypeKey<R> getTypeClass();
Supplier<OpenRegistry<R>> registrySupplier();
Supplier<OpenRegistry<R>> registrySupplier(ConfigPack pack);
}