code cleanup

This commit is contained in:
FalsePattern committed 2022-07-11 00:04:59 +02:00
1 parent ef52fa6e51
commit 0e32ffebae
18 files changed
+45 -91

No files matched your search

@@ -5,10 +5,8 @@ import com.falsepattern.endlessids.constants.ExtendedConstants;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import net.minecraft.world.biome.BiomeGenBase;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
@Mod(modid = Tags.MODID,
@@ -36,7 +36,7 @@ public class IEPlugin implements IFMLLoadingPlugin {
@SneakyThrows
public String[] getASMTransformerClass() {
val cl = ((LaunchClassLoader)this.getClass().getClassLoader());
val cl = ((LaunchClassLoader) this.getClass().getClassLoader());
val field = cl.getClass().getDeclaredField("transformerExceptions");
field.setAccessible(true);
val exceptions = (Set<String>) field.get(cl);
@@ -1,6 +1,5 @@
package com.falsepattern.endlessids.mixin.helpers;
import gnu.trove.function.TIntFunction;
import lombok.val;
import net.minecraft.world.biome.BiomeGenBase;
@@ -12,18 +11,18 @@ import static com.falsepattern.endlessids.EndlessIDs.BIOME_ARRAY_PLACEHOLDER;
public class BiomePatchHelper {
public static byte[] getBiomeArrayTweaked(Chunk chunk, IntFunction<BiomeGenBase> biomesForGeneration) {
val chunkBiomes = ((IChunkMixin)chunk).getBiomeShortArray();
val chunkBiomes = ((IChunkMixin) chunk).getBiomeShortArray();
for(int i = 0; i < chunkBiomes.length; ++i) {
for (int i = 0; i < chunkBiomes.length; ++i) {
chunkBiomes[i] = (short) biomesForGeneration.apply(i).biomeID;
}
return BIOME_ARRAY_PLACEHOLDER;
}
public static byte[] getBiomeArrayTweaked(Chunk chunk, BiomeGenBase[] biomesForGeneration) {
val chunkBiomes = ((IChunkMixin)chunk).getBiomeShortArray();
val chunkBiomes = ((IChunkMixin) chunk).getBiomeShortArray();
for(int i = 0; i < chunkBiomes.length; ++i) {
for (int i = 0; i < chunkBiomes.length; ++i) {
chunkBiomes[i] = (short) biomesForGeneration[i].biomeID;
}
return BIOME_ARRAY_PLACEHOLDER;
@@ -16,7 +16,8 @@ import java.io.File;
@Mixin(value = AntiIdConflictBase.class,
remap = false)
public abstract class AntiIdConflictBaseMixin {
@Shadow public static File mainFolder;
@Shadow
public static File mainFolder;
@Inject(method = "preinit",
at = @At("HEAD"),
@@ -10,9 +10,7 @@ import org.apache.commons.lang3.ArrayUtils;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Constant;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.ModifyConstant;
import net.minecraft.world.biome.BiomeGenBase;
@@ -25,15 +23,20 @@ import static code.elix_x.coremods.antiidconflict.managers.BiomesManager.conflic
@Mixin(value = BiomesManager.class,
remap = false)
public abstract class BiomesManagerMixin {
@Shadow public static String freeBiomeIDs;
@Shadow
public static String freeBiomeIDs;
@Shadow public static String occupiedBiomeIDs;
@Shadow
public static String occupiedBiomeIDs;
@Shadow public static boolean debug;
@Shadow
public static boolean debug;
@Shadow public static int IconflictedIds;
@Shadow
public static int IconflictedIds;
@Shadow public static String conflictedIds;
@Shadow
public static String conflictedIds;
private static String[] getIntervalNaming(int first, int last) {
if (first == last) {
@@ -44,6 +47,7 @@ public abstract class BiomesManagerMixin {
return new String[]{first + "-" + last};
}
}
@ModifyConstant(method = "<clinit>",
constant = @Constant(intValue = VanillaConstants.biomeIDCount),
require = 1)
@@ -77,13 +81,13 @@ public abstract class BiomesManagerMixin {
++BiomesManager.freeIds;
} else if (hasEmpty) {
hasEmpty = false;
for (val part: getIntervalNaming(emptyRegionStart, i - 1)) {
for (val part : getIntervalNaming(emptyRegionStart, i - 1)) {
builder.append(part).append('\n');
}
}
}
if (hasEmpty) {
for (val part: getIntervalNaming(emptyRegionStart, ExtendedConstants.biomeIDCount - 1)) {
for (val part : getIntervalNaming(emptyRegionStart, ExtendedConstants.biomeIDCount - 1)) {
builder.append(part).append('\n');
}
}
@@ -180,13 +184,13 @@ public abstract class BiomesManagerMixin {
hasEmpty = false;
emptyRegionStart = 0;
for(int i = 0; i < biomes.length; ++i) {
for (int i = 0; i < biomes.length; ++i) {
if (!ArrayUtils.isEmpty(conflicts) && conflicts[i] != null) {
writer.println(conflicts[i].getCrashMessage());
} else if (biomes[i] != null) {
if (hasEmpty) {
hasEmpty = false;
for (val part: getIntervalNaming(emptyRegionStart, i - 1)) {
for (val part : getIntervalNaming(emptyRegionStart, i - 1)) {
writer.print(part);
writer.println(" is Available");
}
@@ -203,7 +207,7 @@ public abstract class BiomesManagerMixin {
}
}
if (hasEmpty) {
for (val part: getIntervalNaming(emptyRegionStart, ExtendedConstants.biomeIDCount - 1)) {
for (val part : getIntervalNaming(emptyRegionStart, ExtendedConstants.biomeIDCount - 1)) {
writer.print(part);
writer.println(" is Available");
}
@@ -1,16 +1,12 @@
package com.falsepattern.endlessids.mixin.mixins.common.atg;
import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper;
import com.falsepattern.endlessids.mixin.helpers.IChunkMixin;
import lombok.val;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import ttftcuts.atg.ATGChunkProvider;
import net.minecraft.block.Block;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.chunk.Chunk;
@@ -22,8 +18,8 @@ public abstract class ATGChunkProviderMixin {
@Redirect(method = "provideChunk",
at = @At(value = "INVOKE",
target = "Lnet/minecraft/world/chunk/Chunk;getBiomeArray()[B",
remap = true),
target = "Lnet/minecraft/world/chunk/Chunk;getBiomeArray()[B",
remap = true),
remap = true,
require = 1)
private byte[] setBiomesTweaked(Chunk chunk) {
@@ -13,7 +13,8 @@ import net.minecraft.world.chunk.Chunk;
@Mixin(value = ChunkProviderBOPEnd.class,
remap = false)
public abstract class ChunkProviderBOPEndMixin {
@Shadow private BiomeGenBase[] biomesForGeneration;
@Shadow
private BiomeGenBase[] biomesForGeneration;
@Redirect(method = "provideChunk",
at = @At(value = "INVOKE",
@@ -3,7 +3,6 @@ package com.falsepattern.endlessids.mixin.mixins.common.bop;
import biomesoplenty.common.world.ChunkProviderBOPHell;
import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
@@ -1,7 +1,6 @@
package com.falsepattern.endlessids.mixin.mixins.common.rtg;
import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper;
import com.falsepattern.endlessids.mixin.helpers.IChunkMixin;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
@@ -24,14 +24,12 @@ public abstract class UtilsMixin {
public static void setBiomeAt(World world, int x, int z, BiomeGenBase biome) {
if (biome != null) {
Chunk chunk = world.getChunkFromBlockCoords(x, z);
short[] array = ((IChunkMixin)chunk).getBiomeShortArray();
array[(z & 15) << 4 | x & 15] = (short)(biome.biomeID);
short[] array = ((IChunkMixin) chunk).getBiomeShortArray();
array[(z & 15) << 4 | x & 15] = (short) (biome.biomeID);
if (!world.isRemote) {
PacketHandler.INSTANCE.sendToAllAround(new PacketBiomeChange(x, z, (short)biome.biomeID),
new NetworkRegistry.TargetPoint(world.provider.dimensionId,
x,
world.getHeightValue(x, z),
z,
PacketHandler.INSTANCE.sendToAllAround(new PacketBiomeChange(x, z, (short) biome.biomeID),
new NetworkRegistry.TargetPoint(world.provider.dimensionId, x,
world.getHeightValue(x, z), z,
32.0));
}
}
@@ -13,7 +13,8 @@ import net.minecraft.world.chunk.Chunk;
@Mixin(value = ChunkProviderTwilightForest.class,
remap = false)
public abstract class ChunkProviderTwilightForestMixin {
@Shadow private BiomeGenBase[] biomesForGeneration;
@Shadow
private BiomeGenBase[] biomesForGeneration;
@Redirect(method = "provideChunk",
at = @At(value = "INVOKE",
@@ -1,6 +1,5 @@
package com.falsepattern.endlessids.mixin.mixins.common.vanilla.biome;
import com.falsepattern.endlessids.EndlessIDs;
import com.falsepattern.endlessids.PlaceholderBiome;
import lombok.val;
import org.spongepowered.asm.mixin.Mixin;
@@ -11,8 +10,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.common.BiomeDictionary;
import java.util.Arrays;
@Mixin(value = BiomeDictionary.class,
remap = false)
public abstract class BiomeDictionaryMixin {
@@ -21,7 +21,8 @@ import net.minecraft.world.chunk.Chunk;
import java.util.Arrays;
@Mixin(value = Chunk.class, priority = 900)
@Mixin(value = Chunk.class,
priority = 900)
public abstract class ChunkMixin implements IChunkMixin {
@Shadow
@Final
@@ -30,8 +31,9 @@ public abstract class ChunkMixin implements IChunkMixin {
@Final
public int zPosition;
@Shadow
public World worldObj;
@Shadow
private byte[] blockBiomeArray;
@Shadow public World worldObj;
private short[] blockBiomeShortArray;
@Inject(method = "<init>(Lnet/minecraft/world/World;II)V",
@@ -1,21 +1,15 @@
package com.falsepattern.endlessids.mixin.mixins.common.vanilla.worldgen;
import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper;
import com.falsepattern.endlessids.mixin.helpers.IChunkMixin;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.gen.ChunkProviderEnd;
import java.util.Random;
@Mixin(ChunkProviderEnd.class)
public abstract class ChunkProviderEndMixin {
@Shadow
@@ -1,28 +1,17 @@
package com.falsepattern.endlessids.mixin.mixins.common.vanilla.worldgen;
import com.falsepattern.endlessids.EndlessIDs;
import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper;
import com.falsepattern.endlessids.mixin.helpers.IChunkMixin;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
import net.minecraft.world.gen.ChunkProviderFlat;
import net.minecraft.world.gen.MapGenBase;
import java.util.List;
@Mixin(ChunkProviderFlat.class)
public abstract class ChunkProviderFlatMixin implements IChunkProvider {
@@ -1,27 +1,15 @@
package com.falsepattern.endlessids.mixin.mixins.common.vanilla.worldgen;
import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper;
import com.falsepattern.endlessids.mixin.helpers.IChunkMixin;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.ChunkProviderGenerate;
import net.minecraft.world.gen.MapGenBase;
import net.minecraft.world.gen.structure.MapGenMineshaft;
import net.minecraft.world.gen.structure.MapGenScatteredFeature;
import net.minecraft.world.gen.structure.MapGenStronghold;
import net.minecraft.world.gen.structure.MapGenVillage;
import java.util.Random;
@Mixin(ChunkProviderGenerate.class)
public abstract class ChunkProviderGenerateMixin implements IChunkProvider {
@@ -1,10 +1,7 @@
package com.falsepattern.endlessids.mixin.mixins.common.vanilla.worldgen;
import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper;
import com.falsepattern.endlessids.mixin.helpers.IChunkMixin;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
@@ -12,15 +9,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.ChunkProviderHell;
import net.minecraft.world.gen.MapGenBase;
import net.minecraft.world.gen.structure.MapGenNetherBridge;
import java.util.Random;
@Mixin(ChunkProviderHell.class)
public abstract class ChunkProviderHellMixin implements IChunkProvider {
@@ -60,19 +60,16 @@ public enum Mixin implements IMixin {
//endregion Minecraft
//region AntiIDConflict->common
AIDCAntiIdConflictBaseMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT),
"antiidconflict.AntiIdConflictBaseMixin"),
"antiidconflict.AntiIdConflictBaseMixin"),
AIDCBiomesGenBasePlaceholderMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT),
"antiidconflict.BiomeGenBasePlaceholderMixin"),
AIDCBiomesManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT),
"antiidconflict.BiomesManagerMixin"),
AIDCBiomesManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), "antiidconflict.BiomesManagerMixin"),
AIDCDimensionsManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT),
"antiidconflict.DimensionsManagerMixin"),
"antiidconflict.DimensionsManagerMixin"),
AIDCEnchantementsManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT),
"antiidconflict.EnchantementsManagerMixin"),
AIDCEntitiesManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT),
"antiidconflict.EntitiesManagerMixin"),
AIDCPotionsManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT),
"antiidconflict.PotionsManagerMixin"),
"antiidconflict.EnchantementsManagerMixin"),
AIDCEntitiesManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), "antiidconflict.EntitiesManagerMixin"),
AIDCPotionsManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), "antiidconflict.PotionsManagerMixin"),
//endregion AntiIDConflict->common
//region ATG->common
ATGBiomeConfigMixin(Side.COMMON, require(TargetedMod.ATG), "atg.ATGBiomeConfigMixin"),
@@ -102,8 +99,7 @@ public enum Mixin implements IMixin {
"galacticraft.ConfigManagerCoreMixin"),
//endregion GalactiCraftCore->common
//region ICG->common
ICGMysteriumPatchesFixesCaveMixin(Side.COMMON, require(TargetedMod.ICG),
"icg.MysteriumPatchesFixesCaveMixin"),
ICGMysteriumPatchesFixesCaveMixin(Side.COMMON, require(TargetedMod.ICG), "icg.MysteriumPatchesFixesCaveMixin"),
//endregion ICG->common
//region MFQM->common
MFQMMixin(Side.COMMON, require(TargetedMod.MFQM), "mfqm.MFQMMixin"),