mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2026-02-16 02:20:57 +00:00
initial 1.20.3
also disable forge. we're not publishing it anyway
This commit is contained in:
@@ -20,7 +20,8 @@ object Versions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
object Fabric {
|
object Fabric {
|
||||||
const val fabricAPI = "0.90.0+${Mod.minecraft}"
|
// const val fabricAPI = "0.90.0+${Mod.minecraft}"
|
||||||
|
const val fabricAPI = "0.91.1+1.20.3"
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
// object Quilt {
|
// object Quilt {
|
||||||
@@ -31,20 +32,20 @@ object Versions {
|
|||||||
object Mod {
|
object Mod {
|
||||||
const val mixin = "0.12.5+mixin.0.8.5"
|
const val mixin = "0.12.5+mixin.0.8.5"
|
||||||
|
|
||||||
const val minecraft = "1.20.2"
|
const val minecraft = "1.20.3-pre3"
|
||||||
const val yarn = "$minecraft+build.4"
|
const val yarn = "$minecraft+build.1"
|
||||||
const val fabricLoader = "0.14.23"
|
const val fabricLoader = "0.14.25"
|
||||||
|
|
||||||
const val architecuryLoom = "1.3.357"
|
const val architecuryLoom = "1.3.357"
|
||||||
const val architecturyPlugin = "3.4.146"
|
const val architecturyPlugin = "3.4.146"
|
||||||
|
|
||||||
const val loomVineflower = "1.11.0"
|
const val loomVineflower = "1.11.0"
|
||||||
}
|
}
|
||||||
|
//
|
||||||
object Forge {
|
// object Forge {
|
||||||
const val forge = "${Mod.minecraft}-48.0.13"
|
// const val forge = "${Mod.minecraft}-48.0.13"
|
||||||
const val burningwave = "12.63.0"
|
// const val burningwave = "12.63.0"
|
||||||
}
|
// }
|
||||||
|
|
||||||
object Bukkit {
|
object Bukkit {
|
||||||
const val paper = "1.18.2-R0.1-SNAPSHOT"
|
const val paper = "1.18.2-R0.1-SNAPSHOT"
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ dependencies {
|
|||||||
}
|
}
|
||||||
|
|
||||||
architectury {
|
architectury {
|
||||||
common("fabric", "forge")
|
common("fabric")
|
||||||
minecraft = Versions.Mod.minecraft
|
minecraft = Versions.Mod.minecraft
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,8 @@ import net.minecraft.command.argument.BlockArgumentParser;
|
|||||||
import net.minecraft.registry.Registries;
|
import net.minecraft.registry.Registries;
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.dfsek.terra.api.block.state.BlockState;
|
import com.dfsek.terra.api.block.state.BlockState;
|
||||||
import com.dfsek.terra.api.entity.EntityType;
|
import com.dfsek.terra.api.entity.EntityType;
|
||||||
@@ -31,11 +33,21 @@ import com.dfsek.terra.api.handle.WorldHandle;
|
|||||||
|
|
||||||
public class MinecraftWorldHandle implements WorldHandle {
|
public class MinecraftWorldHandle implements WorldHandle {
|
||||||
|
|
||||||
|
|
||||||
private static final BlockState AIR = (BlockState) Blocks.AIR.getDefaultState();
|
private static final BlockState AIR = (BlockState) Blocks.AIR.getDefaultState();
|
||||||
|
|
||||||
|
private static final Logger logger = LoggerFactory.getLogger(MinecraftWorldHandle.class);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NotNull BlockState createBlockState(@NotNull String data) {
|
public @NotNull BlockState createBlockState(@NotNull String data) {
|
||||||
try {
|
try {
|
||||||
|
if(data.equals("minecraft:grass")) { //TODO: remove in 7.0
|
||||||
|
data = "minecraft:short_grass";
|
||||||
|
logger.warn(
|
||||||
|
"Translating minecraft:grass to minecraft:short_grass. In 1.20.3 minecraft:grass was renamed to minecraft:short_grass" +
|
||||||
|
". You are advised to preform this rename in your config backs as this translation will be removed in the next major " +
|
||||||
|
"version of Terra.");
|
||||||
|
}
|
||||||
net.minecraft.block.BlockState state = BlockArgumentParser.block(Registries.BLOCK.getReadOnlyWrapper(), data, true)
|
net.minecraft.block.BlockState state = BlockArgumentParser.block(Registries.BLOCK.getReadOnlyWrapper(), data, true)
|
||||||
.blockState();
|
.blockState();
|
||||||
if(state == null) throw new IllegalArgumentException("Invalid data: " + data);
|
if(state == null) throw new IllegalArgumentException("Invalid data: " + data);
|
||||||
|
|||||||
@@ -17,8 +17,8 @@
|
|||||||
|
|
||||||
package com.dfsek.terra.mod.mixin.access;
|
package com.dfsek.terra.mod.mixin.access;
|
||||||
|
|
||||||
import net.minecraft.world.MobSpawnerEntry;
|
import net.minecraft.block.spawner.MobSpawnerEntry;
|
||||||
import net.minecraft.world.MobSpawnerLogic;
|
import net.minecraft.block.spawner.MobSpawnerLogic;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||||
|
|
||||||
|
|||||||
@@ -21,11 +21,11 @@ import net.minecraft.block.BlockState;
|
|||||||
import net.minecraft.block.entity.BlockEntity;
|
import net.minecraft.block.entity.BlockEntity;
|
||||||
import net.minecraft.block.entity.BlockEntityType;
|
import net.minecraft.block.entity.BlockEntityType;
|
||||||
import net.minecraft.block.entity.MobSpawnerBlockEntity;
|
import net.minecraft.block.entity.MobSpawnerBlockEntity;
|
||||||
|
import net.minecraft.block.spawner.MobSpawnerLogic;
|
||||||
import net.minecraft.registry.Registries;
|
import net.minecraft.registry.Registries;
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.util.math.random.Random;
|
import net.minecraft.util.math.random.Random;
|
||||||
import net.minecraft.world.MobSpawnerLogic;
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.spongepowered.asm.mixin.Implements;
|
import org.spongepowered.asm.mixin.Implements;
|
||||||
import org.spongepowered.asm.mixin.Interface;
|
import org.spongepowered.asm.mixin.Interface;
|
||||||
|
|||||||
Reference in New Issue
Block a user