1.14: Updated to Forge 105. Experimental features added. Factory Dropper continuous mode added.
This commit is contained in:
stfwi
parent
462e14166c
commit
bc76fed9d6
12 changed files with 23 additions and 12 deletions
|
|
@ -94,7 +94,7 @@ dist-check:
|
|||
@echo "[1.12] Running dist checks ..."
|
||||
@djs tasks.js dist-check
|
||||
|
||||
dist: sanatize dist-check clean-all mod
|
||||
dist: sanatize dist-check clean-all init mod
|
||||
@echo "[1.12] Distribution files ..."
|
||||
@mkdir -p dist
|
||||
@cp build/libs/$(MOD_JAR_PREFIX)* dist/
|
||||
|
|
|
|||
|
|
@ -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.12-b1
|
||||
version_engineersdecor=1.0.12-b2
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ Mod sources for Minecraft version 1.12.2.
|
|||
----
|
||||
## Version history
|
||||
|
||||
~ v1.0.12-b2 [A] Lang files updated.
|
||||
|
||||
- v1.0.12-b1 [A] Mineal Smelter non-experimental now.
|
||||
[M] Window submodels stripped (reopened issue #19, thx overchoice).
|
||||
[M] Opaque full block light opacity fixed (issue #50, thx Illomiurge).
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ tile.engineersdecor.small_solar_panel.help=§6Produces a small amount of power w
|
|||
tile.engineersdecor.small_tree_cutter.name=Small Tree Cutter
|
||||
tile.engineersdecor.small_tree_cutter.help=§6Chops grown trees in front of it.§r\n\
|
||||
Does not collect the lumbers. Deactivate with a redstone signal. \
|
||||
Provide RF power to boost the cutting speed.
|
||||
Provide RF power to boost the cutting speed (takes a long time without power).
|
||||
#-----------------------------------------------------------------------------------------------------------
|
||||
tile.engineersdecor.sign_decor.name=Sign Plate (Engineer's decor)
|
||||
tile.engineersdecor.sign_decor.help=§6This should not be craftable or visible in JEI. Used for creative tab and screenshots.
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ tile.engineersdecor.small_solar_panel.name=Small Solar Panel
|
|||
tile.engineersdecor.small_tree_cutter.name=Small Tree Cutter
|
||||
#tile.engineersdecor.small_tree_cutter.help=§6Chops grown trees in front of it.§r\n\
|
||||
Does not collect the lumbers. Deactivate with a redstone signal. \
|
||||
Provide RF power to boost the cutting speed.
|
||||
Provide RF power to boost the cutting speed (takes a long time without power).
|
||||
#-----------------------------------------------------------------------------------------------------------
|
||||
tile.engineersdecor.sign_decor.name=Табличка с надписью (Логотип Engineer's decor)
|
||||
tile.engineersdecor.sign_decor.help=§Это не должно быть крафтовым или видимым в JEI. Используется для творческой вкладки и скриншотов.
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ tile.engineersdecor.small_solar_panel.name=Small Solar Panel
|
|||
tile.engineersdecor.small_tree_cutter.name=Small Tree Cutter
|
||||
#tile.engineersdecor.small_tree_cutter.help=§6Chops grown trees in front of it.§r\n\
|
||||
Does not collect the lumbers. Deactivate with a redstone signal. \
|
||||
Provide RF power to boost the cutting speed.
|
||||
Provide RF power to boost the cutting speed (takes a long time without power).
|
||||
#-----------------------------------------------------------------------------------------------------------
|
||||
tile.engineersdecor.sign_decor.name=Sign Plate (Engineer's decor)
|
||||
#tile.engineersdecor.sign_decor.help=§6This should not be craftable or visible in JEI. Used for creative tab and screenshots.
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ dist-check:
|
|||
@echo "[1.14] Running dist checks ..."
|
||||
@djs tasks.js dist-check
|
||||
|
||||
dist: sanatize dist-check clean-all mod
|
||||
dist: sanatize dist-check clean-all init mod
|
||||
@echo "[1.14] Distribution files ..."
|
||||
@mkdir -p dist
|
||||
@cp build/libs/$(MOD_JAR_PREFIX)* dist/
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
org.gradle.daemon=false
|
||||
org.gradle.jvmargs=-Xmx8G
|
||||
version_minecraft=1.14.4
|
||||
version_forge_minecraft=1.14.4-28.0.100
|
||||
version_forge_minecraft=1.14.4-28.0.105
|
||||
version_fml_mappings=20190719-1.14.3
|
||||
version_jei=1.14.4:6.0.0.10
|
||||
version_engineersdecor=1.0.12-b2
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
|
||||
"1.14.4": {
|
||||
"1.0.12-b2": "[U] Updated to Forge 1.14.4-28.0.105/20190719-1.14.3.\n[A] Small Solar Panel added.\n[M] Items fall through the Steel Floor Grating like in 1.12.2 version.\n[M] Factory Dropper: Added pulse/continuous mode in GUI (issue #51, thx Aristine for the CR).",
|
||||
"1.0.12-b1": "[U] Updated to Forge 1.14.4-28.0.93/20190719-1.14.3.\n[M] Logo location fixed.",
|
||||
"1.0.11-b3": "[U] Updated to Forge 1.14.4-28.0.81/20190719-1.14.3.\n[F] Adapted recipe condition to Forge version (issue #49).",
|
||||
"1.0.11-b2": "[U] JEI dependency update 1.14.4:6.0.0.10.\n[F] Fixed creative ghost block issue (issue #48).\n[M] Updated ru_ru lang file (Shellyoung, PR#47).",
|
||||
|
|
@ -23,6 +24,6 @@
|
|||
},
|
||||
"promos": {
|
||||
"1.14.4-recommended": "",
|
||||
"1.14.4-latest": "1.0.12-b1"
|
||||
"1.14.4-latest": "1.0.12-b2"
|
||||
}
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ Mod sources for Minecraft version 1.14.3.
|
|||
|
||||
## Version history
|
||||
|
||||
~ v1.0.12-b2 [U] Updated to Forge 1.14.4-28.0.100/20190719-1.14.3.
|
||||
- v1.0.12-b2 [U] Updated to Forge 1.14.4-28.0.105/20190719-1.14.3.
|
||||
[A] Small Solar Panel added.
|
||||
[M] Items fall through the Steel Floor Grating like in 1.12.2 version.
|
||||
[M] Factory Dropper: Added pulse/continuous mode in GUI (issue #51,
|
||||
|
|
|
|||
|
|
@ -22,6 +22,9 @@ import net.minecraft.state.StateContainer;
|
|||
import net.minecraft.tileentity.TileEntityType;
|
||||
import net.minecraft.util.math.*;
|
||||
import net.minecraft.util.text.StringTextComponent;
|
||||
import net.minecraft.util.math.shapes.ISelectionContext;
|
||||
import net.minecraft.util.math.shapes.VoxelShape;
|
||||
import net.minecraft.util.math.shapes.VoxelShapes;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
|
|
@ -64,6 +67,10 @@ public class BlockDecorDropper extends BlockDecorDirected
|
|||
public BlockRenderLayer getRenderLayer()
|
||||
{ return BlockRenderLayer.SOLID; }
|
||||
|
||||
@Override
|
||||
public VoxelShape getCollisionShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext selectionContext)
|
||||
{ return VoxelShapes.fullCube(); }
|
||||
|
||||
@Override
|
||||
protected void fillStateContainer(StateContainer.Builder<Block, BlockState> builder)
|
||||
{ builder.add(FACING, OPEN); }
|
||||
|
|
@ -513,7 +520,7 @@ public class BlockDecorDropper extends BlockDecorDirected
|
|||
boolean dirty = block_power_updated_;
|
||||
boolean redstone_trigger = (block_power_signal_ && ((block_power_updated_) || (continuous_mode)));
|
||||
boolean filter_trigger;
|
||||
boolean filter_defined = false;
|
||||
boolean filter_defined;
|
||||
boolean trigger;
|
||||
// Trigger logic
|
||||
{
|
||||
|
|
@ -891,7 +898,7 @@ public class BlockDecorDropper extends BlockDecorDirected
|
|||
{
|
||||
int filter_gate_offset = ((container.field(5) & BTileEntity.DROPLOGIC_FILTER_ANDGATE) != 0) ? 11 : 0;
|
||||
int extern_gate_offset = ((container.field(5) & BTileEntity.DROPLOGIC_EXTERN_ANDGATE) != 0) ? 11 : 0;
|
||||
int pulse_mode_offset = ((container.fields_[5] & BTileEntity.DROPLOGIC_CONTINUOUS ) != 0) ? 10 : 0;
|
||||
int pulse_mode_offset = ((container.field(5) & BTileEntity.DROPLOGIC_CONTINUOUS ) != 0) ? 10 : 0;
|
||||
blit(x0+132, y0+66, 179+filter_gate_offset, 66, 9, 9);
|
||||
blit(x0+148, y0+66, 179+extern_gate_offset, 66, 9, 9);
|
||||
blit(x0+162, y0+66, 200+pulse_mode_offset, 66, 9, 9);
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
"1.12.2-recommended": "1.0.11",
|
||||
"1.12.2-latest": "1.0.12-b1",
|
||||
"1.14.4-recommended": "",
|
||||
"1.14.4-latest": "1.0.12-b1"
|
||||
"1.14.4-latest": "1.0.12-b2"
|
||||
},
|
||||
"1.12.2": {
|
||||
"1.0.12-b1": "[A] Mineal Smelter non-experimental now.\n[M] Window submodels stripped (reopened issue #19, thx overchoice).\n[M] Opaque full block light opacity fixed (issue #50, thx Illomiurge).\n[M] Factory Dropper: Added pulse/continuous mode in GUI (issue #51, thx Aristine for the CR).",
|
||||
|
|
@ -61,6 +61,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.0.12-b2": "[U] Updated to Forge 1.14.4-28.0.105/20190719-1.14.3.\n[A] Small Solar Panel added.\n[M] Items fall through the Steel Floor Grating like in 1.12.2 version.\n[M] Factory Dropper: Added pulse/continuous mode in GUI (issue #51, thx Aristine for the CR).",
|
||||
"1.0.12-b1": "[U] Updated to Forge 1.14.4-28.0.93/20190719-1.14.3.\n[M] Logo location fixed.",
|
||||
"1.0.11-b3": "[U] Updated to Forge 1.14.4-28.0.81/20190719-1.14.3.\n[F] Adapted recipe condition to Forge version (issue #49).",
|
||||
"1.0.11-b2": "[U] JEI dependency update 1.14.4:6.0.0.10.\n[F] Fixed creative ghost block issue (issue #48).\n[M] Updated ru_ru lang file (Shellyoung, PR#47).",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue