From 43ba0f135d5e357a87151345b1a3fb46d50c09cf Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 5 Dec 2021 11:13:27 +0100 Subject: [PATCH] buffed RTGs, fixed loot block dropping, pylon cable length fix --- .../java/com/hbm/blocks/generic/BlockLoot.java | 7 +++++++ .../machine/TileEntityMachineMiniRTG.java | 2 +- .../tileentity/machine/TileEntityMachineRTG.java | 4 ++-- .../tileentity/network/TileEntityPylonBase.java | 8 ++++++-- .../assets/hbm/textures/blocks/red_connector.png | Bin 0 -> 196 bytes .../hbm/textures/gui/generators/gui_igen_new.png | Bin 0 -> 4019 bytes .../hbm/textures/models/network/pylon_large.png | Bin 0 -> 556 bytes 7 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/blocks/red_connector.png create mode 100644 src/main/resources/assets/hbm/textures/gui/generators/gui_igen_new.png create mode 100644 src/main/resources/assets/hbm/textures/models/network/pylon_large.png diff --git a/src/main/java/com/hbm/blocks/generic/BlockLoot.java b/src/main/java/com/hbm/blocks/generic/BlockLoot.java index e13dd5a5e..57c0e4ee9 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockLoot.java +++ b/src/main/java/com/hbm/blocks/generic/BlockLoot.java @@ -2,6 +2,7 @@ package com.hbm.blocks.generic; import java.util.ArrayList; import java.util.List; +import java.util.Random; import com.hbm.util.Tuple.Quartet; @@ -10,6 +11,7 @@ import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; @@ -41,6 +43,11 @@ public class BlockLoot extends BlockContainer { return false; } + @Override + public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + return null; + } + @Override public void onBlockAdded(World world, int x, int y, int z) { super.onBlockAdded(world, x, y, z); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiniRTG.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiniRTG.java index ad4f26e60..6a2224074 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiniRTG.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiniRTG.java @@ -23,7 +23,7 @@ public class TileEntityMachineMiniRTG extends TileEntity implements IEnergyGener if(this.getBlockType() == ModBlocks.machine_powerrtg) power += 2500; else - power += 70; + power += 700; if(power > getMaxPower()) power = getMaxPower(); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java index 9c4c00225..2b8c699b5 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java @@ -24,7 +24,7 @@ public class TileEntityMachineRTG extends TileEntity implements ISidedInventory, public int heat; public final int heatMax = 150; public long power; - public final long powerMax = 90000; + public final long powerMax = 100000; private static final int[] slots_top = new int[] { 0 }; private static final int[] slots_bottom = new int[] { 0 }; @@ -238,7 +238,7 @@ public class TileEntityMachineRTG extends TileEntity implements ISidedInventory, if(heat > heatMax) heat = heatMax; - power += heat; + power += heat * 10; if(power > powerMax) power = powerMax; diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityPylonBase.java b/src/main/java/com/hbm/tileentity/network/TileEntityPylonBase.java index b5f7c64e7..54e040e42 100644 --- a/src/main/java/com/hbm/tileentity/network/TileEntityPylonBase.java +++ b/src/main/java/com/hbm/tileentity/network/TileEntityPylonBase.java @@ -30,9 +30,13 @@ public abstract class TileEntityPylonBase extends TileEntityCableBaseNT { Vec3 firstPos = first.getMountPos(); Vec3 secondPos = second.getMountPos(); - double deltaSq = Math.pow(secondPos.xCoord - firstPos.xCoord, 2) + Math.pow(secondPos.yCoord - firstPos.yCoord, 2) + Math.pow(secondPos.zCoord - firstPos.zCoord, 2); + Vec3 delta = Vec3.createVectorHelper( + (second.xCoord + secondPos.xCoord) - (first.xCoord + firstPos.xCoord), + (second.yCoord + secondPos.yCoord) - (first.yCoord + firstPos.yCoord), + (second.zCoord + secondPos.zCoord) - (first.zCoord + firstPos.zCoord) + ); - return lenSq >= deltaSq; + return Math.sqrt(lenSq) >= delta.lengthVector(); } public void addConnection(int x, int y, int z) { diff --git a/src/main/resources/assets/hbm/textures/blocks/red_connector.png b/src/main/resources/assets/hbm/textures/blocks/red_connector.png new file mode 100644 index 0000000000000000000000000000000000000000..003282aaaf30bdc3401607893adcf48239bd88df GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfaxxTf^{+ddeJ4ol!J|#HUph@ooO7}W^zaaYboXre-zV{gBZQlCr%KZ=z&4+WGg$&(P s1f6a;J`7xZ?bke}g5@7YTjd{cncel$yz%c)4bT}3p00i_>zopr0DVnOg#Z8m literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/gui/generators/gui_igen_new.png b/src/main/resources/assets/hbm/textures/gui/generators/gui_igen_new.png new file mode 100644 index 0000000000000000000000000000000000000000..544cc0f2526dd9d463d28c469548606d27ac722d GIT binary patch literal 4019 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 HW+eU(4)p_> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/models/network/pylon_large.png b/src/main/resources/assets/hbm/textures/models/network/pylon_large.png new file mode 100644 index 0000000000000000000000000000000000000000..87d5bfb0e1f7d5e2f50ecaf7e544525adeb880a3 GIT binary patch literal 556 zcmeAS@N?(olHy`uVBq!ia0vp^3P601gAGW=JYt#)q*#ibJVQ8upoSx*gMoqZv8Rh; zNX4ADcWi?WIfxwiD4x#$n0L;`uBCAY5{sC*)^C`t9Z|s)T)>ze&6T!BW(TWz1b0i~ z{Ru8LIt*vJ{{#S6a5pvxrimcQXDjdd5C__gY<<@2*F8uJ)|YIdyfGkLXQ-Wzq} z_C*zJ3_A?u;~cJ^IQu)3@u)G#2=R4o;un$~WBL1KkGp;3VUUpJE^-Ib3=9W!#qDNZ z^zc~rUR9;G{`0JD`s;GzrMuEWx-dbWT5i#z^FPhHI!fL?{LPkjN$ql6&h-hW(jCrc z9D24fyVQH0#=J(B3l*KQ0xu6e`)SE=Qt`&Jdg1wl%M3uIlp`s4xE3_`M*x^UHytVtL@HrA1Sch)Vh*4U=JvM!9Y*KJR$b~ h_w)l&kYE4_{$Nn8ER+&vyXg($dAj