diff --git a/build.gradle b/build.gradle index 1bd7e29..154c681 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'org.spongepowered.mixin' def buildnumber = System.getenv('TRAVIS_BUILD_NUMBER') def suffix = buildnumber != null ? ".$buildnumber" : "-SNAPSHOT" -version = "1.1.0$suffix" +version = "1.2.0$suffix" group = "uk.bobbytables.jeidsi" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "jeidsi" @@ -29,6 +29,9 @@ minecraft { mappings "stable_39" makeObfSourceJar false // an Srg named sources jar is made by default. uncomment this to disable. + replaceIn "JEIDsI.java" + replace "@VERSION@", project.version + def args = [ '-Dfml.coreMods.load=uk.bobbytables.jeidsi.JEIDsILoadingPlugin', '-Dmixin.hotSwap=true', @@ -56,6 +59,7 @@ dependencies { compileOnly '2691:339:AbyssalCraft-1.12.2-1.9.6@jar' compileOnly '2683:823:Bookshelf-1.12.2-2.3.577@jar' + compileOnly '2691:93:CyclopsCore-1.12.2-1.1.1@jar' compileOnly '2678:374:extrautils2-1.12-1.9.9@jar' compileOnly '2683:667:TheBetweenlands-3.4.6-universal@jar' compileOnly '2692:524:TofuCraftReload-0.0.2.1@jar' diff --git a/src/main/java/uk/bobbytables/jeidsi/JEIDsI.java b/src/main/java/uk/bobbytables/jeidsi/JEIDsI.java index 4dfee11..84b80f1 100644 --- a/src/main/java/uk/bobbytables/jeidsi/JEIDsI.java +++ b/src/main/java/uk/bobbytables/jeidsi/JEIDsI.java @@ -10,7 +10,7 @@ public class JEIDsI { public static final String MODID = "jeidsi"; public static final String NAME = "JustEnoughIDs Integration"; - public static final String VERSION = "1.0.0"; + public static final String VERSION = "@VERSION@"; public static final Logger LOGGER = LogManager.getLogger("JEIDsI"); diff --git a/src/main/java/uk/bobbytables/jeidsi/compat/cyclopscore/mixins/MixinWorldHelpers.java b/src/main/java/uk/bobbytables/jeidsi/compat/cyclopscore/mixins/MixinWorldHelpers.java new file mode 100644 index 0000000..2b1bf14 --- /dev/null +++ b/src/main/java/uk/bobbytables/jeidsi/compat/cyclopscore/mixins/MixinWorldHelpers.java @@ -0,0 +1,29 @@ +package uk.bobbytables.jeidsi.compat.cyclopscore.mixins; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.chunk.Chunk; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import org.cyclops.cyclopscore.helper.WorldHelpers; +import org.dimdev.jeid.INewChunk; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import uk.bobbytables.jeidsi.network.JEIDsIPacketHandler; +import uk.bobbytables.jeidsi.network.client.BiomeChangeMessage; + +@Mixin(WorldHelpers.class) +public class MixinWorldHelpers { + @Overwrite + public static void setBiome(World world, BlockPos pos, Biome biome) { + Chunk chunk = world.getChunk(pos); + ((INewChunk) chunk).getIntBiomeArray()[(pos.getZ() & 0xF) << 4 | pos.getX() & 0xF] = Biome.getIdForBiome(biome); + chunk.markDirty(); + if (!world.isRemote) { + JEIDsIPacketHandler.INSTANCE.sendToAllAround( + new BiomeChangeMessage(pos.getX(), pos.getZ(), Biome.getIdForBiome(biome)), + new NetworkRegistry.TargetPoint(world.provider.getDimension(), pos.getX(), 128.0D, pos.getZ(), 128.0D) + ); + } + } +} diff --git a/src/main/java/uk/bobbytables/jeidsi/init/mixins/MixinLoader.java b/src/main/java/uk/bobbytables/jeidsi/init/mixins/MixinLoader.java index 07b9554..54c7551 100644 --- a/src/main/java/uk/bobbytables/jeidsi/init/mixins/MixinLoader.java +++ b/src/main/java/uk/bobbytables/jeidsi/init/mixins/MixinLoader.java @@ -21,6 +21,7 @@ public class MixinLoader { private void beforeModSupportMixins(List injectedModContainers, CallbackInfo ci) { Mixins.addConfiguration("mixins.jeidsi.abyssalcraft.json"); Mixins.addConfiguration("mixins.jeidsi.bookshelf.json"); + Mixins.addConfiguration("mixins.jeidsi.cyclopscore.json"); Mixins.addConfiguration("mixins.jeidsi.extrautils2.json"); Mixins.addConfiguration("mixins.jeidsi.tofucraft.json"); Mixins.addConfiguration("mixins.jeidsi.thebetweenlands.json"); diff --git a/src/main/resources/mixins.jeidsi.cyclopscore.json b/src/main/resources/mixins.jeidsi.cyclopscore.json new file mode 100644 index 0000000..d6b26f7 --- /dev/null +++ b/src/main/resources/mixins.jeidsi.cyclopscore.json @@ -0,0 +1,11 @@ +{ + "package": "uk.bobbytables.jeidsi.compat.cyclopscore", + "required": true, + "refmap": "mixins.jeidsi.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.6", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "mixins.MixinWorldHelpers" + ] +} \ No newline at end of file