mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-01-13 07:47:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Can't touch this

Browse source 
- Fixed collision with belts causing a crash in recent forge versions
This commit is contained in:
simibubi 2023-07-05 12:38:10 +02:00
parent 193c905f24
commit e6759d8ecc
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build.gradle
View file

@ -188,6 +188,7 @@ dependencies {
runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}+${curios_minecraft_version}") runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}+${curios_minecraft_version}")
if (cc_tweaked_enable.toBoolean()) { if (cc_tweaked_enable.toBoolean()) {
compileOnly("cc.tweaked:cc-tweaked-${cc_tweaked_minecraft_version}-core-api:${cc_tweaked_version}")
compileOnly fg.deobf("cc.tweaked:cc-tweaked-${cc_tweaked_minecraft_version}-forge-api:${cc_tweaked_version}") compileOnly fg.deobf("cc.tweaked:cc-tweaked-${cc_tweaked_minecraft_version}-forge-api:${cc_tweaked_version}")
runtimeOnly fg.deobf("cc.tweaked:cc-tweaked-${cc_tweaked_minecraft_version}-forge:${cc_tweaked_version}") runtimeOnly fg.deobf("cc.tweaked:cc-tweaked-${cc_tweaked_minecraft_version}-forge:${cc_tweaked_version}")
} }

4
gradle.properties
View file

@ -4,11 +4,11 @@ org.gradle.jvmargs = -Xmx3G
org.gradle.daemon = false org.gradle.daemon = false
# mod version info # mod version info
mod_version = 0.5.1.c mod_version = 0.5.1.d
artifact_minecraft_version = 1.20.1 artifact_minecraft_version = 1.20.1
minecraft_version = 1.20.1 minecraft_version = 1.20.1
forge_version = 47.0.19 forge_version = 47.0.43
# build dependency versions # build dependency versions
forgegradle_version = 6.0.6 forgegradle_version = 6.0.6

2
src/main/java/com/simibubi/create/Create.java
View file

@ -68,7 +68,7 @@ public class Create {
public static final String ID = "create"; public static final String ID = "create";
public static final String NAME = "Create"; public static final String NAME = "Create";
public static final String VERSION = "0.5.1c"; public static final String VERSION = "0.5.1d";
public static final Logger LOGGER = LogUtils.getLogger(); public static final Logger LOGGER = LogUtils.getLogger();

6
src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltMovementHandler.java
View file

@ -142,9 +142,9 @@ public class BeltMovementHandler {
|| ((LivingEntity) entityIn).zza == 0 && ((LivingEntity) entityIn).xxa == 0) || ((LivingEntity) entityIn).zza == 0 && ((LivingEntity) entityIn).xxa == 0)
movement = movement.add(centering); movement = movement.add(centering);
float step = entityIn.maxUpStep; float step = entityIn.maxUpStep();
if (!isPlayer) if (!isPlayer)
entityIn.maxUpStep = 1; entityIn.setMaxUpStep(1);
// Entity Collisions // Entity Collisions
if (Math.abs(movementSpeed) < .5f) { if (Math.abs(movementSpeed) < .5f) {
@ -180,7 +180,7 @@ public class BeltMovementHandler {
entityIn.setOnGround(true); entityIn.setOnGround(true);
if (!isPlayer) if (!isPlayer)
entityIn.maxUpStep = step; entityIn.setMaxUpStep(step);
boolean movedPastEndingSlope = onSlope && (AllBlocks.BELT.has(world.getBlockState(entityIn.blockPosition())) boolean movedPastEndingSlope = onSlope && (AllBlocks.BELT.has(world.getBlockState(entityIn.blockPosition()))
|| AllBlocks.BELT.has(world.getBlockState(entityIn.blockPosition() || AllBlocks.BELT.has(world.getBlockState(entityIn.blockPosition()