1.15/1.14/1.12: Release commit v1.1.0.
This commit is contained in:
stfwi
parent
e8f32e29a1
commit
c6cf013e3b
12 changed files with 86 additions and 27 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.1.0-b2
|
||||
version_engineersdecor=1.1.0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
|
||||
"1.12.2": {
|
||||
"1.1.0": "[R] Maintenance Release build v1.1.0. Changes: * Compatibility fixes. * E-Furnace speed selection bug fixed. * Block Placer improvements. ~ v1.1.0-b3 [/] Version skipped for 1.12.2.",
|
||||
"1.1.0-b2": "[F] Block Placer defers placements if collidable entities are in the way (issue #98, thx DrakoAlcarus).\n[F] Added Block verification during TE ticking in case devices are moved (issue #101, thx D0CTOR-ZED).",
|
||||
"1.1.0-b1": "[F] Fixed Electrical Furnace speed sanitizing bug (issue #97, thx therobotmenace).\n[M] Changed Labeled Crate Nesting to circumvent server crashing in combination with the Sponge mod.",
|
||||
"1.0.20": "[R] Release based on v1.0.20-b6. Release-to-release changes: * Manual back ported. * Steel Mesh Fence Gate back ported. * E-Furnace speed selection switch back ported. * Labeled Crate back ported. * Minor bug fixes, compatibility changes.",
|
||||
|
|
@ -90,7 +91,7 @@
|
|||
"1.0.0-b1": "[A] Initial structure.\n[A] Added clinker bricks and clinker brick stairs.\n[A] Added slag bricks and slag brick stairs.\n[A] Added metal rung ladder.\n[A] Added staggered metal steps ladder.\n[A] Added treated wood ladder.\n[A] Added treated wood pole.\n[A] Added treated wood table."
|
||||
},
|
||||
"promos": {
|
||||
"1.12.2-recommended": "1.0.20",
|
||||
"1.12.2-latest": "1.1.0-b2"
|
||||
"1.12.2-recommended": "1.1.0",
|
||||
"1.12.2-latest": "1.1.0"
|
||||
}
|
||||
}
|
||||
|
|
@ -10,6 +10,15 @@ Mod sources for Minecraft version 1.12.2.
|
|||
----
|
||||
## Version history
|
||||
|
||||
-------------------------------------------------------------------
|
||||
- v1.1.0 [R] Maintenance Release build v1.1.0. Changes:
|
||||
* Compatibility fixes.
|
||||
* E-Furnace speed selection bug fixed.
|
||||
* Block Placer improvements.
|
||||
-------------------------------------------------------------------
|
||||
|
||||
~ v1.1.0-b3 [/] Version skipped for 1.12.2.
|
||||
|
||||
- v1.1.0-b2 [F] Block Placer defers placements if collidable entities are in the way (issue #98, thx DrakoAlcarus).
|
||||
[F] Added Block verification during TE ticking in case devices are moved (issue #101, thx D0CTOR-ZED).
|
||||
|
||||
|
|
|
|||
|
|
@ -5,4 +5,4 @@ version_minecraft=1.14.4
|
|||
version_forge_minecraft=1.14.4-28.2.3
|
||||
version_fml_mappings=20190719-1.14.3
|
||||
version_jei=1.14.4:6.0.0.10
|
||||
version_engineersdecor=1.1.0-b3
|
||||
version_engineersdecor=1.1.0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
|
||||
"1.14.4": {
|
||||
"1.1.0": "[R] Release build v1.1.0. Changes: * GUI button/slider tooltips added (1.5s delay). * IE Sheet Metal Slab Slices added. * Config options extended/updated. * Block Placer improvements. * Block Breaker drop trajectory improved. * Dense Grit Sand textures enhanced. * Pipe Valve redstone connector display fixes. * Compatibility bug fixes.\n[F] Block Placer also defers placements if falling item stacks are in front of it (thx Cid).",
|
||||
"1.1.0-b3": "[F] Block Placer defers placements if collidable entities are in the way (issue #98, thx DrakoAlcarus).\n[M] Block Breaker item drop trajectories have lower speed (fall slightly straighter down).\n[M] Pipe Valves redstone connector also shown if the adjacent block can connect redstone in general.\n[F] Added Block verification during TE ticking in case devices are moved (issue #101, thx D0CTOR-ZED).",
|
||||
"1.1.0-b2": "[A] Added tooltips for buttons/settings in device GUIs (1.5s display delay).",
|
||||
"1.1.0-b1": "[F] Fixed Electrical Furnace speed sanitizing bug (issue #97, thx therobotmenace).\n[A] Sheet Metal Slab Slices added (only available if IE is installed).\n[M] Config options extended/updated.\n[M] Dense Grit Sand textures altered to get slightly more visible structure from distance.",
|
||||
|
|
@ -58,7 +59,7 @@
|
|||
"1.0.7-b3": "[A] Initial 1.14.2 port of decorative blocks."
|
||||
},
|
||||
"promos": {
|
||||
"1.14.4-recommended": "",
|
||||
"1.14.4-latest": "1.1.0-b3"
|
||||
"1.14.4-recommended": "1.1.0",
|
||||
"1.14.4-latest": "1.1.0"
|
||||
}
|
||||
}
|
||||
|
|
@ -11,6 +11,19 @@ Mod sources for Minecraft version 1.14.4.
|
|||
|
||||
## Version history
|
||||
|
||||
-------------------------------------------------------------------
|
||||
- v1.1.0 [R] Release build v1.1.0. Changes:
|
||||
* GUI button/slider tooltips added (1.5s delay).
|
||||
* IE Sheet Metal Slab Slices added.
|
||||
* Config options extended/updated.
|
||||
* Block Placer improvements.
|
||||
* Block Breaker drop trajectory improved.
|
||||
* Dense Grit Sand textures enhanced.
|
||||
* Pipe Valve redstone connector display fixes.
|
||||
* Compatibility bug fixes.
|
||||
-------------------------------------------------------------------
|
||||
[F] Block Placer also defers placements if falling item stacks are in front of it (thx Cid).
|
||||
|
||||
- v1.1.0-b3 [F] Block Placer defers placements if collidable entities are in the way (issue #98, thx DrakoAlcarus).
|
||||
[M] Block Breaker item drop trajectories have lower speed (fall slightly straighter down).
|
||||
[M] Pipe Valves redstone connector also shown if the adjacent block can connect redstone in general.
|
||||
|
|
|
|||
|
|
@ -443,7 +443,7 @@ public class EdPlacer
|
|||
return true;
|
||||
}
|
||||
|
||||
private boolean try_place(Direction facing)
|
||||
private boolean try_place(Direction facing, boolean triggered)
|
||||
{
|
||||
if(world.isRemote) return false;
|
||||
BlockPos placement_pos = pos.offset(facing);
|
||||
|
|
@ -493,7 +493,15 @@ public class EdPlacer
|
|||
}
|
||||
} else if(
|
||||
(!world.getBlockState(placement_pos).getMaterial().isReplaceable()) ||
|
||||
(!world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(placement_pos), Entity::canBeCollidedWith).isEmpty())
|
||||
(!world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(placement_pos), (Entity e)->{
|
||||
if(e.canBeCollidedWith()) return true;
|
||||
if(triggered) return false;
|
||||
if((e instanceof ItemEntity)) {
|
||||
if((e.getMotion().getY() > 0) || (e.getMotion().getY() < -0.5)) return true; // not falling or falling by
|
||||
if(Math.abs(e.getMotion().getX())+Math.abs(e.getMotion().getZ()) > 0) return true; // not straight
|
||||
}
|
||||
return false;
|
||||
}).isEmpty())
|
||||
) {
|
||||
block = Blocks.AIR;
|
||||
no_space = true;
|
||||
|
|
@ -566,10 +574,11 @@ public class EdPlacer
|
|||
final BlockState state = world.getBlockState(pos);
|
||||
if(!(state.getBlock() instanceof PlacerBlock)) { block_power_signal_= false; return; }
|
||||
// Cycle init
|
||||
boolean dirty = block_power_updated_;
|
||||
boolean rssignal = ((logic_ & LOGIC_INVERTED)!=0)==(!block_power_signal_);
|
||||
boolean trigger = (rssignal && ((block_power_updated_) || ((logic_ & LOGIC_CONTINUOUS)!=0)));
|
||||
final boolean updated = block_power_updated_;
|
||||
final boolean rssignal = ((logic_ & LOGIC_INVERTED)!=0)==(!block_power_signal_);
|
||||
final boolean trigger = (rssignal && ((updated) || ((logic_ & LOGIC_CONTINUOUS)!=0)));
|
||||
final Direction placer_facing = state.get(PlacerBlock.FACING);
|
||||
boolean dirty = updated;
|
||||
// Trigger edge detection for next cycle
|
||||
{
|
||||
boolean tr = world.isBlockPowered(pos);
|
||||
|
|
@ -578,7 +587,7 @@ public class EdPlacer
|
|||
if(block_power_updated_) dirty = true;
|
||||
}
|
||||
// Placing
|
||||
if(trigger && try_place(placer_facing)) dirty = true;
|
||||
if(trigger && try_place(placer_facing, rssignal && updated)) dirty = true;
|
||||
if(dirty) markDirty();
|
||||
if(trigger && (tick_timer_ > TICK_INTERVAL)) tick_timer_ = TICK_INTERVAL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,4 +5,4 @@ version_minecraft=1.15.2
|
|||
version_forge_minecraft=1.15.2-31.2.20
|
||||
version_fml_mappings=20200514-1.15.1
|
||||
version_jei=1.15.2:6.0.0.2
|
||||
version_engineersdecor=1.1.0-b3
|
||||
version_engineersdecor=1.1.0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
|
||||
"1.15.2": {
|
||||
"1.1.0": "[R] Release build v1.1.0. Changes: * GUI button/slider tooltips added (1.5s delay). * IE Sheet Metal Slab Slices added. * Config options extended/updated. * Block Placer improvements. * Block Breaker drop trajectory improved. * Dense Grit Sand textures enhanced. * Pipe Valve redstone connector display fixes. * Compatibility bug fixes.\n[F] Block Placer also defers placements if falling item stacks are in front of it (thx Cid).",
|
||||
"1.1.0-b3": "[!] Forge update, requires Forge 1.15.2-31.2.20.\n[F] Block Placer defers placements if collidable entities are in the way (issue #98, thx DrakoAlcarus).\n[M] Block Breaker item drop trajectories have lower speed (fall slightly straighter down).\n[M] Pipe Valves redstone connector also shown if the adjacent block can connect redstone in general.\n[F] Added Block verification during TE ticking in case devices are moved (issue #101, thx D0CTOR-ZED).",
|
||||
"1.1.0-b2": "[A] Added tooltips for buttons/settings in device GUIs (1.5s display delay).\n[U] Updated Forge/Mappings.",
|
||||
"1.1.0-b1": "[F] Fixed Electrical Furnace speed sanitizing bug (issue #97, thx therobotmenace).\n[A] IE Sheet Metal Slab Slices added (only available if IE is installed).\n[M] Config options extended/updated.\n[M] GUI models updated to circumvent too dark representations.\n[M] Dense Grit Sand textures altered to get slightly more visible structure from distance.",
|
||||
|
|
@ -23,7 +24,7 @@
|
|||
"1.0.17-b2": "[A] Initial port."
|
||||
},
|
||||
"promos": {
|
||||
"1.15.2-recommended": "",
|
||||
"1.15.2-latest": "1.1.0-b3"
|
||||
"1.15.2-recommended": "1.1.0",
|
||||
"1.15.2-latest": "1.1.0"
|
||||
}
|
||||
}
|
||||
|
|
@ -11,6 +11,19 @@ Mod sources for Minecraft version 1.15.1.
|
|||
|
||||
## Version history
|
||||
|
||||
-------------------------------------------------------------------
|
||||
- v1.1.0 [R] Release build v1.1.0. Changes:
|
||||
* GUI button/slider tooltips added (1.5s delay).
|
||||
* IE Sheet Metal Slab Slices added.
|
||||
* Config options extended/updated.
|
||||
* Block Placer improvements.
|
||||
* Block Breaker drop trajectory improved.
|
||||
* Dense Grit Sand textures enhanced.
|
||||
* Pipe Valve redstone connector display fixes.
|
||||
* Compatibility bug fixes.
|
||||
-------------------------------------------------------------------
|
||||
[F] Block Placer also defers placements if falling item stacks are in front of it (thx Cid).
|
||||
|
||||
- v1.1.0-b3 [!] Forge update, requires Forge 1.15.2-31.2.20.
|
||||
[F] Block Placer defers placements if collidable entities are in the way (issue #98, thx DrakoAlcarus).
|
||||
[M] Block Breaker item drop trajectories have lower speed (fall slightly straighter down).
|
||||
|
|
|
|||
|
|
@ -442,7 +442,7 @@ public class EdPlacer
|
|||
return true;
|
||||
}
|
||||
|
||||
private boolean try_place(Direction facing)
|
||||
private boolean try_place(Direction facing, boolean triggered)
|
||||
{
|
||||
if(world.isRemote) return false;
|
||||
BlockPos placement_pos = pos.offset(facing);
|
||||
|
|
@ -492,7 +492,15 @@ public class EdPlacer
|
|||
}
|
||||
} else if(
|
||||
(!world.getBlockState(placement_pos).getMaterial().isReplaceable()) ||
|
||||
(!world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(placement_pos), Entity::canBeCollidedWith).isEmpty())
|
||||
(!world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(placement_pos), (Entity e)->{
|
||||
if(e.canBeCollidedWith()) return true;
|
||||
if(triggered) return false;
|
||||
if((e instanceof ItemEntity)) {
|
||||
if((e.getMotion().getY() > 0) || (e.getMotion().getY() < -0.5)) return true; // not falling or falling by
|
||||
if(Math.abs(e.getMotion().getX())+Math.abs(e.getMotion().getZ()) > 0) return true; // not straight
|
||||
}
|
||||
return false;
|
||||
}).isEmpty())
|
||||
) {
|
||||
block = Blocks.AIR;
|
||||
no_space = true;
|
||||
|
|
@ -565,10 +573,11 @@ public class EdPlacer
|
|||
// Cycle init
|
||||
final BlockState state = world.getBlockState(pos);
|
||||
if(!(state.getBlock() instanceof PlacerBlock)) { block_power_signal_= false; return; }
|
||||
boolean dirty = block_power_updated_;
|
||||
boolean rssignal = ((logic_ & LOGIC_INVERTED)!=0)==(!block_power_signal_);
|
||||
boolean trigger = (rssignal && ((block_power_updated_) || ((logic_ & LOGIC_CONTINUOUS)!=0)));
|
||||
final boolean updated = block_power_updated_;
|
||||
final boolean rssignal = ((logic_ & LOGIC_INVERTED)!=0)==(!block_power_signal_);
|
||||
final boolean trigger = (rssignal && ((updated) || ((logic_ & LOGIC_CONTINUOUS)!=0)));
|
||||
final Direction placer_facing = state.get(PlacerBlock.FACING);
|
||||
boolean dirty = updated;
|
||||
// Trigger edge detection for next cycle
|
||||
{
|
||||
boolean tr = world.isBlockPowered(pos);
|
||||
|
|
@ -577,7 +586,7 @@ public class EdPlacer
|
|||
if(block_power_updated_) dirty = true;
|
||||
}
|
||||
// Placing
|
||||
if(trigger && try_place(placer_facing)) dirty = true;
|
||||
if(trigger && try_place(placer_facing, rssignal && updated)) dirty = true;
|
||||
if(dirty) markDirty();
|
||||
if(trigger && (tick_timer_ > TICK_INTERVAL)) tick_timer_ = TICK_INTERVAL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
{
|
||||
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
|
||||
"promos": {
|
||||
"1.12.2-recommended": "1.0.20",
|
||||
"1.12.2-latest": "1.1.0-b2",
|
||||
"1.14.4-recommended": "",
|
||||
"1.14.4-latest": "1.1.0-b3",
|
||||
"1.15.2-recommended": "",
|
||||
"1.15.2-latest": "1.1.0-b3"
|
||||
"1.12.2-recommended": "1.1.0",
|
||||
"1.12.2-latest": "1.1.0",
|
||||
"1.14.4-recommended": "1.1.0",
|
||||
"1.14.4-latest": "1.1.0",
|
||||
"1.15.2-recommended": "1.1.0",
|
||||
"1.15.2-latest": "1.1.0"
|
||||
},
|
||||
"1.12.2": {
|
||||
"1.1.0": "[R] Maintenance Release build v1.1.0. Changes: * Compatibility fixes. * E-Furnace speed selection bug fixed. * Block Placer improvements. ~ v1.1.0-b3 [/] Version skipped for 1.12.2.",
|
||||
"1.1.0-b2": "[F] Block Placer defers placements if collidable entities are in the way (issue #98, thx DrakoAlcarus).\n[F] Added Block verification during TE ticking in case devices are moved (issue #101, thx D0CTOR-ZED).",
|
||||
"1.1.0-b1": "[F] Fixed Electrical Furnace speed sanitizing bug (issue #97, thx therobotmenace).\n[M] Changed Labeled Crate Nesting to circumvent server crashing in combination with the Sponge mod.",
|
||||
"1.0.20": "[R] Release based on v1.0.20-b6. Release-to-release changes: * Manual back ported. * Steel Mesh Fence Gate back ported. * E-Furnace speed selection switch back ported. * Labeled Crate back ported. * Minor bug fixes, compatibility changes.",
|
||||
|
|
@ -98,6 +99,7 @@
|
|||
"1.0.0-b1": "[A] Initial structure.\n[A] Added clinker bricks and clinker brick stairs.\n[A] Added slag bricks and slag brick stairs.\n[A] Added metal rung ladder.\n[A] Added staggered metal steps ladder.\n[A] Added treated wood ladder.\n[A] Added treated wood pole.\n[A] Added treated wood table."
|
||||
},
|
||||
"1.14.4": {
|
||||
"1.1.0": "[R] Release build v1.1.0. Changes: * GUI button/slider tooltips added (1.5s delay). * IE Sheet Metal Slab Slices added. * Config options extended/updated. * Block Placer improvements. * Block Breaker drop trajectory improved. * Dense Grit Sand textures enhanced. * Pipe Valve redstone connector display fixes. * Compatibility bug fixes.\n[F] Block Placer also defers placements if falling item stacks are in front of it (thx Cid).",
|
||||
"1.1.0-b3": "[F] Block Placer defers placements if collidable entities are in the way (issue #98, thx DrakoAlcarus).\n[M] Block Breaker item drop trajectories have lower speed (fall slightly straighter down).\n[M] Pipe Valves redstone connector also shown if the adjacent block can connect redstone in general.\n[F] Added Block verification during TE ticking in case devices are moved (issue #101, thx D0CTOR-ZED).",
|
||||
"1.1.0-b2": "[A] Added tooltips for buttons/settings in device GUIs (1.5s display delay).",
|
||||
"1.1.0-b1": "[F] Fixed Electrical Furnace speed sanitizing bug (issue #97, thx therobotmenace).\n[A] Sheet Metal Slab Slices added (only available if IE is installed).\n[M] Config options extended/updated.\n[M] Dense Grit Sand textures altered to get slightly more visible structure from distance.",
|
||||
|
|
@ -155,6 +157,7 @@
|
|||
"1.0.7-b3": "[A] Initial 1.14.2 port of decorative blocks."
|
||||
},
|
||||
"1.15.2": {
|
||||
"1.1.0": "[R] Release build v1.1.0. Changes: * GUI button/slider tooltips added (1.5s delay). * IE Sheet Metal Slab Slices added. * Config options extended/updated. * Block Placer improvements. * Block Breaker drop trajectory improved. * Dense Grit Sand textures enhanced. * Pipe Valve redstone connector display fixes. * Compatibility bug fixes.\n[F] Block Placer also defers placements if falling item stacks are in front of it (thx Cid).",
|
||||
"1.1.0-b3": "[!] Forge update, requires Forge 1.15.2-31.2.20.\n[F] Block Placer defers placements if collidable entities are in the way (issue #98, thx DrakoAlcarus).\n[M] Block Breaker item drop trajectories have lower speed (fall slightly straighter down).\n[M] Pipe Valves redstone connector also shown if the adjacent block can connect redstone in general.\n[F] Added Block verification during TE ticking in case devices are moved (issue #101, thx D0CTOR-ZED).",
|
||||
"1.1.0-b2": "[A] Added tooltips for buttons/settings in device GUIs (1.5s display delay).\n[U] Updated Forge/Mappings.",
|
||||
"1.1.0-b1": "[F] Fixed Electrical Furnace speed sanitizing bug (issue #97, thx therobotmenace).\n[A] IE Sheet Metal Slab Slices added (only available if IE is installed).\n[M] Config options extended/updated.\n[M] GUI models updated to circumvent too dark representations.\n[M] Dense Grit Sand textures altered to get slightly more visible structure from distance.",
|
||||
|
|
|
|||
Loading…
Reference in a new issue