From f4cce369ebcec32a851287a8822c694e366b309f Mon Sep 17 00:00:00 2001 From: Sam Kirby Date: Wed, 10 Jul 2019 15:00:37 +0100 Subject: [PATCH 1/3] Update README.md --- README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e6fe334..7b63484 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ -# JustEnoughIDs Integration [![Build Status](https://travis-ci.org/robertdroptables-mcmods/JEIDsIntegration.svg?branch=master)](https://travis-ci.org/robertdroptables-mcmods/JEIDsIntegration) [![CurseForge](http://cf.way2muchnoise.eu/318572.svg)](https://minecraft.curseforge.com/projects/justenoughids-integration-jeidsi) +# JustEnoughIDs Integration [![Build Status](https://travis-ci.org/robertdroptables-mcmods/JEIDsIntegration.svg?branch=master)](https://travis-ci.org/robertdroptables-mcmods/JEIDsIntegration) [![CurseForge](http://cf.way2muchnoise.eu/318572.svg)](https://www.curseforge.com/minecraft/mc-mods/justenoughids-integration-jeidsi) This mod exists to improve the compatibility between JustEnoughIDs and other mods. Currently focussed on fixing issues arising as a result of biome IDs being extended. ## Mod Support Extended * Abyssalcraft (only >1.9.6) +* Advanced Rocketry * Bookshelf * CyclopsCore * Extra Utilities 2 @@ -17,6 +18,9 @@ This mod exists to improve the compatibility between JustEnoughIDs and other mod ### AbyssalCraft * AbyssalCraft now changes biomes as expected due to Dread Plague, Ritual of Cleansing and others +### Advanced Rocketry +* Improves on JEID's support - laser effect will still work + ### Bookshelf * Mods that rely on Bookshelf can now change the biome using WorldUtils#setBiomes when JEID is present * This specifically addresses an issue in Hunting Dimension that prevented the Moss from working @@ -28,10 +32,17 @@ This mod exists to improve the compatibility between JustEnoughIDs and other mod ### Extra Utilities 2 * The Terraformer from ExU2 now functions in an environment where JEID is present +### HammerCore +* Mods that rely on HammerCore are now able to change the Biome +* This includes Biome Paint Tools + ### The Betweenlands * The Betweenlands dimension will now generate correctly when there are more then 256 biomes * Spreading sludgy dirt will now be able to alter the biome as intended +### The Creeping Nether +* Support for newer versions (see [here](https://www.curseforge.com/minecraft/mc-mods/the-creeping-nether/issues/7) and DimensionalDevelopment/JustEnoughIDs#48 - I don't believe this is resolved even in Github version) + ### TofuCraft Reload * Tofu dimension now generates correctly when more than 256 biomes are present From 9554b1d370c1da11c214875b6a4589f993979fa7 Mon Sep 17 00:00:00 2001 From: Sam Kirby Date: Wed, 24 Jul 2019 21:47:28 +0100 Subject: [PATCH 2/3] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9919ffb..631e92d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: java -jdk: oraclejdk8 +jdk: openjdk8 before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock @@ -27,4 +27,4 @@ deploy: file_glob: true file: $TRAVIS_BUILD_DIR/build/libs/* on: - tags: true \ No newline at end of file + tags: true From 14fc99c7c474711db7408b41f0e5abb3f47a53cb Mon Sep 17 00:00:00 2001 From: Sam Kirby Date: Mon, 29 Jul 2019 19:14:47 +0100 Subject: [PATCH 3/3] Set the int biome array when ExU2 generates a chunk in the mining dim --- build.gradle | 2 +- .../mixins/MixinWorldProviderSpecialDim.java | 21 +++++++++++++++++++ .../resources/mixins.jeidsi.extrautils2.json | 3 ++- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 src/main/java/uk/bobbytables/jeidsi/core/compat/extrautils2/mixins/MixinWorldProviderSpecialDim.java diff --git a/build.gradle b/build.gradle index bb6b806..9605336 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.3.1$suffix" +version = "1.3.2$suffix" group = "uk.bobbytables.jeidsi" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "jeidsi" diff --git a/src/main/java/uk/bobbytables/jeidsi/core/compat/extrautils2/mixins/MixinWorldProviderSpecialDim.java b/src/main/java/uk/bobbytables/jeidsi/core/compat/extrautils2/mixins/MixinWorldProviderSpecialDim.java new file mode 100644 index 0000000..6b716ca --- /dev/null +++ b/src/main/java/uk/bobbytables/jeidsi/core/compat/extrautils2/mixins/MixinWorldProviderSpecialDim.java @@ -0,0 +1,21 @@ +package uk.bobbytables.jeidsi.core.compat.extrautils2.mixins; + +import com.rwtema.extrautils2.dimensions.workhousedim.WorldProviderSpecialDim; +import net.minecraft.world.chunk.Chunk; +import net.minecraft.world.gen.ChunkProviderServer; +import org.dimdev.jeid.INewChunk; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; + +import java.util.Arrays; + +@Mixin(WorldProviderSpecialDim.class) +public class MixinWorldProviderSpecialDim { + @Inject(method = "generate", at = @At(target = "Lnet/minecraft/world/chunk/Chunk;setTerrainPopulated(Z)V", value = "INVOKE"), locals = LocalCapture.CAPTURE_FAILSOFT) + private static void setChunkIntBiomeArray(int x, int z, ChunkProviderServer chunkProvider, Object generator, CallbackInfo ci, Chunk chunk, int idForBiome) { + Arrays.fill(((INewChunk) chunk).getIntBiomeArray(), idForBiome); + } +} diff --git a/src/main/resources/mixins.jeidsi.extrautils2.json b/src/main/resources/mixins.jeidsi.extrautils2.json index e1b4fbc..3392f5c 100644 --- a/src/main/resources/mixins.jeidsi.extrautils2.json +++ b/src/main/resources/mixins.jeidsi.extrautils2.json @@ -6,6 +6,7 @@ "minVersion": "0.6", "compatibilityLevel": "JAVA_8", "mixins": [ - "mixins.MixinBiomeManip" + "mixins.MixinBiomeManip", + "mixins.MixinWorldProviderSpecialDim" ] } \ No newline at end of file