xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

small laser miner improvements

Browse Source
This commit is contained in:
HbmMods 2020-06-16 22:44:41 +02:00
parent bd4540c24a
commit 1601b745e2
2 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
com/hbm/items/machine/ItemMachineUpgrade.java
View File

@ -15,7 +15,6 @@ public class ItemMachineUpgrade extends Item {
if(this == ModItems.upgrade_speed_1)
{
list.add("Speed Upgrade");
list.add("Mining Drill:");
list.add("Delay -15 / Consumption +300");
list.add("");
@ -28,7 +27,6 @@ public class ItemMachineUpgrade extends Item {
if(this == ModItems.upgrade_speed_2)
{
list.add("Speed Upgrade");
list.add("Mining Drill:");
list.add("Delay -30 / Consumption +600");
list.add("");
@ -41,7 +39,6 @@ public class ItemMachineUpgrade extends Item {
if(this == ModItems.upgrade_speed_3)
{
list.add("Speed Upgrade");
list.add("Mining Drill:");
list.add("Delay -45 / Consumption +900");
list.add("");
@ -54,28 +51,24 @@ public class ItemMachineUpgrade extends Item {
if(this == ModItems.upgrade_effect_1)
{
list.add("Effectiveness Upgrade");
list.add("Mining Drill:");
list.add("Radius +1 / Consumption +80");
}
if(this == ModItems.upgrade_effect_2)
{
list.add("Effectiveness Upgrade");
list.add("Mining Drill:");
list.add("Radius +2 / Consumption +160");
}
if(this == ModItems.upgrade_effect_3)
{
list.add("Effectiveness Upgrade");
list.add("Mining Drill:");
list.add("Radius +3 / Consumption +240");
}
if(this == ModItems.upgrade_power_1)
{
list.add("Power Saving Upgrade");
list.add("Mining Drill:");
list.add("Consumption -30 / Delay +5");
list.add("");
@ -88,7 +81,6 @@ public class ItemMachineUpgrade extends Item {
if(this == ModItems.upgrade_power_2)
{
list.add("Power Saving Upgrade");
list.add("Mining Drill:");
list.add("Consumption -60 / Delay +10");
list.add("");
@ -101,7 +93,6 @@ public class ItemMachineUpgrade extends Item {
if(this == ModItems.upgrade_power_3)
{
list.add("Power Saving Upgrade");
list.add("Mining Drill:");
list.add("Consumption -90 / Delay +15");
list.add("");
@ -114,42 +105,36 @@ public class ItemMachineUpgrade extends Item {
if(this == ModItems.upgrade_fortune_1)
{
list.add("Fortune Upgrade");
list.add("Mining Drill:");
list.add("Fortune +1 / Delay +15");
}
if(this == ModItems.upgrade_fortune_2)
{
list.add("Fortune Upgrade");
list.add("Mining Drill:");
list.add("Fortune +2 / Delay +30");
}
if(this == ModItems.upgrade_fortune_3)
{
list.add("Fortune Upgrade");
list.add("Mining Drill:");
list.add("Fortune +3 / Delay +45");
}
if(this == ModItems.upgrade_afterburn_1)
{
list.add("Afterburner Upgrade");
list.add("Turbofan:");
list.add("Production x2 / Consumption x2.5");
}
if(this == ModItems.upgrade_afterburn_2)
{
list.add("Afterburner Upgrade");
list.add("Turbofan:");
list.add("Production x3 / Consumption x5");
}
if(this == ModItems.upgrade_afterburn_3)
{
list.add("Afterburner Upgrade");
list.add("Turbofan:");
list.add("Production x4 / Consumption x7.5");
}
@ -170,12 +155,44 @@ public class ItemMachineUpgrade extends Item {
list.add("Stacks to 16");
}
if(this == ModItems.upgrade_smelter)
{
list.add("Mining Laser Upgrade");
list.add("Smelts blocks. Easy enough.");
}
if(this == ModItems.upgrade_shredder)
{
list.add("Mining Laser Upgrade");
list.add("Crunches ores");
}
if(this == ModItems.upgrade_centrifuge)
{
list.add("Mining Laser Upgrade");
list.add("Hopefully self-explanatory");
}
if(this == ModItems.upgrade_crystallizer)
{
list.add("Mining Laser Upgrade");
list.add("Your new best friend");
}
if(this == ModItems.upgrade_screm)
{
list.add("Mining Laser Upgrade");
list.add("It's like in Super Mario where all blocks are");
list.add("actually Toads, but here it's Half-Life scientists");
list.add("and they scream. A lot.");
}
if(this == ModItems.upgrade_nullifier)
{
list.add("Mining Laser Upgrade");
list.add("50% chance to override worthless items with /dev/zero");
list.add("50% chance to move worthless items to /dev/null");
}
}
}

17
com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java
View File

@ -102,7 +102,7 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen
scan(range);
if(beam && canBreak(worldObj.getBlock(targetX, targetY, targetZ))) {
if(beam && canBreak(worldObj.getBlock(targetX, targetY, targetZ), targetX, targetY, targetZ)) {
breakProgress += getBreakSpeed(speed);
clientBreakProgress = Math.min(breakProgress, 1);
@ -312,7 +312,16 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen
for(int x = -range; x <= range; x++) {
for(int z = -range; z <= range; z++) {
if(canBreak(worldObj.getBlock(x + xCoord, targetY, z + zCoord))) {
if(worldObj.getBlock(x + xCoord, targetY, z + zCoord).getMaterial().isLiquid()) {
/*targetX = x + xCoord;
targetZ = z + zCoord;
worldObj.func_147480_a(x + xCoord, targetY, z + zCoord, false);
beam = true;*/
continue;
}
if(canBreak(worldObj.getBlock(x + xCoord, targetY, z + zCoord), x + xCoord, targetY, z + zCoord)) {
targetX = x + xCoord;
targetZ = z + zCoord;
beam = true;
@ -325,8 +334,8 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen
targetY--;
}
private boolean canBreak(Block block) {
return block != Blocks.air && block != Blocks.water && block != Blocks.flowing_water;
private boolean canBreak(Block block, int x, int y, int z) {
return block != Blocks.air && block.getBlockHardness(worldObj, x, y, z) >= 0 && block.getMaterial().isSolid();
}
public int getOverdrive() {