black lung balance, tram tooltip

This commit is contained in:
Bob 2023-05-20 23:30:13 +02:00
parent 17eb7b7eb2
commit f2574fc232
7 changed files with 51 additions and 17 deletions

View File

@ -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;
}

View File

@ -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;

View File

@ -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;

View File

@ -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);
}

View File

@ -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 {

View File

@ -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<? extends EntityRailCarBase> train;
private EnumTrainType(Class<? extends EntityRailCarBase> train) {
public String engine;
public String maxSpeed;
public String acceleration;
public String brakeThreshold;
public String parkingBrake;
public String gauge;
private EnumTrainType(Class<? extends EntityRailCarBase> 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;
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB