diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-04-17 10:35:07 +1000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-04-17 10:35:07 +1000 |
| commit | 95747970ad7d142a2a981119bdfafca5ab5b27d2 (patch) | |
| tree | 6e9e581cff710593e6d64205e3b76ad9e9fab836 /src/Java/gtPlusPlus/core/block/machine | |
| parent | f09983f7b7348e89fcc73e865cd11be048e45ba9 (diff) | |
| download | GT5-Unofficial-95747970ad7d142a2a981119bdfafca5ab5b27d2.tar.gz GT5-Unofficial-95747970ad7d142a2a981119bdfafca5ab5b27d2.tar.bz2 GT5-Unofficial-95747970ad7d142a2a981119bdfafca5ab5b27d2.zip | |
+ Added rmb information to Energy Buffers to show current Amperage.
% Migrated getFieldFromGregtechProxy() from Meta_GT_Proxy.java to StaticFields59.java.
$ Fixed hardness/resistance on a few blocks.
$ Fixed bad handling of Item Entities by Fluid Collectors.
Diffstat (limited to 'src/Java/gtPlusPlus/core/block/machine')
3 files changed, 5 insertions, 0 deletions
diff --git a/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java index 1600d9944f..6ae1a52aba 100644 --- a/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java +++ b/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java @@ -51,6 +51,8 @@ public class CircuitProgrammer extends BlockContainer implements ITileTooltip @SuppressWarnings("deprecation") public CircuitProgrammer(){ super(Material.iron); + this.setHardness(5f); + this.setResistance(1f); this.setBlockName("blockCircuitProgrammer"); this.setCreativeTab(AddToCreativeTab.tabMachines); GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockCircuitProgrammer"); diff --git a/src/Java/gtPlusPlus/core/block/machine/FishTrap.java b/src/Java/gtPlusPlus/core/block/machine/FishTrap.java index b5e78f23ef..037ec61ced 100644 --- a/src/Java/gtPlusPlus/core/block/machine/FishTrap.java +++ b/src/Java/gtPlusPlus/core/block/machine/FishTrap.java @@ -51,6 +51,7 @@ public class FishTrap extends BlockContainer implements ITileTooltip super(Material.iron); this.setBlockName("blockFishTrap"); this.setHardness(5f); + this.setResistance(1f); this.setCreativeTab(AddToCreativeTab.tabMachines); GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockFishTrap"); LanguageRegistry.addName(this, "Fish Catcher"); diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java b/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java index 23fdfe9733..945cf7b581 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java @@ -38,6 +38,8 @@ public class Machine_PooCollector extends BlockContainer { public Machine_PooCollector() { super(Material.iron); + this.setHardness(5f); + this.setResistance(1f); this.setBlockName("blockPooCollector"); this.setCreativeTab(AddToCreativeTab.tabMachines); GameRegistry.registerBlock(this, ItemBlockMeta.class,"blockPooCollector"); |