-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #588 from cam72cam/computercraft_support
Add support for ComputerCraft and refactor common access API
- Loading branch information
Showing
8 changed files
with
424 additions
and
213 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,4 +4,4 @@ org.gradle.jvmargs=-Xmx3G | |
|
|
||
| version_major=1 | ||
| version_minor=6 | ||
| version_patch=0 | ||
| version_patch=1 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
211 changes: 211 additions & 0 deletions
211
src/main/java/cam72cam/immersiverailroading/thirdparty/CommonAPI.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,211 @@ | ||
| package cam72cam.immersiverailroading.thirdparty; | ||
|
|
||
| import cam72cam.immersiverailroading.entity.*; | ||
| import cam72cam.immersiverailroading.physics.PhysicsAccummulator; | ||
| import cam72cam.immersiverailroading.registry.EntityRollingStockDefinition; | ||
| import cam72cam.immersiverailroading.registry.LocomotiveDefinition; | ||
| import cam72cam.immersiverailroading.tile.TileRailBase; | ||
| import net.minecraft.util.EnumFacing; | ||
| import net.minecraft.util.math.BlockPos; | ||
| import net.minecraft.util.math.Vec3d; | ||
| import net.minecraft.world.World; | ||
| import net.minecraftforge.common.capabilities.Capability; | ||
| import net.minecraftforge.fluids.FluidStack; | ||
| import net.minecraftforge.fluids.capability.CapabilityFluidHandler; | ||
| import net.minecraftforge.fluids.capability.IFluidHandler; | ||
|
|
||
| import java.util.*; | ||
|
|
||
| public class CommonAPI { | ||
| private final EntityRollingStock stock; | ||
|
|
||
| public static CommonAPI create(World world, BlockPos pos) { | ||
| return create(world, pos, EntityRollingStock.class); | ||
| } | ||
|
|
||
| public static CommonAPI create(World world, BlockPos pos, Class<? extends EntityRollingStock> stockClass) { | ||
| TileRailBase te = TileRailBase.get(world, pos); | ||
| if (te != null) { | ||
| EntityRollingStock stock = te.getStockNearBy(stockClass, null); | ||
| if (stock != null) { | ||
| return new CommonAPI(stock); | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public CommonAPI(EntityRollingStock stock) { | ||
| this.stock = stock; | ||
| } | ||
|
|
||
| public FluidStack getFluid() { | ||
| Capability<IFluidHandler> capability = CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY; | ||
| IFluidHandler fh = stock.getCapability(capability, null); | ||
| if (fh != null) { | ||
| return fh.drain(Integer.MAX_VALUE, false); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public Map<String, Object> info() { | ||
| if (stock != null) { | ||
| Map<String, Object> info = new HashMap<>(); | ||
| EntityRollingStockDefinition def = stock.getDefinition(); | ||
|
|
||
| info.put("id", def.defID); | ||
| info.put("name", def.name()); | ||
| info.put("tag", stock.tag); | ||
| info.put("weight", stock.getWeight()); | ||
|
|
||
| EnumFacing dir = EnumFacing.fromAngle(stock.rotationYaw); | ||
| if (stock instanceof EntityMoveableRollingStock) { | ||
| EntityMoveableRollingStock movable = (EntityMoveableRollingStock) stock; | ||
| info.put("speed", movable.getCurrentSpeed().metric()); | ||
|
|
||
| if (movable.getCurrentSpeed().metric() < 0) { | ||
| dir = dir.getOpposite(); | ||
| } | ||
| } | ||
| info.put("direction", dir.toString()); | ||
|
|
||
| if (stock instanceof EntityRidableRollingStock) { | ||
| EntityRidableRollingStock ridable = (EntityRidableRollingStock) stock; | ||
| info.put("passengers", stock.getPassengers().size() + ridable.staticPassengers.size()); | ||
| } | ||
|
|
||
| if (stock instanceof Locomotive) { | ||
| Locomotive loco = (Locomotive) stock; | ||
| LocomotiveDefinition locoDef = loco.getDefinition(); | ||
| info.put("horsepower", locoDef.getHorsePower(loco.gauge)); | ||
| info.put("traction", locoDef.getStartingTractionNewtons(loco.gauge)); | ||
| info.put("max_speed", locoDef.getMaxSpeed(loco.gauge).metric()); | ||
| info.put("brake", loco.getAirBrake()); | ||
| info.put("throttle", loco.getThrottle()); | ||
|
|
||
| if (loco instanceof LocomotiveSteam) { | ||
| LocomotiveSteam steam = (LocomotiveSteam) loco; | ||
| info.put("pressure", steam.getBoilerPressure()); | ||
| info.put("temperature", steam.getBoilerTemperature()); | ||
| } | ||
| if (loco instanceof LocomotiveDiesel) { | ||
| info.put("temperature", ((LocomotiveDiesel) loco).getEngineTemperature()); | ||
| } | ||
| } | ||
|
|
||
| FluidStack fluid = getFluid(); | ||
| if (fluid != null) { | ||
| info.put("fluid_type", fluid.getFluid().getName()); | ||
| info.put("fluid_amount", fluid.amount); | ||
| } else { | ||
| info.put("fluid_type", null); | ||
| info.put("fluid_amount", 0); | ||
| } | ||
| if (stock instanceof FreightTank) { | ||
| info.put("fluid_max", ((FreightTank) stock).getTankCapacity().MilliBuckets()); | ||
| } | ||
|
|
||
| if (stock instanceof Freight) { | ||
| Freight freight = ((Freight) stock); | ||
| info.put("cargo_percent", freight.getPercentCargoFull()); | ||
| info.put("cargo_size", freight.getInventorySize()); | ||
| } | ||
| return info; | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public Map<String, Object> consist(boolean supportsList) { | ||
| if (!(stock instanceof EntityCoupleableRollingStock)) { | ||
| return null; | ||
| } | ||
| EntityCoupleableRollingStock stock = (EntityCoupleableRollingStock) this.stock; | ||
|
|
||
| int traction = 0; | ||
| PhysicsAccummulator acc = new PhysicsAccummulator(stock.getCurrentTickPosAndPrune()); | ||
| stock.mapTrain(stock, true, true, acc::accumulate); | ||
| Map<String, Object> info = new HashMap<>(); | ||
| List<Object> locos = new ArrayList<>(); | ||
|
|
||
| info.put("cars", acc.count); | ||
| info.put("tractive_effort_N", acc.tractiveEffortNewtons); | ||
| info.put("weight_kg", acc.massToMoveKg); | ||
| info.put("speed_km", stock.getCurrentSpeed().metric()); | ||
| EnumFacing dir = EnumFacing.fromAngle(stock.rotationYaw); | ||
| if (stock.getCurrentSpeed().metric() < 0) { | ||
| dir = dir.getOpposite(); | ||
| } | ||
| info.put("direction", dir.toString()); | ||
|
|
||
| for (EntityCoupleableRollingStock car : stock.getTrain()) { | ||
| if (car instanceof Locomotive) { | ||
| LocomotiveDefinition locoDef = ((Locomotive) car).getDefinition(); | ||
| traction += locoDef.getStartingTractionNewtons(car.gauge); | ||
| locos.add(new CommonAPI(car).info()); | ||
| } | ||
| } | ||
| if (supportsList) { | ||
| info.put("locomotives", locos); | ||
| } else { | ||
| Map<String, Object> locomotives = new HashMap<>(); | ||
| for (int i = 0; i < locos.size(); i++) { | ||
| locomotives.put("" + i, locos.get(i)); | ||
| } | ||
| info.put("locomotives", locomotives); | ||
| } | ||
| info.put("total_traction_N", traction); | ||
| return info; | ||
| } | ||
|
|
||
| public String getTag() { | ||
| return stock.tag; | ||
| } | ||
|
|
||
| public void setTag(String tag) { | ||
| stock.tag = tag; | ||
| } | ||
|
|
||
| private float normalize(double val) { | ||
| if (Double.isNaN(val)) { | ||
| return 0; | ||
| } | ||
| if (val > 1) { | ||
| return 1; | ||
| } | ||
| if (val < -1) { | ||
| return -1; | ||
| } | ||
| return (float)val; | ||
| } | ||
|
|
||
| public void setThrottle(double throttle) { | ||
| if (stock instanceof Locomotive) { | ||
| ((Locomotive)stock).setThrottle(normalize(throttle)); | ||
| } | ||
| } | ||
| public void setAirBrake(double brake) { | ||
| if (stock instanceof Locomotive) { | ||
| ((Locomotive)stock).setAirBrake(normalize(brake)); | ||
| } | ||
| } | ||
|
|
||
| public void setHorn(int horn) { | ||
| if (stock instanceof Locomotive) { | ||
| ((Locomotive)stock).setHorn(horn, null); | ||
| } | ||
| } | ||
|
|
||
| public void setBell(int bell) { | ||
| if (stock instanceof Locomotive) { | ||
| ((Locomotive)stock).setBell(bell); | ||
| } | ||
| } | ||
|
|
||
| public Vec3d getPosition() { | ||
| return stock.getPositionVector(); | ||
| } | ||
|
|
||
| public UUID getUniqueID() { | ||
| return stock.getUniqueID(); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.