diff --git a/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteDrilledBase.java b/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteDrilledBase.java index 00b520a54..58ec7bce2 100644 --- a/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteDrilledBase.java +++ b/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteDrilledBase.java @@ -133,7 +133,6 @@ public abstract class BlockGraphiteDrilledBase extends BlockFlammable implements if(item == ModItems.pile_rod_lithium) return new MetaBlock(ModBlocks.block_graphite_lithium); if(item == ModItems.cell_tritium) return new MetaBlock(ModBlocks.block_graphite_tritium); if(item == ModItems.pile_rod_detector) return new MetaBlock(ModBlocks.block_graphite_detector); - if(item == ModItems.ingot_graphite) return new MetaBlock(ModBlocks.block_graphite); return null; } diff --git a/src/main/java/com/hbm/entity/train/TrainCargoTram.java b/src/main/java/com/hbm/entity/train/TrainCargoTram.java index 8e5d7990f..e0d1aaa2a 100644 --- a/src/main/java/com/hbm/entity/train/TrainCargoTram.java +++ b/src/main/java/com/hbm/entity/train/TrainCargoTram.java @@ -1,7 +1,5 @@ package com.hbm.entity.train; -import java.util.Arrays; - import org.lwjgl.opengl.GL11; import com.hbm.blocks.rail.IRailNTM.TrackGauge; @@ -21,7 +19,6 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/extprop/HbmLivingProps.java b/src/main/java/com/hbm/extprop/HbmLivingProps.java index 73d5957af..da9d1d0c6 100644 --- a/src/main/java/com/hbm/extprop/HbmLivingProps.java +++ b/src/main/java/com/hbm/extprop/HbmLivingProps.java @@ -40,7 +40,7 @@ public class HbmLivingProps implements IExtendedEntityProperties { private int asbestos; public static final int maxAsbestos = 60 * 60 * 20; private int blacklung; - public static final int maxBlacklung = 60 * 60 * 20; + public static final int maxBlacklung = 2 * 60 * 60 * 20; private float radEnv; private float radBuf; private int bombTimer; diff --git a/src/main/java/com/hbm/handler/EntityEffectHandler.java b/src/main/java/com/hbm/handler/EntityEffectHandler.java index 845bbd9a6..2ccce3b4a 100644 --- a/src/main/java/com/hbm/handler/EntityEffectHandler.java +++ b/src/main/java/com/hbm/handler/EntityEffectHandler.java @@ -359,7 +359,7 @@ public class EntityEffectHandler { int bl = HbmLivingProps.getBlackLung(entity); - if(bl > 0 && bl < HbmLivingProps.maxBlacklung * 0.25) + if(bl > 0 && bl < HbmLivingProps.maxBlacklung * 0.5) HbmLivingProps.setBlackLung(entity, HbmLivingProps.getBlackLung(entity) - 1); } diff --git a/src/main/java/com/hbm/handler/HTTPHandler.java b/src/main/java/com/hbm/handler/HTTPHandler.java index e12832267..4efc054f4 100644 --- a/src/main/java/com/hbm/handler/HTTPHandler.java +++ b/src/main/java/com/hbm/handler/HTTPHandler.java @@ -17,15 +17,22 @@ public class HTTPHandler { public static String versionNumber = ""; public static void loadStats() { - - try { - - loadVersion(); - loadSoyuz(); - - } catch(IOException e) { - MainRegistry.logger.warn("Version checker failed!"); - } + + Thread versionChecker = new Thread("NTM Version Checker") { + + @Override + public void run() { + try { + loadVersion(); + loadSoyuz(); + } catch(IOException e) { + MainRegistry.logger.warn("Version checker failed!"); + } + } + + }; + + versionChecker.start(); } private static void loadVersion() throws IOException { diff --git a/src/main/java/com/hbm/items/special/ItemTrain.java b/src/main/java/com/hbm/items/special/ItemTrain.java index 9c5e65062..1a2648d38 100644 --- a/src/main/java/com/hbm/items/special/ItemTrain.java +++ b/src/main/java/com/hbm/items/special/ItemTrain.java @@ -1,5 +1,7 @@ package com.hbm.items.special; +import java.util.List; + import com.hbm.blocks.rail.IRailNTM; import com.hbm.entity.train.EntityRailCarBase; import com.hbm.entity.train.TrainCargoTram; @@ -7,23 +9,52 @@ import com.hbm.items.ItemEnumMulti; import com.hbm.util.EnumUtil; import net.minecraft.block.Block; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; public class ItemTrain extends ItemEnumMulti { public ItemTrain() { super(EnumTrainType.class, true, true); + this.setCreativeTab(CreativeTabs.tabTransport); + this.setMaxStackSize(1); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { + EnumTrainType train = EnumUtil.grabEnumSafely(this.theEnum, stack.getItemDamage()); + + list.add(EnumChatFormatting.GREEN + "Engine: " + EnumChatFormatting.RESET + train.engine); + list.add(EnumChatFormatting.GREEN + "Gauge: " + EnumChatFormatting.RESET + train.gauge); + list.add(EnumChatFormatting.GREEN + "Max Speed: " + EnumChatFormatting.RESET + train.maxSpeed); + list.add(EnumChatFormatting.GREEN + "Acceleration: " + EnumChatFormatting.RESET + train.acceleration); + list.add(EnumChatFormatting.GREEN + "Engine Brake Threshold: " + EnumChatFormatting.RESET + train.brakeThreshold); + list.add(EnumChatFormatting.GREEN + "Parking Brake: " + EnumChatFormatting.RESET + train.parkingBrake); } public static enum EnumTrainType { - CARGO_TRAM(TrainCargoTram.class); + // Engine Gauge Max Speed Accel. Eng. Brake Parking Brake + CARGO_TRAM(TrainCargoTram.class, "Electric", "Standard Gauge", "10m/s", "0.2m/s", "<1m/s", "Yes"); public Class train; - private EnumTrainType(Class train) { + public String engine; + public String maxSpeed; + public String acceleration; + public String brakeThreshold; + public String parkingBrake; + public String gauge; + private EnumTrainType(Class train, String engine, String gauge, String maxSpeed, String acceleration, String brakeThreshold, String parkingBrake) { this.train = train; + this.engine = engine; + this.maxSpeed = maxSpeed; + this.acceleration = acceleration; + this.brakeThreshold = brakeThreshold; + this.parkingBrake = parkingBrake; + this.gauge = gauge; } } diff --git a/src/main/resources/assets/hbm/textures/models/weapons/ipleaker.png b/src/main/resources/assets/hbm/textures/models/weapons/ipleaker.png new file mode 100644 index 000000000..ca0c36889 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/weapons/ipleaker.png differ