aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java2
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java18
-rw-r--r--src/main/java/gregtech/common/bees/GT_AlleleHelper.java18
-rw-r--r--src/main/java/gregtech/common/bees/GT_Bee_Mutation.java44
-rw-r--r--src/main/java/gregtech/common/items/CombType.java383
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java551
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java51
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_CropLoader.java6
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java2
9 files changed, 483 insertions, 592 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index ca5da1dadd..95f323cef3 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -676,7 +676,7 @@ public enum ItemList implements IItemContainer {
Honeycomb, Charcoal_Pile, Block_BrittleCharcoal, Seismic_Prospector_LV, Seismic_Prospector_MV, Seismic_Prospector_HV, Seismic_Prospector_Adv_LV, Seismic_Prospector_Adv_MV, Seismic_Prospector_Adv_HV, Seismic_Prospector_Adv_EV, OilDrill1, OilDrill2, OilDrill3, ConcreteBackfiller1, ConcreteBackfiller2, OreDrill1, OreDrill2, OreDrill3, OreDrill4, PyrolyseOven, OilCracker, Crop_Drop_UUMBerry, Crop_Drop_UUABerry, Empty_Board_Basic, Empty_Board_Elite,
Battery_Charger_4by4_ULV, Battery_Charger_4by4_LV, Battery_Charger_4by4_MV, Battery_Charger_4by4_HV, Battery_Charger_4by4_EV, Battery_Charger_4by4_IV, Battery_Charger_4by4_LuV, Battery_Charger_4by4_ZPM, Battery_Charger_4by4_UV, Battery_Charger_4by4_MAX,
MicroTransmitter_HV, MicroTransmitter_EV, MicroTransmitter_IV, MicroTransmitter_LUV, MicroTransmitter_ZPM, MicroTransmitter_UV,
- Crop_Drop_Bauxite, Crop_Drop_Ilmenite, Crop_Drop_Pitchblende, Crop_Drop_Uraninite, Crop_Drop_Thorium, Crop_Drop_Nickel, Crop_Drop_Zinc, Crop_Drop_Manganese, Crop_Drop_Scheelite, Crop_Drop_Platinum, Crop_Drop_Iridium, Crop_Drop_Osmium, Crop_Drop_Naquadah, Uraniumcell_1, Uraniumcell_2, Uraniumcell_4, Moxcell_1, Moxcell_2, Moxcell_4,
+ Crop_Drop_Bauxite, Crop_Drop_Ilmenite, Crop_Drop_Pitchblende, Crop_Drop_Uraninite, Crop_Drop_Thorium, Crop_Drop_Nickel, Crop_Drop_Zinc, Crop_Drop_Manganese, Crop_Drop_Scheelite, Crop_Drop_Platinum, Crop_Drop_Iridium, Crop_Drop_Osmium, Crop_Drop_Naquadah, Crop_Drop_Mica, Uraniumcell_1, Uraniumcell_2, Uraniumcell_4, Moxcell_1, Moxcell_2, Moxcell_4,
ModularBasicHelmet, ModularBasicChestplate, ModularBasicLeggings, ModularBasicBoots,
ModularElectric1Helmet, ModularElectric1Chestplate, ModularElectric1Leggings, ModularElectric1Boots,
ModularElectric2Helmet, ModularElectric2Chestplate, ModularElectric2Leggings, ModularElectric2Boots, Block_Powderbarrel, GelledToluene,
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 6d50c6964a..f99d4083c9 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -86,15 +86,15 @@ import java.util.*;
public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
private static final EnumSet<OreGenEvent.GenerateMinable.EventType> PREVENTED_ORES = EnumSet.of(OreGenEvent.GenerateMinable.EventType.COAL,
- new OreGenEvent.GenerateMinable.EventType[]{OreGenEvent.GenerateMinable.EventType.IRON, OreGenEvent.GenerateMinable.EventType.GOLD,
- OreGenEvent.GenerateMinable.EventType.DIAMOND, OreGenEvent.GenerateMinable.EventType.REDSTONE, OreGenEvent.GenerateMinable.EventType.LAPIS,
- OreGenEvent.GenerateMinable.EventType.QUARTZ});
+ OreGenEvent.GenerateMinable.EventType.IRON, OreGenEvent.GenerateMinable.EventType.GOLD,
+ OreGenEvent.GenerateMinable.EventType.DIAMOND, OreGenEvent.GenerateMinable.EventType.REDSTONE, OreGenEvent.GenerateMinable.EventType.LAPIS,
+ OreGenEvent.GenerateMinable.EventType.QUARTZ);
public final HashSet<ItemStack> mRegisteredOres = new HashSet<ItemStack>(10000);
public final ArrayList<String> mSoundNames = new ArrayList<String>();
public final ArrayList<ItemStack> mSoundItems = new ArrayList<ItemStack>();
public final ArrayList<Integer> mSoundCounts = new ArrayList<Integer>();
private final Collection<OreDictEventContainer> mEvents = new HashSet<OreDictEventContainer>();
- private final Collection<String> mIgnoredItems = new HashSet<String>(Arrays.asList(new String[]{"itemGhastTear", "itemFlint", "itemClay", "itemBucketSaltWater",
+ private final Collection<String> mIgnoredItems = new HashSet<String>(Arrays.asList("itemGhastTear", "itemFlint", "itemClay", "itemBucketSaltWater",
"itemBucketFreshWater", "itemBucketWater", "itemRock", "itemReed", "itemArrow", "itemSaw", "itemKnife", "itemHammer", "itemChisel", "itemRubber",
"itemEssence", "itemIlluminatedPanel", "itemSkull", "itemRawRubber", "itemBacon", "itemJetpackAccelerator", "itemLazurite", "itemIridium",
"itemTear", "itemClaw", "itemFertilizer", "itemTar", "itemSlimeball", "itemCoke", "itemBeeswax", "itemBeeQueen", "itemForcicium", "itemForcillium",
@@ -104,8 +104,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
"itemCoal", "itemBoat", "itemHerbalMedicineCake", "itemCakeSponge", "itemFishandPumpkinCakeSponge", "itemSoulCleaver", "itemInstantCake",
"itemWhippingCream", "itemGlisteningWhippingCream", "itemCleaver", "itemHerbalMedicineWhippingCream", "itemStrangeWhippingCream",
"itemBlazeCleaver", "itemBakedCakeSponge", "itemMagmaCake", "itemGlisteningCake", "itemOgreCleaver", "itemFishandPumpkinCake",
- "itemMagmaWhippingCream", "itemMultimeter", "itemSuperconductor"}));
- private final Collection<String> mIgnoredNames = new HashSet<String>(Arrays.asList(new String[]{"grubBee", "chainLink", "candyCane", "bRedString", "bVial",
+ "itemMagmaWhippingCream", "itemMultimeter", "itemSuperconductor"));
+ private final Collection<String> mIgnoredNames = new HashSet<String>(Arrays.asList("grubBee", "chainLink", "candyCane", "bRedString", "bVial",
"bFlask", "anorthositeSmooth", "migmatiteSmooth", "slateSmooth", "travertineSmooth", "limestoneSmooth", "orthogneissSmooth", "marbleSmooth",
"honeyDrop", "lumpClay", "honeyEqualssugar", "flourEqualswheat", "bluestoneInsulated", "blockWaterstone", "blockSand", "blockTorch",
"blockPumpkin", "blockClothRock", "blockStainedHardenedClay", "blockQuartzPillar", "blockQuartzChiselled", "blockSpawner", "blockCloth", "mobHead",
@@ -122,8 +122,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
"unfinishedTank", "valvePart", "aquaRegia", "leatherSeal", "leatherSlimeSeal", "hambone", "slimeball", "clay", "enrichedUranium", "camoPaste",
"antiBlock", "burntQuartz", "salmonRaw", "blockHopper", "blockEnderObsidian", "blockIcestone", "blockMagicWood", "blockEnderCore", "blockHeeEndium",
"oreHeeEndPowder", "oreHeeStardust", "oreHeeIgneousRock", "oreHeeInstabilityOrb", "crystalPureFluix", "shardNether", "gemFluorite",
- "stickObsidian", "caveCrystal", "shardCrystal", "dyeCrystal","shardFire","shardWater","shardAir","shardEarth","ingotRefinedIron","blockMarble","ingotUnstable"}));
- private final Collection<String> mInvalidNames = new HashSet<String>(Arrays.asList(new String[]{"diamondShard", "redstoneRoot", "obsidianStick", "bloodstoneOre",
+ "stickObsidian", "caveCrystal", "shardCrystal", "dyeCrystal","shardFire","shardWater","shardAir","shardEarth","ingotRefinedIron","blockMarble","ingotUnstable"));
+ private final Collection<String> mInvalidNames = new HashSet<String>(Arrays.asList("diamondShard", "redstoneRoot", "obsidianStick", "bloodstoneOre",
"universalCable", "bronzeTube", "ironTube", "netherTube", "obbyTube", "infiniteBattery", "eliteBattery", "advancedBattery", "10kEUStore",
"blueDye", "MonazitOre", "quartzCrystal", "whiteLuminiteCrystal", "darkStoneIngot", "invisiumIngot", "demoniteOrb", "enderGem", "starconiumGem",
"osmoniumIngot", "tapaziteGem", "zectiumIngot", "foolsRubyGem", "rubyGem", "meteoriteGem", "adamiteShard", "sapphireGem", "copperIngot",
@@ -135,7 +135,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
"oilBucket", "petroleumOre", "dieselFuel", "diamondNugget", "planks", "wood", "stick", "sticks", "naquadah", "obsidianRod", "stoneRod",
"thaumiumRod", "steelRod", "netherrackRod", "woodRod", "ironRod", "cactusRod", "flintRod", "copperRod", "cobaltRod", "alumiteRod", "blueslimeRod",
"arditeRod", "manyullynRod", "bronzeRod", "boneRod", "slimeRod", "redalloyBundled", "bluestoneBundled", "infusedteslatiteInsulated",
- "redalloyInsulated", "infusedteslatiteBundled"}));
+ "redalloyInsulated", "infusedteslatiteBundled"));
private final DateFormat mDateFormat = DateFormat.getInstance();
public ArrayList<String> mBufferedPlayerActivity = new ArrayList();
public boolean mHardcoreCables = false;
diff --git a/src/main/java/gregtech/common/bees/GT_AlleleHelper.java b/src/main/java/gregtech/common/bees/GT_AlleleHelper.java
index 3431f96eb4..cb54f5d4a1 100644
--- a/src/main/java/gregtech/common/bees/GT_AlleleHelper.java
+++ b/src/main/java/gregtech/common/bees/GT_AlleleHelper.java
@@ -9,6 +9,8 @@ import forestry.core.config.Constants;
import forestry.core.genetics.alleles.*;
import forestry.core.utils.vect.IVect;
import forestry.plugins.PluginManager;
+import gregtech.GT_Mod;
+import org.apache.commons.lang3.reflect.FieldUtils;
import java.util.EnumMap;
import java.util.HashMap;
@@ -19,7 +21,7 @@ public class GT_AlleleHelper extends AlleleHelper {
private static final String modId = Constants.ID;
- private final Map<Class, Map<?, ? extends IAllele>> alleleMaps = new HashMap<>();
+ private Map<Class, Map<?, ? extends IAllele>> alleleMaps = new HashMap<>();
public void init() {
if (PluginManager.Module.APICULTURE.isEnabled()) {
@@ -114,20 +116,28 @@ public class GT_AlleleHelper extends AlleleHelper {
}
public static void initialisation(){
- AlleleHelper.instance = new GT_AlleleHelper();
- AlleleHelper.instance.init();
- }
+ GT_AlleleHelper helper = new GT_AlleleHelper();
+ try {
+ helper.alleleMaps = (Map<Class, Map<?, ? extends IAllele>>) FieldUtils.readField(FieldUtils.getField(AlleleHelper.class,"alleleMaps",true),AlleleHelper.instance,true);
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ }
+ AlleleHelper.instance = helper;
+ //AlleleHelper.instance.init();
+ }
@Override
public <T extends Enum<T> & IChromosomeType> void set(IAllele[] alleles, T chromosomeType, IAllele allele) {
if (allele == null) {
+ GT_Mod.GT_FML_LOGGER.info("Allele is null!");
return;
}
if (!chromosomeType.getAlleleClass().isInstance(allele)) {
+ GT_Mod.GT_FML_LOGGER.info("chromosomeType is not an instance of allele!"+allele.getName());
return;
}
diff --git a/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java b/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java
index a83b4c68f1..7b61505fc7 100644
--- a/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java
+++ b/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java
@@ -8,6 +8,7 @@ import forestry.apiculture.genetics.BeeMutation;
import forestry.core.genetics.mutations.Mutation;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.world.World;
+import org.apache.commons.lang3.reflect.FieldUtils;
import java.lang.reflect.Field;
import java.util.List;
@@ -15,9 +16,9 @@ import java.util.List;
public class GT_Bee_Mutation extends BeeMutation {
- private int split = 1;
+ private float split = 1;
- public GT_Bee_Mutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance, int split) {
+ public GT_Bee_Mutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance, float split) {
super(bee0, bee1, result, chance);
this.split = split;
BeeManager.beeRoot.registerMutation(this);
@@ -25,20 +26,19 @@ public class GT_Bee_Mutation extends BeeMutation {
@Override
public float getBaseChance() {
- return ((float) ((float)super.getBaseChance() / ((float)split)));
+ return super.getBaseChance() / split;
}
@Override
public float getChance(IBeeHousing housing, IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1, IBeeGenome genome0, IBeeGenome genome1) {
- World world = housing.getWorld();
- ChunkCoordinates housingCoordinates = housing.getCoordinates();
- int x = housingCoordinates.posX;
- int y = housingCoordinates.posY;
- int z = housingCoordinates.posZ;
+ World world = housing != null ? housing.getWorld() : null;
+ ChunkCoordinates housingCoordinates = housing != null ? housing.getCoordinates() : null;
+ int x = housingCoordinates != null ? housingCoordinates.posX : 0;
+ int y = housingCoordinates != null ? housingCoordinates.posY : 0;
+ int z = housingCoordinates != null ? housingCoordinates.posZ : 0;
float processedChance = getBasicChance(world, x, y, z, allele0, allele1, genome0, genome1);
-
if (processedChance <= 0f) {
return 0f;
}
@@ -52,25 +52,27 @@ public class GT_Bee_Mutation extends BeeMutation {
return processedChance;
}
- protected float getBasicChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
+ private float getBasicChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
float mutationChance = this.getBaseChance();
List<IMutationCondition> mutationConditions = null;
+ Field f = FieldUtils.getDeclaredField(Mutation.class, "mutationConditions", true);
+ if (f == null)
+ f = FieldUtils.getField(Mutation.class, "mutationConditions", true);
+ if (f == null)
+ return mutationChance;
try {
- Field f = Mutation.class.getDeclaredField("mutationConditions");
- f.setAccessible(true);
- Object o = f.get(this);
- mutationConditions = o instanceof List ? (List) o : null ;
- } catch (NoSuchFieldException | IllegalAccessException e) {
+ mutationConditions = f.get(this) instanceof List ? (List) f.get(this) : null;
+ } catch (IllegalAccessException e) {
e.printStackTrace();
}
if (mutationConditions != null)
- for (IMutationCondition mutationCondition : mutationConditions) {
- mutationChance *= mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1);
- if (mutationChance == 0) {
- return 0;
+ for (IMutationCondition mutationCondition : mutationConditions) {
+ mutationChance *= mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1);
+ if (mutationChance == 0) {
+ return 0;
+ }
}
- }
return mutationChance;
}
-}
+} \ No newline at end of file
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java
index 0fac4b3af8..a4d67ebf86 100644
--- a/src/main/java/gregtech/common/items/CombType.java
+++ b/src/main/java/gregtech/common/items/CombType.java
@@ -5,292 +5,161 @@ import gregtech.api.util.GT_LanguageManager;
public enum CombType {
//Organic Line
- LIGNIE("lignite", true, Materials.Lignite, 100),
- COAL("coal", true, Materials.Coal, 100),
- STICKY("stickyresin", true, Materials._NULL, 50),
- OIL("oil", true, Materials._NULL, 100),
- APATITE("apatite", true, Materials.Apatite, 100),
- ASH("ash", true, Materials.Ash, 100),
+ LIGNIE("lignite", true, Materials.Lignite, 100,0x58300B, 0x906237),
+ COAL("coal", true, Materials.Coal, 100,0x525252, 0x666666),
+ STICKY("stickyresin", true, Materials._NULL, 50,0x2E8F5B, 0xDCC289),
+ OIL("oil", true, Materials._NULL, 100,0x333333, 0x4C4C4C),
+ APATITE("apatite", true, Materials.Apatite, 100,0xc1c1f6, 0x676784),
+ ASH("ash", true, Materials.Ash, 100,0x1e1a18, 0xc6c6c6),
//IC2 Line
- COOLANT("coolant", true, Materials._NULL, 100),
- ENERGY("energy", true, Materials._NULL, 80),
- LAPOTRON("lapotron", true, Materials._NULL, 60),
- PYROTHEUM("pyrotheum", true, Materials.Pyrotheum, 50),
- CRYOTHEUM("cryotheum", true, Materials.Pyrotheum, 50),
+ COOLANT("coolant", true, Materials._NULL, 100,0x144F5A, 0x2494A2),
+ ENERGY("energy", true, Materials._NULL, 80,0xC11F1F, 0xEBB9B9),
+ LAPOTRON("lapotron", true, Materials._NULL, 60,0x1414FF, 0x6478FF),
+ PYROTHEUM("pyrotheum", true, Materials.Pyrotheum, 50,0xffebc4, 0xe36400),
+ CRYOTHEUM("cryotheum", true, Materials.Pyrotheum, 50,0x2660ff, 0x5af7ff),
//Alloy Line
- REDALLOY("redalloy", true, Materials.RedAlloy, 100),
- REDSTONEALLOY("redstonealloy", true, Materials.RedstoneAlloy, 90),
- CONDUCTIVEIRON("conductiveiron", true, Materials.ConductiveIron, 80),
- VIBRANTALLOY("vibrantalloy", true, Materials.VibrantAlloy, 50),
- ENERGETICALLOY("energeticalloy", true, Materials.EnergeticAlloy, 70),
- ELECTRICALSTEEL("electricalsteel", true, Materials.ElectricalSteel, 90),
- DARKSTEEL("darksteel", true, Materials.DarkSteel, 80),
- PULSATINGIRON("pulsatingiron", true, Materials.PulsatingIron, 80),
- STAINLESSSTEEL("stainlesssteel", true, Materials.StainlessSteel, 75),
- ENDERIUM("enderium", true, Materials.Enderium, 40),
+ REDALLOY("redalloy", true, Materials.RedAlloy, 100,0xE60000, 0xB80000),
+ REDSTONEALLOY("redstonealloy", true, Materials.RedstoneAlloy, 90,0xB80000, 0xA50808),
+ CONDUCTIVEIRON("conductiveiron", true, Materials.ConductiveIron, 80,0x817671, 0xCEADA3),
+ VIBRANTALLOY("vibrantalloy", true, Materials.VibrantAlloy, 50,0x86A12D, 0xC4F2AE),
+ ENERGETICALLOY("energeticalloy", true, Materials.EnergeticAlloy, 70,0xFF9933, 0xFFAD5C),
+ ELECTRICALSTEEL("electricalsteel", true, Materials.ElectricalSteel, 90,0x787878, 0xD8D8D8),
+ DARKSTEEL("darksteel", true, Materials.DarkSteel, 80,0x252525, 0x443B44),
+ PULSATINGIRON("pulsatingiron", true, Materials.PulsatingIron, 80,0x006600, 0x6DD284),
+ STAINLESSSTEEL("stainlesssteel", true, Materials.StainlessSteel, 75,0x778899, 0xC8C8DC),
+ ENDERIUM("enderium", true, Materials.Enderium, 40,0x2E8B57, 0x599087),
//Thaumcraft Line
- THAUMIUMDUST("thaumiumdust", true, Materials.Thaumium, 100),
- THAUMIUMSHARD("thaumiumshard", true, Materials._NULL, 85),
- AMBER("amber", true, Materials.Amber, 90),
- QUICKSILVER("quicksilver", true, Materials.Mercury, 90),
- SALISMUNDUS("salismundus", true, Materials._NULL, 75),
- TAINTED("tainted", true, Materials._NULL, 80),
- MITHRIL("mithril", true, Materials.Mithril, 70),
- ASTRALSILVER("astralsilver", true, Materials.AstralSilver, 70),
- THAUMINITE("thauminite", true, Materials._NULL, 50),
- SHADOWMETAL("shadowmetal", true, Materials.Shadow, 50),
- DIVIDED("divided", true, Materials.Unstable, 40),
- SPARKELING("sparkling", true, Materials.NetherStar, 40),
+ THAUMIUMDUST("thaumiumdust", true, Materials.Thaumium, 100,0x7A007A, 0x5C005C),
+ THAUMIUMSHARD("thaumiumshard", true, Materials._NULL, 85,0x9966FF, 0xAD85FF),
+ AMBER("amber", true, Materials.Amber, 90,0x774B15, 0xEE7700),
+ QUICKSILVER("quicksilver", true, Materials.Mercury, 90,0xc7c7ea, 0xb5b3df),
+ SALISMUNDUS("salismundus", true, Materials._NULL, 75,0xF7ADDE, 0x592582),
+ TAINTED("tainted", true, Materials._NULL, 80,0x904BB8, 0xE800FF),
+ MITHRIL("mithril", true, Materials.Mithril, 70,0xF0E68C, 0xFFFFD2),
+ ASTRALSILVER("astralsilver", true, Materials.AstralSilver, 70,0xAFEEEE, 0xE6E6FF),
+ THAUMINITE("thauminite", true, Materials._NULL, 50,0x2E2D79, 0x7581E0),
+ SHADOWMETAL("shadowmetal", true, Materials.Shadow, 50,0x100322, 0x100342),
+ DIVIDED("divided", true, Materials.Unstable, 40,0xF0F0F0, 0xDCDCDC),
+ SPARKELING("sparkling", true, Materials.NetherStar, 40,0x7A007A, 0xFFFFFF),
//Gem Line
- STONE("stone", true, Materials._NULL, 70),
- CERTUS("certus", true, Materials.CertusQuartz, 100),
- FLUIX("fluix", true, Materials.Fluix, 100),
- REDSTONE("redstone", true, Materials.Redstone, 100),
- RAREEARTH("rareearth", true, Materials.RareEarth, 100),
- LAPIS("lapis", true, Materials.Lapis, 100),
- RUBY("ruby", true, Materials.Ruby, 100),
- REDGARNET("redgarnet", true, Materials.GarnetRed,100),
- YELLOWGARNET("yellowgarnet", true, Materials.GarnetYellow,100),
- SAPPHIRE("sapphire", true, Materials.Sapphire, 100),
- DIAMOND("diamond", true, Materials.Diamond, 100),
- OLIVINE("olivine", true, Materials.Olivine, 100),
- EMERALD("emerald", true, Materials.Emerald, 100),
- PYROPE("pyrope", true, Materials.Pyrope, 100),
- GROSSULAR("grossular", true, Materials.Grossular, 100),
- FIRESTONE("firestone", true, Materials.Firestone, 100),
+ STONE("stone", true, Materials._NULL, 70,0x808080, 0x999999),
+ CERTUS("certus", true, Materials.CertusQuartz, 100,0x57CFFB, 0xBBEEFF),
+ FLUIX("fluix", true, Materials.Fluix, 100,0xA375FF, 0xB591FF),
+ REDSTONE("redstone", true, Materials.Redstone, 100,0x7D0F0F, 0xD11919),
+ RAREEARTH("rareearth", true, Materials.RareEarth, 100,0x555643, 0x343428),
+ LAPIS("lapis", true, Materials.Lapis, 100,0x1947D1, 0x476CDA),
+ RUBY("ruby", true, Materials.Ruby, 100,0xE6005C, 0xCC0052),
+ REDGARNET("redgarnet", true, Materials.GarnetRed,100,0xBD4C4C, 0xECCECE),
+ YELLOWGARNET("yellowgarnet", true, Materials.GarnetYellow,100,0xA3A341, 0xEDEDCE),
+ SAPPHIRE("sapphire", true, Materials.Sapphire, 100,0x0033CC, 0x00248F),
+ DIAMOND("diamond", true, Materials.Diamond, 100,0xCCFFFF, 0xA3CCCC),
+ OLIVINE("olivine", true, Materials.Olivine, 100,0x248F24, 0xCCFFCC),
+ EMERALD("emerald", true, Materials.Emerald, 100,0x248F24, 0x2EB82E),
+ PYROPE("pyrope", true, Materials.Pyrope, 100,0x763162, 0x8B8B8B),
+ GROSSULAR("grossular", true, Materials.Grossular, 100,0x9B4E00, 0x8B8B8B),
+ FIRESTONE("firestone", true, Materials.Firestone, 100,0xC00000, 0xFF0000),
//Metals Line
- SLAG("slag", true, Materials._NULL, 50),
- COPPER("copper", true, Materials.Copper, 100),
- TIN("tin", true, Materials.Tin, 100),
- LEAD("lead", true, Materials.Lead, 100),
- IRON("iron", true, Materials.Iron, 100),
- STEEL("steel", true, Materials.Steel, 95),
- NICKEL("nickel", true, Materials.Nickel, 100),
- ZINC("zinc", true, Materials.Zinc, 100),
- SILVER("silver", true, Materials.Silver, 100),
- GOLD("gold", true, Materials.Gold, 100),
- SULFUR("sulfur", true, Materials.Sulfur, 100),
- GALLIUM ("gallium", true, Materials.Gallium, 75),
- ARSENIC ("arsenic", true, Materials.Arsenic, 75),
+ SLAG("slag", true, Materials._NULL, 50,0xD4D4D4, 0x58300B),
+ COPPER("copper", true, Materials.Copper, 100,0xFF6600, 0xE65C00),
+ TIN("tin", true, Materials.Tin, 100,0xD4D4D4, 0xDDDDDD),
+ LEAD("lead", true, Materials.Lead, 100,0x666699, 0xA3A3CC),
+ IRON("iron", true, Materials.Iron, 100,0xDA9147, 0xDE9C59),
+ STEEL("steel", true, Materials.Steel, 95,0x808080, 0x999999),
+ NICKEL("nickel", true, Materials.Nickel, 100,0x8585AD, 0x9D9DBD),
+ ZINC("zinc", true, Materials.Zinc, 100,0xF0DEF0, 0xF2E1F2),
+ SILVER("silver", true, Materials.Silver, 100,0xC2C2D6, 0xCECEDE),
+ GOLD("gold", true, Materials.Gold, 100,0xE6B800, 0xCFA600),
+ SULFUR("sulfur", true, Materials.Sulfur, 100,0x6F6F01, 0x8B8B8B),
+ GALLIUM ("gallium", true, Materials.Gallium, 75,0x8B8B8B, 0xC5C5E4),
+ ARSENIC ("arsenic", true, Materials.Arsenic, 75,0x736C52, 0x292412),
//Rare Metals Line
- BAUXITE("bauxite", true, Materials.Bauxite, 85),
- ALUMINIUM("aluminium", true, Materials.Aluminium, 60),
- MANGANESE("manganese", true, Materials.Manganese, 30),
- MAGNESIUM("magnesium", true, Materials.Magnesium, 75),
- TITANIUM("titanium", true, Materials.Ilmenite, 100),
- CHROME("chromium", true, Materials.Chrome, 50),
- TUNGSTEN("tungsten", true, Materials.Tungstate, 100),
- PLATINUM("platinum", true, Materials.Platinum, 40),
- IRIDIUM("iridium", true, Materials.Iridium, 20),
- MOLYBDENUM("molybdenum", true, Materials.Molybdenum, 20),
- OSMIUM("osmium", true, Materials.Osmium, 15),
- LITHIUM("lithium", true, Materials.Lithium, 75),
- SALT("salt", true, Materials.Salt, 90),
- ELECTROTINE("electrotine", true, Materials.Electrotine, 75),
- ALMANDINE("almandine", true, Materials.Almandine, 85),
+ BAUXITE("bauxite", true, Materials.Bauxite, 85,0x6B3600, 0x8B8B8B),
+ ALUMINIUM("aluminium", true, Materials.Aluminium, 60,0x008AB8, 0xD6D6FF),
+ MANGANESE("manganese", true, Materials.Manganese, 30,0xD5D5D5, 0xAAAAAA),
+ MAGNESIUM("magnesium", true, Materials.Magnesium, 75,0xF1D9D9, 0x8B8B8B),
+ TITANIUM("titanium", true, Materials.Ilmenite, 100,0xCC99FF, 0xDBB8FF),
+ CHROME("chromium", true, Materials.Chrome, 50,0xEBA1EB, 0xF2C3F2),
+ TUNGSTEN("tungsten", true, Materials.Tungstate, 100,0x62626D, 0x161620),
+ PLATINUM("platinum", true, Materials.Platinum, 40,0xE6E6E6, 0xFFFFCC),
+ IRIDIUM("iridium", true, Materials.Iridium, 20,0xDADADA, 0xD1D1E0),
+ MOLYBDENUM("molybdenum", true, Materials.Molybdenum, 20,0xAEAED4, 0x8B8B8B),
+ OSMIUM("osmium", true, Materials.Osmium, 15,0x2B2BDA, 0x8B8B8B),
+ LITHIUM("lithium", true, Materials.Lithium, 75,0xF0328C, 0xE1DCFF),
+ SALT("salt", true, Materials.Salt, 90,0xF0C8C8, 0xFAFAFA),
+ ELECTROTINE("electrotine", true, Materials.Electrotine, 75,0x1E90FF, 0x3CB4C8),
+ ALMANDINE("almandine", true, Materials.Almandine, 85,0xC60000, 0x8B8B8B),
//Radioactive Line
- URANIUM("uranium", true, Materials.Uranium, 50),
- PLUTONIUM("plutonium", true, Materials.Plutonium, 10),
- NAQUADAH("naquadah", true, Materials.Naquadah, 10),
- NAQUADRIA("naquadria", true, Materials.Naquadria, 5),
- DOB("d-o-b", true, Materials._NULL, 50),
- THORIUM("thorium", true, Materials.Thorium, 75),
- LUTETIUM("lutetium", true, Materials.Lutetium, 10),
- AMERICUM("americum", true, Materials.Americium, 5),
- NEUTRONIUM("neutronium", true, Materials.Neutronium, 2),
+ URANIUM("uranium", true, Materials.Uranium, 50,0x19AF19, 0x169E16),
+ PLUTONIUM("plutonium", true, Materials.Plutonium, 10,0x240000, 0x570000),
+ NAQUADAH("naquadah", true, Materials.Naquadah, 10,0x000000, 0x004400),
+ NAQUADRIA("naquadria", true, Materials.Naquadria, 5,0x000000, 0x002400),
+ DOB("d-o-b", true, Materials._NULL, 50,0x007700, 0x002400),
+ THORIUM("thorium", true, Materials.Thorium, 75,0x001E00, 0x005000),
+ LUTETIUM("lutetium", true, Materials.Lutetium, 10,0xE6FFE6, 0xFFFFFF),
+ AMERICUM("americum", true, Materials.Americium, 5,0xE6E6FF, 0xC8C8C8),
+ NEUTRONIUM("neutronium", true, Materials.Neutronium, 2,0xFFF0F0, 0xFAFAFA),
//Twilight
- NAGA("naga", true, Materials._NULL, 100),
- LICH("lich", true, Materials._NULL, 90),
- HYDRA("hydra", true, Materials._NULL, 80),
- URGHAST("urghast", true, Materials._NULL, 70),
- SNOWQUEEN("snowqueen", true, Materials._NULL, 60),
+ NAGA("naga", true, Materials._NULL, 100,0x0D5A0D, 0x28874B),
+ LICH("lich", true, Materials._NULL, 90,0x5C605E, 0xC5C5C5),
+ HYDRA("hydra", true, Materials._NULL, 80,0x872836, 0xB8132C),
+ URGHAST("urghast", true, Materials._NULL, 70,0x7C0618, 0xA7041C),
+ SNOWQUEEN("snowqueen", true, Materials._NULL, 60,0x9C0018, 0xD02001),
//Space
- SPACE("space", true, Materials._NULL, 100),
- METEORICIRON("meteoriciron",true, Materials.MeteoricIron, 100),
- DESH("desh",true, Materials.Desh, 90),
- LEDOX("ledox",true, Materials.Ledox, 75),
- CALLISTOICE("callistoice",true, Materials.CallistoIce, 75),
- MYTRYL("mytryl",true, Materials.Mytryl, 65),
- QUANTIUM("quantium",true, Materials.Quantium, 50),
- ORIHARUKON("oriharukon",true, Materials.Oriharukon, 50),
- MYSTERIOUSCRYSTAL("mysteriouscrystal",true, Materials.MysteriousCrystal, 45),
- BLACKPLUTONIUM("blackplutonium",true, Materials.Quantium, 25),
- TRINIUM("trinium",true, Materials.Trinium, 25),
+ SPACE("space", true, Materials._NULL, 100,0x003366, 0xC0C0C0),
+ METEORICIRON("meteoriciron",true, Materials.MeteoricIron, 100,0x321928, 0x643250),
+ DESH("desh",true, Materials.Desh, 90,0x282828, 0x323232),
+ LEDOX("ledox",true, Materials.Ledox, 75,0x0000CD, 0x0074FF),
+ CALLISTOICE("callistoice",true, Materials.CallistoIce, 75,0x0074FF, 0x1EB1FF),
+ MYTRYL("mytryl",true, Materials.Mytryl, 65,0xDAA520, 0xF26404),
+ QUANTIUM("quantium",true, Materials.Quantium, 50,0x00FF00, 0x00D10B),
+ ORIHARUKON("oriharukon",true, Materials.Oriharukon, 50,0x228B22, 0x677D68),
+ MYSTERIOUSCRYSTAL("mysteriouscrystal",true, Materials.MysteriousCrystal, 45,0x3CB371, 0x16856C),
+ BLACKPLUTONIUM("blackplutonium",true, Materials.Quantium, 25,0x000000, 0x323232),
+ TRINIUM("trinium",true, Materials.Trinium, 25,0xB0E0E6, 0xC8C8D2),
//Planet
- MERCURY("mercury", true, Materials._NULL, 65),
- VENUS("venus",true, Materials._NULL, 65),
- MOON("moon",true, Materials._NULL, 90),
- MARS("mars",true, Materials._NULL, 80),
- JUPITER("jupiter",true, Materials._NULL, 75),
- SATURN("saturn",true, Materials._NULL, 55),
- URANUS("uranus",true, Materials._NULL, 45),
- NEPTUN("neptun",true, Materials._NULL, 35),
- PLUTO("pluto",true, Materials._NULL, 25),
- HAUMEA("haumea",true, Materials._NULL, 20),
- MAKEMAKE("makemake",true, Materials._NULL, 20),
- CENTAURI("centauri",true, Materials._NULL, 15),
- TCETI("tceti",true, Materials._NULL, 10),
- BARNARDA("barnarda",true, Materials._NULL, 10),
- VEGA("vega",true, Materials._NULL, 10),
+ MERCURY("mercury", true, Materials._NULL, 65,0x4A4033, 0xB5A288),
+ VENUS("venus",true, Materials._NULL, 65,0x120E07, 0x272010),
+ MOON("moon",true, Materials._NULL, 90,0x373735, 0x7E7E78),
+ MARS("mars",true, Materials._NULL, 80,0x220D05, 0x3A1505),
+ JUPITER("jupiter",true, Materials._NULL, 75,0x734B2E, 0xD0CBC4),
+ SATURN("saturn",true, Materials._NULL, 55,0xD2A472, 0xF8C37B),
+ URANUS("uranus",true, Materials._NULL, 45,0x75C0C9, 0x84D8EC),
+ NEPTUN("neptun",true, Materials._NULL, 35,0x334CFF, 0x576DFF),
+ PLUTO("pluto",true, Materials._NULL, 25,0x34271E, 0x69503D),
+ HAUMEA("haumea",true, Materials._NULL, 20,0x1C1413, 0x392B28),
+ MAKEMAKE("makemake",true, Materials._NULL, 20,0x301811, 0x120A07),
+ CENTAURI("centauri",true, Materials._NULL, 15,0x2F2A14, 0xB06B32),
+ TCETI("tceti",true, Materials._NULL, 10,0x46241A, 0x7B412F),
+ BARNARDA("barnarda",true, Materials._NULL, 10,0x0D5A0D, 0xE6C18D),
+ VEGA("vega",true, Materials._NULL, 10,0x1A2036, 0xB5C0DE),
//Infinity
- COSMICNEUTRONIUM("cosmicneutronium",true, Materials._NULL, 5),
- INFINITYCATALYST("infinitycatalyst",true, Materials._NULL, 2),
- INFINITY("infinity",true, Materials._NULL, 1);
-
- private static int[][] colours = new int[][]{
- //organic
- {0x58300B, 0x906237},
- {0x525252, 0x666666},
- {0x2E8F5B, 0xDCC289},
- {0x333333, 0x4C4C4C},
- {0xc1c1f6, 0x676784},
- {0x1e1a18, 0xc6c6c6},
- //ic2
- {0x144F5A, 0x2494A2},
- {0xC11F1F, 0xEBB9B9},
- {0x1414FF, 0x6478FF},
- {0xffebc4, 0xe36400},
- {0x2660ff, 0x5af7ff},
- //alloy
- {0xE60000, 0xB80000},
- {0xB80000, 0xA50808},
- {0x817671, 0xCEADA3},
- {0x86A12D, 0xC4F2AE},
- {0xFF9933, 0xFFAD5C},
- {0x787878, 0xD8D8D8},
- {0x252525, 0x443B44},
- {0x006600, 0x6DD284},
- {0x778899, 0xC8C8DC},
- {0x2E8B57, 0x599087},
- //Thaumcraft
- {0x7A007A, 0x5C005C},
- {0x9966FF, 0xAD85FF},
- {0x774B15, 0xEE7700},
- {0xc7c7ea, 0xb5b3df},
- {0xF7ADDE, 0x592582},
- {0x904BB8, 0xE800FF},
- {0xF0E68C, 0xFFFFD2},
- {0xAFEEEE, 0xE6E6FF},
- {0x2E2D79, 0x7581E0},
- {0x100322, 0x100342},
- {0xF0F0F0, 0xDCDCDC},
- {0x7A007A, 0xFFFFFF},
- //gems
- {0x808080, 0x999999},
- {0x57CFFB, 0xBBEEFF},
- {0xA375FF, 0xB591FF},
- {0x7D0F0F, 0xD11919},
- {0x555643, 0x343428},
- {0x1947D1, 0x476CDA},
- {0xE6005C, 0xCC0052},
- {0xBD4C4C, 0xECCECE},
- {0xA3A341, 0xEDEDCE},
- {0x0033CC, 0x00248F},
- {0xCCFFFF, 0xA3CCCC},
- {0x248F24, 0xCCFFCC},
- {0x248F24, 0x2EB82E},
- {0x763162, 0x8B8B8B},
- {0x9B4E00, 0x8B8B8B},
- {0xC00000, 0xFF0000},
- //Metals
- {0xD4D4D4, 0x58300B},
- {0xFF6600, 0xE65C00},
- {0xD4D4D4, 0xDDDDDD},
- {0x666699, 0xA3A3CC},
- {0xDA9147, 0xDE9C59},
- {0x808080, 0x999999},
- {0x8585AD, 0x9D9DBD},
- {0xF0DEF0, 0xF2E1F2},
- {0xC2C2D6, 0xCECEDE},
- {0xE6B800, 0xCFA600},
- {0x6F6F01, 0x8B8B8B},
- {0x8B8B8B, 0xC5C5E4},
- {0x736C52, 0x292412},
- //Rare Metals
- {0x6B3600, 0x8B8B8B},
- {0x008AB8, 0xD6D6FF},
- {0xD5D5D5, 0xAAAAAA},
- {0xF1D9D9, 0x8B8B8B},
- {0xCC99FF, 0xDBB8FF},
- {0xEBA1EB, 0xF2C3F2},
- {0x62626D, 0x161620},
- {0xE6E6E6, 0xFFFFCC},
- {0xDADADA, 0xD1D1E0},
- {0xAEAED4, 0x8B8B8B},
- {0x2B2BDA, 0x8B8B8B},
- {0xF0328C, 0xE1DCFF},
- {0xF0C8C8, 0xFAFAFA},
- {0x1E90FF, 0x3CB4C8},
- {0xC60000, 0x8B8B8B},
- //Radioactive Line
- {0x19AF19, 0x169E16},
- {0x240000, 0x570000},
- {0x000000, 0x004400},
- {0x000000, 0x002400},
- {0x007700, 0x002400},
- {0x001E00, 0x005000},
- {0xE6FFE6, 0xFFFFFF},
- {0xE6E6FF, 0xC8C8C8},
- {0xFFF0F0, 0xFAFAFA},
- //Twilight
- {0x0D5A0D, 0x28874B},
- {0x5C605E, 0xC5C5C5},
- {0x872836, 0xB8132C},
- {0x7C0618, 0xA7041C},
- {0x9C0018, 0xD02001},
- //space
- {0x003366, 0xC0C0C0},
- {0x321928, 0x643250},
- {0x282828, 0x323232},
- {0x0000CD, 0x0074FF},
- {0x0074FF, 0x1EB1FF},
- {0xDAA520, 0xF26404},
- {0x00FF00, 0x00D10B},
- {0x228B22, 0x677D68},
- {0x3CB371, 0x16856C},
- {0x000000, 0x323232},
- {0xB0E0E6, 0xC8C8D2},
- //planets
- {0x4A4033, 0xB5A288},
- {0x120E07, 0x272010},
- {0x373735, 0x7E7E78},
- {0x220D05, 0x3A1505},
- {0x734B2E, 0xD0CBC4},
- {0xD2A472, 0xF8C37B},
- {0x75C0C9, 0x84D8EC},
- {0x334CFF, 0x576DFF},
- {0x34271E, 0x69503D},
- {0x1C1413, 0x392B28},
- {0x301811, 0x120A07},
- {0x2F2A14, 0xB06B32},
- {0x46241A, 0x7B412F},
- {0x0D5A0D, 0xE6C18D},
- {0x1A2036, 0xB5C0DE},
- //infinity
- {0x484848, 0x323232},
- {0xFFFFFF, 0xFFFFFF},
- {0xFFFFFF, 0xFFFFFF},
- };
+ COSMICNEUTRONIUM("cosmicneutronium",true, Materials._NULL, 5,0x484848, 0x323232),
+ INFINITYCATALYST("infinitycatalyst",true, Materials._NULL, 2,0xFFFFFF, 0xFFFFFF),
+ INFINITY("infinity",true, Materials._NULL, 1,0xFFFFFF, 0xFFFFFF);
public boolean showInList;
public Materials material;
public int chance;
+
private String name;
- private CombType(String pName, boolean show, Materials material, int chance) {
+ private int[] color;
+
+ CombType(String pName, boolean show, Materials material, int chance, int... color) {
this.name = pName;
this.material = material;
this.chance = chance;
this.showInList = show;
+ this.color=color;
}
public void setHidden() {
@@ -303,6 +172,6 @@ public enum CombType {
}
public int[] getColours() {
- return colours[this.ordinal()];
+ return color == null || color.length != 2 ? new int[]{0,0} : color;
}
} \ No newline at end of file
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
index 684506f2a0..e708ece935 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
@@ -4,11 +4,9 @@ import gregtech.api.GregTech_API;
import gregtech.api.enums.*;
import gregtech.api.items.GT_MetaGenerated_Item_X32;
import gregtech.api.objects.GT_CopiedBlockTexture;
-import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.objects.ItemData;
import gregtech.api.objects.MaterialStack;
import gregtech.api.util.*;
-import gregtech.common.covers.GT_Cover_SolarPanel;
import gregtech.common.items.behaviors.Behaviour_Arrow;
import net.minecraft.dispenser.IBlockSource;
import net.minecraft.enchantment.Enchantment;
@@ -30,312 +28,315 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
private final static String aTextCover = "Usable as Cover"; private final static String aTextForestry = "Forestry";
public GT_MetaGenerated_Item_02() {
- super("metaitem.02", new OrePrefixes[]{OrePrefixes.toolHeadSword, OrePrefixes.toolHeadPickaxe, OrePrefixes.toolHeadShovel, OrePrefixes.toolHeadAxe, OrePrefixes.toolHeadHoe, OrePrefixes.toolHeadHammer, OrePrefixes.toolHeadFile, OrePrefixes.toolHeadSaw, OrePrefixes.toolHeadDrill, OrePrefixes.toolHeadChainsaw, OrePrefixes.toolHeadWrench, OrePrefixes.toolHeadUniversalSpade, OrePrefixes.toolHeadSense, OrePrefixes.toolHeadPlow, OrePrefixes.toolHeadArrow, OrePrefixes.toolHeadBuzzSaw, OrePrefixes.turbineBlade, null, OrePrefixes.itemCasing, OrePrefixes.wireFine, OrePrefixes.gearGtSmall, OrePrefixes.rotor, OrePrefixes.stickLong, OrePrefixes.springSmall, OrePrefixes.spring, OrePrefixes.arrowGtWood, OrePrefixes.arrowGtPlastic, OrePrefixes.gemChipped, OrePrefixes.gemFlawed, OrePrefixes.gemFlawless, OrePrefixes.gemExquisite, OrePrefixes.gearGt});
+ super("metaitem.02", OrePrefixes.toolHeadSword, OrePrefixes.toolHeadPickaxe, OrePrefixes.toolHeadShovel, OrePrefixes.toolHeadAxe, OrePrefixes.toolHeadHoe, OrePrefixes.toolHeadHammer, OrePrefixes.toolHeadFile, OrePrefixes.toolHeadSaw, OrePrefixes.toolHeadDrill, OrePrefixes.toolHeadChainsaw, OrePrefixes.toolHeadWrench, OrePrefixes.toolHeadUniversalSpade, OrePrefixes.toolHeadSense, OrePrefixes.toolHeadPlow, OrePrefixes.toolHeadArrow, OrePrefixes.toolHeadBuzzSaw, OrePrefixes.turbineBlade, null, OrePrefixes.itemCasing, OrePrefixes.wireFine, OrePrefixes.gearGtSmall, OrePrefixes.rotor, OrePrefixes.stickLong, OrePrefixes.springSmall, OrePrefixes.spring, OrePrefixes.arrowGtWood, OrePrefixes.arrowGtPlastic, OrePrefixes.gemChipped, OrePrefixes.gemFlawed, OrePrefixes.gemFlawless, OrePrefixes.gemExquisite, OrePrefixes.gearGt);
INSTANCE = this;
int tLastID = 0;
- ItemList.ThermosCan_Dark_Coffee.set(addItem(tLastID = 0, "Dark Coffee", "Coffee, dark, without anything else", new Object[]{new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.moveSpeed.id, 400, 1, 70, Potion.digSpeed.id, 400, 1, 70}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects