Compare commits
7 Commits
Author | SHA1 | Date |
---|---|---|
Andrew Lalis | 54b5a1de49 | |
Andrew Lalis | 9cd948b090 | |
KxmischesDomi | e1ce6408ab | |
Andrew Lalis | 2e7ea5b7b0 | |
Andrew Lalis | c89a24fe3d | |
Nate | 2429cabfa4 | |
BuildTools | 2948e19f5b |
|
@ -1,5 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id 'fabric-loom' version '0.10-SNAPSHOT'
|
id 'fabric-loom' version '0.12-SNAPSHOT'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
|
||||||
|
|
||||||
# Fabric Properties
|
# Fabric Properties
|
||||||
# check these on https://fabricmc.net/versions.html
|
# check these on https://fabricmc.net/versions.html
|
||||||
minecraft_version=1.18
|
minecraft_version=1.19
|
||||||
yarn_mappings=1.18+build.1
|
yarn_mappings=1.19+build.1
|
||||||
loader_version=0.12.8
|
loader_version=0.14.7
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version = 1.3.0
|
mod_version = 1.4.0
|
||||||
maven_group = nl.andrewlalis
|
maven_group = nl.andrewlalis
|
||||||
archives_base_name = speed-carts
|
archives_base_name = speed-carts
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
fabric_version=0.43.1+1.18
|
fabric_version=0.55.3+1.19
|
||||||
|
|
|
@ -39,6 +39,7 @@ public class Config {
|
||||||
|
|
||||||
private void ensureConfigExists() throws IOException {
|
private void ensureConfigExists() throws IOException {
|
||||||
if (!Files.exists(CONFIG_FILE)) {
|
if (!Files.exists(CONFIG_FILE)) {
|
||||||
|
Files.createDirectories(CONFIG_FILE.getParent());
|
||||||
OutputStream out = Files.newOutputStream(CONFIG_FILE);
|
OutputStream out = Files.newOutputStream(CONFIG_FILE);
|
||||||
InputStream defaultConfigInputStream = SpeedCarts.class.getClassLoader().getResourceAsStream("default_config.yaml");
|
InputStream defaultConfigInputStream = SpeedCarts.class.getClassLoader().getResourceAsStream("default_config.yaml");
|
||||||
if (defaultConfigInputStream == null) {
|
if (defaultConfigInputStream == null) {
|
||||||
|
|
|
@ -18,7 +18,6 @@ import net.minecraft.sound.SoundEvents;
|
||||||
import net.minecraft.state.property.Properties;
|
import net.minecraft.state.property.Properties;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.util.DyeColor;
|
import net.minecraft.util.DyeColor;
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
import net.minecraft.util.math.*;
|
import net.minecraft.util.math.*;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import nl.andrewlalis.speed_carts.SpeedCarts;
|
import nl.andrewlalis.speed_carts.SpeedCarts;
|
||||||
|
@ -77,9 +76,9 @@ public abstract class AbstractMinecartMixin extends Entity {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Shadow
|
@Shadow
|
||||||
protected abstract double getMaxOffRailSpeed();
|
protected abstract double getMaxSpeed();
|
||||||
|
|
||||||
@Inject(at = @At("HEAD"), method = "getMaxOffRailSpeed", cancellable = true)
|
@Inject(at = @At("HEAD"), method = "getMaxSpeed", cancellable = true)
|
||||||
public void getMaxOffRailSpeedOverwrite(CallbackInfoReturnable<Double> cir) {
|
public void getMaxOffRailSpeedOverwrite(CallbackInfoReturnable<Double> cir) {
|
||||||
cir.setReturnValue(this.maxSpeedBps / 20.0);
|
cir.setReturnValue(this.maxSpeedBps / 20.0);
|
||||||
}
|
}
|
||||||
|
@ -122,8 +121,7 @@ public abstract class AbstractMinecartMixin extends Entity {
|
||||||
|
|
||||||
for (BlockPos position : this.getPositionsToCheck(pos)) {
|
for (BlockPos position : this.getPositionsToCheck(pos)) {
|
||||||
BlockEntity blockEntity = this.world.getBlockEntity(position);
|
BlockEntity blockEntity = this.world.getBlockEntity(position);
|
||||||
if (blockEntity instanceof SignBlockEntity) {
|
if (blockEntity instanceof SignBlockEntity sign) {
|
||||||
SignBlockEntity sign = (SignBlockEntity) blockEntity;
|
|
||||||
if (!sign.getPos().equals(this.lastUpdatedFrom) || this.world.getTime() > this.lastSpeedUpdate + SPEED_UPDATE_COOLDOWN) {
|
if (!sign.getPos().equals(this.lastUpdatedFrom) || this.world.getTime() > this.lastSpeedUpdate + SPEED_UPDATE_COOLDOWN) {
|
||||||
BlockState state = this.world.getBlockState(position);
|
BlockState state = this.world.getBlockState(position);
|
||||||
Direction dir = (Direction) state.getEntries().get(Properties.HORIZONTAL_FACING);
|
Direction dir = (Direction) state.getEntries().get(Properties.HORIZONTAL_FACING);
|
||||||
|
@ -143,7 +141,7 @@ public abstract class AbstractMinecartMixin extends Entity {
|
||||||
*/
|
*/
|
||||||
private boolean updateSpeedForSign(SignBlockEntity sign) {
|
private boolean updateSpeedForSign(SignBlockEntity sign) {
|
||||||
Text text = sign.getTextOnRow(0, false);
|
Text text = sign.getTextOnRow(0, false);
|
||||||
String s = text.asString();
|
String s = text.getString();
|
||||||
if (!SIGN_PATTERN.matcher(s).matches()) {
|
if (!SIGN_PATTERN.matcher(s).matches()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -312,7 +310,7 @@ public abstract class AbstractMinecartMixin extends Entity {
|
||||||
f = q + i * x;
|
f = q + i * x;
|
||||||
this.setPosition(d, e, f);
|
this.setPosition(d, e, f);
|
||||||
v = this.hasPassengers() ? 0.75D : 1.0D;
|
v = this.hasPassengers() ? 0.75D : 1.0D;
|
||||||
w = this.getMaxOffRailSpeed();
|
w = this.getMaxSpeed();
|
||||||
velocity = this.getVelocity();
|
velocity = this.getVelocity();
|
||||||
Vec3d movement = new Vec3d(MathHelper.clamp(v * velocity.x, -w, w), 0.0D, MathHelper.clamp(v * velocity.z, -w, w));
|
Vec3d movement = new Vec3d(MathHelper.clamp(v * velocity.x, -w, w), 0.0D, MathHelper.clamp(v * velocity.z, -w, w));
|
||||||
this.move(MovementType.SELF, movement);
|
this.move(MovementType.SELF, movement);
|
||||||
|
|
|
@ -23,12 +23,12 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"mixins": [
|
"mixins": [
|
||||||
"modid.mixins.json"
|
"speed-carts.mixins.json"
|
||||||
],
|
],
|
||||||
|
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": ">=0.11.3",
|
"fabricloader": ">=0.14.7",
|
||||||
"minecraft": "1.18.x",
|
"minecraft": "1.19.x",
|
||||||
"java": ">=17"
|
"java": ">=17"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue