MORE JSONS: UU matter, upgrades, scrapboxes, and rubber sapling! Also fix rubber sapling model

src/main/java/techreborn/client/RegisterItemJsons.java

@@ -24,6 +24,8 @@ public class RegisterItemJsons {
 		register(ModItems.nanosaber, "nanosaber");
 
 		register(ModItems.frequencyTransmitter, "frequencytransmitter");
+		register(ModItems.uuMatter, "misc/uu_matter");
+		register(ModItems.scrapBox, "misc/scrapbox");
 
 		register(ModItems.ironDrill, "tool/steel_drill");
 		register(ModItems.diamondDrill, "tool/diamond_drill");
@@ -36,6 +38,7 @@ public class RegisterItemJsons {
 		register(ModItems.steelJackhammer, "tool/steel_jackhammer");
 		register(ModItems.diamondJackhammer, "tool/diamond_jackhammer");
 		register(ModItems.advancedJackhammer, "tool/advanced_jackhammer");
+		register(ModBlocks.rubberSapling, "misc/rubber_sapling");
 
 		for (int i = 0; i < ItemIngots.types.length; ++i) {
 			String[] name = ItemIngots.types.clone();
@@ -66,6 +69,11 @@ public class RegisterItemJsons {
 			String[] name = ItemDustsSmall.types.clone();
 			registerBlockstate(ModItems.smallDusts, i, name[i]);
 		}
+
+		for (int i = 0; i < ItemUpgrades.types.length; ++i) {
+			String[] name = ItemUpgrades.types.clone();
+			registerBlockstate(ModItems.upgrades, i, name[i]);
+		}
 	}
 
 	private static void registerBlocks() {

src/main/java/techreborn/init/ModRecipes.java

@@ -881,25 +881,25 @@ public class ModRecipes {
 		CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.scrapBox), "SSS", "SSS", "SSS", 'S',
 			ItemParts.getPartByName("scrap"));
 
-		CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock"), "TTT", "WCW", 'T',
+		CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("overclock"), "TTT", "WCW", 'T',
 			ItemParts.getPartByName("CoolantSimple"), 'W', ItemStandaloneCables.getCableByName("insulatedcopper"),
 			'C', "circuitBasic");
 
-		CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock", 2), " T ", "WCW", 'T',
+		CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("overclock", 2), " T ", "WCW", 'T',
 			ItemParts.getPartByName("heliumCoolantSimple"), 'W',
 			ItemStandaloneCables.getCableByName("insulatedcopper"), 'C',
 			"circuitBasic");
 
-		CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock", 2), " T ", "WCW", 'T',
+		CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("overclock", 2), " T ", "WCW", 'T',
 			ItemParts.getPartByName("NaKCoolantSimple"), 'W',
 			ItemStandaloneCables.getCableByName("insulatedcopper"), 'C',
 			"circuitBasic");
 
-		CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Transformer"), "GGG", "WTW", "GCG", 'G',
+		CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("transformer"), "GGG", "WTW", "GCG", 'G',
 			"blockGlass", 'W', ItemStandaloneCables.getCableByName("insulatedgold"), 'C',
 			"circuitBasic", 'T', ModBlocks.MVT);
 
-		CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("EnergyStorage"), "PPP", "WBW", "PCP", 'P',
+		CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("energy_storage"), "PPP", "WBW", "PCP", 'P',
 			"plankWood", 'W', ItemStandaloneCables.getCableByName("insulatedcopper"), 'C',
 			"circuitBasic", 'B', ModItems.reBattery);
 
@@ -926,11 +926,11 @@ public class ModRecipes {
 				ItemCells.getCellByName("potassium"));
 
 		CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.advancedDrill), "ODO", "AOA", 'O',
-			ItemUpgrades.getUpgradeByName("Overclock"), 'D', diamondDrillStack, 'A', "circuitAdvanced");
+			ItemUpgrades.getUpgradeByName("overclock"), 'D', diamondDrillStack, 'A', "circuitAdvanced");
 		CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.advancedChainsaw), "ODO", "AOA", 'O',
-			ItemUpgrades.getUpgradeByName("Overclock"), 'D', diamondChainsawStack, 'A', "circuitAdvanced");
+			ItemUpgrades.getUpgradeByName("overclock"), 'D', diamondChainsawStack, 'A', "circuitAdvanced");
 		CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.advancedJackhammer), "ODO", "AOA", 'O',
