From 970a5c60d9cd79824f13b3b1537a2cfc7ee9c38a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB?= Date: Tue, 12 Jul 2022 13:09:58 -0700 Subject: [PATCH] clean --- .../com/dfsek/terra/mod/mixin/FertilizableMixin.java | 10 ---------- .../java/com/dfsek/terra/mod/util/MinecraftUtil.java | 2 +- .../com/dfsek/terra/lifecycle/asm/FertilizableASM.java | 2 +- .../java/com/dfsek/terra/lifecycle}/util/ASMUtil.java | 2 +- 4 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/FertilizableMixin.java rename platforms/{mixin-common/src/main/java/com/dfsek/terra/mod => mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle}/util/ASMUtil.java (98%) diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/FertilizableMixin.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/FertilizableMixin.java deleted file mode 100644 index 141e5a79b..000000000 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/FertilizableMixin.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.dfsek.terra.mod.mixin; - -import net.minecraft.block.Fertilizable; -import org.spongepowered.asm.mixin.Mixin; - - -@Mixin(Fertilizable.class) -public class FertilizableMixin { - -} diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java index 941f85b2c..d61bb74c7 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java @@ -110,7 +110,7 @@ public final class MinecraftUtil { builder.temperatureModifier(Objects.requireNonNull(vanillaBiomeProperties.getTemperatureModifier())); builder.spawnSettings(Objects.requireNonNull(vanillaBiomeProperties.getSpawnSettings())); - + return builder .effects(effects.build()) .generationSettings(generationSettings.build()) diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/asm/FertilizableASM.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/asm/FertilizableASM.java index ff6bb8a07..e8d525c52 100644 --- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/asm/FertilizableASM.java +++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/asm/FertilizableASM.java @@ -15,7 +15,7 @@ import org.objectweb.asm.tree.VarInsnNode; import java.io.IOException; import com.dfsek.terra.lifecycle.util.LoaderUtil; -import com.dfsek.terra.mod.util.ASMUtil; +import com.dfsek.terra.lifecycle.util.ASMUtil; import com.dfsek.terra.mod.util.FertilizableUtil; import static org.objectweb.asm.Opcodes.ACC_STATIC; diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/ASMUtil.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/ASMUtil.java similarity index 98% rename from platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/ASMUtil.java rename to platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/ASMUtil.java index d424331c2..918c398b1 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/ASMUtil.java +++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/ASMUtil.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.mod.util; +package com.dfsek.terra.lifecycle.util; import org.objectweb.asm.ClassReader; import org.objectweb.asm.tree.ClassNode;