aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/registration
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-01-29 18:45:40 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-01-29 18:45:40 +1000
commit0828168a736692402bd621b984c2d35590ed9730 (patch)
treefb9da5ea4836544b6278364db449ed5cebf52696 /src/Java/gtPlusPlus/xmod/gregtech/registration
parent33a1703896cbc37b9986c71038e20c659edb7814 (diff)
downloadGT5-Unofficial-0828168a736692402bd621b984c2d35590ed9730.tar.gz
GT5-Unofficial-0828168a736692402bd621b984c2d35590ed9730.tar.bz2
GT5-Unofficial-0828168a736692402bd621b984c2d35590ed9730.zip
+ Added Trinium Titanium Cable/wires.
+ Redid material components to better use GT texture assets. % Gave all 32 ore types new TextureSets. % Doubled capacity of all fluid pipes. % Moved Item/Block creation from init() to preInit(). $ Fixed Sludge fluid texture. $ Moved Darkworld from being a child mod into it's own mod, Renamed to Toxic Everglades. $ Bundled SegmentHelper.java, for future development ease.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/registration')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index a584323cf3..f3287f338c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -64,20 +64,24 @@ public class GregtechConduits {
}
private static void run1(){
+
if (LoadedMods.Big_Reactors){
wireFactory("Blutonium", 8196, BaseWireID, 8, 32, 2, new short[]{28, 28, 218, 0});
wireFactory("Cyanite", 512, BaseWireID+15, 2, 16, 4, new short[]{27, 130, 178, 0});
wireFactory("Yellorium", 2048, BaseWireID+30, 4, 16, 2, new short[]{150, 195, 54, 0});
}
+
if (LoadedMods.EnderIO){
wireFactory("RedstoneAlloy", 32, BaseWireID+45, 0, 2, 1, new short[]{178,34,34, 0});
}
if(!GTNH) {
- customWireFactory(ALLOY.LEAGRISIUM, 512, BaseWireID + 45 + 11, 1, 2, 2);
+ customWireFactory(ALLOY.LEAGRISIUM, 512, BaseWireID + 56, 1, 2, 2);
customWireFactory(ELEMENT.getInstance().ZIRCONIUM, 128, BaseWireID + 67, 1, 2, 2);
customWireFactory(ALLOY.HG1223, 32768, BaseWireID + 78, 2, 8, 4);
}
+
+ customWireFactory(ALLOY.TRINIUM_TITANIUM, 2048, BaseWireID + 89, 1, 2, 16);
//superConductorFactory(GT_Materials.Superconductor, 524288, 30660, 0, 0, 8);
if (LoadedMods.Thaumcraft){
@@ -106,6 +110,7 @@ public class GregtechConduits {
}
generateGTFluidPipes(Materials.Clay, BasePipeID+65, 100, 500, false);
generateGTFluidPipes(Materials.Lead, BasePipeID+70, 720, 1200, true);
+
}
private static void wireFactory(final String Material, final int Voltage, final int ID, final long insulatedLoss, final long uninsulatedLoss, final long Amps, final short[] rgb){
@@ -234,7 +239,7 @@ public class GregtechConduits {
}
private static void generateNonGTFluidPipes(final GT_Materials material, final Material myMaterial, final int startID, final int transferRatePerSec, final int heatResistance, final boolean isGasProof){
- final int transferRatePerTick = transferRatePerSec/20;
+ final int transferRatePerTick = transferRatePerSec/10;
long mass;
long voltage;
if (myMaterial != null){