Bunch of new item textures, move Lazurite to plates

... and relocation of some assets
This commit is contained in:
Yulife 2016-05-30 13:35:20 +02:00
parent d051286f95
commit 341e862e37
36 changed files with 10 additions and 9 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 593 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 648 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 631 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 169 B

After

Width:  |  Height:  |  Size: 755 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 516 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 197 B

After

Width:  |  Height:  |  Size: 424 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 482 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 739 B

After

Width:  |  Height:  |  Size: 593 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 739 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 169 B

View file

@ -543,6 +543,7 @@ public class ModItems
OreUnifier.registerOre("plateTungstensteel", ItemPlates.getPlateByName("tungstensteel")); OreUnifier.registerOre("plateTungstensteel", ItemPlates.getPlateByName("tungstensteel"));
OreUnifier.registerOre("plateYellowGarnet", ItemPlates.getPlateByName("yellowGarnet")); OreUnifier.registerOre("plateYellowGarnet", ItemPlates.getPlateByName("yellowGarnet"));
OreUnifier.registerOre("plateZinc", ItemPlates.getPlateByName("zinc")); OreUnifier.registerOre("plateZinc", ItemPlates.getPlateByName("zinc"));
OreUnifier.registerOre("blockLapis", ItemPlates.getPlateByName("lazurite"));
OreUnifier.registerOre("diamondTR", ItemDusts.getDustByName("Diamond")); OreUnifier.registerOre("diamondTR", ItemDusts.getDustByName("Diamond"));
OreUnifier.registerOre("diamondTR", Items.DIAMOND); OreUnifier.registerOre("diamondTR", Items.DIAMOND);
@ -553,7 +554,6 @@ public class ModItems
OreUnifier.registerOre("circuitData", ItemParts.getPartByName("dataStorageCircuit")); OreUnifier.registerOre("circuitData", ItemParts.getPartByName("dataStorageCircuit"));
OreUnifier.registerOre("craftingSuperconductor", ItemParts.getPartByName("superconductor")); OreUnifier.registerOre("craftingSuperconductor", ItemParts.getPartByName("superconductor"));
OreUnifier.registerOre("batteryUltimate", ItemParts.getPartByName("diamondGrindingHead")); OreUnifier.registerOre("batteryUltimate", ItemParts.getPartByName("diamondGrindingHead"));
OreUnifier.registerOre("blockLapis", ItemParts.getPartByName("lazuriteChunk"));
OreUnifier.registerOre("containerWater", ItemCells.getCellByName("water")); OreUnifier.registerOre("containerWater", ItemCells.getCellByName("water"));
OreUnifier.registerOre("containerWater", Items.WATER_BUCKET); OreUnifier.registerOre("containerWater", Items.WATER_BUCKET);

View file

@ -29,7 +29,7 @@ public class ItemBlockRubberSapling extends ItemBlock implements ITexturedItem
@Override @Override
public String getTextureName(int damage) public String getTextureName(int damage)
{ {
return "techreborn:items/rubber_sapling"; return "techreborn:items/misc/rubber_sapling";
} }
@Override @Override

View file

@ -105,6 +105,6 @@ public class ItemFrequencyTransmitter extends ItemTextureBase implements ITextur
@Override public String getTextureName(int arg0) @Override public String getTextureName(int arg0)
{ {
return "techreborn:items/misc/frequency_transmitter"; return "techreborn:items/tools/frequency_transmitter";
} }
} }

View file

@ -54,7 +54,7 @@ public class ItemLapotronicOrb extends ItemTextureBase implements IEnergyItemInf
@Override @Override
public String getTextureName(int damage) public String getTextureName(int damage)
{ {
return "techreborn:items/lapotronicEnergyOrb"; return "techreborn:items/tool/lapotronicEnergyOrb";
} }
@Override @Override

View file

