Merge pull request #81 from FalsePattern/1.4-maintenance

Merge fixes from 1.4 maintenance branch
This commit is contained in:
FalsePattern authored and GitHub committed 2022-12-29 13:02:16 +01:00
commit 7381139fdf
4 files changed
+42 -9

No files matched your search

@@ -1,8 +0,0 @@
package com.falsepattern.endlessids.mixin.mixins.common.rtg;
import org.spongepowered.asm.mixin.Mixin;
import rtg.world.biome.realistic.RealisticBiomeBase;
@Mixin(RealisticBiomeBase.class)
public abstract class RealisticBiomeBaseMixin {
}
@@ -0,0 +1,20 @@
package com.falsepattern.endlessids.mixin.mixins.common.rwg;
import com.falsepattern.endlessids.constants.ExtendedConstants;
import com.falsepattern.endlessids.constants.VanillaConstants;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Pseudo;
import org.spongepowered.asm.mixin.injection.Constant;
import org.spongepowered.asm.mixin.injection.ModifyConstant;
@Pseudo
@Mixin(targets = "rwg.biomes.realistic.RealisticBiomeBase",
remap = false)
public abstract class RealisticBiomeBaseMixin {
@ModifyConstant(method = "<clinit>",
constant = @Constant(intValue = VanillaConstants.biomeIDCount),
require = 1)
private static int extendBiomeIDCount(int constant) {
return ExtendedConstants.biomeIDCount;
}
}
@@ -0,0 +1,20 @@
package com.falsepattern.endlessids.mixin.mixins.common.rwg;
import com.falsepattern.endlessids.constants.ExtendedConstants;
import com.falsepattern.endlessids.constants.VanillaConstants;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Pseudo;
import org.spongepowered.asm.mixin.injection.Constant;
import org.spongepowered.asm.mixin.injection.ModifyConstant;
@Pseudo
@Mixin(targets = "rwg.data.VillageMaterials",
remap = false)
public abstract class VillageMaterialsMixin {
@ModifyConstant(method = "<clinit>",
constant = @Constant(intValue = VanillaConstants.biomeIDCount),
require = 1)
private static int extendBiomeIDCount(int constant) {
return ExtendedConstants.biomeIDCount;
}
}
@@ -196,10 +196,11 @@ public enum Mixin implements IMixin {
//region RTG->common
RTGChunkProviderRTGMixin(Side.COMMON, require(TargetedMod.RTG), "rtg.ChunkProviderRTGMixin"),
RTGLandscapeGeneratorMixin(Side.COMMON, require(TargetedMod.RTG), "rtg.LandscapeGeneratorMixin"),
RTGRealisticBiomeBaseMixin(Side.COMMON, require(TargetedMod.RTG), "rtg.RealisticBiomeBaseMixin"),
//endregion RTG->common
//region RWG->common
RWGChunkGeneratorRealisticMixin(Side.COMMON, require(TargetedMod.RWG), "rwg.ChunkGeneratorRealisticMixin"),
RWGRealisticBiomeBaseMixin(Side.COMMON, require(TargetedMod.RWG), "rwg.RealisticBiomeBaseMixin"),
RWGVillageMaterialsMixin(Side.COMMON, require(TargetedMod.RWG), "rwg.VillageMaterialsMixin"),
//endregion RWG->common
//region Thaumcraft->common
ThaumcraftUtilsMixin(Side.COMMON, require(TargetedMod.THAUMCRAFT), "thaumcraft.UtilsMixin"),