Holy huge commit with unhelpful name batman!

-Added TRNoDestroy (for items that do not use JSONDestroyer)
-Batteries now use item overrides to display different texture when empty
-Fixed diamond nugget unity texture
-Removed new fluid sources from JEI
-Fixed empty cell lang entry
This commit is contained in:
Prospector 2016-06-05 01:33:40 -07:00
parent 0bbc088524
commit a719a1c563
21 changed files with 163 additions and 63 deletions

View file

@ -365,44 +365,7 @@ 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
item.techreborn.cell.biomass.name=Biomass Cell
item.techreborn.cell.calciumCarbonate.name=Calcium Carbonate Cell
item.techreborn.cell.calcium.name=Calcium Cell
item.techreborn.cell.carbon.name=Carbon Cell
item.techreborn.cell.chlorine.name=Chlorine Cell
item.techreborn.cell.deuterium.name=Deuterium Cell
item.techreborn.cell.diesel.name=Diesel Cell
item.techreborn.cell.ethanol.name=Ethanol Cell
item.techreborn.cell.glyceryl.name=Glyceryl Cell
item.techreborn.cell.helium3.name=Helium3 Cell
item.techreborn.cell.helium.name=Helium Cell
item.techreborn.cell.heliumPlasma.name=Helium Plasma Cell
item.techreborn.cell.hydrogen.name=Hydrogen Cell
item.techreborn.cell.ice.name=Ice Cell
item.techreborn.cell.lithium.name=Lithium Cell
item.techreborn.cell.mercury.name=Mercury Cell
item.techreborn.cell.methane.name=Methane Cell
item.techreborn.cell.nitrocarbon.name=Nitrocarbon Cell
item.techreborn.cell.nitroCoalfuel.name=Nitro Coal Fuel Cell
item.techreborn.cell.nitroDiesel.name=Nitro Diesel Cell
item.techreborn.cell.nitrogen.name=Nitrogen Cell
item.techreborn.cell.nitrogenDioxide.name=Nitrogen Dioxide Cell
item.techreborn.cell.oil.name=Oil Cell
item.techreborn.cell.potassium.name=Potassium Cell
item.techreborn.cell.seedOil.name=Seed Oil Cell
item.techreborn.cell.silicon.name=Silicon Cell
item.techreborn.cell.sodium.name=Sodium Cell
item.techreborn.cell.sodiumPersulfate.name=Sodium Persulfate Cell
item.techreborn.cell.sodiumSulfide.name=Sodium Sulfide Cell
item.techreborn.cell.sulfur.name=Sulfur Cell
item.techreborn.cell.sulfuricAcid.name=Sulfuric Acid Cell
item.techreborn.cell.tritium.name=Tritium Cell
item.techreborn.cell.wolframium.name=Wolframium Cell
item.techreborn.cell.empty.name=Empty Cell
item.techreborn.cell.water.name=Water Cell
item.techreborn.cell.lava.name=Lava Cell
item.techreborn.cell.name=Empty Cell
item.techreborn.rebattery.name=Battery
item.techreborn.lithiumBattery.name=Lithium Battery
item.techreborn.energyCrystal.name=Energy Crystal

View file

@ -0,0 +1,14 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/energyCrystal"
},
"overrides": [
{
"predicate": {
"techreborn:empty": 1
},
"model": "techreborn:item/energyCrystalEmpty"
}
]
}

View file

@ -0,0 +1,6 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/energyCrystalEmpty"
}
}

View file

@ -0,0 +1,14 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/lapotronCrystal"
},
"overrides": [
{
"predicate": {
"techreborn:empty": 1
},
"model": "techreborn:item/lapotronCrystalEmpty"
}
]
}

View file

@ -0,0 +1,6 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/lapotronCrystalEmpty"
}
}

View file

@ -0,0 +1,14 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/lithiumBattery"
},
"overrides": [
{
"predicate": {
"techreborn:empty": 1
},
"model": "techreborn:item/lithiumBatteryEmpty"
}
]
}

View file

@ -0,0 +1,6 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/lithiumBatteryEmpty"
}
}

View file

@ -0,0 +1,14 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/reBattery"
},
"overrides": [
{
"predicate": {
"techreborn:empty": 1
},
"model": "techreborn:item/reBatteryEmpty"
}
]
}

View file

@ -0,0 +1,6 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/reBatteryEmpty"
}
}

View file

@ -0,0 +1,3 @@
{
"parent": "item/generated"
}