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 000000000..003282aaa Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/red_connector.png differ 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 000000000..544cc0f25 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/generators/gui_igen_new.png differ 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 000000000..87d5bfb0e Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/network/pylon_large.png differ