Working on issues preventing the dev jar from working correctly
This commit is contained in:
parent
c2ec7df86d
commit
318aa650b7
3 changed files with 24 additions and 12 deletions
21
build.gradle
21
build.gradle
|
@ -72,20 +72,21 @@ tasks.withType(JavaCompile) {
|
||||||
options.encoding = 'utf8'
|
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 {
|
jar {
|
||||||
from(project("Mixin").sourceSets.main.output) {
|
from(project("Mixin").sourceSets.main.output) {
|
||||||
exclude 'LICENSE.txt'
|
exclude 'LICENSE.txt'
|
||||||
}
|
}
|
||||||
|
|
||||||
manifest {
|
manifest 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"
|
|
||||||
}
|
|
||||||
|
|
||||||
classifier = 'universal'
|
classifier = 'universal'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -140,6 +141,8 @@ task sourceJar(type: Jar) {
|
||||||
task deobfJar(type: Jar) {
|
task deobfJar(type: Jar) {
|
||||||
from sourceSets.main.output
|
from sourceSets.main.output
|
||||||
from project("Mixin").sourceSets.main.output
|
from project("Mixin").sourceSets.main.output
|
||||||
|
|
||||||
|
manifest commonManifest
|
||||||
classifier = 'deobf'
|
classifier = 'deobf'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,9 +26,16 @@ import biomesoplenty.api.biome.IGenerator;
|
||||||
@Mixin(BiomeDecorator.class)
|
@Mixin(BiomeDecorator.class)
|
||||||
public class MixinBiomeDecorator implements IExtendedDecorator
|
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
|
//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
|
@Override
|
||||||
public void addGenerator(String key, IGenerator<?> generator, Decorate.EventType nextFeature)
|
public void addGenerator(String key, IGenerator<?> generator, Decorate.EventType nextFeature)
|
||||||
|
|
|
@ -26,11 +26,13 @@ public abstract class MixinBiomeGenBase implements IExtendedBiome
|
||||||
@Shadow
|
@Shadow
|
||||||
public BiomeDecorator theBiomeDecorator;
|
public BiomeDecorator theBiomeDecorator;
|
||||||
|
|
||||||
private BiomeOwner biomeOwner = BiomeOwner.OTHER;
|
private BiomeOwner biomeOwner;
|
||||||
|
|
||||||
@Inject(method = "<init>(IZ)V", at = @At("RETURN"))
|
@Inject(method = "<init>(IZ)V", at = @At("RETURN"))
|
||||||
private void onConstructed(int biomeId, boolean register, CallbackInfo callbackInfo)
|
private void onConstructed(int biomeId, boolean register, CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
|
this.biomeOwner = BiomeOwner.OTHER;
|
||||||
|
|
||||||
//Prevents Forge from wiping all of our added data
|
//Prevents Forge from wiping all of our added data
|
||||||
this.theBiomeDecorator = new BiomeDecorator();
|
this.theBiomeDecorator = new BiomeDecorator();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue