From 2f15b44a8512cece9ceeac21424809335527fa95 Mon Sep 17 00:00:00 2001 From: FalsePattern <30945458+FalsePattern@users.noreply.github.com> Date: Tue, 27 Dec 2022 16:56:49 +0100 Subject: [PATCH] Nomadic Tents compat (#51) --- dependencies.gradle | 3 ++ .../nomadictents/TentChunkProviderMixin.java | 28 +++++++++++++++++++ .../endlessids/mixin/plugin/Mixin.java | 3 ++ .../endlessids/mixin/plugin/TargetedMod.java | 1 + 4 files changed, 35 insertions(+) create mode 100644 src/main/java/com/falsepattern/endlessids/mixin/mixins/common/nomadictents/TentChunkProviderMixin.java diff --git a/dependencies.gradle b/dependencies.gradle index 22da7c8..4512704 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -113,6 +113,9 @@ dependencies { //Netherlicious 3.2.3 compile(deobfCurse("netherlicious-385860:3858031")) + //Nomadic Tents 1.12.1 + compile(deobfCurse("nomadictents-238794:2679476")) + //RandomThings 2.2.4 compileOnly(deobfCurse("randomthings-59816:2225310")) diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/nomadictents/TentChunkProviderMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/nomadictents/TentChunkProviderMixin.java new file mode 100644 index 0000000..66d3965 --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/nomadictents/TentChunkProviderMixin.java @@ -0,0 +1,28 @@ +package com.falsepattern.endlessids.mixin.mixins.common.nomadictents; + +import com.falsepattern.endlessids.mixin.helpers.IChunkMixin; +import com.yurtmod.dimension.TentChunkProvider; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.chunk.Chunk; + +import java.util.Arrays; + +@Mixin(value = TentChunkProvider.class, + remap = false) +public abstract class TentChunkProviderMixin { + @Redirect(method = "provideChunk", + at = @At(value = "INVOKE", + remap = true, + target = "Lnet/minecraft/world/chunk/Chunk;setBiomeArray([B)V"), + remap = true, + require = 1) + private void setBiomesTweaked(Chunk chunk, byte[] p_76616_1_) { + short[] biomeMap = new short[256]; + Arrays.fill(biomeMap, (short)BiomeGenBase.ocean.biomeID); + ((IChunkMixin)chunk).setBiomeShortArray(biomeMap); + } +} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java index fe18bff..ad6a396 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -169,6 +169,9 @@ public enum Mixin implements IMixin { NetherliciousBiomeConfigurationMixin(Side.COMMON, require(TargetedMod.NETHERLICIOUS), "netherlicious.BiomeConfigurationMixin"), //endregion Netherlicious->common + //region NomadicTents->common + NomadicTentsTentChunkProviderMixin(Side.COMMON, require(TargetedMod.NOMADICTENTS), "nomadictents.TentChunkProviderMixin"), + //endregion NomadicTents->common //region RandomThings->common ItemBiomePainterMixin(Side.COMMON, require(TargetedMod.RANDOMTHINGS), "randomthings.ItemBiomePainterMixin"), MessagePaintBiomeMixin(Side.COMMON, require(TargetedMod.RANDOMTHINGS), "randomthings.MessagePaintBiomeMixin"), diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java index b4b7352..7940d88 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java @@ -36,6 +36,7 @@ public enum TargetedMod implements ITargetedMod { MFQM("More Fun Quicksand Mod", true, startsWith("morefunquicksandmod-")), NATURESCOMPASS("Nature's Compass", true, startsWith("naturescompass")), NETHERLICIOUS("Netherlicious", true, startsWith("netherlicious-")), + NOMADICTENTS("Nomadic Tents", true, startsWith("nomadictents")), RANDOMTHINGS("Random Things", true, startsWith("randomthings-")), RTG("Realistic Terrain Generation", true, startsWith("rtg-")), THAUMCRAFT("Thaumcraft", true, startsWith("thaumcraft")),