Gea/TAIGA
1
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit 73a56e617debf4e47665ab454f443820b3b00c66
Author: Giovanni Harting <539@idlegandalf.com>
Date:   Fri May 27 16:07:58 2016 +0200

    removed IMCs because there are not needed anymore

commit 7e241adc9384d0b23e3178b5e0367b7b9130a081
Author: Giovanni Harting <539@idlegandalf.com>
Date:   Fri May 27 13:54:03 2016 +0200

    updated mappings to stable_24
    added a updated tinker (mappings)
This commit is contained in:
Giovanni Harting
2016-05-27 16:10:46 +02:00
parent c6d90c67f3
commit a0666590da
5 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@@ -40,8 +40,7 @@ minecraft {
// stable_# stables are built at the discretion of the MCP team.
// Use non-default mappings at your own risk. they may not allways work.
// simply re-run your setup task after changing the mappings to update your workspace.
mappings = "snapshot_20160527"
// OLD: mappings = "snapshot_20160511"
mappings = "stable_24"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
replace "@VERSION@", project.version
@@ -54,7 +53,8 @@ dependencies {
deobfCompile "slimeknights.mantle:Mantle:1.9-0.10.1.jenkins140:deobf"
//Old: deobfCompile "slimeknights.mantle:Mantle:1.9-0.10.0.jenkins132:deobf"
deobfCompile "mezz.jei:jei_1.9:3.3.3.197"
deobfCompile "slimeknights:TConstruct:1.9-2.3.0.jenkins193:deobf"
//deobfCompile "slimeknights:TConstruct:1.9-2.3.0.jenkins193:deobf"
compile files('libs/TConstruct-1.9-2.3.1.DEV.1d4c1de-deobf.jar')
}
//noinspection GroovyAssignabilityCheck

BIN
libs/TConstruct-1.9-2.3.1.DEV.1d4c1de-deobf.jar Normal file
View File

Binary file not shown.

5
src/main/java/com/sosnitzka/ztic_addon/Fluids.java
View File

@@ -2,14 +2,13 @@ package com.sosnitzka.ztic_addon;
import com.sosnitzka.ztic_addon.generic.BasicTinkerFluid;
import com.sosnitzka.ztic_addon.util.Utils;
import net.minecraft.init.Blocks;
import net.minecraftforge.fluids.FluidRegistry;
import org.apache.commons.lang3.StringUtils;
import java.lang.reflect.Field;
import static com.sosnitzka.ztic_addon.Items.*;
import static com.sosnitzka.ztic_addon.util.Utils.registerFluid;
import static slimeknights.tconstruct.library.TinkerRegistry.registerMelting;
public class Fluids {
@@ -67,7 +66,7 @@ public class Fluids {
try {
BasicTinkerFluid fluid = (BasicTinkerFluid) field.get(targetType);
Utils.registerTinkerFluid(StringUtils.capitalize(fluid.getName()), fluid, fluid.isToolForge());
registerFluid(fluid);
} catch (IllegalAccessException e) {
e.printStackTrace();
}

5
src/main/java/com/sosnitzka/ztic_addon/ZTiC.java
View File

@@ -21,7 +21,6 @@ import slimeknights.tconstruct.library.TinkerRegistry;
import slimeknights.tconstruct.library.materials.ExtraMaterialStats;
import slimeknights.tconstruct.library.materials.HandleMaterialStats;
import slimeknights.tconstruct.library.materials.HeadMaterialStats;
import slimeknights.tconstruct.library.materials.Material;
import slimeknights.tconstruct.library.traits.AbstractTrait;
import slimeknights.tconstruct.tools.TinkerMaterials;
@@ -93,8 +92,6 @@ public class ZTiC {
registerTinkerMaterial("Terramite", terramite, terramiteFluid, 419, 7.25f, 2.85f, 1.03f, 208, 150, TITANITE, false, true);
registerTinkerMaterial("Cryptogen", cryptogen, cryptogenFluid, 504, 5.71f, 6.93f, 0.88f, 58, 117, METEORITE, false, true);
registerTinkerMaterial("Proxideum", proxideum, proxideumFluid, 535, 10.55f, 4.21f, 0.99f, -60, 200, METEORITE, false, true);
}
@EventHandler
@@ -126,10 +123,12 @@ public class ZTiC {
TinkerRegistry.addMaterialStats(material, new HandleMaterialStats(handleMod, handleDura));
TinkerRegistry.addMaterialStats(material, new ExtraMaterialStats(extra));
material.setFluid(fluid).setCraftable(craft).setCastable(cast);
/*
if (material.isCraftable()) {
material.addItem(Blocks.tiberiumBlock, Material.VALUE_Block);
material.setRepresentativeItem(Blocks.tiberiumBlock);
}
*/
proxy.setRenderInfo(material, fluid);
MaterialIntegration integration = new MaterialIntegration(material, fluid, oreSuffix);

12
src/main/java/com/sosnitzka/ztic_addon/util/Utils.java
View File

@@ -24,18 +24,6 @@ public class Utils {
System.out.println(String.format("Registered: %s", block));
}
public static void registerTinkerFluid(String oreDictSuffix, Fluid fluid, boolean toolForge) {
System.out.println(String.format("Register TinkerFluid with oreDictSuffix: %s", oreDictSuffix));
registerFluid(fluid);
NBTTagCompound tag = new NBTTagCompound();
tag.setString("fluid", fluid.getName());
tag.setString("ore", oreDictSuffix);
tag.setBoolean("toolforge", toolForge);
FMLInterModComms.sendMessage("tconstruct", "integrateSmeltery", tag);
}
public static void registerFluid(Fluid fluid) {
FluidRegistry.registerFluid(fluid);
FluidRegistry.addBucketForFluid(fluid);