Working on issues preventing the dev jar from working correctly

This commit is contained in:
Adubbz 2015-02-10 16:52:42 +11:00
parent c2ec7df86d
commit 318aa650b7
3 changed files with 24 additions and 12 deletions

View File

@ -72,20 +72,21 @@ tasks.withType(JavaCompile) {
options.encoding = 'utf8'
}
def commonManifest = {
attributes 'FMLCorePlugin': 'biomesoplenty.common.asm.BOPLoadingPlugin'
attributes 'FMLCorePluginContainsFMLMod': 'true'
attributes 'ForceLoadAsMod': true
attributes 'FMLAT': 'biomesoplenty_at.cfg'
attributes 'TweakClass': "org.spongepowered.asm.launch.MixinTweaker"
attributes 'TweakOrder': "10000"
}
jar {
from(project("Mixin").sourceSets.main.output) {
exclude 'LICENSE.txt'
}
manifest {
attributes 'FMLCorePlugin': 'biomesoplenty.common.asm.BOPLoadingPlugin'
attributes 'FMLCorePluginContainsFMLMod': 'true'
attributes 'ForceLoadAsMod': true
attributes 'FMLAT': 'biomesoplenty_at.cfg'
attributes 'TweakClass': "org.spongepowered.asm.launch.MixinTweaker"
attributes 'TweakOrder': "10000"
}
manifest commonManifest
classifier = 'universal'
}
@ -140,6 +141,8 @@ task sourceJar(type: Jar) {
task deobfJar(type: Jar) {
from sourceSets.main.output
from project("Mixin").sourceSets.main.output
manifest commonManifest
classifier = 'deobf'
}

View File

@ -26,9 +26,16 @@ import biomesoplenty.api.biome.IGenerator;
@Mixin(BiomeDecorator.class)
public class MixinBiomeDecorator implements IExtendedDecorator
{
private Map<String, IGenerator<?>> generatorMap = new HashMap();
private Map<String, IGenerator<?>> generatorMap;
//TODO: Come up with a better sequencing system
private Map<String, Decorate.EventType> generatorSequenceMap = new HashMap();
private Map<String, Decorate.EventType> generatorSequenceMap;
@Inject(method = "<init>", at = @At("RETURN"))
private void onConstructed(CallbackInfo callbackInfo)
{
this.generatorMap = new HashMap();
this.generatorSequenceMap = new HashMap();
}
@Override
public void addGenerator(String key, IGenerator<?> generator, Decorate.EventType nextFeature)

View File

@ -26,11 +26,13 @@ public abstract class MixinBiomeGenBase implements IExtendedBiome
@Shadow
public BiomeDecorator theBiomeDecorator;
private BiomeOwner biomeOwner = BiomeOwner.OTHER;
private BiomeOwner biomeOwner;
@Inject(method = "<init>(IZ)V", at = @At("RETURN"))
private void onConstructed(int biomeId, boolean register, CallbackInfo callbackInfo)
{
this.biomeOwner = BiomeOwner.OTHER;
//Prevents Forge from wiping all of our added data
this.theBiomeDecorator = new BiomeDecorator();
}