1.12/1.14/1.15: Fixed Gloor Grating item jitter. 1.14/1.15: Librarizing, Factory Hopper second standard insertion run added (issue #84), Placer planting race condition circumvention added (issue #83). 1.15: JEI integration enabled (issue #85).
This commit is contained in:
stfwi
parent
66b2390ca5
commit
35b1785e9c
126 changed files with 3325 additions and 3043 deletions
|
|
@ -4,4 +4,4 @@ org.gradle.jvmargs=-Xmx8G
|
|||
version_minecraft=1.12.2
|
||||
version_forge=14.23.5.2768
|
||||
version_jei=4.10.0.198
|
||||
version_engineersdecor=1.0.19-b1
|
||||
version_engineersdecor=1.0.19-b2
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
|
||||
"1.12.2": {
|
||||
"1.0.19-b2": "[F] Fixed Floor Grating item pass-through jitters (thx Cid).\n[M] Removed obsolete recipe collision testing recipes.",
|
||||
"1.0.19-b1": "[F] Fixed Tree Cutter / Block Breaker not accepting small energy transfers (thx WindFox, issue #82).",
|
||||
"1.0.18": "[R] Release based on v1.0.18-b2. Release-to-release changes: * Tree cutter config fixes. * Treated Wood Crafting Table mouse tweaks. * Lang updates.\n[M] Lang update ru_ru (PR#77, thanks Smollet777).",
|
||||
"1.0.18-b2": "[A] Added Treated Wood Crafting table tweaks (ctrl-shift moves all same stacks from the inventory, mouse wheel over crafting slot increases/decreases crafting grid stacks).\n[F] EN Lang file fixed (issue #76, thx Riverstar907).\n[F] Fixed Tree Cutter not respecting power-required config (thx federsavo, issue #77).",
|
||||
|
|
@ -78,6 +79,6 @@
|
|||
},
|
||||
"promos": {
|
||||
"1.12.2-recommended": "1.0.18",
|
||||
"1.12.2-latest": "1.0.19-b1"
|
||||
"1.12.2-latest": "1.0.19-b2"
|
||||
}
|
||||
}
|
||||
|
|
@ -10,6 +10,9 @@ Mod sources for Minecraft version 1.12.2.
|
|||
----
|
||||
## Version history
|
||||
|
||||
- v1.0.19-b2 [F] Fixed Floor Grating item pass-through jitters (thx Cid).
|
||||
[M] Removed obsolete recipe collision testing recipes.
|
||||
|
||||
- v1.0.19-b1 [F] Fixed Tree Cutter / Block Breaker not accepting small energy transfers (thx WindFox, issue #82).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -338,7 +338,7 @@ public class ModContent
|
|||
"steel_floor_grating",
|
||||
BlockDecor.CFG_CUTOUT,
|
||||
Material.IRON, 1.0f, 15f, SoundType.METAL,
|
||||
ModAuxiliaries.getPixeledAABB(0,14,0, 16,16,16)
|
||||
ModAuxiliaries.getPixeledAABB(0,14,0, 16,15.9,16)
|
||||
);
|
||||
|
||||
//--------------------------------------------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -17,12 +17,12 @@ import net.minecraft.entity.item.EntityItem;
|
|||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
public class BlockDecorFloorGrating extends BlockDecor
|
||||
{
|
||||
|
|
@ -45,45 +45,27 @@ public class BlockDecorFloorGrating extends BlockDecor
|
|||
public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing face)
|
||||
{ return BlockFaceShape.UNDEFINED; }
|
||||
|
||||
@Override
|
||||
public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entity, boolean isActualState)
|
||||
{ if(!(entity instanceof EntityItem)) super.addCollisionBoxToList(state, world, pos, entityBox, collidingBoxes, entity, isActualState); }
|
||||
|
||||
@Override
|
||||
public void onFallenUpon(World world, BlockPos pos, Entity entity, float fallDistance)
|
||||
{
|
||||
if(!(entity instanceof EntityItem)) {
|
||||
entity.fall(fallDistance, 1.0F);
|
||||
} else {
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
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.setPositionAndUpdate(pos.getX()+0.5, entity.posY-0.3, pos.getZ()+0.5);
|
||||
final boolean colliding = ((entity.posY-pos.getY()) > 0.7);
|
||||
if(colliding || (entity.motionY > 0)) {
|
||||
double x = pos.getX() + 0.5;
|
||||
double y = MathHelper.clamp(entity.posY-0.3, pos.getY(), pos.getY()+0.6);
|
||||
double z = pos.getZ() + 0.5;
|
||||
if(colliding) {
|
||||
entity.motionX = 0;
|
||||
entity.motionZ = 0;
|
||||
entity.motionY = -0.3;
|
||||
if((entity.posY-pos.getY()) > 0.8) y = pos.getY() + 0.6;
|
||||
entity.prevPosX = x+0.1;
|
||||
entity.prevPosY = y+0.1;
|
||||
entity.prevPosZ = z+0.1;
|
||||
}
|
||||
entity.motionY = MathHelper.clamp(entity.motionY, -0.3, 0);
|
||||
entity.fallDistance = 0;
|
||||
entity.setPositionAndUpdate(x,y,z);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"parent": "block/cube",
|
||||
"textures": {
|
||||
"s": "engineersdecor:blocks/furniture/steel_table_side_texture",
|
||||
"particle": "engineersdecor:blocks/furniture/steel_table_side_texture",
|
||||
"s": "engineersdecor:blocks/furniture/steel_table_side_texture",
|
||||
"t": "engineersdecor:blocks/furniture/steel_table_top_texture"
|
||||
},
|
||||
"elements": [
|
||||
|
|
@ -173,15 +173,28 @@
|
|||
}
|
||||
],
|
||||
"display": {
|
||||
"thirdperson_righthand": {
|
||||
"rotation": [66, 0, 0],
|
||||
"translation": [0.25, 0, -2.75],
|
||||
"scale": [0.3, 0.3, 0.3]
|
||||
},
|
||||
"firstperson_righthand": {
|
||||
"rotation": [-4, -1, 58],
|
||||
"translation": [2.5, 0.25, 1.75],
|
||||
"scale": [0.3, 0.3, 0.3]
|
||||
},
|
||||
"ground": {
|
||||
"translation": [0, 1.75, 0],
|
||||
"translation": [0, 1.75, 0],
|
||||
"scale": [0.2, 0.2, 0.2]
|
||||
},
|
||||
"gui": {
|
||||
"rotation": [30, 225, 0],
|
||||
"translation": [0, -2, 0],
|
||||
"scale": [0.625, 0.625, 0.625]
|
||||
},
|
||||
"fixed": {
|
||||
"rotation": [-90, 0, 1],
|
||||
"translation": [0, 0.25, 3.25],
|
||||
"scale": [0.5, 0.5, 0.5]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "engineersdecor:grc",
|
||||
"experimental": true
|
||||
}
|
||||
],
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"pattern": [
|
||||
"DDD",
|
||||
" D ",
|
||||
" D "
|
||||
],
|
||||
"key": {
|
||||
"D": { "item": "minecraft:stone", "data":3 }
|
||||
},
|
||||
"result": {
|
||||
"item": "minecraft:stone",
|
||||
"data": 0,
|
||||
"count": 1
|
||||
}
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "engineersdecor:grc",
|
||||
"experimental": true
|
||||
}
|
||||
],
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"pattern": [
|
||||
"DDD",
|
||||
" D ",
|
||||
" D "
|
||||
],
|
||||
"key": {
|
||||
"D": { "item": "minecraft:stone", "data":3 }
|
||||
},
|
||||
"result": {
|
||||
"item": "minecraft:stone",
|
||||
"data": 1,
|
||||
"count": 1
|
||||
}
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "engineersdecor:grc",
|
||||
"experimental": true
|
||||
}
|
||||
],
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"pattern": [
|
||||
"DDD",
|
||||
" D ",
|
||||
" D "
|
||||
],
|
||||
"key": {
|
||||
"D": { "item": "minecraft:stone", "data":3 }
|
||||
},
|
||||
"result": {
|
||||
"item": "minecraft:stone",
|
||||
"data": 5,
|
||||
"count": 1
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue