diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core')
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java b/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java index cdb3bda718..b497e0e3a3 100644 --- a/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java +++ b/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java @@ -32,7 +32,7 @@ public class CustomGTMaterials { **/ - public static List<Materials> Custom_GT_Materials = new ArrayList<Materials>(); + /*public static List<Materials> Custom_GT_Materials = new ArrayList<Materials>(); public static Materials Zirconium = materialBuilder_Element(1232, TextureSet.SET_METALLIC, 6.0F, 256, 2, 1|2|8|32|64|128, 200, 200, 200, 0, "Zirconium", "Zirconium", 0, 0, 1811, 0, false, false, 3, 1, 1, Dyes.dyeLightGray, Element.Zr, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3))); public static Materials Geikielite = materialBuilder(1234, TextureSet.SET_SHINY, new int[]{1,2,3}, "Geikielite", Dyes.dyeBlack, Arrays.asList(new MaterialStack(Titanium, 1), new MaterialStack(Magnesium, 1), new MaterialStack(Oxygen, 3))); @@ -89,6 +89,6 @@ public class CustomGTMaterials { registerMaterial(newMat); return newMat; } - +*/ } diff --git a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java index c53642c0ec..9440522db8 100644 --- a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java +++ b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java @@ -33,7 +33,7 @@ import net.minecraft.entity.Entity; public class ClientProxy extends CommonProxy implements Runnable{ - private final HashSet mCapeList = new HashSet(); + private final HashSet<String> mCapeList = new HashSet<String>(); private final GTPP_CapeRenderer mCapeRenderer; public ClientProxy(){ diff --git a/src/Java/gtPlusPlus/core/util/gregtech/material/MaterialBuilder.java b/src/Java/gtPlusPlus/core/util/gregtech/material/MaterialBuilder.java index e642258645..64c2751cde 100644 --- a/src/Java/gtPlusPlus/core/util/gregtech/material/MaterialBuilder.java +++ b/src/Java/gtPlusPlus/core/util/gregtech/material/MaterialBuilder.java @@ -11,7 +11,7 @@ import gregtech.api.enums.TextureSet; import gregtech.api.objects.MaterialStack; public class MaterialBuilder { - public static final int DIESEL = 0, GAS = 1, THERMAL = 2, SEMIFLUID = 3, PLASMA = 4, MAGIC = 5; + /*public static final int DIESEL = 0, GAS = 1, THERMAL = 2, SEMIFLUID = 3, PLASMA = 4, MAGIC = 5; private int metaItemSubID; private TextureSet iconSet; @@ -250,5 +250,5 @@ public class MaterialBuilder { this.canBeCracked = canBeCracked; return this; } - +*/ }
\ No newline at end of file |