maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Flattened parts

Browse source
This commit is contained in:
drcrazy 2018-08-27 13:26:56 +03:00
parent de45f3e68d
commit 8987311694
28 changed files with 515 additions and 437 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/techreborn/blocks/BlockOre.java
View file

@ -52,7 +52,6 @@ import techreborn.events.TRRecipeHandler;
import techreborn.init.ModBlocks;
import techreborn.init.ModDusts;
import techreborn.init.ModGems;
import techreborn.items.ItemDusts;
import techreborn.lib.ModInfo;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.world.config.IOreNameProvider;

8
src/main/java/techreborn/blocks/BlockRubberLog.java
View file

@ -47,8 +47,8 @@ import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.util.WorldUtils;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModParts;
import techreborn.init.ModSounds;
import techreborn.items.ItemParts;
import techreborn.items.tools.ItemElectricTreetap;
import techreborn.items.tools.ItemTreeTap;
import techreborn.lib.ModInfo;
@ -186,8 +186,8 @@ public class BlockRubberLog extends Block {
} else {
playerIn.getHeldItem(EnumHand.MAIN_HAND).damageItem(1, playerIn);
}
if (!playerIn.inventory.addItemStackToInventory(ItemParts.getPartByName("rubberSap").copy())) {
WorldUtils.dropItem(ItemParts.getPartByName("rubberSap").copy(), worldIn, pos.offset(side));
if (!playerIn.inventory.addItemStackToInventory(ModParts.SAP.getStack())) {
WorldUtils.dropItem(ModParts.SAP.getStack(), worldIn, pos.offset(side));
}
if (playerIn instanceof EntityPlayerMP) {
TRRecipeHandler.unlockTRRecipes((EntityPlayerMP) playerIn);
@ -210,7 +210,7 @@ public class BlockRubberLog extends Block {
drops.add(new ItemStack(this));
if (state.getValue(HAS_SAP)) {
if (new Random().nextInt(4) == 0) {
drops.add(ItemParts.getPartByName("rubberSap"));
drops.add(ModParts.SAP.getStack());
}
}
return drops;

16
src/main/java/techreborn/client/RegisterItemJsons.java
View file

@ -43,6 +43,7 @@ import techreborn.init.ModGems;
import techreborn.init.ModIngots;
import techreborn.init.ModItems;
import techreborn.init.ModNuggets;
import techreborn.init.ModParts;
import techreborn.init.ModPlates;
import techreborn.items.*;
import techreborn.lib.ModInfo;
@ -128,19 +129,16 @@ public class RegisterItemJsons {
registerBlockstateMultiItem(ModItems.BRONZE_HOE, "bronze_hoe", "items/tool/tool");
}
ModIngots.registerModel();
ModGems.registerModel();
ModPlates.registerModel();
ModNuggets.registerModel();
ModDusts.registerModel();
ModDustsSmall.registerModel();
ModGems.registerModel();
ModIngots.registerModel();
ModNuggets.registerModel();
ModParts.registerModel();
ModPlates.registerModel();
String[] name = ItemParts.types.clone();
for (int i = 0; i < ItemParts.types.length; ++i) {
registerBlockstate(ModItems.PARTS, i, name[i], "items/materials/");
}
name = ItemUpgrades.types.clone();
String[] name = ItemUpgrades.types.clone();
for (int i = 0; i < ItemUpgrades.types.length; ++i) {
registerBlockstate(ModItems.UPGRADES, i, name[i], "items/misc/");
}

1
src/main/java/techreborn/events/BlockBreakHandler.java
View file

@ -39,7 +39,6 @@ import reborncore.common.util.OreDrop;
import techreborn.init.ModDusts;
import techreborn.init.ModGems;
import techreborn.init.ModItems;
import techreborn.items.ItemDusts;
import techreborn.lib.ModInfo;
import techreborn.utils.OreDictUtils;

8
src/main/java/techreborn/init/ModItems.java
View file

@ -154,13 +154,12 @@ public class ModItems {
ModDusts.register();
ModDustsSmall.register();
ModIngots.register();
ModGems.register();
ModPlates.register();
ModIngots.register();
ModNuggets.register();
ModParts.register();
ModPlates.register();
PARTS = new ItemParts();
registerItem(PARTS, "part");
ROCK_CUTTER = new ItemRockCutter();
registerItem(ROCK_CUTTER, "rockCutter");
@ -325,7 +324,6 @@ public class ModItems {
BlockMachineBase.advancedFrameStack = BlockMachineFrames.getFrameByName("advanced", 1);
BlockMachineBase.basicFrameStack = BlockMachineFrames.getFrameByName("basic", 1);
OreUtil.registerOre("itemRubber", ItemParts.getPartByName("rubber"));
}
public static void registerItem(Item item, String name) {

90
src/main/java/techreborn/init/ModParts.java Normal file
View file

@ -0,0 +1,90 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2018 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.init;
import java.util.Arrays;
import com.google.common.base.CaseFormat;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.RebornRegistry;
import techreborn.items.ItemParts;
import techreborn.lib.ModInfo;
/**
* @author drcrazy
*
*/
public enum ModParts implements IStringSerializable {
CARBON_FIBER, CARBON_MESH, CIRCUIT_ADVANCED, CIRCUIT_BASIC, CIRCUIT_ELITE, COMPUTER_MONITOR, COOLANT_SIMPLE, COOLANT_SIX, COOLANT_TRIPLE,
CUPRONICKEL_HEATING_COIL, DATA_ORB, DATA_STORAGE_CIRCUIT, DEPLETED_CELL,
DIAMOND_GRINDING_HEAD, DIAMOND_SAW_BLADE, DOUBLE_DEPLETED_CELL, DOUBLE_PLUTONIUM_CELL, DOUBLE_THORIUM_CELL,
DOUBLE_URANIUM_CELL, ENERGY_FLOW_CIRCUIT, HELIUM_COOLANT_SIMPLE, HELIUM_COOLANT_SIX,
HELIUM_COOLANT_TRIPLE, IRIDIUM_NEUTRON_REFLECTOR, KANTHAL_HEATING_COIL, MACHINE_PARTS, NAK_COOLANT_SIMPLE,
NAK_COOLANT_SIX, NAK_COOLANT_TRIPLE, NEUTRON_REFLECTOR, NICHROME_HEATING_COIL, PLUTONIUM_CELL, QUAD_DEPLETED_CELL,
QUAD_PLUTONIUM_CELL, QUAD_THORIUM_CELL, QUAD_URANIUM_CELL, RUBBER, SAP, SCRAP, SUPER_CONDUCTOR,
THICK_NEUTRON_REFLECTOR, THORIUM_CELL, TUNGSTEN_GRINDING_HEAD, URANIUM_CELL;
public final String name;
public final Item item;
private ModParts() {
name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, this.toString());
item = new ItemParts();
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
item.setTranslationKey(ModInfo.MOD_ID + "." + name);
}
public ItemStack getStack() {
return new ItemStack(item);
}
public ItemStack getStack(int amount) {
return new ItemStack(item, amount);
}
public static void register() {
Arrays.stream(ModParts.values()).forEach(part -> RebornRegistry.registerItem(part.item));
}
@SideOnly(Side.CLIENT)
public static void registerModel() {
ResourceLocation blockstateJson = new ResourceLocation(ModInfo.MOD_ID, "items/materials/parts");
Arrays.stream(ModParts.values()).forEach(part -> ModelLoader.setCustomModelResourceLocation(part.item, 0,
new ModelResourceLocation(blockstateJson, "type=" + part.name)));
}
@Override
public String getName() {
return name;
}
}

24
src/main/java/techreborn/init/OreDict.java
View file

@ -45,11 +45,11 @@ public class OreDict {
public static void init() {
OreUtil.registerOre("reBattery", ModItems.RE_BATTERY);
OreUtil.registerOre("circuitBasic", ItemParts.getPartByName("electronicCircuit"));
OreUtil.registerOre("circuitAdvanced", ItemParts.getPartByName("advancedCircuit"));
OreUtil.registerOre("circuitStorage", ItemParts.getPartByName("dataStorageCircuit"));
OreUtil.registerOre("circuitElite", ItemParts.getPartByName("dataControlCircuit"));
OreUtil.registerOre("circuitMaster", ItemParts.getPartByName("energyFlowCircuit"));
// OreUtil.registerOre("circuitBasic", ItemParts.getPartByName("electronicCircuit"));
// OreUtil.registerOre("circuitAdvanced", ItemParts.getPartByName("advancedCircuit"));
// OreUtil.registerOre("circuitStorage", ItemParts.getPartByName("dataStorageCircuit"));
// OreUtil.registerOre("circuitElite", ItemParts.getPartByName("dataControlCircuit"));
// OreUtil.registerOre("circuitMaster", ItemParts.getPartByName("energyFlowCircuit"));
OreUtil.registerOre("machineBlockBasic", BlockMachineFrames.getFrameByName("machine", 1));
OreUtil.registerOre("machineBlockAdvanced", BlockMachineFrames.getFrameByName("advancedMachine", 1));
@ -74,13 +74,15 @@ public class OreDict {
OreUtil.registerOre("woodRubber", ModBlocks.RUBBER_LOG);
OreUtil.registerOre("glassReinforced", ModBlocks.REINFORCED_GLASS);
OreUtil.registerOre("craftingDiamondGrinder", ItemParts.getPartByName("diamondGrindingHead"));
OreUtil.registerOre("craftingTungstenGrinder", ItemParts.getPartByName("tungstenGrindingHead"));
OreUtil.registerOre("craftingSuperconductor", ItemParts.getPartByName("superconductor"));
// OreUtil.registerOre("craftingDiamondGrinder", ItemParts.getPartByName("diamondGrindingHead"));
// OreUtil.registerOre("craftingTungstenGrinder", ItemParts.getPartByName("tungstenGrindingHead"));
// OreUtil.registerOre("craftingSuperconductor", ItemParts.getPartByName("superconductor"));
// OreUtil.registerOre("materialResin", ItemParts.getPartByName("rubberSap"));
// OreUtil.registerOre("materialRubber", ItemParts.getPartByName("rubber"));
// OreUtil.registerOre("itemRubber", ItemParts.getPartByName("rubber"));
OreUtil.registerOre("materialResin", ItemParts.getPartByName("rubberSap"));
OreUtil.registerOre("materialRubber", ItemParts.getPartByName("rubber"));
OreUtil.registerOre("itemRubber", ItemParts.getPartByName("rubber"));
// OreUtil.registerOre("pulpWood", ItemDusts.getDustByName("saw_dust"));
// OreUtil.registerOre("dustAsh", ItemDusts.getDustByName("ashes"));

6
src/main/java/techreborn/init/SubItemRetriever.java
View file

@ -111,12 +111,14 @@ public class SubItemRetriever implements ISubItemRetriever {
@Override
public ItemStack getPartByName(String name) {
return ItemParts.getPartByName(name);
// return ItemParts.getPartByName(name);
return null;
}
@Override
public ItemStack getPartByName(String name, int count) {
return ItemParts.getPartByName(name, count);
// return ItemParts.getPartByName(name, count);
return null;
}
@Override

132
src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
View file

@ -53,7 +53,7 @@ public class CraftingTableRecipes extends RecipeMethods {
registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), "stone", "plateIridiumAlloy");
registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("tungstensteel", 1), "plateIridium");
registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), getMaterialObject("tungstensteel", Type.INGOT));
// registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), getMaterialObject("tungstensteel", Type.INGOT));
registerShapeless(getStack(ModBlocks.RUBBER_PLANKS, 4), getStack(ModBlocks.RUBBER_LOG));
registerShaped(DynamicCell.getEmptyCell(16), " T ", "T T", " T ", 'T', "ingotTin");
registerShaped(getStack(ModBlocks.REFINED_IRON_FENCE), "RRR", "RRR", 'R', "ingotRefinedIron");
@ -64,7 +64,7 @@ public class CraftingTableRecipes extends RecipeMethods {
registerShaped(getStack(ModItems.WRENCH), "BNB", "NBN", " B ", 'B', "ingotBronze", 'N', "nuggetBronze");
registerShaped(getStack(ModItems.TREE_TAP), " S ", "PPP", "P ", 'S', "stickWood", 'P', "plankWood");
registerShaped(getStack(ModItems.ELECTRIC_TREE_TAP), "TB", " ", 'T', getStack(ModItems.TREE_TAP), 'B', "reBattery");
registerShaped(getStack(ModItems.NANOSABER), "DC ", "DC ", "GLG", 'L', "lapotronCrystal", 'C', "plateCarbon", 'D', "plateDiamond", 'G', getMaterialObject("glowstone", Type.SMALL_DUST));
// registerShaped(getStack(ModItems.NANOSABER), "DC ", "DC ", "GLG", 'L', "lapotronCrystal", 'C', "plateCarbon", 'D', "plateDiamond", 'G', getMaterialObject("glowstone", Type.SMALL_DUST));
ItemStack rockCutter = getStack(ModItems.ROCK_CUTTER);
rockCutter.addEnchantment(Enchantments.SILK_TOUCH, 1);
registerShaped(rockCutter, "DT ", "DT ", "DCB", 'D', "dustDiamond", 'T', "ingotTitanium", 'C', "circuitBasic", 'B', "reBattery");
@ -89,9 +89,9 @@ public class CraftingTableRecipes extends RecipeMethods {
//Upgrades
registerShaped(ItemUpgrades.getUpgradeByName("energy_storage"), "PPP", "WBW", "PCP", 'P', "plankWood", 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic", 'B', "reBattery");
registerShaped(ItemUpgrades.getUpgradeByName("overclock"), "TTT", "WCW", 'T', getMaterial("coolant_simple", Type.PART), 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic");
registerShaped(ItemUpgrades.getUpgradeByName("overclock", 2), " T ", "WCW", 'T', getMaterial("helium_coolant_triple", Type.PART), 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic");
registerShaped(ItemUpgrades.getUpgradeByName("overclock", 2), " T ", "WCW", 'T', getMaterial("nak_coolant_simple", Type.PART), 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic");
// registerShaped(ItemUpgrades.getUpgradeByName("overclock"), "TTT", "WCW", 'T', getMaterial("coolant_simple", Type.PART), 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic");
// registerShaped(ItemUpgrades.getUpgradeByName("overclock", 2), " T ", "WCW", 'T', getMaterial("helium_coolant_triple", Type.PART), 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic");
// registerShaped(ItemUpgrades.getUpgradeByName("overclock", 2), " T ", "WCW", 'T', getMaterial("nak_coolant_simple", Type.PART), 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic");
registerShaped(ItemUpgrades.getUpgradeByName("transformer"), "GGG", "WTW", "GCG", 'G', "blockGlass", 'W', EnumCableType.IGOLD.getStack(), 'C', "circuitBasic", 'T', getStack(ModBlocks.MV_TRANSFORMER));
//Machines
@ -118,10 +118,10 @@ public class CraftingTableRecipes extends RecipeMethods {
registerShaped(getStack(ModBlocks.INDUSTRIAL_ELECTROLYZER), "RER", "CFC", "RER", 'R', "plateIron", 'E', getStack(ModBlocks.EXTRACTOR), 'C', "circuitAdvanced", 'F', "machineBlockAdvanced");
registerShaped(getStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), "RCR", "AEA", "RCR", 'R', "ingotRefinedIron", 'E', getStack(ModBlocks.EXTRACTOR), 'A', "machineBlockAdvanced", 'C', "circuitAdvanced");
registerShaped(getStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), "RCR", "AEA", "RCR", 'R', "plateAluminum", 'E', getStack(ModBlocks.EXTRACTOR), 'A', "machineBlockAdvanced", 'C', "circuitAdvanced");
registerShaped(getStack(ModBlocks.INDUSTRIAL_SAWMILL), "PAP", "SSS", "ACA", 'P', "ingotRefinedIron", 'A', "circuitAdvanced", 'S', getMaterial("diamond_saw_blade", Type.PART), 'C', "machineBlockAdvanced");
// registerShaped(getStack(ModBlocks.INDUSTRIAL_SAWMILL), "PAP", "SSS", "ACA", 'P', "ingotRefinedIron", 'A', "circuitAdvanced", 'S', getMaterial("diamond_saw_blade", Type.PART), 'C', "machineBlockAdvanced");
registerShaped(getStack(ModBlocks.INDUSTRIAL_BLAST_FURNACE), "CHC", "HBH", "FHF", 'H', getMaterial("cupronickelHeatingCoil", Type.PART), 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'F', getStack(ModBlocks.ELECTRIC_FURNACE));
registerShaped(getStack(ModBlocks.INDUSTRIAL_GRINDER), "ECG", "HHH", "CBC", 'E', getStack(ModBlocks.INDUSTRIAL_ELECTROLYZER), 'H', "craftingDiamondGrinder", 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'G', getStack(ModBlocks.GRINDER));
registerShaped(getStack(ModBlocks.IMPLOSION_COMPRESSOR), "ABA", "CPC", "ABA", 'A', getMaterialObject("advancedAlloy", Type.INGOT), 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'P', getStack(ModBlocks.COMPRESSOR));
// registerShaped(getStack(ModBlocks.IMPLOSION_COMPRESSOR), "ABA", "CPC", "ABA", 'A', getMaterialObject("advancedAlloy", Type.INGOT), 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'P', getStack(ModBlocks.COMPRESSOR));
registerShaped(getStack(ModBlocks.VACUUM_FREEZER), "SPS", "CGC", "SPS", 'S', "plateSteel", 'C', "circuitAdvanced", 'G', "glassReinforced", 'P', getStack(ModBlocks.EXTRACTOR));
registerShaped(getStack(ModBlocks.DISTILLATION_TOWER), "CMC", "PBP", "EME", 'E', getStack(ModBlocks.INDUSTRIAL_ELECTROLYZER), 'M', "circuitMaster", 'B', "machineBlockElite", 'C', getStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), 'P', getStack(ModBlocks.EXTRACTOR));
registerShaped(getStack(ModBlocks.CHEMICAL_REACTOR), "IMI", "CPC", "IEI", 'I', "plateInvar", 'C', "circuitAdvanced", 'M', getStack(ModBlocks.EXTRACTOR), 'P', getStack(ModBlocks.COMPRESSOR), 'E', getStack(ModBlocks.EXTRACTOR));
@ -136,10 +136,10 @@ public class CraftingTableRecipes extends RecipeMethods {
registerShaped(getStack(ModBlocks.SCRAPBOXINATOR), "ICI", "DSD", "ICI", 'S', getStack(ModItems.SCRAP_BOX), 'C', "circuitBasic", 'I', "plateIron", 'D', "dirt");
registerShaped(getStack(ModBlocks.FUSION_CONTROL_COMPUTER), "CCC", "PTP", "CCC", 'P', "energyCrystal", 'T', getStack(ModBlocks.FUSION_COIL), 'C', "circuitMaster");
registerShaped(getStack(ModBlocks.FUSION_COIL), "CSC", "NAN", "CRC", 'A', getStack(ModBlocks.MACHINE_CASINGS, 1, 2), 'N', getMaterial("nichromeHeatingCoil", Type.PART), 'C', "circuitMaster", 'S', "craftingSuperconductor", 'R', getMaterial("iridiumNeutronReflector", Type.PART));
registerShaped(getStack(ModBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateAluminum", 'D', getMaterial("data_orb", Type.PART), 'C', getMaterial("computer_monitor", Type.PART));
registerShaped(getStack(ModBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateSteel", 'D', getMaterial("data_orb", Type.PART), 'C', getMaterial("computer_monitor", Type.PART));
// registerShaped(getStack(ModBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateAluminum", 'D', getMaterial("data_orb", Type.PART), 'C', getMaterial("computer_monitor", Type.PART));
// registerShaped(getStack(ModBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateSteel", 'D', getMaterial("data_orb", Type.PART), 'C', getMaterial("computer_monitor", Type.PART));
registerShaped(getStack(ModBlocks.MATTER_FABRICATOR), "ETE", "AOA", "ETE", 'E', "circuitMaster", 'T', getStack(ModBlocks.EXTRACTOR), 'A', "machineBlockElite", 'O', getStack(ModItems.LAPOTRONIC_ORB));
registerShaped(getStack(ModBlocks.COMPUTER_CUBE), "OMC", "MFM", "CMO", 'O', getMaterial("data_orb", Type.PART), 'M', getMaterial("computer_monitor", Type.PART), 'C', "circuitMaster", 'F', "machineBlockAdvanced");
// registerShaped(getStack(ModBlocks.COMPUTER_CUBE), "OMC", "MFM", "CMO", 'O', getMaterial("data_orb", Type.PART), 'M', getMaterial("computer_monitor", Type.PART), 'C', "circuitMaster", 'F', "machineBlockAdvanced");
registerShaped(getStack(ModBlocks.PLAYER_DETECTOR, true), " D ", "CFC", " D ", 'D', "circuitStorage", 'C', "circuitAdvanced", 'F', getStack(ModBlocks.COMPUTER_CUBE));
registerShaped(getStack(ModBlocks.DRAGON_EGG_SYPHON), "CTC", "PSP", "CBC", 'C', "circuitMaster", 'T', getStack(ModBlocks.MEDIUM_VOLTAGE_SU), 'P', "plateIridiumAlloy", 'S', "craftingSuperconductor", 'B', getStack(ModItems.LAPOTRONIC_ORB));
registerShaped(getStack(ModBlocks.PLASMA_GENERATOR), "PPP", "PTP", "CGC", 'P', "plateTungstensteel", 'T', getStack(ModBlocks.HV_TRANSFORMER), 'C', "circuitMaster", 'G', getStack(ModBlocks.SOLID_FUEL_GENEREATOR));
@ -170,47 +170,47 @@ public class CraftingTableRecipes extends RecipeMethods {
registerShaped(getStack(ModBlocks.EXTRACTOR), "TMT", "TCT", " ", 'T', getStack(ModItems.TREE_TAP, true), 'M', "machineBlockBasic", 'C', "circuitBasic");
registerShaped(getStack(ModBlocks.GRINDER), "FFF", "SMS", " C ", 'F', Items.FLINT, 'S', getStack(Blocks.COBBLESTONE), 'M', getMaterial("machine", Type.MACHINE_FRAME), 'C', "circuitBasic");
registerShapeless(getStack(ModItems.FREQUENCY_TRANSMITTER), EnumCableType.ICOPPER.getStack(), "circuitBasic");
registerShaped(getStack(ModBlocks.QUANTUM_CHEST), "DCD", "ATA", "DQD", 'D', getMaterial("dataOrb", Type.PART), 'C', getMaterial("computerMonitor", Type.PART), 'A', "machineBlockElite", 'Q', getStack(ModBlocks.DIGITAL_CHEST), 'T', getStack(ModBlocks.COMPRESSOR));
// registerShaped(getStack(ModBlocks.QUANTUM_CHEST), "DCD", "ATA", "DQD", 'D', getMaterial("dataOrb", Type.PART), 'C', getMaterial("computerMonitor", Type.PART), 'A', "machineBlockElite", 'Q', getStack(ModBlocks.DIGITAL_CHEST), 'T', getStack(ModBlocks.COMPRESSOR));
registerShaped(getStack(ModBlocks.QUANTUM_TANK), "EPE", "PCP", "EPE", 'P', "platePlatinum", 'E', "circuitAdvanced", 'C', getStack(ModBlocks.QUANTUM_CHEST));
//Lighting
registerShaped(getStack(ModBlocks.LAMP_INCANDESCENT), "GGG", "TCT", "GGG", 'G', "paneGlass", 'T', getMaterial("copper", Type.CABLE), 'C', getMaterial("carbon_fiber", Type.PART));
// registerShaped(getStack(ModBlocks.LAMP_INCANDESCENT), "GGG", "TCT", "GGG", 'G', "paneGlass", 'T', getMaterial("copper", Type.CABLE), 'C', getMaterial("carbon_fiber", Type.PART));
registerShaped(getStack(ModBlocks.LAMP_LED), "GGG", "TLT", "GGG", 'G', "paneGlass", 'T', getMaterial("tin", Type.CABLE), 'L', "dustGlowstone");
//Parts
registerShaped(getMaterial("iridium_alloy", Type.INGOT), "IAI", "ADA", "IAI", 'I', "ingotIridium", 'D', "dustDiamond", 'A', "plateAdvancedAlloy");
// registerShaped(getMaterial("iridium_alloy", Type.INGOT), "IAI", "ADA", "IAI", 'I', "ingotIridium", 'D', "dustDiamond", 'A', "plateAdvancedAlloy");
registerShaped(getStack(ModItems.RE_BATTERY), " W ", "TRT", "TRT", 'T', "ingotTin", 'R', "dustRedstone", 'W', EnumCableType.ICOPPER.getStack());
registerShaped(getStack(ModItems.LITHIUM_BATTERY), " C ", "PFP", "PFP", 'F', getCell("lithium"), 'P', "plateAluminum", 'C', EnumCableType.IGOLD.getStack());
registerShaped(getStack(ModItems.LITHIUM_BATTERY_PACK), "BCB", "BPB", "B B", 'B', getStack(ModItems.LITHIUM_BATTERY), 'P', "plateAluminum", 'C', "circuitAdvanced");
registerShaped(getStack(ModItems.ENERGY_CRYSTAL), "RRR", "RDR", "RRR", 'R', "dustRedstone", 'D', "gemDiamond");
registerShaped(getStack(ModItems.LAPOTRONIC_CRYSTAL), "LCL", "LEL", "LCL", 'L', "dyeBlue", 'E', "energyCrystal", 'C', "circuitBasic");
registerShaped(getStack(ModItems.LAPOTRONIC_ORB), "LLL", "LPL", "LLL", 'L', "lapotronCrystal", 'P', "plateIridiumAlloy");
registerShaped(getStack(ModItems.SCRAP_BOX), "SSS", "SSS", "SSS", 'S', getMaterial("scrap", Type.PART));
// registerShaped(getStack(ModItems.SCRAP_BOX), "SSS", "SSS", "SSS", 'S', getMaterial("scrap", Type.PART));
registerShaped(getMaterial("machine", Type.MACHINE_FRAME), "AAA", "A A", "AAA", 'A', "ingotRefinedIron");
registerShaped(getMaterial("advanced_machine", Type.MACHINE_FRAME), " C ", "AMA", " C ", 'A', "plateAdvancedAlloy", 'C', "plateCarbon", 'M', "machineBlockBasic");
registerShaped(getMaterial("highly_advanced_machine", Type.MACHINE_FRAME), "CTC", "TBT", "CTC", 'C', "plateChrome", 'T', "plateTitanium", 'B', "machineBlockAdvanced");
registerShaped(getMaterial("data_storage_circuit", Type.PART), "RGR", "LCL", "EEE", 'R', "dustRedstone", 'G', "dustGlowstone", 'L', "gemLapis", 'C', "circuitBasic", 'E', "plateEmerald");
registerShaped(getMaterial("data_control_circuit", Type.PART), "ADA", "DID", "ADA", 'I', "ingotIridium", 'A', "circuitAdvanced", 'D', "circuitStorage");
registerShaped(getMaterial("energy_flow_circuit", 4, Type.PART), "ATA", "LIL", "ATA", 'T', "ingotTungsten", 'I', "plateIridiumAlloy", 'A', "circuitAdvanced", 'L', "lapotronCrystal");
registerShaped(getMaterial("data_orb", Type.PART), "DDD", "DSD", "DDD", 'D', "circuitStorage", 'S', "circuitElite");
registerShaped(getMaterial("diamond_saw_blade", 4, Type.PART), "DSD", "S S", "DSD", 'D', "dustDiamond", 'S', "ingotSteel");
registerShaped(getMaterial("diamond_grinding_head", 2, Type.PART), "DSD", "SGS", "DSD", 'S', "ingotSteel", 'D', "dustDiamond", 'G', "gemDiamond");
registerShaped(getMaterial("tungsten_grinding_head", 2, Type.PART), "TST", "SBS", "TST", 'S', "ingotSteel", 'T', "ingotTungsten", 'B', "blockSteel");
registerShaped(getMaterial("computer_monitor", Type.PART), "ADA", "DGD", "ADA", 'D', "dye", 'A', "ingotAluminum", 'G', "paneGlass");
registerShaped(getMaterial("coolant_simple", 2, Type.PART), " T ", "TWT", " T ", 'T', "ingotTin", 'W', getStack(Items.WATER_BUCKET));
registerShaped(getMaterial("coolant_triple", Type.PART), "TTT", "CCC", "TTT", 'T', "ingotTin", 'C', getMaterial("coolant_simple", Type.PART));
registerShaped(getMaterial("coolant_six", Type.PART), "TCT", "TPT", "TCT", 'T', "ingotTin", 'C', getMaterial("coolant_triple", Type.PART), 'P', "plateCopper");
registerShaped(getMaterial("helium_coolant_simple", Type.PART), " T ", "TCT", " T ", 'T', "ingotTin", 'C', getCell("helium"));
registerShaped(getMaterial("helium_coolant_triple", Type.PART), "TTT", "CCC", "TTT", 'T', "ingotTin", 'C', getMaterial("helium_coolant_simple", Type.PART));
registerShaped(getMaterial("helium_coolant_six", Type.PART), "THT", "TCT", "THT", 'T', "ingotTin", 'C', "ingotCopper", 'H', getMaterial("helium_coolant_triple", Type.PART));
registerShaped(getMaterial("nak_coolant_simple", Type.PART), "TST", "PCP", "TST", 'T', "ingotTin", 'C', getMaterial("coolant_simple", Type.PART), 'S', getCell("sodium"), 'P', getCell("potassium"));
registerShaped(getMaterial("nak_coolant_simple", Type.PART), "TPT", "SCS", "TPT", 'T', "ingotTin", 'C', getMaterial("coolant_simple", Type.PART), 'S', getCell("sodium"), 'P', getCell("potassium"));
registerShaped(getMaterial("nak_coolant_triple", Type.PART), "TTT", "CCC", "TTT", 'T', "ingotTin", 'C', getMaterial("nak_coolant_simple", Type.PART));
registerShaped(getMaterial("nak_coolant_six", Type.PART), "THT", "TCT", "THT", 'T', "ingotTin", 'C', "ingotCopper", 'H', getMaterial("nak_coolant_triple", Type.PART));
registerShaped(getMaterial("iridium_neutron_reflector", Type.PART), "PPP", "PIP", "PPP", 'P', getMaterial("thick_neutron_reflector", Type.PART), 'I', "ingotIridium");
registerShaped(getMaterial("thick_neutron_reflector", Type.PART), " P ", "PCP", " P ", 'P', getMaterial("neutron_reflector", Type.PART), 'C', getCell("Berylium"));
registerShaped(getMaterial("neutron_reflector", Type.PART), "TCT", "CPC", "TCT", 'T', "dustTin", 'C', "dustCoal", 'P', "plateCopper");
registerShaped(getMaterial("super_conductor", 4, Type.PART), "CCC", "TIT", "EEE", 'E', "circuitMaster", 'C', getMaterial("heliumCoolantSimple", Type.PART), 'T', "ingotTungsten", 'I', "plateIridiumAlloy");
// registerShaped(getMaterial("data_storage_circuit", Type.PART), "RGR", "LCL", "EEE", 'R', "dustRedstone", 'G', "dustGlowstone", 'L', "gemLapis", 'C', "circuitBasic", 'E', "plateEmerald");
// registerShaped(getMaterial("data_control_circuit", Type.PART), "ADA", "DID", "ADA", 'I', "ingotIridium", 'A', "circuitAdvanced", 'D', "circuitStorage");
// registerShaped(getMaterial("energy_flow_circuit", 4, Type.PART), "ATA", "LIL", "ATA", 'T', "ingotTungsten", 'I', "plateIridiumAlloy", 'A', "circuitAdvanced", 'L', "lapotronCrystal");
// registerShaped(getMaterial("data_orb", Type.PART), "DDD", "DSD", "DDD", 'D', "circuitStorage", 'S', "circuitElite");
// registerShaped(getMaterial("diamond_saw_blade", 4, Type.PART), "DSD", "S S", "DSD", 'D', "dustDiamond", 'S', "ingotSteel");
// registerShaped(getMaterial("diamond_grinding_head", 2, Type.PART), "DSD", "SGS", "DSD", 'S', "ingotSteel", 'D', "dustDiamond", 'G', "gemDiamond");
// registerShaped(getMaterial("tungsten_grinding_head", 2, Type.PART), "TST", "SBS", "TST", 'S', "ingotSteel", 'T', "ingotTungsten", 'B', "blockSteel");
// registerShaped(getMaterial("computer_monitor", Type.PART), "ADA", "DGD", "ADA", 'D', "dye", 'A', "ingotAluminum", 'G', "paneGlass");
// registerShaped(getMaterial("coolant_simple", 2, Type.PART), " T ", "TWT", " T ", 'T', "ingotTin", 'W', getStack(Items.WATER_BUCKET));
// registerShaped(getMaterial("coolant_triple", Type.PART), "TTT", "CCC", "TTT", 'T', "ingotTin", 'C', getMaterial("coolant_simple", Type.PART));
// registerShaped(getMaterial("coolant_six", Type.PART), "TCT", "TPT", "TCT", 'T', "ingotTin", 'C', getMaterial("coolant_triple", Type.PART), 'P', "plateCopper");
// registerShaped(getMaterial("helium_coolant_simple", Type.PART), " T ", "TCT", " T ", 'T', "ingotTin", 'C', getCell("helium"));
// registerShaped(getMaterial("helium_coolant_triple", Type.PART), "TTT", "CCC", "TTT", 'T', "ingotTin", 'C', getMaterial("helium_coolant_simple", Type.PART));
// registerShaped(getMaterial("helium_coolant_six", Type.PART), "THT", "TCT", "THT", 'T', "ingotTin", 'C', "ingotCopper", 'H', getMaterial("helium_coolant_triple", Type.PART));
// registerShaped(getMaterial("nak_coolant_simple", Type.PART), "TST", "PCP", "TST", 'T', "ingotTin", 'C', getMaterial("coolant_simple", Type.PART), 'S', getCell("sodium"), 'P', getCell("potassium"));
// registerShaped(getMaterial("nak_coolant_simple", Type.PART), "TPT", "SCS", "TPT", 'T', "ingotTin", 'C', getMaterial("coolant_simple", Type.PART), 'S', getCell("sodium"), 'P', getCell("potassium"));
// registerShaped(getMaterial("nak_coolant_triple", Type.PART), "TTT", "CCC", "TTT", 'T', "ingotTin", 'C', getMaterial("nak_coolant_simple", Type.PART));
// registerShaped(getMaterial("nak_coolant_six", Type.PART), "THT", "TCT", "THT", 'T', "ingotTin", 'C', "ingotCopper", 'H', getMaterial("nak_coolant_triple", Type.PART));
// registerShaped(getMaterial("iridium_neutron_reflector", Type.PART), "PPP", "PIP", "PPP", 'P', getMaterial("thick_neutron_reflector", Type.PART), 'I', "ingotIridium");
// registerShaped(getMaterial("thick_neutron_reflector", Type.PART), " P ", "PCP", " P ", 'P', getMaterial("neutron_reflector", Type.PART), 'C', getCell("Berylium"));
// registerShaped(getMaterial("neutron_reflector", Type.PART), "TCT", "CPC", "TCT", 'T', "dustTin", 'C', "dustCoal", 'P', "plateCopper");
// registerShaped(getMaterial("super_conductor", 4, Type.PART), "CCC", "TIT", "EEE", 'E', "circuitMaster", 'C', getMaterial("heliumCoolantSimple", Type.PART), 'T', "ingotTungsten", 'I', "plateIridiumAlloy");
registerShaped(getMaterial("copper", 6, Type.CABLE), "CCC", 'C', "ingotCopper");
@ -232,11 +232,11 @@ public class CraftingTableRecipes extends RecipeMethods {
registerShaped(getMaterial("glassfiber", 6, Type.CABLE), "GGG", "RDR", "GGG", 'R', "ingotSilver", 'D', "dustDiamond", 'G', "blockGlass");
registerShaped(getMaterial("glassfiber", 8, Type.CABLE), "GGG", "RDR", "GGG", 'R', "ingotElectrum", 'D', "gemDiamond", 'G', "blockGlass");
registerShaped(getMaterial("glassfiber", 8, Type.CABLE), "GGG", "RDR", "GGG", 'R', "ingotElectrum", 'D', "dustDiamond", 'G', "blockGlass");
registerShaped(getMaterial("carbon_fiber", Type.PART), " C ", "C C", " C ", 'C', "dustCoal");
registerShaped(getMaterial("carbon_fiber", Type.PART), "CCC", "C C", "CCC", 'C', getCell("carbon"));
registerShapeless(getMaterial("carbon_mesh", Type.PART), getMaterial("carbon_fiber", Type.PART), getMaterial("carbon_fiber", Type.PART));
registerShaped(getMaterial("electronic_circuit", Type.PART), "WWW", "SRS", "WWW", 'R', "ingotRefinedIron", 'S', Items.REDSTONE, 'W', EnumCableType.ICOPPER.getStack());
registerShaped(getMaterial("advanced_circuit", Type.PART), "RGR", "LCL", "RGR", 'R', "dustRedstone", 'G', "dustGlowstone", 'L', "gemLapis", 'C', "circuitBasic");
// registerShaped(getMaterial("carbon_fiber", Type.PART), " C ", "C C", " C ", 'C', "dustCoal");
// registerShaped(getMaterial("carbon_fiber", Type.PART), "CCC", "C C", "CCC", 'C', getCell("carbon"));
// registerShapeless(getMaterial("carbon_mesh", Type.PART), getMaterial("carbon_fiber", Type.PART), getMaterial("carbon_fiber", Type.PART));
// registerShaped(getMaterial("electronic_circuit", Type.PART), "WWW", "SRS", "WWW", 'R', "ingotRefinedIron", 'S', Items.REDSTONE, 'W', EnumCableType.ICOPPER.getStack());
// registerShaped(getMaterial("advanced_circuit", Type.PART), "RGR", "LCL", "RGR", 'R', "dustRedstone", 'G', "dustGlowstone", 'L', "gemLapis", 'C', "circuitBasic");
//UU-Matter
@ -277,11 +277,11 @@ public class CraftingTableRecipes extends RecipeMethods {
// registerShaped(getMaterial("aluminum", 16, Type.DUST), " U ", " U ", "UUU", 'U', uuStack);
// registerShaped(getMaterial("iridium", 1, Type.ORE), "UUU", " U ", "UUU", 'U', uuStack);
for (String part : ItemParts.types) {
if (part.endsWith("Gear")) {
registerShaped(getMaterial(part, Type.PART), " O ", "OIO", " O ", 'I', getStack(Items.IRON_INGOT), 'O', "ingot" + StringUtils.toFirstCapital(part.replace("Gear", "")));
}
}
// for (String part : ItemParts.types) {
// if (part.endsWith("Gear")) {
// registerShaped(getMaterial(part, Type.PART), " O ", "OIO", " O ", 'I', getStack(Items.IRON_INGOT), 'O', "ingot" + StringUtils.toFirstCapital(part.replace("Gear", "")));
// }
// }
registerShaped(new ItemStack(ModBlocks.RUBBER_LOG_SLAB_HALF), "WWW", 'W', new ItemStack(ModBlocks.RUBBER_PLANKS));
registerShaped(new ItemStack(ModBlocks.RUBBER_LOG_STAIR), "W ", "WW ", "WWW", 'W', new ItemStack(ModBlocks.RUBBER_PLANKS));
@ -295,24 +295,24 @@ public class CraftingTableRecipes extends RecipeMethods {
static void registerCompressionRecipes() {
for (String name : BlockStorage.types) {
if (OreUtil.hasIngot(name)) {
registerShaped(BlockStorage.getStorageBlockByName(name), "AAA", "AAA", "AAA", 'A', "ingot" + StringUtils.toFirstCapital(name));
registerShapeless(getMaterial(name, 9, Type.INGOT), BlockStorage.getStorageBlockByName(name));
} else if (OreUtil.hasGem(name)) {
registerShaped(BlockStorage.getStorageBlockByName(name), "AAA", "AAA", "AAA", 'A', "gem" + StringUtils.toFirstCapital(name));
registerShapeless(getMaterial(name, 9, Type.GEM), BlockStorage.getStorageBlockByName(name));
}
// if (OreUtil.hasIngot(name)) {
// registerShaped(BlockStorage.getStorageBlockByName(name), "AAA", "AAA", "AAA", 'A', "ingot" + StringUtils.toFirstCapital(name));
// registerShapeless(getMaterial(name, 9, Type.INGOT), BlockStorage.getStorageBlockByName(name));
// } else if (OreUtil.hasGem(name)) {
// registerShaped(BlockStorage.getStorageBlockByName(name), "AAA", "AAA", "AAA", 'A', "gem" + StringUtils.toFirstCapital(name));
// registerShapeless(getMaterial(name, 9, Type.GEM), BlockStorage.getStorageBlockByName(name));
// }
}
for (String block : BlockStorage2.types){
block = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, block);
if (OreUtil.hasIngot(block)) {
registerShaped(BlockStorage2.getStorageBlockByName(block), "AAA", "AAA", "AAA", 'A', "ingot" + StringUtils.toFirstCapital(block));
registerShapeless(getMaterial(block, 9, Type.INGOT), BlockStorage2.getStorageBlockByName(block));
} else if (OreUtil.hasGem(block)) {
registerShaped(BlockStorage2.getStorageBlockByName(block), "AAA", "AAA", "AAA", 'A', "gem" + StringUtils.toFirstCapital(block));
registerShapeless(getMaterial(block, 9, Type.GEM), BlockStorage2.getStorageBlockByName(block));
}
// block = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, block);
// if (OreUtil.hasIngot(block)) {
// registerShaped(BlockStorage2.getStorageBlockByName(block), "AAA", "AAA", "AAA", 'A', "ingot" + StringUtils.toFirstCapital(block));
// registerShapeless(getMaterial(block, 9, Type.INGOT), BlockStorage2.getStorageBlockByName(block));
// } else if (OreUtil.hasGem(block)) {
// registerShaped(BlockStorage2.getStorageBlockByName(block), "AAA", "AAA", "AAA", 'A', "gem" + StringUtils.toFirstCapital(block));
// registerShapeless(getMaterial(block, 9, Type.GEM), BlockStorage2.getStorageBlockByName(block));
// }
}
// for (String name : ItemDustsSmall.types) {
@ -368,11 +368,11 @@ public class CraftingTableRecipes extends RecipeMethods {
if (!OreDictionary.doesOreNameExist(bottom)) {
return;
}
if (top.equals("ingotRefinedIron")) {
registerShaped(getMaterial("mixed_metal", amount, Type.INGOT), "TTT", "MMM", "BBB", 'T', "ingotRefinedIron", 'M', middle, 'B', bottom);
} else {
registerShaped(getMaterial("mixed_metal", amount, Type.INGOT), "TTT", "MMM", "BBB", 'T', top, 'M', middle, 'B', bottom);
}
// if (top.equals("ingotRefinedIron")) {
// registerShaped(getMaterial("mixed_metal", amount, Type.INGOT), "TTT", "MMM", "BBB", 'T', "ingotRefinedIron", 'M', middle, 'B', bottom);
// } else {
// registerShaped(getMaterial("mixed_metal", amount, Type.INGOT), "TTT", "MMM", "BBB", 'T', top, 'M', middle, 'B', bottom);
// }
if (middle.equals("ingotBronze")) {
registerMixedMetal(top, "ingotBrass", bottom, amount);
}

9
src/main/java/techreborn/init/recipes/ExtractorRecipes.java
View file

@ -40,10 +40,11 @@ import techreborn.items.DynamicCell;
*/
public class ExtractorRecipes extends RecipeMethods {
public static void init() {
register(getStack(ModBlocks.RUBBER_SAPLING), getMaterial("rubber", Type.PART), false);
register(getStack(ModBlocks.RUBBER_LOG), getMaterial("rubber", Type.PART), false);
register(getStack(Items.SLIME_BALL), getMaterial("rubber", 2, Type.PART));
register(getMaterial("sap", Type.PART), getMaterial("rubber", 3, Type.PART));
// TODO: Fix Recipe
// register(getStack(ModBlocks.RUBBER_SAPLING), getMaterial("rubber", Type.PART), false);
// register(getStack(ModBlocks.RUBBER_LOG), getMaterial("rubber", Type.PART), false);
// register(getStack(Items.SLIME_BALL), getMaterial("rubber", 2, Type.PART));
// register(getMaterial("sap", Type.PART), getMaterial("rubber", 3, Type.PART));
register(getStack(Blocks.RED_FLOWER), getStack(Items.DYE, 2, 1), false);
register(getStack(Blocks.YELLOW_FLOWER), getStack(Items.DYE, 2, 11), false);
register(getStack(Blocks.RED_FLOWER, 1, 1), getStack(Items.DYE, 2, 12), false);

4
src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java
View file

@ -79,8 +79,8 @@ public class IndustrialCentrifugeRecipes extends RecipeMethods {
register(getStack(Blocks.BROWN_MUSHROOM, 32), 5000, getMaterial("methane", Type.CELL));
register(getStack(Blocks.RED_MUSHROOM, 32), 5000, getMaterial("methane", Type.CELL));
register(getStack(Items.NETHER_WART, 32), 5000, getMaterial("methane", Type.CELL));
register(getMaterial("sap", 4, Type.PART), 1300, getMaterial("rubber", 14, Type.PART));
register(getStack(ModBlocks.RUBBER_LOG, 16), 5000, false, getMaterial("sap", 8, Type.PART), getMaterial("methane", Type.CELL), getMaterial("carbon", 4, Type.CELL));
// register(getMaterial("sap", 4, Type.PART), 1300, getMaterial("rubber", 14, Type.PART));
// register(getStack(ModBlocks.RUBBER_LOG, 16), 5000, false, getMaterial("sap", 8, Type.PART), getMaterial("methane", Type.CELL), getMaterial("carbon", 4, Type.CELL));
// register(getStack(Blocks.SOUL_SAND, 16), 2500, getStack(Blocks.SAND, 10), getMaterial("saltpeter", 4, Type.DUST), getMaterial("coal", Type.DUST), getMaterial("oil", Type.CELL));
// register(getOre("dustBronze"), 1500, getMaterial("copper", 6, Type.SMALL_DUST), getMaterial("tin", 2, Type.SMALL_DUST));
// register(getOre("dustIron", 2), 1500, getMaterial("tin", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST));

4
src/main/java/techreborn/init/recipes/RecipeMethods.java
View file

@ -58,8 +58,8 @@ public abstract class RecipeMethods {
// } else
if (type == Type.CELL) {
return ItemCells.getCellByName(name, count);
} else if (type == Type.PART) {
return ItemParts.getPartByName(name, count);
// } else if (type == Type.PART) {
// return ItemParts.getPartByName(name, count);
} else if (type == Type.CABLE) {
return BlockCable.getCableByName(name, count);
} else if (type == Type.MACHINE_FRAME) {

8
src/main/java/techreborn/init/recipes/RollingMachineRecipes.java
View file

@ -36,13 +36,13 @@ import techreborn.lib.ModInfo;
*/
public class RollingMachineRecipes extends RecipeMethods {
public static void init() {
register(new ResourceLocation(ModInfo.MOD_ID, "cupronickel_heating_coil"), getMaterial("cupronickel_heating_coil", 3, Type.PART), "NCN", "C C", "NCN", 'N', "ingotNickel", 'C', "ingotCopper");
register(new ResourceLocation(ModInfo.MOD_ID, "nichrome_heating_coil"), getMaterial("nichrome_heating_coil", 2, Type.PART), " N ", "NCN", " N ", 'N', "ingotNickel", 'C', "ingotChrome");
// register(new ResourceLocation(ModInfo.MOD_ID, "cupronickel_heating_coil"), getMaterial("cupronickel_heating_coil", 3, Type.PART), "NCN", "C C", "NCN", 'N', "ingotNickel", 'C', "ingotCopper");
// register(new ResourceLocation(ModInfo.MOD_ID, "nichrome_heating_coil"), getMaterial("nichrome_heating_coil", 2, Type.PART), " N ", "NCN", " N ", 'N', "ingotNickel", 'C', "ingotChrome");
if (oresExist("ingotAluminum")) {
register(new ResourceLocation(ModInfo.MOD_ID, "kanthal_heating_coil"), getMaterial("kanthal_heating_coil", 3, Type.PART), "RRR", "CAA", "CCA", 'R', "ingotRefinedIron", 'C', "ingotChrome", 'A', "ingotAluminum");
// register(new ResourceLocation(ModInfo.MOD_ID, "kanthal_heating_coil"), getMaterial("kanthal_heating_coil", 3, Type.PART), "RRR", "CAA", "CCA", 'R', "ingotRefinedIron", 'C', "ingotChrome", 'A', "ingotAluminum");
}
if (oresExist("ingotAluminium")) {
register(new ResourceLocation(ModInfo.MOD_ID, "kanthal_heating_coil2"), getMaterial("kanthal_heating_coil", 3, Type.PART), "RRR", "CAA", "CCA", 'R', "ingotRefinedIron", 'C', "ingotChrome", 'A', "ingotAluminium");
// register(new ResourceLocation(ModInfo.MOD_ID, "kanthal_heating_coil2"), getMaterial("kanthal_heating_coil", 3, Type.PART), "RRR", "CAA", "CCA", 'R', "ingotRefinedIron", 'C', "ingotChrome", 'A', "ingotAluminium");
}
// TODO: fix recipe
// register(new ResourceLocation(ModInfo.MOD_ID, "plateMagnalium"), getMaterial("magnalium", 3, Type.PLATE), "AAA", "MMM", "AAA", 'A', "ingotAluminum", 'M', "dustMagnesium");

4
src/main/java/techreborn/init/recipes/ScrapboxRecipes.java
View file

@ -116,8 +116,8 @@ public class ScrapboxRecipes extends RecipeMethods {
register(DynamicCell.getEmptyCell(1));
register(getMaterial("water", Type.CELL));
register(getMaterial("compressedair", Type.CELL));
register(getMaterial("sap", Type.PART));
register(getMaterial("rubber", Type.PART));
// register(getMaterial("sap", Type.PART));
// register(getMaterial("rubber", Type.PART));
register(getStack(Blocks.TRAPDOOR));
register(getStack(Blocks.STONE_BUTTON));

2
src/main/java/techreborn/init/recipes/SmeltingRecipes.java
View file

@ -37,7 +37,7 @@ import techreborn.items.ItemIngots;
public class SmeltingRecipes extends RecipeMethods {
public static void init() {
register(getMaterial("sap", Type.PART), getMaterial("rubber", Type.PART));
// register(getMaterial("sap", Type.PART), getMaterial("rubber", Type.PART));
// TODO: Fix recipe
// register(getStack(Items.IRON_INGOT), getMaterial("refined_iron", Type.INGOT));
// register(BlockOre2.getOreByName("copper"), getMaterial("copper", Type.INGOT));

1
src/main/java/techreborn/items/ItemCells.java
View file

@ -28,7 +28,6 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import org.apache.commons.lang3.Validate;
import reborncore.common.util.StringUtils;
public class ItemCells {

95
src/main/java/techreborn/items/ItemParts.java
View file

@ -24,85 +24,46 @@
package techreborn.items;
import com.google.common.base.CaseFormat;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.init.ModItems;
import techreborn.utils.TechRebornCreativeTab;
import java.security.InvalidParameterException;
public class ItemParts extends ItemTR {
public static final String[] types = new String[] { "energy_flow_circuit", "data_control_circuit", "data_storage_circuit",
"data_orb", "diamond_grinding_head", "diamond_saw_blade", "tungsten_grinding_head", "helium_coolant_simple",
"helium_coolant_triple", "helium_coolant_six", "nak_coolant_simple", "nak_coolant_triple", "nak_coolant_six",
"cupronickel_heating_coil", "nichrome_heating_coil", "kanthal_heating_coil", "super_conductor",
"thorium_cell", "double_thorium_cell", "quad_thorium_cell", "plutonium_cell", "double_plutonium_cell",
"quad_plutonium_cell", "computer_monitor", "machine_parts", "neutron_reflector", "iridium_neutron_reflector",
"thick_neutron_reflector", "electronic_circuit", "advanced_circuit", "sap", "rubber", "scrap",
"carbon_mesh", "carbon_fiber", "coolant_simple", "coolant_triple", "coolant_six"};
public ItemParts() {
this.setCreativeTab(TechRebornCreativeTab.instance);
this.setHasSubtypes(true);
this.setTranslationKey("techreborn.part");
}
public static ItemStack getPartByName(String name, final int count) {
//TODO: Change all recipes n' shit to use proper snake_case names so I don't have to do this bullshit
if (name.equals("NaKCoolantSimple"))
name = "nak_coolant_simple";
if (name.equals("NaKCoolantTriple"))
name = "nak_coolant_triple";
if (name.equals("NaKCoolantSix"))
name = "nak_coolant_six";
if (name.equals("superconductor"))
name = "super_conductor";
if (name.equals("carbonfiber"))
name = "carbon_fiber";
if (name.equals("carbonmesh"))
name = "carbon_mesh";
if (name.equals("rubberSap"))
name = "sap";
name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name);
for (int i = 0; i < ItemParts.types.length; i++) {
if (ItemParts.types[i].equalsIgnoreCase(name)) {
return new ItemStack(ModItems.PARTS, count, i);
}
}
throw new InvalidParameterException("The part " + name + " could not be found.");
}
public static ItemStack getPartByName(final String name) {
return ItemParts.getPartByName(name, 1);
}
@Override
// gets Unlocalized Name depending on meta data
public String getTranslationKey(final ItemStack itemStack) {
int meta = itemStack.getItemDamage();
if (meta < 0 || meta >= ItemParts.types.length) {
meta = 0;
}
return super.getTranslationKey() + "." + ItemParts.types[meta];
}
// Adds Dusts SubItems To Creative Tab
@Override
public void getSubItems(final CreativeTabs creativeTabs, final NonNullList<ItemStack> list) {
if (!isInCreativeTab(creativeTabs)) {
return;
}
for (int meta = 0; meta < ItemParts.types.length; ++meta) {
list.add(new ItemStack(this, 1, meta));
}
}
// public static ItemStack getPartByName(String name, final int count) {
// //TODO: Change all recipes n' shit to use proper snake_case names so I don't have to do this bullshit
// if (name.equals("NaKCoolantSimple"))
// name = "nak_coolant_simple";
// if (name.equals("NaKCoolantTriple"))
// name = "nak_coolant_triple";
// if (name.equals("NaKCoolantSix"))
// name = "nak_coolant_six";
// if (name.equals("superconductor"))
// name = "super_conductor";
// if (name.equals("carbonfiber"))
// name = "carbon_fiber";
// if (name.equals("carbonmesh"))
// name = "carbon_mesh";
// if (name.equals("rubberSap"))
// name = "sap";
// name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name);
// for (int i = 0; i < ItemParts.types.length; i++) {
// if (ItemParts.types[i].equalsIgnoreCase(name)) {
// return new ItemStack(ModItems.PARTS, count, i);
// }
// }
// throw new InvalidParameterException("The part " + name + " could not be found.");
// }
//
// public static ItemStack getPartByName(final String name) {
// return ItemParts.getPartByName(name, 1);
// }
public ItemStack onItemRightClick(final ItemStack itemStack, final World world, final EntityPlayer player) {
switch (itemStack.getItemDamage()) {

5
src/main/java/techreborn/tiles/TileMatterFabricator.java
View file

@ -39,7 +39,7 @@ import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.ModItems;
import techreborn.items.ItemParts;
import techreborn.init.ModParts;
import techreborn.lib.ModInfo;
@RebornRegistry(modID = ModInfo.MOD_ID)
@ -110,8 +110,7 @@ public class TileMatterFabricator extends TilePowerAcceptor
}
public int getValue(ItemStack itemStack) {
if (itemStack.getItem() == ModItems.PARTS
&& itemStack.getItemDamage() == ItemParts.getPartByName("scrap").getItemDamage()) {
if (itemStack.isItemEqual(ModParts.SCRAP.getStack())) {
return 200;
} else if (itemStack.getItem() == ModItems.SCRAP_BOX) {
return 2000;

4
src/main/java/techreborn/tiles/tier1/TileRecycler.java
View file

@ -39,7 +39,7 @@ import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.items.ItemParts;
import techreborn.init.ModParts;
import techreborn.lib.ModInfo;
@RebornRegistry(modID = ModInfo.MOD_ID)
@ -75,7 +75,7 @@ public class TileRecycler extends TilePowerAcceptor
}
public void recycleItems() {
final ItemStack itemstack = ItemParts.getPartByName("scrap");
final ItemStack itemstack = ModParts.SCRAP.getStack();
final int randomchance = this.world.rand.nextInt(chance);
if (randomchance == 1) {

4
src/main/java/techreborn/utils/TechRebornCreativeTab.java
View file

@ -26,7 +26,7 @@ package techreborn.utils;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import techreborn.items.ItemParts;
import techreborn.init.ModParts;
public class TechRebornCreativeTab extends CreativeTabs {
@ -38,6 +38,6 @@ public class TechRebornCreativeTab extends CreativeTabs {
@Override
public ItemStack createIcon() {
return ItemParts.getPartByName("machine_parts");
return ModParts.MACHINE_PARTS.getStack();
}
}

6
src/main/resources/assets/techreborn/advancements/sap.json
View file

@ -1,8 +1,7 @@
{
"display": {
"icon": {
"item": "techreborn:part",
"data": 31
"item": "techreborn:sap"
},
"title": {
"translate": "advancements.techreborn.sap"
@ -18,8 +17,7 @@
"conditions": {
"items": [
{
"item": "techreborn:part",
"data": 31
"item": "techreborn:sap"
}
]
}

201
src/main/resources/assets/techreborn/blockstates/items/materials/part.json
View file

@ -1,201 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item"
},
"variants": {
"type": {
"energy_flow_circuit": {
"textures": {
"layer0": "techreborn:items/part/energy_flow_circuit"
}
},
"data_control_circuit": {
"textures": {
"layer0": "techreborn:items/part/data_control_circuit"
}
},
"data_storage_circuit": {
"textures": {
"layer0": "techreborn:items/part/data_storage_circuit"
}
},
"data_orb": {
"textures": {
"layer0": "techreborn:items/part/data_orb"
}
},
"diamond_grinding_head": {
"textures": {
"layer0": "techreborn:items/part/diamond_grinding_head"
}
},
"diamond_saw_blade": {
"textures": {
"layer0": "techreborn:items/part/diamond_saw_blade"
}
},
"tungsten_grinding_head": {
"textures": {
"layer0": "techreborn:items/part/tungsten_grinding_head"
}
},
"helium_coolant_simple": {
"textures": {
"layer0": "techreborn:items/part/helium_coolant_simple"
}
},
"helium_coolant_triple": {
"textures": {
"layer0": "techreborn:items/part/helium_coolant_triple"
}
},
"helium_coolant_six": {
"textures": {
"layer0": "techreborn:items/part/helium_coolant_six"
}
},
"nak_coolant_simple": {
"textures": {
"layer0": "techreborn:items/part/nak_coolant_simple"
}
},
"nak_coolant_triple": {
"textures": {
"layer0": "techreborn:items/part/nak_coolant_triple"
}
},
"nak_coolant_six": {
"textures": {
"layer0": "techreborn:items/part/nak_coolant_six"
}
},
"cupronickel_heating_coil": {
"textures": {
"layer0": "techreborn:items/part/cupronickel_heating_coil"
}
},
"nichrome_heating_coil": {
"textures": {
"layer0": "techreborn:items/part/nichrome_heating_coil"
}
},
"kanthal_heating_coil": {
"textures": {
"layer0": "techreborn:items/part/kanthal_heating_coil"
}
},
"super_conductor": {
"textures": {
"layer0": "techreborn:items/part/super_conductor"
}
},
"thorium_cell": {
"textures": {
"layer0": "techreborn:items/part/thorium_cell"
}
},
"double_thorium_cell": {
"textures": {
"layer0": "techreborn:items/part/double_thorium_cell"
}
},
"quad_thorium_cell": {
"textures": {
"layer0": "techreborn:items/part/quad_thorium_cell"
}
},
"plutonium_cell": {
"textures": {
"layer0": "techreborn:items/part/plutonium_cell"
}
},
"double_plutonium_cell": {
"textures": {
"layer0": "techreborn:items/part/double_plutonium_cell"
}
},
"quad_plutonium_cell": {
"textures": {
"layer0": "techreborn:items/part/quad_plutonium_cell"
}
},
"computer_monitor": {
"textures": {
"layer0": "techreborn:items/part/computer_monitor"
}
},
"machine_parts": {
"textures": {
"layer0": "techreborn:items/part/machine_parts"
}
},
"neutron_reflector": {
"textures": {
"layer0": "techreborn:items/part/neutron_reflector"
}
},
"iridium_neutron_reflector": {
"textures": {
"layer0": "techreborn:items/part/iridium_neutron_reflector"
}
},
"thick_neutron_reflector": {
"textures": {
"layer0": "techreborn:items/part/thick_neutron_reflector"
}
},
"electronic_circuit": {
"textures": {
"layer0": "techreborn:items/part/electronic_circuit"
}
},
"advanced_circuit": {
"textures": {
"layer0": "techreborn:items/part/advanced_circuit"
}
},
"sap": {
"textures": {
"layer0": "techreborn:items/part/sap"
}
},
"rubber": {
"textures": {
"layer0": "techreborn:items/part/rubber"
}
},
"scrap": {
"textures": {
"layer0": "techreborn:items/part/scrap"
}
},
"carbon_mesh": {
"textures": {
"layer0": "techreborn:items/part/carbon_mesh"
}
},
"carbon_fiber": {
"textures": {
"layer0": "techreborn:items/part/carbon_fiber"
}
},
"coolant_simple": {
"textures": {
"layer0": "techreborn:items/part/coolant_simple"
}
},
"coolant_triple": {
"textures": {
"layer0": "techreborn:items/part/coolant_triple"
}
},
"coolant_six": {
"textures": {
"layer0": "techreborn:items/part/coolant_six"
}
}
}
}
}

231
src/main/resources/assets/techreborn/blockstates/items/materials/parts.json Normal file
View file

@ -0,0 +1,231 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item"
},
"variants": {
"type": {
"carbonfiber": {
"textures": {
"layer0": "techreborn:items/part/carbon_fiber"
}
},
"carbonmesh": {
"textures": {
"layer0": "techreborn:items/part/carbon_mesh"
}
},
"circuitadvanced": {
"textures": {
"layer0": "techreborn:items/part/circuit_advanced"
}
},
"circuitbasic": {
"textures": {
"layer0": "techreborn:items/part/circuit_basic"
}
},
"circuitelite": {
"textures": {
"layer0": "techreborn:items/part/circuit_elite"
}
},
"computermonitor": {
"textures": {
"layer0": "techreborn:items/part/computer_monitor"
}
},
"coolantsimple": {
"textures": {
"layer0": "techreborn:items/part/coolant_simple"
}
},
"coolantsix": {
"textures": {
"layer0": "techreborn:items/part/coolant_six"
}
},
"coolanttriple": {
"textures": {
"layer0": "techreborn:items/part/coolant_triple"
}
},
"cupronickelheatingcoil": {
"textures": {
"layer0": "techreborn:items/part/cupronickel_heating_coil"
}
},
"dataorb": {
"textures": {
"layer0": "techreborn:items/part/data_orb"
}
},
"datastoragecircuit": {
"textures": {
"layer0": "techreborn:items/part/data_storage_circuit"
}
},
"depletedcell": {
"textures": {
"layer0": "techreborn:items/part/depleted_cell"
}
},
"diamondgrindinghead": {
"textures": {
"layer0": "techreborn:items/part/diamond_grinding_head"
}
},
"diamondsawblade": {
"textures": {
"layer0": "techreborn:items/part/diamond_saw_blade"
}
},
"doubledepletedcell": {
"textures": {
"layer0": "techreborn:items/part/double_depleted_cell"
}
},
"doubleplutoniumcell": {
"textures": {
"layer0": "techreborn:items/part/double_plutonium_cell"
}
},
"doublethoriumcell": {
"textures": {
"layer0": "techreborn:items/part/double_thorium_cell"
}
},
"doubleuraniumcell": {
"textures": {
"layer0": "techreborn:items/part/double_uranium_cell"
}
},
"energyflowcircuit": {
"textures": {
"layer0": "techreborn:items/part/energy_flow_circuit"
}
},
"heliumcoolantsimple": {
"textures": {
"layer0": "techreborn:items/part/helium_coolant_simple"
}
},
"heliumcoolantsix": {
"textures": {
"layer0": "techreborn:items/part/helium_coolant_six"
}
},
"heliumcoolanttriple": {
"textures": {
"layer0": "techreborn:items/part/helium_coolant_triple"
}
},
"iridiumneutronreflector": {
"textures": {
"layer0": "techreborn:items/part/iridium_neutron_reflector"
}
},
"kanthalheatingcoil": {
"textures": {
"layer0": "techreborn:items/part/kanthal_heating_coil"
}
},
"machineparts": {
"textures": {
"layer0": "techreborn:items/part/machine_parts"
}
},
"nakcoolantsimple": {
"textures": {
"layer0": "techreborn:items/part/nak_coolant_simple"
}
},
"nakcoolantsix": {
"textures": {
"layer0": "techreborn:items/part/nak_coolant_six"
}
},
"nakcoolanttriple": {
"textures": {
"layer0": "techreborn:items/part/nak_coolant_triple"
}
},
"neutronreflector": {
"textures": {
"layer0": "techreborn:items/part/neutron_reflector"
}
},
"nichromeheatingcoil": {
"textures": {
"layer0": "techreborn:items/part/nichrome_heating_coil"
}
},
"plutoniumcell": {
"textures": {
"layer0": "techreborn:items/part/plutonium_cell"
}
},
"quaddepletedcell": {
"textures": {
"layer0": "techreborn:items/part/quad_depleted_cell"
}
},
"quadplutoniumcell": {
"textures": {
"layer0": "techreborn:items/part/quad_plutonium_cell"
}
},
"quadthoriumcell": {
"textures": {
"layer0": "techreborn:items/part/quad_thorium_cell"
}
},
"quaduraniumcell": {
"textures": {
"layer0": "techreborn:items/part/quad_uranium_cell"
}
},
"rubber": {
"textures": {
"layer0": "techreborn:items/part/rubber"
}
},
"sap": {
"textures": {
"layer0": "techreborn:items/part/sap"
}
},
"scrap": {
"textures": {
"layer0": "techreborn:items/part/scrap"
}
},
"superconductor": {
"textures": {
"layer0": "techreborn:items/part/super_conductor"
}
},
"thickneutronreflector": {
"textures": {
"layer0": "techreborn:items/part/thick_neutron_reflector"
}
},
"thoriumcell": {
"textures": {
"layer0": "techreborn:items/part/thorium_cell"
}
},
"tungstengrindinghead": {
"textures": {
"layer0": "techreborn:items/part/tungsten_grinding_head"
}
},
"uraniumcell": {
"textures": {
"layer0": "techreborn:items/part/uranium_cell"
}
}
}
}
}

82
src/main/resources/assets/techreborn/lang/en_us.lang
View file

@ -440,44 +440,50 @@ item.techreborn.plateZinc.name=Zinc Plate
#Parts
item.techreborn.part.diamond_grinding_head.name=Diamond Grinding Head
item.techreborn.part.diamond_saw_blade.name=Diamond Saw Blade
item.techreborn.part.tungsten_grinding_head.name=Tungsten Grinding Head
item.techreborn.part.helium_coolant_simple.name=60k Helium Coolant Cell
item.techreborn.part.helium_coolant_triple.name=180k Helium Coolant Cell
item.techreborn.part.helium_coolant_six.name=360k Helium Coolant Cell
item.techreborn.part.nak_coolant_simple.name=60k nak Coolant Cell
item.techreborn.part.nak_coolant_triple.name=180k nak Coolant Cell
item.techreborn.part.nak_coolant_six.name=360k nak Coolant Cell
item.techreborn.part.cupronickel_heating_coil.name=Cupronickel Heating Coil
item.techreborn.part.nichrome_heating_coil.name=Nichrome Heating Coil
item.techreborn.part.kanthal_heating_coil.name=Kanthal Heating Coil
item.techreborn.part.super_conductor.name=Superconductor
item.techreborn.part.thorium_cell.name=Fuel Rod (Thorium)
item.techreborn.part.double_thorium_cell.name=Dual Fuel Rod (Thorium)
item.techreborn.part.quad_thorium_cell.name=Quad Fuel Rod (Thorium)
item.techreborn.part.plutonium_cell.name=Fuel Rod (Plutonium)
item.techreborn.part.double_plutonium_cell.name=Dual Fuel Rod (Plutonium)
item.techreborn.part.quad_plutonium_cell.name=Quad Fuel Rod (Plutonium)
item.techreborn.part.iridium_neutron_reflector.name=Iridium Neutron Reflector
item.techreborn.part.computer_monitor.name=Computer Monitor
item.techreborn.part.machine_parts.name=Machine Parts
item.techreborn.part.neutron_reflector.name=Neutron Reflector
item.techreborn.part.thick_neutron_reflector.name=Thick Neutron Reflector
item.techreborn.part.sap.name=Sap
item.techreborn.part.rubber.name=Rubber
item.techreborn.part.scrap.name=Scrap
item.techreborn.part.electronic_circuit.name=Electronic Circuit
item.techreborn.part.advanced_circuit.name=Advanced Electronic Circuit
item.techreborn.part.energy_flow_circuit.name=Energy Flow Circuit
item.techreborn.part.data_control_circuit.name=Data Control Circuit
item.techreborn.part.data_orb.name=Data Orb
item.techreborn.part.data_storage_circuit.name=Data Storage Circuit
item.techreborn.part.coolant_simple.name=10k Coolant Cell
item.techreborn.part.coolant_triple.name=30k Coolant Cell
item.techreborn.part.coolant_six.name=60k Coolant Cell
item.techreborn.part.carbon_mesh.name=Carbon Mesh
item.techreborn.part.carbon_fiber.name=Carbon Fiber
item.techreborn.carbonfiber.name=Carbon Fiber
item.techreborn.carbonmesh.name=Carbon Mesh
item.techreborn.circuitadvanced.name=Advanced Electronic Circuit
item.techreborn.circuitbasic.name=Electronic Circuit
item.techreborn.circuitelite.name=Data Control Circuit
item.techreborn.computermonitor.name=Computer Monitor
item.techreborn.coolantsimple.name=10k Coolant Cell
item.techreborn.coolantsix.name=60k Coolant Cell
item.techreborn.coolanttriple.name=30k Coolant Cell
item.techreborn.cupronickelheatingcoil.name=Cupronickel Heating Coil
item.techreborn.dataorb.name=Data Orb
item.techreborn.datastoragecircuit.name=Data Storage Circuit
item.techreborn.depletedcell.name=Depleted Fuel Rod
item.techreborn.diamondgrindinghead.name=Diamond Grinding Head
item.techreborn.diamondsawblade.name=Diamond Saw Blade
item.techreborn.doubledepletedcell.name=Dual Depleted Fuel Rod
item.techreborn.doubleplutoniumcell.name=Dual Fuel Rod (Plutonium)
item.techreborn.doublethoriumcell.name=Dual Fuel Rod (Thorium)
item.techreborn.doubleuraniumcell.name=Dual Fuel Rod (Uranium)
item.techreborn.energyflowcircuit.name=Energy Flow Circuit
item.techreborn.heliumcoolantsimple.name=60k Helium Coolant Cell
item.techreborn.heliumcoolantsix.name=360k Helium Coolant Cell
item.techreborn.heliumcoolanttriple.name=180k Helium Coolant Cell
item.techreborn.iridiumneutronreflector.name=Iridium Neutron Reflector
item.techreborn.kanthalheatingcoil.name=Kanthal Heating Coil
item.techreborn.machineparts.name=Machine Parts
item.techreborn.nakcoolantsimple.name=60k nak Coolant Cell
item.techreborn.nakcoolantsix.name=360k nak Coolant Cell
item.techreborn.nakcoolanttriple.name=180k nak Coolant Cell
item.techreborn.neutronreflector.name=Neutron Reflector
item.techreborn.nichromeheatingcoil.name=Nichrome Heating Coil
item.techreborn.plutoniumcell.name=Fuel Rod (Plutonium)
item.techreborn.quaddepletedcell.name=Quad Depleeted Fuel Rod
item.techreborn.quadplutoniumcell.name=Quad Fuel Rod (Plutonium)
item.techreborn.quadthoriumcell.name=Quad Fuel Rod (Thorium)
item.techreborn.quaduraniumcell.name=Quad Fuel Rod (Uranium)
item.techreborn.rubber.name=Rubber
item.techreborn.sap.name=Sap
item.techreborn.scrap.name=Scrap
item.techreborn.superconductor.name=Superconductor
item.techreborn.thickneutronreflector.name=Thick Neutron Reflector
item.techreborn.thoriumcell.name=Fuel Rod (Thorium)
item.techreborn.tungstengrindinghead.name=Tungsten Grinding Head
item.techreborn.uraniumcell.name=Fuel Rod (Uranium)
#Tools
item.techreborn.rockcutter.name=Rockcutter

6
src/main/resources/assets/techreborn/loot_tables/chests/rubber_plantation.json
View file

@ -46,13 +46,9 @@
},
{
"type": "item",
"name": "techreborn:part",
"name": "techreborn:sap",
"weight": 10,
"functions": [
{
"function": "set_data",
"data": 31
},
{
"function": "set_count",
"count" : {

0
src/main/resources/assets/techreborn/textures/items/part/advanced_circuit.png → src/main/resources/assets/techreborn/textures/items/part/circuit_advanced.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 769 B

After

Width:  |  Height:  |  Size: 769 B

0
src/main/resources/assets/techreborn/textures/items/part/electronic_circuit.png → src/main/resources/assets/techreborn/textures/items/part/circuit_basic.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 754 B

After

Width:  |  Height:  |  Size: 754 B

0
src/main/resources/assets/techreborn/textures/items/part/data_control_circuit.png → src/main/resources/assets/techreborn/textures/items/part/circuit_elite.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 583 B

After

Width:  |  Height:  |  Size: 583 B