-			ItemUpgrades.getUpgradeByName("Overclock"), 'D', diamondJackhammerStack, 'A', "circuitAdvanced");
+			ItemUpgrades.getUpgradeByName("overclock"), 'D', diamondJackhammerStack, 'A', "circuitAdvanced");
 
 		CraftingHelper
 			.addShapedOreRecipe(ItemParts.getPartByName("dataControlCircuit"), "ADA", "DID", "ADA", 'I', "ingotIridium",

src/main/java/techreborn/itemblocks/ItemBlockRubberSapling.java

@@ -1,42 +1,17 @@
 package techreborn.itemblocks;
 
-import me.modmuss50.jsonDestroyer.api.ITexturedItem;
 import net.minecraft.block.Block;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-import reborncore.RebornCore;
 import techreborn.client.TechRebornCreativeTabMisc;
-import techreborn.lib.ModInfo;
 
 /**
  * Created by modmuss50 on 20/02/2016.
  */
-public class ItemBlockRubberSapling extends ItemBlock implements ITexturedItem {
+public class ItemBlockRubberSapling extends ItemBlock {
 
 	public ItemBlockRubberSapling(Block block) {
 		super(block);
 		setCreativeTab(TechRebornCreativeTabMisc.instance);
 		setUnlocalizedName("techreborn.rubberSapling");
-		RebornCore.jsonDestroyer.registerObject(this);
-	}
-
-	@Override
-	public String getTextureName(int damage) {
-		return "techreborn:items/misc/rubber_sapling";
-	}
-
-	@Override
-	public int getMaxMeta() {
-		return 1;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) {
-		return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory");
 	}
 }

src/main/java/techreborn/items/ItemScrapBox.java

@@ -1,6 +1,5 @@
 package techreborn.items;
 
-import me.modmuss50.jsonDestroyer.api.ITexturedItem;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -12,7 +11,7 @@ import reborncore.RebornCore;
 import techreborn.api.ScrapboxList;
 import techreborn.client.TechRebornCreativeTabMisc;
 
-public class ItemScrapBox extends ItemTextureBase implements ITexturedItem {
+public class ItemScrapBox extends ItemTRNoDestroy {
 
 	public ItemScrapBox() {
 		setUnlocalizedName("techreborn.scrapbox");
@@ -39,14 +38,4 @@ public class ItemScrapBox extends ItemTextureBase implements ITexturedItem {
 		}
 		return new ActionResult<>(EnumActionResult.SUCCESS, stack);
 	}
-
-	@Override
-	public int getMaxMeta() {
-		return 1;
-	}
-
-	@Override
-	public String getTextureName(int arg0) {
-		return "techreborn:items/misc/scrapBox";
-	}
 }

src/main/java/techreborn/items/ItemUUmatter.java

@@ -1,22 +1,11 @@
 package techreborn.items;
 
-import me.modmuss50.jsonDestroyer.api.ITexturedItem;
 import techreborn.client.TechRebornCreativeTabMisc;
 
-public class ItemUUmatter extends ItemTextureBase implements ITexturedItem {
+public class ItemUUmatter extends ItemTRNoDestroy {
 
 	public ItemUUmatter() {
 		setCreativeTab(TechRebornCreativeTabMisc.instance);
 		setUnlocalizedName("techreborn.uuMatter");
 	}
-
-	@Override
-	public String getTextureName(int damage) {
-		return "techreborn:items/misc/itemMatter";
-	}
-
-	@Override
-	public int getMaxMeta() {
-		return 1;
-	}
 }

src/main/java/techreborn/items/ItemUpgrades.java

@@ -1,10 +1,10 @@
 package techreborn.items;
 
-import me.modmuss50.jsonDestroyer.api.ITexturedItem;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.NonNullList;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.text.translation.I18n;
 import reborncore.common.recipes.RecipeCrafter;
@@ -15,9 +15,9 @@ import techreborn.utils.upgrade.IMachineUpgrade;
 import java.security.InvalidParameterException;
 import java.util.List;
 
-public class ItemUpgrades extends ItemTextureBase implements IMachineUpgrade, ITexturedItem {
+public class ItemUpgrades extends ItemTRNoDestroy implements IMachineUpgrade {
 
-	public static final String[] types = new String[] { "Overclock", "Transformer", "EnergyStorage" };
+	public static final String[] types = new String[] { "overclock", "transformer", "energy_storage" };
 
 	public ItemUpgrades() {
 		setUnlocalizedName("techreborn.upgrade");
@@ -50,7 +50,8 @@ public class ItemUpgrades extends ItemTextureBase implements IMachineUpgrade, IT
 	}
 
 	// Adds Dusts SubItems To Creative Tab
-	public void getSubItems(Item item, CreativeTabs creativeTabs, List list) {
+	@Override
+	public void getSubItems(Item item, CreativeTabs creativeTabs, NonNullList list) {
 		for (int meta = 0; meta < types.length; ++meta) {
 			list.add(new ItemStack(item, 1, meta));
 		}
@@ -82,14 +83,4 @@ public class ItemUpgrades extends ItemTextureBase implements IMachineUpgrade, IT
 		tooltip.add(TextFormatting.RED + I18n.translateToLocal("tooltip.upBroken"));
 		tooltip.add(TextFormatting.RED + I18n.translateToLocal("tooltip.ingredient"));
 	}
-
-	@Override
-	public int getMaxMeta() {
-		return types.length;
-	}
-
-	@Override
-	public String getTextureName(int damage) {
-		return "techreborn:items/upgrade/upgrade" + types[damage];
-	}
 }

src/main/resources/assets/techreborn/blockstates/rubbersapling.json

@@ -0,0 +1,60 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "cross",
+    "textures": {
+      "cross": "techreborn:blocks/rubber_sapling"
+    }
+  },
+  "variants": {
+    "type": {
+      "oak": {
+        "model": "cross"
+      },
+      "birch": {
+        "model": "cross"
+      },
+      "spruce": {
+        "model": "cross"
+      },
+      "jungle": {
+        "model": "cross"
+      }
+    },
+    "stage": {
+      "0": {
+        "model": "cross"
+      },
+      "1": {
+        "model": "cross"
+      },
+      "2": {
+        "model": "cross"
+      },
+      "3": {
+        "model": "cross"
+      },
+      "4": {
+        "model": "cross"
+      },
+      "5": {
+        "model": "cross"
+      },
+      "6": {
+        "model": "cross"
+      }
+    },
+    "normal": {
+      "parent": "item/generated",
+      "textures": {
+        "layer0": "expandedindustry:blocks/sapling/sapling.redwoodd"
+      }
+    },
+    "inventory": {
+      "parent": "item/generated",
+      "textures": {
+        "layer0": "expandedindustry:blocks/sapling/sapling.redwoodd"
+      }
+    }
+  }
+}

src/main/resources/assets/techreborn/blockstates/upgrades.json

@@ -0,0 +1,26 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "builtin/generated",
+    "transform": "forge:default-item"
+  },
+  "variants": {
+    "type": {
+      "overclock": {
+        "textures": {
+          "layer0": "techreborn:items/upgrade/overclocker_upgrade"
+        }
+      },
+      "transformer": {
+        "textures": {
+          "layer0": "techreborn:items/upgrade/transformer_upgrade"
+        }
+      },
+      "energy_storage": {
+        "textures": {
+          "layer0": "techreborn:items/upgrade/energy_storage_upgrade"
+        }
+      }
+    }
+  }
+}

src/main/resources/assets/techreborn/lang/en_us.lang

@@ -374,9 +374,9 @@ item.techreborn.energyCrystal.name=Energy Crystal
 item.techreborn.lapotronCrystal.name=Lapotron Crystal
 item.techreborn.treetap.name=Treetap
 item.techreborn.nanosaber.name=Nanosaber
-item.techreborn.upgrade.Overclock.name=Overclocker Upgrade
-item.techreborn.upgrade.Transformer.name=Tranformer Upgrade
-item.techreborn.upgrade.EnergyStorage.name=Energy Storage Upgrade
+item.techreborn.upgrade.overclock.name=Overclocker Upgrade
+item.techreborn.upgrade.transformer.name=Tranformer Upgrade
+item.techreborn.upgrade.energy_storage.name=Energy Storage Upgrade
 item.techreborn.electric_treetap.name=Electric Treetap
 
 #Gems

src/main/resources/assets/techreborn/models/item/misc/rubber_sapling.json

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

src/main/resources/assets/techreborn/models/item/misc/scrapbox.json

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

src/main/resources/assets/techreborn/models/item/misc/uu_matter.json

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