aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java8
-rw-r--r--src/Java/gtPlusPlus/core/material/ELEMENT.java8
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java30
3 files changed, 35 insertions, 11 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index e8f0e31458..aa450ccd4b 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -522,7 +522,13 @@ public final class ModItems {
MaterialGenerator.generate(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN);
MaterialGenerator.generate(ELEMENT.STANDALONE.HYPOGEN);
MaterialGenerator.generate(ELEMENT.STANDALONE.CHRONOMATIC_GLASS);
-
+
+ //Custom Materials that are from Runescape
+ MaterialGenerator.generate(ELEMENT.STANDALONE.BLACK_METAL);
+ MaterialGenerator.generate(ELEMENT.STANDALONE.WHITE_METAL);
+ MaterialGenerator.generate(ELEMENT.STANDALONE.GRANITE);
+ MaterialGenerator.generate(ELEMENT.STANDALONE.RUNITE);
+ MaterialGenerator.generate(ELEMENT.STANDALONE.DRAGON_METAL);
//Carbides - Tungsten Carbide exists in .09 so don't generate it. - Should still come before alloys though
if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index 62e1163a39..9a4947027d 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -214,6 +214,14 @@ public final class ELEMENT {
public static final Material ADVANCED_NITINOL = new Material("Advanced Nitinol", MaterialState.SOLID, TextureSets.ENRICHED.get(), ALLOY.NITINOL_60.getRGB(), 8400, 14377, 40, 51, true, "⚷⚙⚷ Ni4Ti6", 0);//Not a GT Inherited Material
public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material
+
+ //Runescape materials
+ public static final Material BLACK_METAL = new Material("Black", MaterialState.SOLID, TextureSet.SET_FINE, new short[] {5, 5, 5}, 2350, 4650, 24, 17, false, "҈", 0);//Not a GT Inherited Material
+ public static final Material WHITE_METAL = new Material("White", MaterialState.SOLID, TextureSet.SET_FINE, new short[] {250, 250, 250}, 4560, 7580, 35, 41, false, "҉", 0);//Not a GT Inherited Material
+ public static final Material GRANITE = new Material("Ancient Granite", MaterialState.SOLID, TextureSet.SET_SAND, new short[] {127, 127, 127}, 500, 2000, 16, 12, false, "«»", 0);//Not a GT Inherited Material
+ public static final Material RUNITE = new Material("Runite", MaterialState.SOLID, TextureSet.SET_METALLIC, new short[] {20, 40, 220}, 6750, 11550, 73, 87, true, "§", 0);//Not a GT Inherited Material
+ public static final Material DRAGON_METAL = new Material("Dragon", MaterialState.SOLID, TextureSet.SET_SHINY, new short[] {220, 40, 20}, 12560, 19850, 96, 105, true, "۞", 0);//Not a GT Inherited Material
+
}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
index ed5b2bcdf6..e6ffe1e89d 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
@@ -55,13 +55,18 @@ public class HazmatUtils {
addProtection(Ic2Items.nanoLeggings);
addProtection(Ic2Items.nanoBoots);
+ Logger.INFO("[Hazmat] Registered Nano as hazmat gear.");
+
//Make Quantum a hazmat suit
addProtection(Ic2Items.quantumHelmet);
addProtection(Ic2Items.quantumBodyarmor);
addProtection(Ic2Items.quantumLeggings);
- addProtection(Ic2Items.quantumBoots);
+ addProtection(Ic2Items.quantumBoots);
+ Logger.INFO("[Hazmat] Registered Quantum as hazmat gear.");
- Utils.registerEvent(mInstance);
+ Utils.registerEvent(mInstance);
+ Logger.INFO("[Hazmat] Registered Tooltip handler for hazmat gear.");
+ mInit = true;
}
@@ -71,24 +76,24 @@ public class HazmatUtils {
public void onItemTooltip(ItemTooltipEvent event){
Logger.INFO("Ticking Hazmat handler");
if (GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.STARTED && GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.SERVER_START) {
- Logger.INFO("Bad Phase : "+GTplusplus.CURRENT_LOAD_PHASE);
+ Logger.INFO("[Hazmat] Bad Phase : "+GTplusplus.CURRENT_LOAD_PHASE);
return;
}
if (event.itemStack == null || isVanillaHazmatPiece(event.itemStack)) {
- Logger.INFO("Invalid Itemstack or vanilla hazmat");
+ Logger.INFO("[Hazmat] Invalid Itemstack or vanilla hazmat");
return;
}
else {
- Logger.INFO("Finding Tooltip Data");
+ Logger.INFO("[Hazmat] Finding Tooltip Data");
ItemStack aStackTemp = event.itemStack;
GT_ItemStack aStack = new GT_ItemStack(aStackTemp);
String[] aTooltips = getTooltips(aStack);
if (aTooltips == null || aTooltips.length == 0) {
- Logger.INFO("No Info!");
+ Logger.INFO("[Hazmat] No Info!");
return;
}
else {
- Logger.INFO("Found Tooltips!");
+ Logger.INFO("[Hazmat] Found Tooltips!");
if (providesProtection(aStackTemp)) {
event.toolTip.add("Provides full hazmat protection.");
}
@@ -168,6 +173,7 @@ public class HazmatUtils {
* @return - Did we register this ItemStack properly?
*/
public static boolean addProtection(ItemStack aVanStack) {
+ Logger.INFO("[Hazmat] Registering "+aVanStack.getDisplayName() +" for full Hazmat protection.");
GT_ItemStack aStack = getGtStackFromVanilla(aVanStack);
AutoMap<Boolean> aAdded = new AutoMap<Boolean>();
aAdded.put(addProtection_Frost(aStack));
@@ -181,6 +187,7 @@ public class HazmatUtils {
return false;
}
}
+ Logger.INFO("[Hazmat] Protection added for all 6 damage types, registering to master Hazmat list.");
sHazmatList.add(aStack);
return true;
}
@@ -254,23 +261,26 @@ public class HazmatUtils {
private static String[] getTooltips(GT_ItemStack aStack) {
AutoMap<String> aTempTooltipData = mToolTips.get(aStack);
if (aTempTooltipData == null) {
- Logger.INFO("Item was not mapped for TTs");
+ Logger.INFO("[Hazmat] Item was not mapped for TTs");
return new String[] {};
}
else {
- Logger.INFO("Item was mapped for TTs");
+ Logger.INFO("[Hazmat] Item was mapped for TTs");
Collections.sort(aTempTooltipData);
- Logger.INFO("Sorted TTs");
+ Logger.INFO("[Hazmat] Sorted TTs");
return aTempTooltipData.toArray();
}
}
private static void registerTooltip(GT_ItemStack aStack, String aTooltip) {
+ Logger.INFO("[Hazmat] Mapping "+aTooltip+" for "+getStackFromGtStack(aStack).getDisplayName());
AutoMap<String> aTempTooltipData = mToolTips.get(aStack);
if (aTempTooltipData == null) {
+ Logger.INFO("No data mapped yet, creating.");
aTempTooltipData = new AutoMap<String>();
}
aTempTooltipData.add(aTooltip);
+ mToolTips.put(aStack, aTempTooltipData);
}
public static ItemStack getStackFromGtStack(GT_ItemStack aGtStack) {
generated by cgit (git 2.46.0) at 2025-03-31 15:12:00 +0000