aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/util
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-11-29 00:47:46 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-11-29 00:47:46 +1000
commit3369fc3ca7553eaaff688f5de5399464d8a0d8d7 (patch)
tree8b344b2c7a52ab2a077d4a43328b7d48e9dba5b5 /src/Java/gtPlusPlus/core/util
parent9fc8b38599a4a58741e490ebf4fc1c802f7cac7e (diff)
downloadGT5-Unofficial-3369fc3ca7553eaaff688f5de5399464d8a0d8d7.tar.gz
GT5-Unofficial-3369fc3ca7553eaaff688f5de5399464d8a0d8d7.tar.bz2
GT5-Unofficial-3369fc3ca7553eaaff688f5de5399464d8a0d8d7.zip
+ Added some Thaumcraft Shards, they will not generate unless Thaumcraft is missing.
+ Added recipes to create these shards. + Added a texture for shards. + Added a class to handle Block Events. BlockEventHandler.java % Improved formatting on the 'Infused' dusts.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util')
-rw-r--r--src/Java/gtPlusPlus/core/util/Utils.java58
-rw-r--r--src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java6
2 files changed, 40 insertions, 24 deletions
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index 99b5a30827..3c406d9046 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -20,6 +20,9 @@ import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.item.Item.ToolMaterial;
import net.minecraft.item.ItemStack;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
import net.minecraft.world.World;
import net.minecraftforge.common.util.EnumHelper;
import net.minecraftforge.fluids.*;
@@ -33,7 +36,7 @@ import cpw.mods.fml.common.FMLLog;
public class Utils {
public static final int WILDCARD_VALUE = Short.MAX_VALUE;
-
+
public static final boolean isServer(){
return FMLCommonHandler.instance().getEffectiveSide().isServer();
}
@@ -44,23 +47,23 @@ public class Utils {
Utils.LOG_WARNING("Timer expired.");
}
}
-
+
public static boolean isModUpToDate(){
-
+
if (CORE.MASTER_VERSION.toLowerCase().equals("offline")){
return false;
}
-
+
if (CORE.MASTER_VERSION.equals(CORE.VERSION.toLowerCase())){
return true;
}
return false;
}
-
+
public static TC_AspectStack getTcAspectStack (TC_Aspects aspect, long size){
return getTcAspectStack(aspect.name(), (int) size);
}
-
+
public static TC_AspectStack getTcAspectStack (String aspect, long size){
return getTcAspectStack(aspect, (int) size);
}
@@ -68,7 +71,7 @@ public class Utils {
public static TC_AspectStack getTcAspectStack (TC_Aspects aspect, int size){
return getTcAspectStack(aspect.name(), size);
}
-
+
public static TC_AspectStack getTcAspectStack (String aspect, int size){
TC_AspectStack returnValue = null;
@@ -102,8 +105,8 @@ public class Utils {
} catch (NoSuchFieldError r){
Utils.LOG_INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus");
}
-
-
+
+
}
else if (aspect.toUpperCase() == "PRAECANTATIO"){
//Adds in Compat for older GT Versions which Misspell aspects.
@@ -184,6 +187,15 @@ public class Utils {
g.drawRect (MinA, MinB, MaxA, MaxB);
}
+ // Send a message to all players on the server
+ public static void sendServerMessage(String translationKey) {
+ sendServerMessage(new ChatComponentText(translationKey));
+ }
+ // Send a message to all players on the server
+ public static void sendServerMessage(IChatComponent chatComponent) {
+ MinecraftServer.getServer().getConfigurationManager().sendChatMsg(chatComponent);
+ }
+
/**
* Returns if that Liquid is IC2Steam.
*/
@@ -246,28 +258,28 @@ public class Utils {
sb.append(")");
return sb.toString();
}
-
+
/**
*
* @param colourStr e.g. "#FFFFFF"
* @return
*/
public static Color hex2Rgb(String colorStr) {
- return new Color(
- Integer.valueOf( colorStr.substring( 1, 3 ), 16 ),
- Integer.valueOf( colorStr.substring( 3, 5 ), 16 ),
- Integer.valueOf( colorStr.substring( 5, 7 ), 16 ) );
+ return new Color(
+ Integer.valueOf( colorStr.substring( 1, 3 ), 16 ),
+ Integer.valueOf( colorStr.substring( 3, 5 ), 16 ),
+ Integer.valueOf( colorStr.substring( 5, 7 ), 16 ) );
}
-
+
/**
*
* @param colourInt e.g. 0XFFFFFF
* @return Colour
*/
public static Color hex2Rgb(int colourInt) {
- return Color.decode(String.valueOf(colourInt));
+ return Color.decode(String.valueOf(colourInt));
}
-
+
/**
*
* @param colourInt e.g. 0XFFFFFF
@@ -305,7 +317,7 @@ public class Utils {
List<Object> targetList = new ArrayList<Object>(Arrays.asList(sourceArray));
return targetList;
}
-
+
public static List<Object> convertArrayListToList(ArrayList sourceArray) {
List<Object> targetList = new ArrayList<Object>(Arrays.asList(sourceArray));
return targetList;
@@ -491,11 +503,11 @@ public class Utils {
}
return null;
}
-
+
public static String sanitizeString(String input){
String temp;
String output;
-
+
temp = input.replace(" ", "");
temp = temp.replace("-", "");
temp = temp.replace("_", "");
@@ -512,9 +524,9 @@ public class Utils {
temp = temp.replace(" ", "");
output = temp;
return output;
-
+
}
-
+
public static ToolMaterial generateMaterialFromGT(Materials gtMaterial){
String name = gtMaterial.name();
int harvestLevel = gtMaterial.mToolQuality;
@@ -524,7 +536,7 @@ public class Utils {
int enchantability = gtMaterial.mEnchantmentToolsLevel;
ToolMaterial temp = EnumHelper.addToolMaterial(name, harvestLevel, durability, efficiency, damage, enchantability);
return temp;
-
+
}
diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
index d96d813e6f..58ce45f43c 100644
--- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
@@ -55,7 +55,11 @@ public class MaterialUtils {
int radioactivity = 0;
if (material.isRadioactive()){
radioactivity = 1;
- }
+ }
+ if (name.toLowerCase().contains("infused")){
+ String tempname = name.substring(7, name.length());
+ name = "Infused " + tempname;
+ }
if (hasValidRGBA(rgba) || element == Element.H || (material == Materials.InfusedAir || material == Materials.InfusedFire || material == Materials.InfusedEarth || material == Materials.InfusedWater)){
//ModItems.itemBaseDecidust = UtilsItems.generateDecidust(material);
//ModItems.itemBaseCentidust = UtilsItems.generateCentidust(material);