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

Merge remote-tracking branch 'origin/ver/7.0.0' into dev/pure

Browse Source
This commit is contained in:
dfsek
2022-08-28 21:39:36 -07:00
parent 91766599c6 a0738a3b32
commit 3077178cd2
13 changed files with 102 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/fabric/build.gradle.kts
+2
View File
@@ -19,6 +19,8 @@ dependencies {
"developmentFabric"(project(path = ":platforms:mixin-lifecycle", configuration = "namedElements")) { isTransitive = false }
shaded(project(path = ":platforms:mixin-lifecycle", configuration = "transformProductionFabric")) { isTransitive = false }
modRuntimeOnly(libs.mod.fabric.fabric.api)
minecraft(libs.mod.minecraft)
mappings("net.fabricmc", "yarn", libs.versions.mod.yarn.get(), classifier = "v2")
platforms/mixin-common/src/main/java/com/dfsek/terra/mod/MinecraftAddon.java
+3 -6
View File
@@ -22,6 +22,7 @@ import ca.solostudios.strata.version.Version;
import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.event.events.PackEvent;
import com.dfsek.terra.mod.config.VanillaWorldProperties;
import com.dfsek.terra.mod.util.MinecraftUtil;
@@ -52,12 +53,8 @@ public abstract class MinecraftAddon implements BaseAddon {
public void initialize() {
modPlatform.getEventManager()
.getHandler(FunctionalEventHandler.class)
.register(this, ConfigurationLoadEvent.class)
.then(event -> {
if(event.is(ConfigPack.class)) {
event.getLoadedObject(ConfigPack.class).getContext().put(event.load(new VanillaWorldProperties()));
}
})
.register(this, ConfigPackPreLoadEvent.class)
.then(event -> event.loadTemplate(new VanillaWorldProperties()))
.global();
modPlatform.getEventManager()
.getHandler(FunctionalEventHandler.class)
platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VanillaWorldProperties.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class VanillaWorldProperties implements ConfigTemplate, Properties {
@Default
private Boolean respawnAnchorWorks = false;
@Value("minecraft.height")
@Value("minecraft.height.range")
@Default
private Range height = new ConstantRange(0, 16);
platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/BiomeUtil.java
+11 -9
View File
@@ -40,12 +40,18 @@ public class BiomeUtil {
logger.info("Terra biomes registered.");
}
public static RegistryKey<net.minecraft.world.biome.Biome> registerKey(Identifier identifier) {
return RegistryKey.of(Registry.BIOME_KEY, identifier);
}
protected static RegistryKey<net.minecraft.world.biome.Biome> registerBiome(Identifier identifier,
net.minecraft.world.biome.Biome biome) {
BuiltinRegistries.add(BuiltinRegistries.BIOME,
MinecraftUtil.registerKey(identifier)
.getValue(),
biome);
RegistryKey key = registerKey(identifier);
if(!BuiltinRegistries.BIOME.contains(key)) {
BuiltinRegistries.add(BuiltinRegistries.BIOME,
key.getValue(),
biome);
}
return getBiomeKey(identifier);
}
@@ -62,11 +68,7 @@ public class BiomeUtil {
protected static void registerBiome(Biome biome, ConfigPack pack,
com.dfsek.terra.api.registry.key.RegistryKey id) {
VanillaBiomeProperties vanillaBiomeProperties;
if (biome.getContext().has(VanillaBiomeProperties.class)) {
vanillaBiomeProperties = biome.getContext().get(VanillaBiomeProperties.class);
} else {
vanillaBiomeProperties = new VanillaBiomeProperties();
}
vanillaBiomeProperties = biome.getContext().get(VanillaBiomeProperties.class);
net.minecraft.world.biome.Biome minecraftBiome = MinecraftUtil.createBiome(vanillaBiomeProperties);
platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/DimensionUtil.java
+8 -9
View File
@@ -18,10 +18,13 @@ import java.util.OptionalLong;
public class DimensionUtil {
protected static RegistryKey<DimensionType> registerDimension(Identifier identifier,
DimensionType dimension) {
BuiltinRegistries.add(BuiltinRegistries.DIMENSION_TYPE,
registerKey(identifier)
.getValue(),
dimension);
RegistryKey key = registerKey(identifier);
if(!BuiltinRegistries.BIOME.contains(key)) {
BuiltinRegistries.add(BuiltinRegistries.DIMENSION_TYPE,
key
.getValue(),
dimension);
}
return getDimensionKey(identifier);
}
@@ -34,11 +37,7 @@ public class DimensionUtil {
protected static RegistryKey<DimensionType> registerDimension(ConfigPack pack) {
VanillaWorldProperties vanillaWorldProperties;
if (pack.getContext().has(VanillaBiomeProperties.class)) {
vanillaWorldProperties = pack.getContext().get(VanillaWorldProperties.class);
} else {
vanillaWorldProperties = new VanillaWorldProperties();
}
vanillaWorldProperties = pack.getContext().get(VanillaWorldProperties.class);
DimensionType overworldDimensionType = new DimensionType(
vanillaWorldProperties.getFixedTime() == null ? OptionalLong.empty() : OptionalLong.of(vanillaWorldProperties.getFixedTime()),
platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java
-4
View File
@@ -68,10 +68,6 @@ public final class MinecraftUtil {
TerraIntProvider.TERRA_RANGE_TYPE_TO_INT_PROVIDER_TYPE.put(ConstantRange.class, CONSTANT);
}
public static RegistryKey<Biome> registerKey(Identifier identifier) {
return RegistryKey.of(Registry.BIOME_KEY, identifier);
}
public static Biome createBiome(VanillaBiomeProperties vanillaBiomeProperties) {
GenerationSettings.Builder generationSettings = new GenerationSettings.Builder();
platforms/mixin-common/src/main/resources/terra.common.mixins.json
-1
View File
@@ -4,7 +4,6 @@
"package": "com.dfsek.terra.mod.mixin",
"compatibilityLevel": "JAVA_17",
"mixins": [
"access.BiomeAccessor",
"access.MobSpawnerLogicAccessor",
"access.StateAccessor",
"access.StructureAccessorAccessor",