From aecdcd578cdb3e6b592214a58bf8e50e14cd8aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Mon, 27 Nov 2023 13:35:48 -0700 Subject: [PATCH] initial 1.20.3 also disable forge. we're not publishing it anyway --- buildSrc/src/main/kotlin/Versions.kt | 19 ++++++++++--------- ...d.gradle.kts => build.gradle.kts.disabled} | 0 platforms/mixin-common/build.gradle.kts | 2 +- .../mod/handle/MinecraftWorldHandle.java | 12 ++++++++++++ .../mixin/access/MobSpawnerLogicAccessor.java | 4 ++-- .../entity/MobSpawnerBlockEntityMixin.java | 2 +- 6 files changed, 26 insertions(+), 13 deletions(-) rename platforms/forge/{build.gradle.kts => build.gradle.kts.disabled} (100%) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 18dbd85fe..28efbc1e6 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -20,7 +20,8 @@ object Versions { } 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 { @@ -31,20 +32,20 @@ object Versions { object Mod { const val mixin = "0.12.5+mixin.0.8.5" - const val minecraft = "1.20.2" - const val yarn = "$minecraft+build.4" - const val fabricLoader = "0.14.23" + const val minecraft = "1.20.3-pre3" + const val yarn = "$minecraft+build.1" + const val fabricLoader = "0.14.25" const val architecuryLoom = "1.3.357" const val architecturyPlugin = "3.4.146" const val loomVineflower = "1.11.0" } - - object Forge { - const val forge = "${Mod.minecraft}-48.0.13" - const val burningwave = "12.63.0" - } +// +// object Forge { +// const val forge = "${Mod.minecraft}-48.0.13" +// const val burningwave = "12.63.0" +// } object Bukkit { const val paper = "1.18.2-R0.1-SNAPSHOT" diff --git a/platforms/forge/build.gradle.kts b/platforms/forge/build.gradle.kts.disabled similarity index 100% rename from platforms/forge/build.gradle.kts rename to platforms/forge/build.gradle.kts.disabled diff --git a/platforms/mixin-common/build.gradle.kts b/platforms/mixin-common/build.gradle.kts index a6b4e7231..031cd7159 100644 --- a/platforms/mixin-common/build.gradle.kts +++ b/platforms/mixin-common/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { } architectury { - common("fabric", "forge") + common("fabric") minecraft = Versions.Mod.minecraft } diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/handle/MinecraftWorldHandle.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/handle/MinecraftWorldHandle.java index 52ea52dfa..538041417 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/handle/MinecraftWorldHandle.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/handle/MinecraftWorldHandle.java @@ -23,6 +23,8 @@ import net.minecraft.command.argument.BlockArgumentParser; import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; 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.entity.EntityType; @@ -31,11 +33,21 @@ import com.dfsek.terra.api.handle.WorldHandle; public class MinecraftWorldHandle implements WorldHandle { + private static final BlockState AIR = (BlockState) Blocks.AIR.getDefaultState(); + private static final Logger logger = LoggerFactory.getLogger(MinecraftWorldHandle.class); + @Override public @NotNull BlockState createBlockState(@NotNull String data) { 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) .blockState(); if(state == null) throw new IllegalArgumentException("Invalid data: " + data); diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/access/MobSpawnerLogicAccessor.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/access/MobSpawnerLogicAccessor.java index 5289cd427..002b5c25b 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/access/MobSpawnerLogicAccessor.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/access/MobSpawnerLogicAccessor.java @@ -17,8 +17,8 @@ package com.dfsek.terra.mod.mixin.access; -import net.minecraft.world.MobSpawnerEntry; -import net.minecraft.world.MobSpawnerLogic; +import net.minecraft.block.spawner.MobSpawnerEntry; +import net.minecraft.block.spawner.MobSpawnerLogic; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/block/entity/MobSpawnerBlockEntityMixin.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/block/entity/MobSpawnerBlockEntityMixin.java index 1b882e5fd..8004b903f 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/block/entity/MobSpawnerBlockEntityMixin.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/block/entity/MobSpawnerBlockEntityMixin.java @@ -21,11 +21,11 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.block.entity.MobSpawnerBlockEntity; +import net.minecraft.block.spawner.MobSpawnerLogic; import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.random.Random; -import net.minecraft.world.MobSpawnerLogic; import org.jetbrains.annotations.NotNull; import org.spongepowered.asm.mixin.Implements; import org.spongepowered.asm.mixin.Interface;