Skip to content
This repository has been archived by the owner on Aug 30, 2019. It is now read-only.

Commit

Permalink
Merge branch 'release/1.3.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
sam-kirby committed Jul 29, 2019
2 parents 33174ca + 14fc99c commit 6731fd1
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: java
jdk: oraclejdk8
jdk: openjdk8

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
Expand Down Expand Up @@ -27,4 +27,4 @@ deploy:
file_glob: true
file: $TRAVIS_BUILD_DIR/build/libs/*
on:
tags: true
tags: true
13 changes: 12 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
@@ -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);
}
}
3 changes: 2 additions & 1 deletion src/main/resources/mixins.jeidsi.extrautils2.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"minVersion": "0.6",
"compatibilityLevel": "JAVA_8",
"mixins": [
"mixins.MixinBiomeManip"
"mixins.MixinBiomeManip",
"mixins.MixinWorldProviderSpecialDim"
]
}

0 comments on commit 6731fd1

Please sign in to comment.