Merge remote-tracking branch 'PolyhedralDev/ver/6.2.0' into dev/enviroment

This commit is contained in:
Zoë
2022-07-05 01:53:05 -07:00
37 changed files with 630 additions and 269 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
# mixin-common
This project contains mixins shared between Forge & Fabric, as
This project contains mixins shared between Forge, Fabric and Quilt, as
well as glue code.
+1 -1
View File
@@ -22,7 +22,7 @@ dependencies {
}
architectury {
common("fabric", "forge")
common("fabric", "forge", "quilt")
minecraft = Versions.Mod.minecraft
}
@@ -4,8 +4,14 @@ import com.dfsek.tectonic.api.TypeRegistry;
import com.dfsek.tectonic.api.depth.DepthTracker;
import com.dfsek.tectonic.api.exception.LoadException;
import com.dfsek.terra.api.handle.ItemHandle;
import com.dfsek.terra.api.handle.WorldHandle;
import com.dfsek.terra.mod.config.SpawnSettingsTemplate;
import com.dfsek.terra.mod.handle.MinecraftItemHandle;
import com.dfsek.terra.mod.handle.MinecraftWorldHandle;
import com.dfsek.terra.mod.config.VillagerTypeTemplate;
import net.minecraft.entity.EntityType;
@@ -46,10 +52,15 @@ import com.dfsek.terra.mod.config.SpawnGroupTemplate;
import com.dfsek.terra.mod.config.SpawnTypeConfig;
import com.dfsek.terra.mod.util.PresetUtil;
import org.jetbrains.annotations.NotNull;
public abstract class ModPlatform extends AbstractPlatform {
public abstract MinecraftServer getServer();
private final ItemHandle itemHandle = new MinecraftItemHandle();
private final WorldHandle worldHandle = new MinecraftWorldHandle();
public void registerWorldTypes(BiConsumer<Identifier, WorldPreset> registerFunction) {
getRawConfigRegistry()
.forEach(pack -> PresetUtil.createDefault(pack).apply(registerFunction));
@@ -97,4 +108,14 @@ public abstract class ModPlatform extends AbstractPlatform {
}
protected abstract BaseAddon getPlatformAddon();
@Override
public @NotNull WorldHandle getWorldHandle() {
return worldHandle;
}
@Override
public @NotNull ItemHandle getItemHandle() {
return itemHandle;
}
}