diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-09-23 11:19:01 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-09-23 11:19:01 +1000 |
| commit | 48b5bed437d6517af87856f84259a2efda81c371 (patch) | |
| tree | 5afd22dab52d74ffdf89794ad884e3d3dcbadf0e /src/Java/gtPlusPlus/core | |
| parent | 378ddec805d28721f0bb0bab59804dc816105921 (diff) | |
| parent | d25675f4dbf81607e2960464d9e302c4ef8ca46e (diff) | |
| download | GT5-Unofficial-48b5bed437d6517af87856f84259a2efda81c371.tar.gz GT5-Unofficial-48b5bed437d6517af87856f84259a2efda81c371.tar.bz2 GT5-Unofficial-48b5bed437d6517af87856f84259a2efda81c371.zip | |
On NewMatSystem: Winging It.
Diffstat (limited to 'src/Java/gtPlusPlus/core')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/ModItems.java | 3 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/lib/LoadedMods.java | 6 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/ALLOY.java | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 1737b6ea4a..07a689f1e2 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -391,9 +391,12 @@ public final class ModItems { FuelRod_Uranium = new FuelRod_Base("itemFuelRod_Uranium", "Uranium", 2500, 2500); FuelRod_Plutonium = new FuelRod_Base("itemFuelRod_Plutonium", "Plutonium", 5000, 5000); RfEuBattery = new RF2EU_Battery(); + + if (LoadedMods.Baubles){ itemPersonalCloakingDevice = new ItemCloakingDevice(0); //itemPersonalCloakingDeviceCharged = new ItemCloakingDevice(0).set; itemPersonalHealingDevice = new ItemHealingDevice(); + } //Registry //GameRegistry.registerItem(FuelRod_Empty, "itemFuelRod_Empty"); //GameRegistry.registerItem(FuelRod_Thorium, "itemFuelRod_Thorium"); diff --git a/src/Java/gtPlusPlus/core/lib/LoadedMods.java b/src/Java/gtPlusPlus/core/lib/LoadedMods.java index a727d3172b..ad7ab7b2c9 100644 --- a/src/Java/gtPlusPlus/core/lib/LoadedMods.java +++ b/src/Java/gtPlusPlus/core/lib/LoadedMods.java @@ -17,6 +17,7 @@ public class LoadedMods { public static boolean Simply_Jetpacks = false; public static boolean RFTools = false; public static boolean Thaumcraft = false; + public static boolean Baubles = false; public static boolean Extra_Utils = false; public static boolean PneumaticCraft = false; public static boolean MorePlanets = false; @@ -166,6 +167,11 @@ public class LoadedMods { IHL = true; Utils.LOG_INFO("Components enabled for: IHL"); totalMods++; + } + if (Loader.isModLoaded("Baubles") == true){ + Baubles = true; + Utils.LOG_INFO("Components enabled for: Baubles"); + totalMods++; } Utils.LOG_INFO("Content found for "+totalMods+" mods"); diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java index a4cdd77d59..89ea7ec2ff 100644 --- a/src/Java/gtPlusPlus/core/material/ALLOY.java +++ b/src/Java/gtPlusPlus/core/material/ALLOY.java @@ -41,7 +41,7 @@ public final class ALLOY { public static final Material TANTALLOY_60 = new Material( "Tantalloy-60", //Material Name - new short[]{66, 75, 166, 0}, //Material Colour + new short[]{213, 231, 237, 0}, //Material Colour 3025, //Melting Point in C ((ELEMENT.TUNGSTEN.getBoilingPoint_C()*1)+(ELEMENT.TANTALUM.getBoilingPoint_C()*8)+(ELEMENT.TITANIUM.getBoilingPoint_C()*1))/10, //Boiling Point in C ((ELEMENT.TUNGSTEN.getProtons()*1)+(ELEMENT.TANTALUM.getProtons()*8)+(ELEMENT.TITANIUM.getProtons()*1))/10, //Protons @@ -56,7 +56,7 @@ public final class ALLOY { public static final Material TANTALLOY_61 = new Material( "Tantalloy-61", //Material Name - new short[]{122, 135, 196, 0}, //Material Colour + new short[]{193, 211, 217, 0}, //Material Colour 3030, //Melting Point in C ((ELEMENT.TUNGSTEN.getBoilingPoint_C()*1)+(ELEMENT.TANTALUM.getBoilingPoint_C()*7)+(ELEMENT.TITANIUM.getBoilingPoint_C()*1)+(ELEMENT.YTTRIUM.getBoilingPoint_C()*1))/10, //Boiling Point in C ((ELEMENT.TUNGSTEN.getProtons()*1)+(ELEMENT.TANTALUM.getProtons()*7)+(ELEMENT.TITANIUM.getProtons()*1)+(ELEMENT.YTTRIUM.getProtons()*1))/10, //Protons |