Remove debug lines and make tools children of item/handheld.

This commit is contained in:
Prospector 2017-01-02 15:31:28 -08:00
parent f88f0f3cdb
commit cf6fbb5ddc
10 changed files with 9 additions and 27 deletions

View file

@ -76,57 +76,39 @@ public class IndustrialElectrolyzerRecipes extends RecipeMethods {
throw new InvalidParameterException("Invalid industrial electrolyzer outputs: " + outputs); throw new InvalidParameterException("Invalid industrial electrolyzer outputs: " + outputs);
} }
System.out.println("==========================");
System.out.println("RECIPE INPUT: " + input);
System.out.println("OUTPUT 1: " + output1);
System.out.println("OUTPUT 2: " + output2);
System.out.println("OUTPUT 3: " + output3);
System.out.println("OUTPUT 4: " + output4);
int cellCount = 0; int cellCount = 0;
for (ItemStack stack : outputs) { for (ItemStack stack : outputs) {
if (stack.getItem() instanceof DynamicCell) { if (stack.getItem() instanceof DynamicCell) {
cellCount += stack.getCount(); cellCount += stack.getCount();
System.out.println("Output Cell Count: " + cellCount);
} }
} }
if (input.getItem() instanceof DynamicCell) { if (input.getItem() instanceof DynamicCell) {
int inputCount = input.getCount(); int inputCount = input.getCount();
System.out.println("Input Cell Count: " + inputCount);
if (cellCount < inputCount) { if (cellCount < inputCount) {
if (output2 == null) { if (output2 == null) {
output2 = DynamicCell.getEmptyCell(inputCount - cellCount); output2 = DynamicCell.getEmptyCell(inputCount - cellCount);
System.out.println("New Cell Output 2: " + (inputCount - cellCount));
} else if (output3 == null) { } else if (output3 == null) {
output3 = DynamicCell.getEmptyCell(inputCount - cellCount); output3 = DynamicCell.getEmptyCell(inputCount - cellCount);
System.out.println("New Cell Output 3: " + (inputCount - cellCount));
} else if (output4 == null) { } else if (output4 == null) {
output4 = DynamicCell.getEmptyCell(inputCount - cellCount); output4 = DynamicCell.getEmptyCell(inputCount - cellCount);
System.out.println("New Cell Output 4: " + (inputCount - cellCount));
} }
} }
cellCount -= inputCount; cellCount -= inputCount;
System.out.println("New Cell Count: " + cellCount);
} }
if (cellCount < 0) { if (cellCount < 0) {
System.out.println("Cells less than 0: " + cellCount);
cellCount = 0; cellCount = 0;
} }
ItemStack cells = null; ItemStack cells = null;
if (cellCount > 0) { if (cellCount > 0) {
if (cellCount > 64) { if (cellCount > 64) {
throw new InvalidParameterException("Invalid industrial electrolyzer outputs: " + outputs + "(Recipe requires > 64 cells)"); throw new InvalidParameterException("Invalid industrial electrolyzer outputs: " + outputs + "(Recipe requires > 64 cells)");
} }
System.out.println("Input Cells Amount: " + cellCount);
cells = DynamicCell.getEmptyCell(cellCount); cells = DynamicCell.getEmptyCell(cellCount);
} }
System.out.println("==========================");
System.out.println("");
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(input, cells, output1, output2, output3, output4, ticks, euPerTick, oreDict)); RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(input, cells, output1, output2, output3, output4, ticks, euPerTick, oreDict));
} }

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/electric_treetap" "layer0": "techreborn:items/tool/electric_treetap"
} }

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/nanosaber_off" "layer0": "techreborn:items/tool/nanosaber_off"
}, },

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/nanosaber_on" "layer0": "techreborn:items/tool/nanosaber_on"
} }

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/nanosaber_low" "layer0": "techreborn:items/tool/nanosaber_low"
} }

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/omni_tool" "layer0": "techreborn:items/tool/omni_tool"
} }

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/rock_cutter" "layer0": "techreborn:items/tool/rock_cutter"
} }

View file

@ -1,3 +1,3 @@
{ {
"parent": "techreborn:item/techrebornitem" "parent": "item/handheld"
} }

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/treetap" "layer0": "techreborn:items/tool/treetap"
} }

View file

@ -1,5 +1,5 @@
{ {
"parent": "techreborn:item/techrebornItem", "parent": "techreborn:item/tool/tool",
"textures": { "textures": {
"layer0": "techreborn:items/tool/wrench" "layer0": "techreborn:items/tool/wrench"
} }