fixed trains nor consuming fuel, some model stuff

This commit is contained in:
Bob 2023-05-18 22:05:22 +02:00
parent 1df34a3fa3
commit 830f0e5162
7 changed files with 9930 additions and 4 deletions

View File

@ -133,6 +133,7 @@ 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

@ -49,17 +49,19 @@ public abstract class EntityRailCarRidable extends EntityRailCarCargo {
if(this.canAccelerate()) {
if(player.moveForward > 0) {
engineSpeed += this.getPoweredAcceleration();
this.consumeFuel();
} else if(player.moveForward < 0) {
engineSpeed -= this.getPoweredAcceleration();
this.consumeFuel();
} else {
if(this.shouldUseEngineBrake(player)) {
engineSpeed *= this.getPassivBrake();
} else {
this.consumeFuel();
}
}
} else {
if(this.shouldUseEngineBrake(player)) {
engineSpeed *= this.getPassivBrake();
}
engineSpeed *= this.getPassivBrake();
}
} else {

View File

@ -1,5 +1,7 @@
package com.hbm.entity.train;
import java.util.Arrays;
import org.lwjgl.opengl.GL11;
import com.hbm.blocks.rail.IRailNTM.TrackGauge;
@ -19,6 +21,7 @@ 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;
@ -56,7 +59,7 @@ public class TrainCargoTram extends EntityRailCarElectric implements IGUIProvide
@Override public String getInventoryName() { return this.hasCustomInventoryName() ? this.getEntityName() : "container.trainTram"; }
@Override public int getMaxPower() { return this.getPowerConsumption() * 100; }
@Override public int getPowerConsumption() { return 50; }
@Override public int getPowerConsumption() { return 10; }
@Override public boolean hasChargeSlot() { return true; }
@Override public int getChargeSlot() { return 28; }
@ -180,6 +183,12 @@ public class TrainCargoTram extends EntityRailCarElectric implements IGUIProvide
this.ySize = 204;
}
@Override
public void drawScreen(int x, int y, float interp) {
super.drawScreen(x, y, interp);
this.drawElectricityInfo(this, x, y, guiLeft + 152, guiTop + 18, 16, 52, train.getPower(), train.getMaxPower());
}
@Override
protected void drawGuiContainerForegroundLayer(int i, int j) {
String name = this.train.hasCustomInventoryName() ? this.train.getInventoryName() : I18n.format(this.train.getInventoryName());
@ -192,6 +201,13 @@ public class TrainCargoTram extends EntityRailCarElectric implements IGUIProvide
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
int i = train.getPower() * 53 / train.getMaxPower();
drawTexturedModalRect(guiLeft + 152, guiTop + 70 - i, 176, 52 - i, 16, i);
if(train.getPower() > train.getPowerConsumption()) {
drawTexturedModalRect(guiLeft + 156, guiTop + 4, 176, 52, 9, 12);
}
}
}
}

View File

@ -397,6 +397,7 @@ container.soyuzLauncher=Soyuz-Startplatform
container.storageDrum=Atommüll-Lagertrommel
container.teleLinker=TelLink-Gerät
container.teleporter=Teleporter
container.trainTram=Elektrischer Flachwagen
container.turbinegas=Kombizyklus-Gasturbine
container.turretArty=Greg
container.turretChekhov=Tschechows Gewehr
@ -3156,6 +3157,7 @@ item.titanium_plate.name=Titanbrustpanzer
item.titanium_shovel.name=Titanschaufel
item.titanium_sword.name=Titanschwert
item.toothpicks.name=Zahnstocher
item.train.cargo_tram.name=Elektrischer Flachwagen
item.trinitite.name=Trinitit
item.tritium_deuterium_cake.name=Tritium-Deuterium-Kuchen
item.tsar_core.name=Fusionskern

View File

@ -690,6 +690,7 @@ container.soyuzLauncher=Soyuz Launch Platform
container.storageDrum=Nuclear Waste Disposal Drum
container.teleLinker=TelLink Device
container.teleporter=Teleporter
container.trainTram=Electric Flat Bed Tram
container.turbinegas=Combined Cycle Gas Turbine
container.turretArty=Greg
container.turretChekhov=Chekhov's Gun
@ -3941,6 +3942,7 @@ item.titanium_plate.name=Titanium Chestplate
item.titanium_shovel.name=Titanium Shovel
item.titanium_sword.name=Titanium Sword
item.toothpicks.name=Toothpicks
item.train.cargo_tram.name=Electric Flat Bed Tram
item.trinitite.name=Trinitite
item.tritium_deuterium_cake.name=Tritium-Deuterium-Cake
item.tritium_deuterium_cake.desc=Not actual cake, but great$universal fusion fuel!

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff