diff --git a/src/main/java/techreborn/compat/recipes/RecipesIC2.java b/src/main/java/techreborn/compat/recipes/RecipesIC2.java index f802c028d..58a173fa3 100644 --- a/src/main/java/techreborn/compat/recipes/RecipesIC2.java +++ b/src/main/java/techreborn/compat/recipes/RecipesIC2.java @@ -22,9 +22,12 @@ public class RecipesIC2 { { removeIc2Recipes(); addShappedIc2Recipes(); - addTechRebornRecipes(); + addShapedTrRecipes(); + addTRMaceratorRecipes(); + addTROreWashingRecipes(); + addTRThermalCentrifugeRecipes(); } - + public static void removeIc2Recipes() { if (config.ExpensiveMacerator); @@ -38,7 +41,7 @@ public class RecipesIC2 { LogHelper.info("IC2 Recipes Removed"); } - + public static void addShappedIc2Recipes() { if (config.ExpensiveMacerator); @@ -49,7 +52,7 @@ public class RecipesIC2 { 'D', Items.diamond, 'M', IC2Items.getItem("machine"), 'C', IC2Items.getItem("electronicCircuit")}); - + if (config.ExpensiveDrill); CraftingHelper.addShapedOreRecipe(IC2Items.getItem("miningDrill"), new Object[] @@ -57,7 +60,7 @@ public class RecipesIC2 { 'S', "ingotSteel", 'B', IC2Items.getItem("reBattery"), 'C', IC2Items.getItem("electronicCircuit")}); - + if (config.ExpensiveDiamondDrill); CraftingHelper.addShapedOreRecipe(IC2Items.getItem("diamondDrill"), new Object[] @@ -66,7 +69,7 @@ public class RecipesIC2 { 'T', "ingotTitanium", 'B', IC2Items.getItem("miningDrill"), 'C', IC2Items.getItem("advancedCircuit")}); - + if (config.ExpensiveSolar); CraftingHelper.addShapedOreRecipe(IC2Items.getItem("solarPanel"), new Object[] @@ -354,70 +357,70 @@ public class RecipesIC2 { - + LogHelper.info("Added Expensive IC2 Recipes"); } - - public static void addTechRebornRecipes() + + public static void addShapedTrRecipes() { CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 4, 6), new Object[] - { "EEE", "EAE", "EEE", - 'E', "gemEmerald", + { "EEE", "EAE", "EEE", + 'E', "gemEmerald", 'A', IC2Items.getItem("electronicCircuit") }); CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 7), new Object[] - { "AGA", "RPB", "ASA", - 'A', "ingotAluminium", + { "AGA", "RPB", "ASA", + 'A', "ingotAluminium", 'G', "dyeGreen", - 'R', "dyeRed", - 'P', "paneGlass", - 'B', "dyeBlue", + 'R', "dyeRed", + 'P', "paneGlass", + 'B', "dyeBlue", 'S',Items.glowstone_dust, }); CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 4, 8), new Object[] - { "DSD", "S S", "DSD", - 'D', "dustDiamond", + { "DSD", "S S", "DSD", + 'D', "dustDiamond", 'S', "ingotSteel" }); CraftingHelper.addShapedOreRecipe( new ItemStack(ModItems.parts, 16, 13), new Object[] - { "CSC", "SCS", "CSC", - 'S', "ingotSteel", + { "CSC", "SCS", "CSC", + 'S', "ingotSteel", 'C',IC2Items.getItem("electronicCircuit") }); CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 2, 14), new Object[] - { "TST", "SBS", "TST", - 'S', "ingotSteel", + { "TST", "SBS", "TST", + 'S', "ingotSteel", 'T', "ingotTungsten", 'B', "blockSteel" }); CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 15), new Object[] - { "AAA", "AMA", "AAA", - 'A', "ingotAluminium", + { "AAA", "AMA", "AAA", + 'A', "ingotAluminium", 'M', new ItemStack(ModItems.parts, 1, 13) }); CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 16), new Object[] - { "AAA", "AMA", "AAA", - 'A', "ingotBronze", + { "AAA", "AMA", "AAA", + 'A', "ingotBronze", 'M', new ItemStack(ModItems.parts, 1, 13) }); CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 17), new Object[] - { "AAA", "AMA", "AAA", + { "AAA", "AMA", "AAA", 'A', "ingotSteel", 'M', new ItemStack(ModItems.parts, 1, 13) }); CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 18), new Object[] - { "AAA", "AMA", "AAA", - 'A', "ingotTitanium", + { "AAA", "AMA", "AAA", + 'A', "ingotTitanium", 'M', new ItemStack(ModItems.parts, 1, 13) }); CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 19), @@ -426,6 +429,9 @@ public class RecipesIC2 { 'A', "ingotBrass", 'M', new ItemStack(ModItems.parts, 1, 13)}); + } + + public static void addTRMaceratorRecipes() { //Macerator Recipes.macerator.addRecipe(new RecipeInputOreDict("oreAluminm"), null, new ItemStack(ModItems.crushedOre, 2, 0)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreArdite"), null, new ItemStack(ModItems.crushedOre, 2, 1)); @@ -469,7 +475,11 @@ public class RecipesIC2 { Recipes.macerator.addRecipe(new RecipeInputOreDict("oreCalcite"), null, new ItemStack(ModItems.dusts, 2, 14)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSodalite"), null, new ItemStack(ModItems.dusts, 12, 69)); Recipes.macerator.addRecipe(new RecipeInputOreDict("oreGraphite"), null, new ItemStack(ModItems.dusts, 12, 33)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("blockMarble"), null, new ItemStack(ModItems.dusts, 12, 49)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("blockBasalt"), null, new ItemStack(ModItems.dusts, 12, 8)); + } + public static void addTROreWashingRecipes() { //Ore Washing Plant NBTTagCompound liquidAmount = new NBTTagCompound(); liquidAmount.setInteger("amount", 1000); @@ -490,7 +500,81 @@ public class RecipesIC2 { Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedTetrahedrite"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 14), new ItemStack(ModItems.tinyDusts, 2, 79), IC2Items.getItem("stoneDust")); Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedTungsten"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 15), new ItemStack(ModItems.tinyDusts, 2, 82), IC2Items.getItem("stoneDust")); Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedGalena"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 16), new ItemStack(ModItems.tinyDusts, 2, 88), IC2Items.getItem("stoneDust")); - } + public static void addTRThermalCentrifugeRecipes() { + //Thermal Centrifuge + + //Heat Values + NBTTagCompound aluminumHeat = new NBTTagCompound(); + aluminumHeat.setInteger("minHeat", 2000); + NBTTagCompound arditeHeat = new NBTTagCompound(); + arditeHeat.setInteger("minHeat", 3000); + NBTTagCompound bauxiteHeat = new NBTTagCompound(); + bauxiteHeat.setInteger("minHeat", 2500); + NBTTagCompound cadmiumHeat = new NBTTagCompound(); + cadmiumHeat.setInteger("minHeat", 1500); + NBTTagCompound cinnabarHeat = new NBTTagCompound(); + cinnabarHeat.setInteger("minHeat", 1500); + NBTTagCompound cobaltHeat = new NBTTagCompound(); + cobaltHeat.setInteger("minHeat", 3000); + NBTTagCompound darkIronHeat = new NBTTagCompound(); + darkIronHeat.setInteger("minHeat", 2500); + NBTTagCompound indiumHeat = new NBTTagCompound(); + indiumHeat.setInteger("minHeat", 2000); + NBTTagCompound iridiumHeat = new NBTTagCompound(); + iridiumHeat.setInteger("minHeat", 4000); + NBTTagCompound nickelHeat = new NBTTagCompound(); + nickelHeat.setInteger("minHeat", 2000); + NBTTagCompound osmiumHeat = new NBTTagCompound(); + osmiumHeat.setInteger("minHeat", 2000); + NBTTagCompound platinumHeat = new NBTTagCompound(); + platinumHeat.setInteger("minHeat", 3000); + NBTTagCompound pyriteHeat = new NBTTagCompound(); + pyriteHeat.setInteger("minHeat", 1500); + NBTTagCompound sphaleriteHeat = new NBTTagCompound(); + sphaleriteHeat.setInteger("minHeat", 1500); + NBTTagCompound tetrahedriteHeat = new NBTTagCompound(); + tetrahedriteHeat.setInteger("minHeat", 500); + NBTTagCompound tungstenHeat = new NBTTagCompound(); + tungstenHeat.setInteger("minHeat", 2000); + NBTTagCompound galenaHeat = new NBTTagCompound(); + galenaHeat.setInteger("minHeat", 2500); + + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedAluminum"), aluminumHeat, new ItemStack(ModItems.tinyDusts, 1, 9), new ItemStack(ModItems.dusts, 1, 2), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedArdite"), arditeHeat, new ItemStack(ModItems.tinyDusts, 1, 6), new ItemStack(ModItems.dusts, 1, 6), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedBauxite"), bauxiteHeat, new ItemStack(ModItems.tinyDusts, 1, 2), new ItemStack(ModItems.dusts, 1, 9), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCadmium"), cadmiumHeat, new ItemStack(ModItems.tinyDusts, 1, 13), new ItemStack(ModItems.dusts, 1, 13), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCinnabar"), cinnabarHeat, new ItemStack(ModItems.tinyDusts, 1, 66), new ItemStack(ModItems.dusts, 1, 17), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCobalt"), cobaltHeat, new ItemStack(ModItems.tinyDusts, 1, 20), new ItemStack(ModItems.dusts, 1, 20), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedDarkIron"), darkIronHeat, new ItemStack(ModItems.tinyDusts, 1, 40), new ItemStack(ModItems.dusts, 1, 24), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedIndium"), indiumHeat, new ItemStack(ModItems.tinyDusts, 1, 37), new ItemStack(ModItems.dusts, 1, 35), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedIridium"), iridiumHeat, new ItemStack(ModItems.tinyDusts, 1, 60), new ItemStack(ModItems.dusts, 1, 37), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedNickel"), nickelHeat, new ItemStack(ModItems.tinyDusts, 1, 40), new ItemStack(ModItems.dusts, 1, 53), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedOsmium"), osmiumHeat, new ItemStack(ModItems.tinyDusts, 1, 57), new ItemStack(ModItems.dusts, 1, 55), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPlatinum"), platinumHeat, new ItemStack(ModItems.tinyDusts, 1, 39), new ItemStack(ModItems.dusts, 1, 58), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPyrite"), pyriteHeat, new ItemStack(ModItems.tinyDusts, 1, 76), new ItemStack(ModItems.dusts, 1, 60), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedSphalerite"), sphaleriteHeat, new ItemStack(ModItems.tinyDusts, 1, 87), new ItemStack(ModItems.dusts, 1, 71), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedTetrahedrite"), tetrahedriteHeat, new ItemStack(ModItems.tinyDusts, 1, 5), new ItemStack(ModItems.dusts, 1, 76), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedTungsten"), tungstenHeat, new ItemStack(ModItems.tinyDusts, 1, 49), new ItemStack(ModItems.dusts, 1, 79), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedGalena"), galenaHeat, new ItemStack(ModItems.tinyDusts, 1, 76), new ItemStack(ModItems.dusts, 1, 85), IC2Items.getItem("stoneDust")); + + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedAluminum"), aluminumHeat, new ItemStack(ModItems.tinyDusts, 1, 9), new ItemStack(ModItems.dusts, 1, 2)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedArdite"), arditeHeat, new ItemStack(ModItems.tinyDusts, 1, 6), new ItemStack(ModItems.dusts, 1, 6)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedBauxite"), bauxiteHeat, new ItemStack(ModItems.tinyDusts, 1, 2), new ItemStack(ModItems.dusts, 1, 9)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCadmium"), cadmiumHeat, new ItemStack(ModItems.tinyDusts, 1, 13), new ItemStack(ModItems.dusts, 1, 13)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCinnabar"), cinnabarHeat, new ItemStack(ModItems.tinyDusts, 1, 66), new ItemStack(ModItems.dusts, 1, 17)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCobalt"), cobaltHeat, new ItemStack(ModItems.tinyDusts, 1, 20), new ItemStack(ModItems.dusts, 1, 20)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedDarkIron"), darkIronHeat, new ItemStack(ModItems.tinyDusts, 1, 40), new ItemStack(ModItems.dusts, 1, 24)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedIndium"), indiumHeat, new ItemStack(ModItems.tinyDusts, 1, 37), new ItemStack(ModItems.dusts, 1, 35)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedIridium"), iridiumHeat, new ItemStack(ModItems.tinyDusts, 1, 60), new ItemStack(ModItems.dusts, 1, 37)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedNickel"), nickelHeat, new ItemStack(ModItems.tinyDusts, 1, 40), new ItemStack(ModItems.dusts, 1, 53)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedOsmium"), osmiumHeat, new ItemStack(ModItems.tinyDusts, 1, 57), new ItemStack(ModItems.dusts, 1, 55)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedPlatinum"), platinumHeat, new ItemStack(ModItems.tinyDusts, 1, 39), new ItemStack(ModItems.dusts, 1, 58)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedPyrite"), pyriteHeat, new ItemStack(ModItems.tinyDusts, 1, 76), new ItemStack(ModItems.dusts, 1, 60)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedSphalerite"), sphaleriteHeat, new ItemStack(ModItems.tinyDusts, 1, 87), new ItemStack(ModItems.dusts, 1, 71)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedTetrahedrite"), tetrahedriteHeat, new ItemStack(ModItems.tinyDusts, 1, 5), new ItemStack(ModItems.dusts, 1, 76)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedTungsten"), tungstenHeat, new ItemStack(ModItems.tinyDusts, 1, 49), new ItemStack(ModItems.dusts, 1, 79)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedGalena"), galenaHeat, new ItemStack(ModItems.tinyDusts, 1, 76), new ItemStack(ModItems.dusts, 1, 85)); + } } diff --git a/src/main/resources/assets/techreborn/textures/fluids/berylium.png b/src/main/resources/assets/techreborn/textures/fluids/berylium.png new file mode 100644 index 000000000..2f9afa243 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/berylium.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/berylium.png.mcmeta b/src/main/resources/assets/techreborn/textures/fluids/berylium.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/fluids/berylium.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/fluids/calcium.png b/src/main/resources/assets/techreborn/textures/fluids/calcium.png new file mode 100644 index 000000000..dbd15d2ab Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/calcium.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/calcium.png.mcmeta b/src/main/resources/assets/techreborn/textures/fluids/calcium.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/fluids/calcium.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/fluids/calciumcarbonate.png b/src/main/resources/assets/techreborn/textures/fluids/calciumcarbonate.png new file mode 100644 index 000000000..39d7f64a5 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/calciumcarbonate.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/calciumcarbonate.png.mcmeta b/src/main/resources/assets/techreborn/textures/fluids/calciumcarbonate.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/fluids/calciumcarbonate.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/fluids/chlorite.png b/src/main/resources/assets/techreborn/textures/fluids/chlorite.png new file mode 100644 index 000000000..ff75f08dd Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/chlorite.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/chlorite.png.mcmeta b/src/main/resources/assets/techreborn/textures/fluids/chlorite.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/fluids/chlorite.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/fluids/deuterium.png b/src/main/resources/assets/techreborn/textures/fluids/deuterium.png new file mode 100644 index 000000000..113af7662 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/deuterium.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/glyceryl.png b/src/main/resources/assets/techreborn/textures/fluids/glyceryl.png new file mode 100644 index 000000000..5d326fcdf Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/glyceryl.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/glyceryl.png.mcmeta b/src/main/resources/assets/techreborn/textures/fluids/glyceryl.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/fluids/glyceryl.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/fluids/helium-3.png b/src/main/resources/assets/techreborn/textures/fluids/helium-3.png new file mode 100644 index 000000000..395e43887 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/helium-3.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/helium.png b/src/main/resources/assets/techreborn/textures/fluids/helium.png new file mode 100644 index 000000000..2ead95048 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/helium.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/heliumplasma.png b/src/main/resources/assets/techreborn/textures/fluids/heliumplasma.png new file mode 100644 index 000000000..bfeb435f0 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/heliumplasma.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/heliumplasma.png.mcmeta b/src/main/resources/assets/techreborn/textures/fluids/heliumplasma.png.mcmeta new file mode 100644 index 000000000..87c542d29 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/fluids/heliumplasma.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/fluids/hydrogen.png b/src/main/resources/assets/techreborn/textures/fluids/hydrogen.png new file mode 100644 index 000000000..53197e093 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/hydrogen.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/lithium.png b/src/main/resources/assets/techreborn/textures/fluids/lithium.png new file mode 100644 index 000000000..6247837ed Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/lithium.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/lithium.png.mcmeta b/src/main/resources/assets/techreborn/textures/fluids/lithium.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/fluids/lithium.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/fluids/mercury.png b/src/main/resources/assets/techreborn/textures/fluids/mercury.png new file mode 100644 index 000000000..16ab029f1 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/mercury.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/mercury.png.mcmeta b/src/main/resources/assets/techreborn/textures/fluids/mercury.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/fluids/mercury.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/fluids/methane.png b/src/main/resources/assets/techreborn/textures/fluids/methane.png new file mode 100644 index 000000000..5f8e539e8 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/methane.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/nitrocoalfuel.png b/src/main/resources/assets/techreborn/textures/fluids/nitrocoalfuel.png new file mode 100644 index 000000000..6ef50c4ed Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/nitrocoalfuel.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/nitrocoalfuel.png.mcmeta b/src/main/resources/assets/techreborn/textures/fluids/nitrocoalfuel.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/fluids/nitrocoalfuel.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/fluids/nitrofuel.png b/src/main/resources/assets/techreborn/textures/fluids/nitrofuel.png new file mode 100644 index 000000000..c563ca002 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/nitrofuel.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/nitrofuel.png.mcmeta b/src/main/resources/assets/techreborn/textures/fluids/nitrofuel.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/fluids/nitrofuel.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/fluids/nitrogen.png b/src/main/resources/assets/techreborn/textures/fluids/nitrogen.png new file mode 100644 index 000000000..55cde5b4d Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/nitrogen.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/nitrogendioxide.png b/src/main/resources/assets/techreborn/textures/fluids/nitrogendioxide.png new file mode 100644 index 000000000..e7323cb12 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/nitrogendioxide.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/potassium.png b/src/main/resources/assets/techreborn/textures/fluids/potassium.png new file mode 100644 index 000000000..67084c8fb Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/potassium.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/potassium.png.mcmeta b/src/main/resources/assets/techreborn/textures/fluids/potassium.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/fluids/potassium.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/fluids/silicon.png b/src/main/resources/assets/techreborn/textures/fluids/silicon.png new file mode 100644 index 000000000..65e1aa72b Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/silicon.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/silicon.png.mcmeta b/src/main/resources/assets/techreborn/textures/fluids/silicon.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/fluids/silicon.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/fluids/sodium.png b/src/main/resources/assets/techreborn/textures/fluids/sodium.png new file mode 100644 index 000000000..0ec7857c8 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/sodium.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/sodium.png.mcmeta b/src/main/resources/assets/techreborn/textures/fluids/sodium.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/fluids/sodium.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/fluids/sodiumpersulfate.png b/src/main/resources/assets/techreborn/textures/fluids/sodiumpersulfate.png new file mode 100644 index 000000000..3de580dbe Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/sodiumpersulfate.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/sodiumpersulfate.png.mcmeta b/src/main/resources/assets/techreborn/textures/fluids/sodiumpersulfate.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/fluids/sodiumpersulfate.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/fluids/tritium.png b/src/main/resources/assets/techreborn/textures/fluids/tritium.png new file mode 100644 index 000000000..495cdb1bb Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/tritium.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/wolframium.png b/src/main/resources/assets/techreborn/textures/fluids/wolframium.png new file mode 100644 index 000000000..86b084ea7 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/fluids/wolframium.png differ diff --git a/src/main/resources/assets/techreborn/textures/fluids/wolframium.png.mcmeta b/src/main/resources/assets/techreborn/textures/fluids/wolframium.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/fluids/wolframium.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file