diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/cells/lavaCell.png b/run/resourcepacks/unity/assets/techreborn/textures/items/cells/lavaCell.png deleted file mode 100644 index b83b983d8..000000000 Binary files a/run/resourcepacks/unity/assets/techreborn/textures/items/cells/lavaCell.png and /dev/null differ diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/cells/lavaCell.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/items/cells/lavaCell.png.mcmeta deleted file mode 100644 index 7ceb36394..000000000 --- a/run/resourcepacks/unity/assets/techreborn/textures/items/cells/lavaCell.png.mcmeta +++ /dev/null @@ -1,45 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 18, - 17, - 16, - 15, - 14, - 13, - 12, - 11, - 10, - 9, - 8, - 7, - 6, - 5, - 4, - 3, - 2, - 1 - ] - } -} \ No newline at end of file diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/cells/waterCell.png b/run/resourcepacks/unity/assets/techreborn/textures/items/cells/waterCell.png deleted file mode 100644 index 00fad5ddc..000000000 Binary files a/run/resourcepacks/unity/assets/techreborn/textures/items/cells/waterCell.png and /dev/null differ diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/cells/waterCell.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/items/cells/waterCell.png.mcmeta deleted file mode 100644 index 0645f48c6..000000000 --- a/run/resourcepacks/unity/assets/techreborn/textures/items/cells/waterCell.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 2 - } -} diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/dust/STONETEMPLATE.png b/run/resourcepacks/unity/assets/techreborn/textures/items/dust/STONETEMPLATE.png deleted file mode 100644 index 1330761c1..000000000 Binary files a/run/resourcepacks/unity/assets/techreborn/textures/items/dust/STONETEMPLATE.png and /dev/null differ diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/dust/andesiteDust.png b/run/resourcepacks/unity/assets/techreborn/textures/items/dust/andesiteDust.png new file mode 100644 index 000000000..4da6372ed Binary files /dev/null and b/run/resourcepacks/unity/assets/techreborn/textures/items/dust/andesiteDust.png differ diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/dust/dioriteDust.png b/run/resourcepacks/unity/assets/techreborn/textures/items/dust/dioriteDust.png new file mode 100644 index 000000000..381240bd2 Binary files /dev/null and b/run/resourcepacks/unity/assets/techreborn/textures/items/dust/dioriteDust.png differ diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/dust/graniteDust.png b/run/resourcepacks/unity/assets/techreborn/textures/items/dust/graniteDust.png new file mode 100644 index 000000000..de76b9075 Binary files /dev/null and b/run/resourcepacks/unity/assets/techreborn/textures/items/dust/graniteDust.png differ diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/advancedAlloyIngot.png b/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/advancedAlloyIngot.png index 05b7a8035..657b8637e 100644 Binary files a/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/advancedAlloyIngot.png and b/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/advancedAlloyIngot.png differ diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/advancedAlloyIngot_alt.png b/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/advancedAlloyIngot_alt.png index 657b8637e..05b7a8035 100644 Binary files a/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/advancedAlloyIngot_alt.png and b/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/advancedAlloyIngot_alt.png differ diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/iridiumAlloyIngot.png b/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/iridiumAlloyIngot.png index dbfacd7e5..2a38694db 100644 Binary files a/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/iridiumAlloyIngot.png and b/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/iridiumAlloyIngot.png differ diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/iridiumAlloyIngot_alt.png b/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/iridiumAlloyIngot_alt.png index 2a38694db..dbfacd7e5 100644 Binary files a/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/iridiumAlloyIngot_alt.png and b/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/iridiumAlloyIngot_alt.png differ diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/STONETEMPLATE.png b/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/STONETEMPLATE.png deleted file mode 100644 index cdcdb6e71..000000000 Binary files a/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/STONETEMPLATE.png and /dev/null differ diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/smallAndesiteDust.png b/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/smallAndesiteDust.png new file mode 100644 index 000000000..75d28dce8 Binary files /dev/null and b/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/smallAndesiteDust.png differ diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/smallDioriteDust.png b/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/smallDioriteDust.png new file mode 100644 index 000000000..a92ff30da Binary files /dev/null and b/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/smallDioriteDust.png differ diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/smallGlowstoneDust.png b/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/smallGlowstoneDust.png index d83b69d8c..25c2a0039 100644 Binary files a/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/smallGlowstoneDust.png and b/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/smallGlowstoneDust.png differ diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/smallGraniteDust.png b/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/smallGraniteDust.png new file mode 100644 index 000000000..091123030 Binary files /dev/null and b/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/smallGraniteDust.png differ diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/smallRedstoneDust.png b/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/smallRedstoneDust.png index 5ee407429..17817254f 100644 Binary files a/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/smallRedstoneDust.png and b/run/resourcepacks/unity/assets/techreborn/textures/items/smallDust/smallRedstoneDust.png differ diff --git a/src/main/java/techreborn/items/ItemDusts.java b/src/main/java/techreborn/items/ItemDusts.java index c4c879d7e..fbbb4256e 100644 --- a/src/main/java/techreborn/items/ItemDusts.java +++ b/src/main/java/techreborn/items/ItemDusts.java @@ -13,14 +13,14 @@ import java.util.List; public class ItemDusts extends ItemTextureBase { - public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "andesite", "ashes", "basalt", + public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt", "bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper", - "darkAshes", "diamond", "diorite", "electrum", "emerald", "enderEye", "enderPearl", "endstone", "flint", "galena", - "gold", "granite", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack", + "darkAshes", "diamond", "electrum", "emerald", "enderEye", "enderPearl", "endstone", "flint", "galena", + "gold", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack", "nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "redGarnet", "%NULL%", "ruby", "saltpeter", "sapphire", "sawDust", "silver", "sodalite", "spessartine", "sphalerite", "steel", "sulfur", "tin", "titanium", "tungsten", "uvarovite", "%NULL%", "yellowGarnet", "zinc", - "olivine" }; + "olivine", "andesite", "diorite", "granite" }; public ItemDusts() { diff --git a/src/main/java/techreborn/items/ItemDustsSmall.java b/src/main/java/techreborn/items/ItemDustsSmall.java index 30a2b105d..4f68d0adb 100644 --- a/src/main/java/techreborn/items/ItemDustsSmall.java +++ b/src/main/java/techreborn/items/ItemDustsSmall.java @@ -14,14 +14,14 @@ import java.util.List; public class ItemDustsSmall extends ItemTextureBase { - public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "andesite", "ashes", "basalt", + public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt", "bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper", - "darkAshes", "diamond", "diorite", "electrum", "emerald", "enderEye", "enderPearl", "endstone", "flint", "galena", - "gold", "granite", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack", + "darkAshes", "diamond", "electrum", "emerald", "enderEye", "enderPearl", "endstone", "flint", "galena", + "gold", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack", "nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "redGarnet", "%NULL%", "ruby", "saltpeter", "sapphire", "sawDust", "silver", "sodalite", "spessartine", "sphalerite", "steel", "sulfur", "tin", "titanium", "tungsten", "uvarovite", "%NULL%", "yellowGarnet", "zinc", - "olivine", "redstone", "glowstone" }; + "olivine", "redstone", "glowstone", "andesite", "diorite", "granite" }; public ItemDustsSmall() { diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 795a5d6c0..b4a6879ca 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -265,7 +265,6 @@ item.techreborn.dust.potassiumFeldspar.name=Potassium Feldspar Dust item.techreborn.dust.pyrite.name=Pyrite Dust item.techreborn.dust.pyrope.name=Pyrope Dust item.techreborn.dust.redGarnet.name=Red Garnet Dust -item.techreborn.dust.redrock.name=Red Rock Dust item.techreborn.dust.ruby.name=Ruby Dust item.techreborn.dust.saltpeter.name=Saltpeter Dust item.techreborn.dust.sapphire.name=Sapphire Dust @@ -290,6 +289,10 @@ item.techreborn.dust.zinc.name=Zinc Dust item.techreborn.dust.galena.name=Galena Dust item.techreborn.dust.sawDust.name=Saw Dust item.techreborn.dust.olivine.name=Olivine Dust +item.techreborn.dust.andesite.name=Andesite Dust +item.techreborn.dust.diorite.name=Diorite Dust +item.techreborn.dust.granite.name=Granite Dust + item.techreborn.ingot.refinedIron.name=Refined Iron Ingot item.techreborn.wrench.name=Wrench item.techreborn.cable.COPPER.name=Copper Cable @@ -348,7 +351,6 @@ item.techreborn.dustsmall.platinum.name=Small Pile of Platinum Dust item.techreborn.dustsmall.pyrite.name=Small Pile of Pyrite Dust item.techreborn.dustsmall.pyrope.name=Small Pile of Pyrope Dust item.techreborn.dustsmall.redGarnet.name=Small Pile of Red Garnet Dust -item.techreborn.dustsmall.redrock.name=Small Pile of Red Rock Dust item.techreborn.dustsmall.redstone.name=Small Pile of Redstone item.techreborn.dustsmall.ruby.name=Small Pile of Ruby Dust item.techreborn.dustsmall.saltpeter.name=Small Pile of Saltpeter Dust @@ -368,6 +370,9 @@ item.techreborn.dustsmall.voidstone.name=Small Pile of Voidstone Dust item.techreborn.dustsmall.yellowGarnet.name=Small Pile of Yellow Garnet Dust item.techreborn.dustsmall.zinc.name=Small Pile of Zinc Dust item.techreborn.dustsmall.olivine.name=Small Pile of Olivine Dust +item.techreborn.dustsmall.andesite.name=Small Pile of Andesite Dust +item.techreborn.dustsmall.diorite.name=Small Pile of Diorite Dust +item.techreborn.dustsmall.granite.name=Small Pile of Granite Dust #Cells item.techreborn.cell.Berylium.name=Beryllium Cell