Update forge

Update mappings
Update Tinkers support - Closes #614
This commit is contained in:
modmuss50 2016-06-04 11:31:53 +01:00
parent 1a0fb02516
commit c968cd3b2e
5 changed files with 7 additions and 6 deletions

View file

@ -4,6 +4,7 @@ import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.relauncher.Side;
import techreborn.client.render.parts.ClientPartLoader;
import techreborn.compat.tinkers.CompatModuleTinkers;
import techreborn.compat.waila.CompatModuleWaila;
import techreborn.config.ConfigTechReborn;
import techreborn.parts.StandalonePartCompact;
@ -44,7 +45,7 @@ public class CompatManager
registerCompact(StandalonePartCompact.class, "!reborncore-mcmultipart");
registerCompact(WailaMcMultiPartCompact.class, "reborncore-mcmultipart", "Waila", "!IC2");
registerCompact(CompatModuleWaila.class, "Waila");
//registerCompact(CompatModuleTinkers.class, "tconstruct");
registerCompact(CompatModuleTinkers.class, "tconstruct");
//registerCompact(CompatModulePsi.class, "Psi");
}

View file

@ -0,0 +1,43 @@
package techreborn.compat.tinkers;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import techreborn.compat.ICompatModule;
/**
* @author Prospector on 08/05/16
*/
public class CompatModuleTinkers implements ICompatModule
{
public CompatModuleTinkers()
{
super();
}
@Override public void preInit(FMLPreInitializationEvent event)
{
TinkersFluids.init();
}
@Override public void init(FMLInitializationEvent event)
{
}
@Override public void postInit(FMLPostInitializationEvent event)
{
}
@Override public void serverStarting(FMLServerStartingEvent event)
{
}
}

View file

@ -0,0 +1,74 @@
package techreborn.compat.tinkers;
import net.minecraft.item.EnumRarity;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fml.common.event.FMLInterModComms;
import slimeknights.tconstruct.library.fluid.FluidMolten;
/**
* @author Prospector on 08/05/16
*/
public class TinkersFluids
{
private static ResourceLocation moltenMetal = new ResourceLocation("tconstruct:blocks/fluids/molten_metal");
private static ResourceLocation moltenMetalFlowing = new ResourceLocation(
"tconstruct:blocks/fluids/molten_metal_flow");
public static FluidMolten moltenChrome = new FluidMolten("chrome", 0x90C9C9, moltenMetal, moltenMetalFlowing);
public static FluidMolten moltenInvar = new FluidMolten("invar", 0x7F907F, moltenMetal, moltenMetalFlowing);
public static FluidMolten moltenIridium = new FluidMolten("iridium", 0xFFFFFF, moltenMetal, moltenMetalFlowing);
public static FluidMolten moltenPlatinum = new FluidMolten("platinum", 0x34BFBF, moltenMetal, moltenMetalFlowing);
public static FluidMolten moltenTitanium = new FluidMolten("titanium", 0x3C372F, moltenMetal, moltenMetalFlowing);
public static FluidMolten moltenTungsten = new FluidMolten("tungsten", 0x3A464F, moltenMetal, moltenMetalFlowing);
public static void init()
{
addFluidStuff(moltenChrome, "Chrome");
moltenChrome.setTemperature(800);
addFluidStuff(moltenInvar, "Invar");
moltenInvar.setTemperature(580);
addFluidStuff(moltenIridium, "Iridium");
moltenIridium.setTemperature(4000);
moltenIridium.setRarity(EnumRarity.EPIC);
addFluidStuff(moltenPlatinum, "Platinum");
moltenPlatinum.setTemperature(900);
addFluidStuff(moltenTitanium, "Titanium");
moltenTitanium.setTemperature(1000);
addFluidStuff(moltenTungsten, "Tungsten");
moltenTungsten.setTemperature(1200);
//Invar Alloying
NBTTagList tagList = new NBTTagList();
NBTTagCompound fluid = new NBTTagCompound();
fluid.setString("FluidName", "invar");
fluid.setInteger("Amount", 144);
tagList.appendTag(fluid);
fluid = new NBTTagCompound();
fluid.setString("FluidName", "iron");
fluid.setInteger("Amount", 96);
tagList.appendTag(fluid);
fluid = new NBTTagCompound();
fluid.setString("FluidName", "nickel");
fluid.setInteger("Amount", 48);
tagList.appendTag(fluid);
NBTTagCompound message = new NBTTagCompound();
message.setTag("alloy", tagList);
FMLInterModComms.sendMessage("tconstruct", "alloy", message);
}
public static void addFluidStuff(Fluid fluid, String oreSuffix)
{
FluidRegistry.registerFluid(fluid);
FluidRegistry.addBucketForFluid(fluid);
NBTTagCompound tag = new NBTTagCompound();
tag.setString("fluid", fluid.getName());
tag.setString("ore", oreSuffix);
tag.setBoolean("toolforge", true);
FMLInterModComms.sendMessage("tconstruct", "integrateSmeltery", tag);
}
}

View file

@ -241,7 +241,7 @@ public class TechRebornWorldGen implements IWorldGenerator
{
int chance = config.rubberTreeConfig.chance;
boolean isValidSpawn = false;
Biome biomeGenBase = world.getBiomeGenForCoords(new BlockPos(chunkX * 16, 72, chunkZ * 16));
Biome biomeGenBase = world.getBiomeForCoordsBody(new BlockPos(chunkX * 16, 72, chunkZ * 16));
if (BiomeDictionary.isBiomeOfType(biomeGenBase, BiomeDictionary.Type.SWAMP))
{
// TODO check the config file for bounds on this, might cause