From f57bd9c353e9b9eb7f03861b69c079beaf37a1e2 Mon Sep 17 00:00:00 2001 From: FalsePattern Date: Tue, 6 Aug 2024 23:47:01 +0200 Subject: [PATCH] pinhole mixin linter fixes --- .../client/biome/biomewand/BiomeWandItemMixin.java | 3 +++ .../common/antiidconflict/BiomesManagerMixin.java | 11 ++++++++--- .../common/biome/arocketry/AdvancedRocketryMixin.java | 4 ++-- .../biome/randomthings/MessagePaintBiomeMixin.java | 10 +++++----- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/biome/biomewand/BiomeWandItemMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/biome/biomewand/BiomeWandItemMixin.java index 111d4d9..1da6d4a 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/biome/biomewand/BiomeWandItemMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/biome/biomewand/BiomeWandItemMixin.java @@ -31,6 +31,8 @@ import org.spongepowered.asm.mixin.Overwrite; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.biome.BiomeGenBase; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @Mixin(value = BiomeWandItem.class, remap = false) @@ -39,6 +41,7 @@ public abstract class BiomeWandItemMixin { * @author FalsePattern * @reason Biome ID extension */ + @SideOnly(Side.CLIENT) @Overwrite public int getColorFromItemStack(ItemStack stack, int pass) { NBTTagCompound tag = stack.getTagCompound(); diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/antiidconflict/BiomesManagerMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/antiidconflict/BiomesManagerMixin.java index 3558e52..29e2136 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/antiidconflict/BiomesManagerMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/antiidconflict/BiomesManagerMixin.java @@ -78,9 +78,14 @@ public abstract class BiomesManagerMixin { return ExtendedConstants.biomeIDCount; } - @ModifyConstant(method = {"preinit", "setUpBiomesFolder"}, - constant = {@Constant(stringValue = "\\biomes"), @Constant(stringValue = "\\main.cfg")}) - private static String fixPaths(String original) { + @ModifyConstant(method = "preinit", + constant = @Constant(stringValue = "\\biomes")) + private static String fixPaths1(String original) { + return AIDCStringFixer.fixString(original); + } + @ModifyConstant(method = "setUpBiomesFolder", + constant = @Constant(stringValue = "\\main.cfg")) + private static String fixPaths2(String original) { return AIDCStringFixer.fixString(original); } diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/arocketry/AdvancedRocketryMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/arocketry/AdvancedRocketryMixin.java index e54771f..2be4b4b 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/arocketry/AdvancedRocketryMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/arocketry/AdvancedRocketryMixin.java @@ -43,14 +43,14 @@ public abstract class AdvancedRocketryMixin { @Constant(intValue = 118, ordinal = 0), @Constant(intValue = 119, ordinal = 0)}, require = 10) - private static int shiftBiomeIDsUp(int constant) { + private int shiftBiomeIDsUp(int constant) { return constant + 9000; } @ModifyConstant(method = "preInit", constant = @Constant(intValue = -2), require = 1) - private static int changeDefaultDimID(int constant) { + private int changeDefaultDimID(int constant) { return -5613; } } diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/randomthings/MessagePaintBiomeMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/randomthings/MessagePaintBiomeMixin.java index cf6c86d..206b914 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/randomthings/MessagePaintBiomeMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/randomthings/MessagePaintBiomeMixin.java @@ -48,19 +48,19 @@ import java.util.Random; public abstract class MessagePaintBiomeMixin { @Shadow - private int posZ; + int posZ; @Shadow - private int posX; + int posX; @Shadow - private int biomeID; + int biomeID; @Shadow - private int dimensionID; + int dimensionID; @Shadow - private int posY; + int posY; /** * @author FalsePattern