From e257c424e2aa4f8c7addb127854aed8144425d10 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 6 Oct 2015 22:57:34 +0100 Subject: [PATCH] Quick fix for crash, full fix coming tomorrow --- .../techreborn/blocks/generator/BlockDieselGenerator.java | 8 ++++---- .../blocks/generator/BlockDragonEggSiphoner.java | 8 ++++---- .../java/techreborn/blocks/generator/BlockGasTurbine.java | 8 ++++---- .../techreborn/blocks/generator/BlockHeatGenerator.java | 8 ++++---- .../techreborn/blocks/generator/BlockLightningRod.java | 8 ++++---- .../blocks/generator/BlockMagicEnergyAbsorber.java | 8 ++++---- .../blocks/generator/BlockMagicEnergyConverter.java | 8 ++++---- .../techreborn/blocks/generator/BlockPlasmaGenerator.java | 8 ++++---- .../blocks/generator/BlockSemiFluidGenerator.java | 8 ++++---- .../blocks/generator/BlockThermalGenerator.java | 8 ++++---- .../java/techreborn/blocks/machine/BlockAlloySmelter.java | 8 ++++---- .../techreborn/blocks/machine/BlockAssemblingMachine.java | 8 ++++---- .../java/techreborn/blocks/machine/BlockCentrifuge.java | 8 ++++---- .../techreborn/blocks/machine/BlockChemicalReactor.java | 8 ++++---- .../techreborn/blocks/machine/BlockDistillationTower.java | 8 ++++---- src/main/java/techreborn/blocks/machine/BlockGrinder.java | 8 ++++---- .../blocks/machine/BlockIndustrialElectrolyzer.java | 8 ++++---- src/main/java/techreborn/blocks/machine/BlockLathe.java | 8 ++++---- .../blocks/machine/BlockPlateCuttingMachine.java | 8 ++++---- .../techreborn/blocks/machine/BlockRollingMachine.java | 8 ++++---- 20 files changed, 80 insertions(+), 80 deletions(-) diff --git a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java index 557636566..3234c9f9f 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java @@ -66,9 +66,9 @@ public class BlockDieselGenerator extends BlockMachineBase { } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO } diff --git a/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java b/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java index 41f23438a..3a9544e68 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java +++ b/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java @@ -54,9 +54,9 @@ public class BlockDragonEggSiphoner extends BlockMachineBase { } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO } diff --git a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java index b15370c37..9a78c803b 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java +++ b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java @@ -66,9 +66,9 @@ public class BlockGasTurbine extends BlockMachineBase { } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO } diff --git a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java index 5fe00a085..2a0987adc 100644 --- a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java @@ -54,9 +54,9 @@ public class BlockHeatGenerator extends BlockMachineBase { } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO } diff --git a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java index d000223a2..7455f277e 100644 --- a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java +++ b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java @@ -46,9 +46,9 @@ public class BlockLightningRod extends BlockMachineBase { } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO } diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java index 4bc2398b1..fdb9229eb 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java @@ -46,9 +46,9 @@ public class BlockMagicEnergyAbsorber extends BlockMachineBase { } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO } diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java index b5d0796e2..924f5cf27 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java @@ -46,9 +46,9 @@ public class BlockMagicEnergyConverter extends BlockMachineBase { } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO } diff --git a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java index 5cf60edb1..24f09fe20 100644 --- a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java @@ -46,9 +46,9 @@ public class BlockPlasmaGenerator extends BlockMachineBase { } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO } diff --git a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java index 432f7437b..0a5323677 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java @@ -66,9 +66,9 @@ public class BlockSemiFluidGenerator extends BlockMachineBase { } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO } diff --git a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java index 2c0422115..7227ad69b 100644 --- a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java @@ -66,9 +66,9 @@ public class BlockThermalGenerator extends BlockMachineBase { } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO } diff --git a/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java index b97b712d2..bbbed83d5 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java +++ b/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java @@ -75,8 +75,8 @@ public class BlockAlloySmelter extends BlockMachineBase { } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO } diff --git a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java index 0be8d02f7..21469eee3 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java @@ -74,10 +74,10 @@ public class BlockAssemblingMachine extends BlockMachineBase { : (side == metadata ? this.iconFront : this.blockIcon)); } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO @Override diff --git a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java index 4fd6ecb7d..57dd2a302 100644 --- a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java +++ b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java @@ -97,9 +97,9 @@ public class BlockCentrifuge extends BlockMachineBase { } } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO } diff --git a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java index 4a1f69007..3b7a6a638 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java @@ -74,10 +74,10 @@ public class BlockChemicalReactor extends BlockMachineBase { : (side == metadata ? this.iconFront : this.blockIcon)); } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO @Override public IIcon getIcon(int side, int meta) { diff --git a/src/main/java/techreborn/blocks/machine/BlockDistillationTower.java b/src/main/java/techreborn/blocks/machine/BlockDistillationTower.java index 117fc6c78..b46c2c221 100644 --- a/src/main/java/techreborn/blocks/machine/BlockDistillationTower.java +++ b/src/main/java/techreborn/blocks/machine/BlockDistillationTower.java @@ -47,10 +47,10 @@ public class BlockDistillationTower extends BlockMachineBase { : (side == metadata ? this.iconFront : this.blockIcon)); } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO @Override diff --git a/src/main/java/techreborn/blocks/machine/BlockGrinder.java b/src/main/java/techreborn/blocks/machine/BlockGrinder.java index 553c10e08..b7a7235d9 100644 --- a/src/main/java/techreborn/blocks/machine/BlockGrinder.java +++ b/src/main/java/techreborn/blocks/machine/BlockGrinder.java @@ -78,10 +78,10 @@ public class BlockGrinder extends BlockMachineBase { : (side == metadata ? this.iconFront : this.blockIcon)); } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// } //TODO get a standalone way for this @Override public IIcon getIcon(int side, int meta) { diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java index 739b233a3..e8c86b0d6 100644 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java @@ -75,10 +75,10 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase { : (side == metadata ? this.iconFront : this.blockIcon)); } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO @Override diff --git a/src/main/java/techreborn/blocks/machine/BlockLathe.java b/src/main/java/techreborn/blocks/machine/BlockLathe.java index 04df3548a..d09777a8b 100644 --- a/src/main/java/techreborn/blocks/machine/BlockLathe.java +++ b/src/main/java/techreborn/blocks/machine/BlockLathe.java @@ -74,10 +74,10 @@ public class BlockLathe extends BlockMachineBase { : (side == metadata ? this.iconFront : this.blockIcon)); } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO @Override public IIcon getIcon(int side, int meta) { diff --git a/src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java b/src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java index 9a4eb0f6e..ec74adade 100644 --- a/src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java @@ -74,10 +74,10 @@ public class BlockPlateCuttingMachine extends BlockMachineBase { : (side == metadata ? this.iconFront : this.blockIcon)); } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO @Override public IIcon getIcon(int side, int meta) { diff --git a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java index 13515051e..2c745597e 100644 --- a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java @@ -67,10 +67,10 @@ public class BlockRollingMachine extends BlockMachineBase { : (side == metadata ? this.iconFront : this.blockIcon)); } - @Override - public Item getItemDropped(int meta, Random random, int fortune) { - return IC2Items.getItem("machine").getItem(); - } +// @Override +// public Item getItemDropped(int meta, Random random, int fortune) { +// return IC2Items.getItem("machine").getItem(); +// }//TODO @Override public IIcon getIcon(int side, int meta) {