From c579f737337122cdc0f6f7b99f20abee1f1712d1 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sat, 2 Jul 2016 11:36:58 +0200 Subject: [PATCH] Add Argon Gas --- .../GT_Loader_Item_Block_And_Fluid.java | 25 +++++++++--------- .../textures/blocks/fluids/fluid.argon.png | Bin 0 -> 6797 bytes .../blocks/fluids/fluid.argon.png.mcmeta | 5 ++++ 3 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png.mcmeta diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 7950f5b6..ff32d37d 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -365,6 +365,7 @@ public class GT_Loader_Item_Block_And_Fluid GT_Mod.gregtechproxy.addFluid("Deuterium", "Deuterium", Materials.Deuterium, 2, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Deuterium, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); GT_Mod.gregtechproxy.addFluid("Tritium", "Tritium", Materials.Tritium, 2, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Tritium, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); GT_Mod.gregtechproxy.addFluid("Helium", "Helium", Materials.Helium, 2, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); + GT_Mod.gregtechproxy.addFluid("Argon", "Argon", Materials.Argon, 2, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); GT_Mod.gregtechproxy.addFluid("Radon", "Radon", Materials.Radon, 2, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); GT_Mod.gregtechproxy.addFluid("Fluorine", "Fluorine", Materials.Fluorine, 2, 53, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fluorine, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); GT_Mod.gregtechproxy.addFluid("Titaniumtetrachloride", "Titaniumtetrachloride", Materials.Titaniumtetrachloride, 1, 2200, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Titaniumtetrachloride, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); @@ -634,18 +635,18 @@ public class GT_Loader_Item_Block_And_Fluid GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Firestone, GT_ModHandler.getModItem("Railcraft", "firestone.raw", 1L)); new Values(); - ItemList.ModularBasicHelmet.set(new ModularArmor_Item(0, 0, "modulararmor_helmet",0)); - ItemList.ModularBasicChestplate.set(new ModularArmor_Item(0, 1, "modulararmor_chestplate",0)); - ItemList.ModularBasicLeggings.set(new ModularArmor_Item(0, 2, "modulararmor_leggings",0)); - ItemList.ModularBasicBoots.set(new ModularArmor_Item(0, 3, "modulararmor_boots",0)); - ItemList.ModularElectric1Helmet.set(new ElectricModularArmor1(0, 0, "modularelectric1_helmet",1)); - ItemList.ModularElectric1Chestplate.set(new ElectricModularArmor1(0, 1, "modularelectric1_chestplate",1)); - ItemList.ModularElectric1Leggings.set(new ElectricModularArmor1(0, 2, "modularelectric1_leggings",1)); - ItemList.ModularElectric1Boots.set(new ElectricModularArmor1(0, 3, "modularelectric1_boots",1)); - ItemList.ModularElectric2Helmet.set(new ElectricModularArmor1(0, 0, "modularelectric2_helmet",2)); - ItemList.ModularElectric2Chestplate.set(new ElectricModularArmor1(0, 1, "modularelectric2_chestplate",2)); - ItemList.ModularElectric2Leggings.set(new ElectricModularArmor1(0, 2, "modularelectric2_leggings",2)); - ItemList.ModularElectric2Boots.set(new ElectricModularArmor1(0, 3, "modularelectric2_boots",2)); + ItemList.ModularBasicHelmet.set(new ModularArmor_Item(0, 0, "modulararmor_helmet",0)); + ItemList.ModularBasicChestplate.set(new ModularArmor_Item(0, 1, "modulararmor_chestplate",0)); + ItemList.ModularBasicLeggings.set(new ModularArmor_Item(0, 2, "modulararmor_leggings",0)); + ItemList.ModularBasicBoots.set(new ModularArmor_Item(0, 3, "modulararmor_boots",0)); + ItemList.ModularElectric1Helmet.set(new ElectricModularArmor1(0, 0, "modularelectric1_helmet",1)); + ItemList.ModularElectric1Chestplate.set(new ElectricModularArmor1(0, 1, "modularelectric1_chestplate",1)); + ItemList.ModularElectric1Leggings.set(new ElectricModularArmor1(0, 2, "modularelectric1_leggings",1)); + ItemList.ModularElectric1Boots.set(new ElectricModularArmor1(0, 3, "modularelectric1_boots",1)); + ItemList.ModularElectric2Helmet.set(new ElectricModularArmor1(0, 0, "modularelectric2_helmet",2)); + ItemList.ModularElectric2Chestplate.set(new ElectricModularArmor1(0, 1, "modularelectric2_chestplate",2)); + ItemList.ModularElectric2Leggings.set(new ElectricModularArmor1(0, 2, "modularelectric2_leggings",2)); + ItemList.ModularElectric2Boots.set(new ElectricModularArmor1(0, 3, "modularelectric2_boots",2)); // long bits = GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE; // GT_ModHandler.addCraftingRecipe(ItemList.ModularBasicHelmet. getWildcard(1, new Object[0]),bits, new Object[] { "AAA", "B B", 'A', new ItemStack(Items.leather, 1, 32767), 'B', OrePrefixes.ring.get(Materials.AnyIron)} ); diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png new file mode 100644 index 0000000000000000000000000000000000000000..a164b8e76f471b77ee5b3867373a55a6428306c3 GIT binary patch literal 6797 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png.mcmeta new file mode 100644 index 00000000..8b689a1b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file