@ -19,7 +19,7 @@ public class ItemParts extends ItemTextureBase
public static final String[] types = new String[] { "energyFlowCircuit", "dataControlCircuit", "dataStorageCircuit", public static final String[] types = new String[] { "energyFlowCircuit", "dataControlCircuit", "dataStorageCircuit",
"dataOrb", "diamondGrindingHead", "diamondSawBlade", "tungstenGrindingHead", "heliumCoolantSimple", "dataOrb", "diamondGrindingHead", "diamondSawBlade", "tungstenGrindingHead", "heliumCoolantSimple",
"heliumCoolantTriple", "heliumCoolantSix", "NaKCoolantSimple", "NaKCoolantTriple", "NaKCoolantSix", "heliumCoolantTriple", "heliumCoolantSix", "NaKCoolantSimple", "NaKCoolantTriple", "NaKCoolantSix",
"cupronickelHeatingCoil", "nichromeHeatingCoil", "kanthalHeatingCoil", "lazuriteChunk", "superConductor", "cupronickelHeatingCoil", "nichromeHeatingCoil", "kanthalHeatingCoil", ModItems.META_PLACEHOLDER, "superConductor",
"thoriumCell", "doubleThoriumCell", "quadThoriumCell", "plutoniumCell", "doublePlutoniumCell", "thoriumCell", "doubleThoriumCell", "quadThoriumCell", "plutoniumCell", "doublePlutoniumCell",
"quadPlutoniumCell", "computerMonitor", "machineParts", "neutronReflector", "iridiumNeutronReflector", "quadPlutoniumCell", "computerMonitor", "machineParts", "neutronReflector", "iridiumNeutronReflector",
"thickNeutronReflector", "electronicCircuit", "advancedCircuit", "rubberSap", "rubber", "scrap", "thickNeutronReflector", "electronicCircuit", "advancedCircuit", "rubberSap", "rubber", "scrap",

View file

@ -16,7 +16,8 @@ public class ItemPlates extends ItemTextureBase
public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum", public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum",
"invar", "iridium", "iron", "gold", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium", "invar", "iridium", "iron", "gold", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium",
"tungsten", "tungstensteel", "zinc", "refinedIron", "carbon", "wood", "magnalium", "tungsten", "tungstensteel", "zinc", "refinedIron", "carbon", "wood", "magnalium",
"silicon", "ruby", "sapphire", "peridot", "redGarnet", "yellowGarnet", "redstone", "diamond", "emerald", "lapis", "coal", "obsidian", "advancedAlloy" }; "silicon", "ruby", "sapphire", "peridot", "redGarnet", "yellowGarnet", "redstone",
"diamond", "emerald", "lapis", "coal", "obsidian", "advancedAlloy", "lazurite" };
public ItemPlates() public ItemPlates()
{ {

View file

@ -120,7 +120,7 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITex
@Override @Override
public String getTextureName(int damage) public String getTextureName(int damage)
{ {
return "techreborn:items/tool/lapotronicEnergyOrb"; return "techreborn:items/tool/lapotronicPack";
} }
@Override @Override

View file

@ -117,7 +117,7 @@ public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemIn
@Override @Override
public String getTextureName(int damage) public String getTextureName(int damage)
{ {
return "techreborn:items/techreborn.cloakingdevice"; return "techreborn:items/tool/cloakingDevice";
} }
@Override @Override

View file

@ -565,6 +565,7 @@ item.techreborn.plate.zinc.name=Zinc Plate
item.techreborn.plate.refinedIron.name=Refined Iron Plate item.techreborn.plate.refinedIron.name=Refined Iron Plate
item.techreborn.plate.wood.name=Wooden Plate item.techreborn.plate.wood.name=Wooden Plate
item.techreborn.plate.advancedAlloy.name=Advanced Alloy item.techreborn.plate.advancedAlloy.name=Advanced Alloy
item.techreborn.plate.lazurite.name=Lazurite Plate
#Parts #Parts
item.techreborn.part.advancedCircuitParts.name=Advanced Circuit Parts item.techreborn.part.advancedCircuitParts.name=Advanced Circuit Parts
@ -591,7 +592,6 @@ item.techreborn.part.steelGear.name=Steel Gear
item.techreborn.part.tungstensteelGear.name=Tungstensteel Gear item.techreborn.part.tungstensteelGear.name=Tungstensteel Gear
item.techreborn.part.laserFocus.name=Laser Focus item.techreborn.part.laserFocus.name=Laser Focus
item.techreborn.part.ductTape.name=Aerospace Advanced Reinforced Duct Tape FAL-84 item.techreborn.part.ductTape.name=Aerospace Advanced Reinforced Duct Tape FAL-84
item.techreborn.part.lazuriteChunk.name=Lazurite Chunk
item.techreborn.part.iridiumAlloyIngot.name=Iridium Alloy Ingot item.techreborn.part.iridiumAlloyIngot.name=Iridium Alloy Ingot
item.techreborn.part.rockCutterBlade.name=Rock Cutter Blade item.techreborn.part.rockCutterBlade.name=Rock Cutter Blade
item.techreborn.part.superConductor.name=Superconductor item.techreborn.part.superConductor.name=Superconductor

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 172 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 191 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 199 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 215 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 220 B