diff options
author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2019-03-11 02:17:58 +0100 |
---|---|---|
committer | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2019-03-11 02:17:58 +0100 |
commit | 928159a9e889d502eecb30d8882ff78f3aa7cc59 (patch) | |
tree | ab99807b40cb581ab998569076d8e0611a464c08 /src/main | |
parent | 382082b24ffb74dfcea9c6348a687e6b45b30dd0 (diff) | |
download | GT5-Unofficial-928159a9e889d502eecb30d8882ff78f3aa7cc59.tar.gz GT5-Unofficial-928159a9e889d502eecb30d8882ff78f3aa7cc59.tar.bz2 GT5-Unofficial-928159a9e889d502eecb30d8882ff78f3aa7cc59.zip |
small fixes
-oredicted some recipes
-fixed vacuum freezer voiding items
-fixed non localised gui
-version increase
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Former-commit-id: b2353ef18f835520ae3fa40bbb119093ba01c720
Diffstat (limited to 'src/main')
3 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/gui/BW_GUIContainer_RotorBlock.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/gui/BW_GUIContainer_RotorBlock.java index 0ad5c5982f..597fb1cb0b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/gui/BW_GUIContainer_RotorBlock.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/gui/BW_GUIContainer_RotorBlock.java @@ -40,7 +40,7 @@ public class BW_GUIContainer_RotorBlock extends GuiWindKineticGenerator { public BW_GUIContainer_RotorBlock(ContainerWindKineticGenerator container1) { super(container1); this.container = container1; - this.name = StatCollector.translateToLocal("tile.BWRotorBlock.name"); + this.name = StatCollector.translateToLocal("tile.BWRotorBlock.0.name"); } protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java index 7e4571e9c4..95cb64890b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java @@ -575,7 +575,7 @@ public class RecipeLoader implements Runnable { "WLh", "WLf", 'L', new ItemStack(Items.leather), - 'W', new ItemStack(Blocks.log, 1, OreDictionary.WILDCARD_VALUE), + 'W', "logWood", } ); GT_ModHandler.addCraftingRecipe( @@ -586,7 +586,7 @@ public class RecipeLoader implements Runnable { "WLh", "WLf", 'L', new ItemStack(Blocks.carpet), - 'W', new ItemStack(Blocks.log, 1, OreDictionary.WILDCARD_VALUE), + 'W', "logWood", } ); GT_ModHandler.addCraftingRecipe( @@ -597,7 +597,7 @@ public class RecipeLoader implements Runnable { "WLh", "WLf", 'L', new ItemStack(Items.paper), - 'W', new ItemStack(Blocks.log, 1, OreDictionary.WILDCARD_VALUE), + 'W', "logWood", } ); GT_ModHandler.addCraftingRecipe( @@ -610,7 +610,7 @@ public class RecipeLoader implements Runnable { 'E', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'Z', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'D', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), - 'W', new ItemStack(Blocks.log, 1, OreDictionary.WILDCARD_VALUE), + 'W', "logWood", } ); GT_ModHandler.addCraftingRecipe( @@ -665,7 +665,7 @@ public class RecipeLoader implements Runnable { "RGR", "WRW", 'R', GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Iron, 1L), - 'W', new ItemStack(Blocks.planks), + 'W', "plankWood", 'G', GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), } ); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java index b6ee743027..14af3300a9 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java @@ -78,7 +78,7 @@ public class GT_TileEntity_MegaVacuumFreezer extends GT_MetaTileEntity_VacuumFre int processed = 0; long nominalV = BW_Util.getnominalVoltage(this); while (this.getStoredInputs().size() > 0 && processed < ConfigHandler.megaMachinesMax) { - if (tRecipe != null && tRecipe.isRecipeInputEqual(true, null, tInputs) && (tRecipe.mEUt*processed) < nominalV ) { + if (tRecipe != null && (tRecipe.mEUt*(processed+1)) < nominalV && tRecipe.isRecipeInputEqual(true, null, tInputs)) { found_Recipe = true; for (int i = 0; i < tRecipe.mOutputs.length; i++) { outputItems.add(tRecipe.getOutput(i)); |