diff --git a/changelog b/changelog index 3c15d7b6d..f0e596acf 100644 --- a/changelog +++ b/changelog @@ -1,5 +1,9 @@ ## Changed * Changed the multi fluid ID recipe, they now use analog circuits instead of silicon based ones, no longer requiring plastic to make +* Decreased the connection speed for all battery blocks, a full discharge now takes 30 seconds instead of 1 second, and charging now takes 10 seconds + * Capacitors have also been nerfed but they are twice as fast as battery blocks, 5 seconds for charging and 15 seconds for discharging +* Removed forgotten bricks +* Updated CMB brick texture ## Fixed * Fixed pumpjack gauges not syncing properly diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 1bfd61054..ed94bd3a9 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -388,7 +388,6 @@ public class ModBlocks { public static Block brick_jungle_glyph; public static Block brick_jungle_circle; - public static Block brick_forgotten; public static Block brick_red; public static Block deco_computer; @@ -1562,7 +1561,6 @@ public class ModBlocks { brick_jungle_glyph = new BlockGlyph(Material.rock).setBlockName("brick_jungle_glyph").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(360.0F); brick_jungle_circle = new BlockBallsSpawner(Material.rock).setBlockName("brick_jungle_circle").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(360.0F).setBlockTextureName(RefStrings.MODID + ":brick_jungle_circle"); - brick_forgotten = new BlockGeneric(Material.rock).setBlockName("brick_forgotten").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(1000000).setBlockTextureName(RefStrings.MODID + ":brick_forgotten"); brick_red = new BlockRedBrick(Material.rock).setBlockName("brick_red").setResistance(10_000); deco_computer = new BlockDecoModel(Material.iron, DecoComputerEnum.class, true, false).setBlockBoundsTo(.160749F, 0F, 0F, .839251F, .867849F, .622184F).setBlockName("deco_computer").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_computer"); @@ -2719,7 +2717,6 @@ public class ModBlocks { GameRegistry.registerBlock(brick_jungle_trap, ItemTrapBlock.class, brick_jungle_trap.getUnlocalizedName()); GameRegistry.registerBlock(brick_jungle_glyph, ItemGlyphBlock.class, brick_jungle_glyph.getUnlocalizedName()); GameRegistry.registerBlock(brick_jungle_circle, brick_jungle_circle.getUnlocalizedName()); - GameRegistry.registerBlock(brick_forgotten, brick_forgotten.getUnlocalizedName()); GameRegistry.registerBlock(brick_red, brick_red.getUnlocalizedName()); register(deco_computer); register(deco_crt); diff --git a/src/main/java/com/hbm/blocks/machine/MachineBattery.java b/src/main/java/com/hbm/blocks/machine/MachineBattery.java index 5aa2f11e0..7f4616a5e 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineBattery.java +++ b/src/main/java/com/hbm/blocks/machine/MachineBattery.java @@ -280,6 +280,9 @@ public class MachineBattery extends BlockContainer implements ILookOverlay, IPer @Override public void addInformation(ItemStack stack, NBTTagCompound persistentTag, EntityPlayer player, List list, boolean ext) { + list.add(EnumChatFormatting.GOLD + "Stores up to "+ BobMathUtil.getShortNumber(this.maxPower) + "HE"); + list.add(EnumChatFormatting.GOLD + "Charge speed: "+ BobMathUtil.getShortNumber(this.maxPower / 200) + "HE"); + list.add(EnumChatFormatting.GOLD + "Discharge speed: "+ BobMathUtil.getShortNumber(this.maxPower / 600) + "HE"); list.add(EnumChatFormatting.YELLOW + "" + BobMathUtil.getShortNumber(persistentTag.getLong("power")) + "/" + BobMathUtil.getShortNumber(this.maxPower) + "HE"); } } diff --git a/src/main/java/com/hbm/blocks/machine/MachineCapacitor.java b/src/main/java/com/hbm/blocks/machine/MachineCapacitor.java index 8e06209ca..f7a0fcfb8 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineCapacitor.java +++ b/src/main/java/com/hbm/blocks/machine/MachineCapacitor.java @@ -109,6 +109,9 @@ public class MachineCapacitor extends BlockContainer implements ILookOverlay, IP @Override public void addInformation(ItemStack stack, NBTTagCompound persistentTag, EntityPlayer player, List list, boolean ext) { + list.add(EnumChatFormatting.GOLD + "Stores up to "+ BobMathUtil.getShortNumber(this.power) + "HE"); + list.add(EnumChatFormatting.GOLD + "Charge speed: "+ BobMathUtil.getShortNumber(this.power / 200) + "HE"); + list.add(EnumChatFormatting.GOLD + "Discharge speed: "+ BobMathUtil.getShortNumber(this.power / 600) + "HE"); list.add(EnumChatFormatting.YELLOW + "" + BobMathUtil.getShortNumber(persistentTag.getLong("power")) + "/" + BobMathUtil.getShortNumber(persistentTag.getLong("maxPower")) + "HE"); } @@ -249,6 +252,14 @@ public class MachineCapacitor extends BlockContainer implements ILookOverlay, IP return maxPower; } + @Override public long getProviderSpeed() { + return this.getMaxPower() / 300; + } + + @Override public long getReceiverSpeed() { + return this.getMaxPower() / 100; + } + @Override public ConnectionPriority getPriority() { return ConnectionPriority.LOW; diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 78f5f6034..5a88ba3bf 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -1421,6 +1421,7 @@ public class MainRegistry { ignoreMappings.add("hbm:item.gas6"); ignoreMappings.add("hbm:item.gas7"); ignoreMappings.add("hbm:item.gas8"); + ignoreMappings.add("hbm:tile.brick_forgotten"); /// REMAP /// remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java index f61193726..51448207a 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java @@ -235,12 +235,12 @@ public class TileEntityMachineBattery extends TileEntityMachineBase implements I @Override public long getProviderSpeed() { int mode = this.getRelevantMode(true); - return mode == mode_output || mode == mode_buffer ? this.getMaxPower() / 20 : 0; + return mode == mode_output || mode == mode_buffer ? this.getMaxPower() / 600 : 0; } @Override public long getReceiverSpeed() { int mode = this.getRelevantMode(true); - return mode == mode_input || mode == mode_buffer ? this.getMaxPower() / 20 : 0; + return mode == mode_input || mode == mode_buffer ? this.getMaxPower() / 200 : 0; } @Override diff --git a/src/main/resources/assets/hbm/textures/blocks/cmb_brick_reinforced.png b/src/main/resources/assets/hbm/textures/blocks/cmb_brick_reinforced.png index ade707867..939e78a86 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/cmb_brick_reinforced.png and b/src/main/resources/assets/hbm/textures/blocks/cmb_brick_reinforced.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/drill_pipe.png b/src/main/resources/assets/hbm/textures/blocks/drill_pipe.png deleted file mode 100644 index ce47da701..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/drill_pipe.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/playground/0_0_noise.png b/src/main/resources/assets/hbm/textures/blocks/playground/0_0_noise.png new file mode 100644 index 000000000..764360850 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/playground/0_0_noise.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/playground/0_1_verticals.png b/src/main/resources/assets/hbm/textures/blocks/playground/0_1_verticals.png new file mode 100644 index 000000000..d8a0c1169 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/playground/0_1_verticals.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/playground/0_2_framed.png b/src/main/resources/assets/hbm/textures/blocks/playground/0_2_framed.png new file mode 100644 index 000000000..c57639acf Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/playground/0_2_framed.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/playground/1_0_noise.png b/src/main/resources/assets/hbm/textures/blocks/playground/1_0_noise.png new file mode 100644 index 000000000..1006ddaa6 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/playground/1_0_noise.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/playground/1_1_framed.png b/src/main/resources/assets/hbm/textures/blocks/playground/1_1_framed.png new file mode 100644 index 000000000..5b864439d Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/playground/1_1_framed.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/playground/1_2_depth.png b/src/main/resources/assets/hbm/textures/blocks/playground/1_2_depth.png new file mode 100644 index 000000000..2c661253c Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/playground/1_2_depth.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/playground/2_0_noise.png b/src/main/resources/assets/hbm/textures/blocks/playground/2_0_noise.png new file mode 100644 index 000000000..26c489a8f Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/playground/2_0_noise.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/playground/2_1_verticals.png b/src/main/resources/assets/hbm/textures/blocks/playground/2_1_verticals.png new file mode 100644 index 000000000..64ef53bdb Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/playground/2_1_verticals.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/playground/deco_steel_blank_clean.png b/src/main/resources/assets/hbm/textures/blocks/playground/deco_steel_blank_clean.png new file mode 100644 index 000000000..96db3fd1a Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/playground/deco_steel_blank_clean.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/playground/deco_steel_blank_clean_framed.png b/src/main/resources/assets/hbm/textures/blocks/playground/deco_steel_blank_clean_framed.png new file mode 100644 index 000000000..c1e4b548e Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/playground/deco_steel_blank_clean_framed.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/playground/deco_steel_kit.png b/src/main/resources/assets/hbm/textures/blocks/playground/deco_steel_kit.png new file mode 100644 index 000000000..066efb53e Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/playground/deco_steel_kit.png differ diff --git a/src/main/resources/assets/hbm/textures/models/machines/lpw2.png b/src/main/resources/assets/hbm/textures/models/machines/lpw2.png index e34de5920..03b6216de 100644 Binary files a/src/main/resources/assets/hbm/textures/models/machines/lpw2.png and b/src/main/resources/assets/hbm/textures/models/machines/lpw2.png differ diff --git a/src/main/resources/assets/hbm/textures/models/mine_he.png b/src/main/resources/assets/hbm/textures/models/mine_he.png deleted file mode 100644 index d0305e489..000000000 Binary files a/src/main/resources/assets/hbm/textures/models/mine_he.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/models/sat_base_old.png b/src/main/resources/assets/hbm/textures/models/sat_base_old.png deleted file mode 100644 index 2cb645e09..000000000 Binary files a/src/main/resources/assets/hbm/textures/models/sat_base_old.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/models/weapons/twr.png b/src/main/resources/assets/hbm/textures/models/weapons/twr.png deleted file mode 100644 index 57ed6b512..000000000 Binary files a/src/main/resources/assets/hbm/textures/models/weapons/twr.png and /dev/null differ