MinecraftMods/EngineersDecor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

1.12: Floor grating issue fixed. Lang updates.

Browse source
This commit is contained in:
stfwi 2019-08-24 12:11:39 +02:00
parent 029a97fa18
commit 10968cbdd2
9 changed files with 38 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
1.12/meta/update.json
View file

@ -1,6 +1,7 @@
{
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
"1.12.2": {
"1.0.11-b2": "[F] Fixed Floor Grating issue, which could have caused a crash.\n[M] Lang update ru-ru (Shellyoung, PR #47).",
"1.0.11-b1": "[M] Lang update ru-ru (Shellyoung, PR #45).\n[F] Fixed bounding box of the Steel Table.\n[M] Steel Floor Frating: Items fall through.",
"1.0.10": "[R] Release based on v1.0.10-b2. Release-to-release changes: * Steel table added. * Steel floor grating added. * Treated wood side table added. * Exit Sign added. * Recipe fixes.",
"1.0.10-b2": "[A] Steel table added.\n[A] Steel floor grating added.",
@ -52,6 +53,6 @@
},
"promos": {
"1.12.2-recommended": "1.0.10",
"1.12.2-latest": "1.0.11-b1"
"1.12.2-latest": "1.0.11-b2"
}
}

3
1.12/readme.md
View file

@ -10,7 +10,8 @@ Mod sources for Minecraft version 1.12.2.
----
## Version history
~ v1.0.11-b2 [A]
- v1.0.11-b2 [F] Fixed Floor Grating issue, which could have caused a crash.
[M] Lang update ru-ru (Shellyoung, PR #47).
- v1.0.11-b1 [M] Lang update ru-ru (Shellyoung, PR #45).
[F] Fixed bounding box of the Steel Table.

25
1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFloorGrating.java
View file

@ -55,7 +55,23 @@ public class BlockDecorFloorGrating extends BlockDecor
if(!(entity instanceof EntityItem)) {
entity.fall(fallDistance, 1.0F);
} else {
entity.setVelocity(0,-0.2,0);
entity.motionX = 0;
entity.motionY = -0.1;
entity.motionZ = 0;
entity.setPositionAndUpdate(pos.getX()+0.5, entity.posY-0.3, pos.getZ()+0.5);
}
}
@Override
public void onLanded(World world, Entity entity)
{
if(!(entity instanceof EntityItem)) {
super.onLanded(world, entity);
} else {
entity.motionX = 0;
entity.motionY = -0.1;
entity.motionZ = 0;
entity.setPositionAndUpdate(entity.posX, entity.posY-0.3, entity.posZ);
}
}
@ -63,12 +79,11 @@ public class BlockDecorFloorGrating extends BlockDecor
public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity)
{
if(!(entity instanceof EntityItem)) return;
entity.motionX = 0;
entity.motionZ = 0;
if((entity.posY-pos.getY()) > 0.7) {
if(entity.motionY > -0.2) entity.motionY = -0.2;
entity.setVelocity(0,-0.1,0);
entity.setPositionAndUpdate(entity.posX, entity.posY-0.3, entity.posZ);
} else {
entity.setVelocity(0,entity.motionY,0);
entity.setPositionAndUpdate(pos.getX()+0.5, entity.posY-0.3, pos.getZ()+0.5);
}
}
}