From eb2816df1da35c12f85e1d2c753d3f772809726c Mon Sep 17 00:00:00 2001 From: drcrazy Date: Mon, 23 Jul 2018 13:47:12 +0300 Subject: [PATCH 1/2] Returned return. --- src/main/java/techreborn/blocks/BlockRubberLeaves.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/techreborn/blocks/BlockRubberLeaves.java b/src/main/java/techreborn/blocks/BlockRubberLeaves.java index 31fcdde0e..95d15c888 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLeaves.java +++ b/src/main/java/techreborn/blocks/BlockRubberLeaves.java @@ -133,7 +133,7 @@ public class BlockRubberLeaves extends BlockLeaves { @Override public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { if(!fancyLeaves()){ - blockState.shouldSideBeRendered(blockAccess, pos, side); + return blockState.shouldSideBeRendered(blockAccess, pos, side); } return true; } From a42e04606f729016c0bd62d1ea11e1bd7cdbecac Mon Sep 17 00:00:00 2001 From: drcrazy Date: Mon, 23 Jul 2018 14:21:07 +0300 Subject: [PATCH 2/2] Done with maxCharge and trasnferRate review for powered items --- src/main/java/techreborn/config/ConfigTechReborn.java | 4 ++-- src/main/java/techreborn/items/tools/ItemCloakingDevice.java | 3 ++- src/main/java/techreborn/items/tools/ItemNanosaber.java | 4 +++- src/main/java/techreborn/items/tools/ItemOmniTool.java | 4 +++- src/main/java/techreborn/items/tools/ItemRockCutter.java | 4 +++- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index a7bef4f69..568dc6980 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -37,7 +37,7 @@ public class ConfigTechReborn { public static boolean enableGemArmorAndTools = true; @ConfigRegistry(config = "items", category = "power", key = "nanoSaberCharge", comment = "Energy Capacity for Nano Saber (FE)") - public static int nanoSaberCharge = 640_000; + public static int nanoSaberCharge = 4_000_000; @ConfigRegistry(config = "items", category = "power", key = "steelDrillCharge", comment = "Energy Capacity for Steel Drill (FE)") public static int SteelDrillCharge = 40_000; @@ -67,7 +67,7 @@ public class ConfigTechReborn { public static int AdvancedJackhammerCharge = 4_000_000; @ConfigRegistry(config = "items", category = "power", key = "omniToolCharge", comment = "Energy Capacity for Omni Tool (FE)") - public static int OmniToolCharge = 20_000; + public static int OmniToolCharge = 4_000_000; @ConfigRegistry(config = "items", category = "power", key = "rockCutterCharge", comment = "Energy Capacity for Rock Cutter (FE)") public static int RockCutterCharge = 400_000; diff --git a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java index 72cc7132c..cc39e301a 100644 --- a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java +++ b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java @@ -60,9 +60,10 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo public static int usage = 10; public static int maxCharge = ConfigTechReborn.CloakingDeviceCharge; - public static int transferLimit = 100; + public static int transferLimit = 10_000; public static boolean isActive; + // 40M FE capacity with 10k FE\t charge rate public ItemCloakingDevice() { super(Reference.CLOAKING_ARMOR, EntityEquipmentSlot.CHEST); setTranslationKey("techreborn.cloakingdevice"); diff --git a/src/main/java/techreborn/items/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index 1fe4b54af..ba5c87206 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -63,8 +63,10 @@ import java.util.List; public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { public static final int maxCharge = ConfigTechReborn.nanoSaberCharge; + public int transferLimit = 1_000; public int cost = 250; + // 4M FE max charge with 1k charge rate public ItemNanosaber() { super(ToolMaterial.DIAMOND); setNoRepair(); @@ -237,7 +239,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { @Override public int getMaxInput() { - return 1_000; + return transferLimit; } @Override diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index b6a4bc231..8831705b0 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -57,9 +57,11 @@ import java.util.List; public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo { public static final int maxCharge = ConfigTechReborn.OmniToolCharge; + public int transferLimit = 1_000; public int cost = 100; public int hitCost = 125; + // 4M FE max charge with 1k charge rate public ItemOmniTool() { super(ToolMaterial.DIAMOND); efficiency = 13F; @@ -177,7 +179,7 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo { @Override public int getMaxInput() { - return 1_000; + return transferLimit; } @Override diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index 5d7647812..39ff0b1dd 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -55,8 +55,10 @@ import java.util.Random; public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo { public static final int maxCharge = ConfigTechReborn.RockCutterCharge; + public int transferLimit = 1_000; public int cost = 500; + // 400k FE with 1k FE\t charge rate public ItemRockCutter() { super(ToolMaterial.DIAMOND); setTranslationKey("techreborn.rockcutter"); @@ -163,7 +165,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo { @Override public int getMaxInput() { - return 1_000; + return transferLimit; } @Override