diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
3 files changed, 19 insertions, 19 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index 424b894341..0d9f3b3305 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -135,7 +135,7 @@ public enum GregtechItemList implements GregtechItemContainer { //Casings Tier 2 [17-32] Casing_StructuralGlass, Casing_Refinery_External, Casing_Refinery_Structural, Casing_Refinery_Internal, - Casing_PlaceHolder4, Casing_Sifter, Casing_PlaceHolder6, + Casing_PlaceHolder4, Casing_Sifter, Casing_SifterGrate, Casing_PlaceHolder7, Casing_PlaceHolder8, Casing_PlaceHolder9, Casing_PlaceHolder10, Casing_PlaceHolder11, Casing_PlaceHolder12, Casing_PlaceHolder13, Casing_PlaceHolder14, Casing_PlaceHolder15, diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java index dc51184e71..0e93c8d807 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java @@ -43,7 +43,7 @@ extends GregtechMetaCasingBlocksAbstract { GregtechItemList.Casing_Refinery_Internal.set(new ItemStack(this, 1, 3)); GregtechItemList.Casing_PlaceHolder4.set(new ItemStack(this, 1, 4)); GregtechItemList.Casing_Sifter.set(new ItemStack(this, 1, 5)); - GregtechItemList.Casing_PlaceHolder6.set(new ItemStack(this, 1, 6)); + GregtechItemList.Casing_SifterGrate.set(new ItemStack(this, 1, 6)); GregtechItemList.Casing_PlaceHolder7.set(new ItemStack(this, 1, 7)); GregtechItemList.Casing_PlaceHolder8.set(new ItemStack(this, 1, 8)); GregtechItemList.Casing_PlaceHolder9.set(new ItemStack(this, 1, 9)); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java index cd64f294f8..6f33188957 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java @@ -115,7 +115,7 @@ extends GregtechMeta_MultiBlockBase { @Override public boolean checkRecipe(final ItemStack aStack) { - Utils.LOG_INFO("1"); + Utils.LOG_WARNING("1"); //Get inputs. final ArrayList<ItemStack> tInputList = this.getStoredInputs(); @@ -132,7 +132,7 @@ extends GregtechMeta_MultiBlockBase { } } - Utils.LOG_INFO("2"); + Utils.LOG_WARNING("2"); //Temp var final ItemStack[] tInputs = Arrays.copyOfRange(tInputList.toArray(new ItemStack[tInputList.size()]), 0, 2); @@ -143,7 +143,7 @@ extends GregtechMeta_MultiBlockBase { } - Utils.LOG_INFO("3"); + Utils.LOG_WARNING("3"); //Make a recipe instance for the rest of the method. final GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sSifterRecipes.findRecipe(this.getBaseMetaTileEntity(), false, 9223372036854775807L, null, tInputs); @@ -152,53 +152,53 @@ extends GregtechMeta_MultiBlockBase { if (cloneRecipe != tRecipe || cloneRecipe == null){ cloneRecipe = tRecipe.copy(); - Utils.LOG_INFO("Setting Recipe"); + Utils.LOG_WARNING("Setting Recipe"); } if (mInputStacks != tRecipe.mInputs || mInputStacks == null){ mInputStacks = tRecipe.mInputs; - Utils.LOG_INFO("Setting Recipe Inputs"); + Utils.LOG_WARNING("Setting Recipe Inputs"); } if (cloneChances != tRecipe.mChances || cloneChances == null){ cloneChances = tRecipe.mChances.clone(); - Utils.LOG_INFO("Setting Chances"); + Utils.LOG_WARNING("Setting Chances"); } for (int r=0;r<cloneChances.length;r++){ - Utils.LOG_INFO("Original map Output["+r+"] chance = "+cloneChances[r]); + Utils.LOG_WARNING("Original map Output["+r+"] chance = "+cloneChances[r]); } - Utils.LOG_INFO("3.1"); + Utils.LOG_WARNING("3.1"); //Change bonus chances int[] outputChances; - Utils.LOG_INFO("3.2"); + Utils.LOG_WARNING("3.2"); if (cloneRecipe.mChances != null){ outputChances = cloneRecipe.mChances.clone(); - Utils.LOG_INFO("3.3"); + Utils.LOG_WARNING("3.3"); for (int r=0;r<outputChances.length;r++){ - Utils.LOG_INFO("Output["+r+"] chance = "+outputChances[r]); + Utils.LOG_WARNING("Output["+r+"] chance = "+outputChances[r]); if (outputChances[r]<10000){ int temp = outputChances[r]; if (outputChances[r] < 8000 && outputChances[r] >= 1){ outputChances[r] = temp+1200; - Utils.LOG_INFO("Output["+r+"] chance now = "+outputChances[r]); + Utils.LOG_WARNING("Output["+r+"] chance now = "+outputChances[r]); } else if (outputChances[r] < 9000 && outputChances[r] >= 8000){ outputChances[r] = temp+400; - Utils.LOG_INFO("Output["+r+"] chance now = "+outputChances[r]); + Utils.LOG_WARNING("Output["+r+"] chance now = "+outputChances[r]); } else if (outputChances[r] <= 9900 && outputChances[r] >= 9000){ outputChances[r] = temp+100; - Utils.LOG_INFO("Output["+r+"] chance now = "+outputChances[r]); + Utils.LOG_WARNING("Output["+r+"] chance now = "+outputChances[r]); } } } - Utils.LOG_INFO("3.4"); + Utils.LOG_WARNING("3.4"); //Rebuff Drop Rates for % output cloneRecipe.mChances = outputChances; @@ -206,11 +206,11 @@ extends GregtechMeta_MultiBlockBase { } - Utils.LOG_INFO("4"); + Utils.LOG_WARNING("4"); final int tValidOutputSlots = this.getValidOutputSlots(this.getBaseMetaTileEntity(), cloneRecipe, tInputs); - Utils.LOG_INFO("Sifter - Valid Output Hatches: "+tValidOutputSlots); + Utils.LOG_WARNING("Sifter - Valid Output Hatches: "+tValidOutputSlots); //More than or one input if ((tInputList.size() > 0) && (tValidOutputSlots >= 1)) { |