Added 'defence sign' (issue #26). Factory dropper GUI adapted (issue #27). Lang files updated. Credits updated.
This commit is contained in:
stfwi
parent
f8442e36bf
commit
ad93fdb302
16 changed files with 73 additions and 22 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.7-b1
|
||||
version_engineersdecor=1.0.7-b2
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{
|
||||
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
|
||||
"1.12.2": {
|
||||
"1.0.7-b1": "[A] Factory dropper (config:experimental) button placement fixed, GUI vs external view x/y markers added, internal trigger logic simplified. Thx @overchoice for beta testing!",
|
||||
"1.0.7-b2": "[A] Added Defense System Warning sign (design by J. Carver).\n[M] Factory dropper non-experimental now. GUI click area tuning. \"Fast drop\" symbol replaced from arrow to dog icon (thx overchoice for that icon).\n[M] Lang files updated.",
|
||||
"1.0.7-b1": "[M] Factory dropper (config:experimental) button placement fixed, GUI vs external view x/y markers added, internal trigger logic simplified. Thx @overchoice for beta testing!",
|
||||
"1.0.6": "[R] Release based on v1.0.6-b1. Release-to-release changes: * Fixed FML remapping issue (COULD CAUSE CRASHES). * Small waste incinerator added. * Lang files updated/corrections. * Metal ladder easier to break.\n[A] Added factory dropper (config:experimental).\n[C] Thx to abdurraslan for the detailed issue #25.",
|
||||
"1.0.6-b1": "[A] Added small waste incinerator (delayed fifo-buffered item disposal).\n[M] Fixed item/block name capitalization (by Voxelo).\n[M] Metal ladders are easier to break/harvest.\n[F] Fixed FML remapping issue by using dedicated IItemHandler instances.",
|
||||
"1.0.5": "[R] Release based on v1.0.5-b1. Release-to-release changes: * Small electrical passthrough-furnace added. * Passive fluid accumulator added. * Config options added. * Sign plates added. * Minor bug fixes.\n[A] Added sign \"Electrical hazzard\"/\"Caution hot wire\".\n[A] Added sign \"Caution dangerous there\" (skull/bones).",
|
||||
"1.0.5": "[R] Release based on v1.0.5-b1. Release-to-release changes: * Small electrical passthrough-furnace added. * Passive fluid accumulator added. * Config options added. * Sign plates added. * Minor bug fixes.\n[A] Added sign \"Electrical hazard\"/\"Caution hot wire\".\n[A] Added sign \"Caution dangerous there\" (skull/bones).",
|
||||
"1.0.5-b1": "[A] Added passive fluid accumulator.\n[A] Added small electrical passthrough-furnace.\n[F] Fixed version check URL.\n[M] Opt-out config options for valves, passive fluid accumulator, and furni.",
|
||||
"1.0.4": "[R] Release based on v1.0.4-b9. Release-to-release changes: * Crafting table: Quick crafting history re-fab, JEI integration. * Rendering improvements and issue fixes (stairs, ambient occlusion, optifine, etc). * Walls with texture variations. * Thin/thick steel poles with support feet/heads. * Horizontal steel double-T support beams added. * Fluid pipe valves added: Check valve, redstone controlled valve, analog redstone controlled valve. Support pressurized transfer. * Tool tip documentation (CTRL-SHIFT) for stairs added. * Internal code cleanups. * Recipes tuned.\n[E] Added pass-through electrical furnace (experimental, see config).",
|
||||
"1.0.4-b9": "[F] Inserting fluids with pressurized tag only into IE piping.\n[F] Valve redstone connector rendering does not check for \"can connect redstone\" but only for \"can provide power\".\n[M] Valves are adapted to be detected as pipe by IE.",
|
||||
|
|
@ -39,6 +40,6 @@
|
|||
},
|
||||
"promos": {
|
||||
"1.12.2-recommended": "1.0.6",
|
||||
"1.12.2-latest": "1.0.7-b1"
|
||||
"1.12.2-latest": "1.0.7-b2"
|
||||
}
|
||||
}
|
||||
|
|
@ -10,7 +10,13 @@ Mod sources for Minecraft version 1.12.2.
|
|||
----
|
||||
## Revision history
|
||||
|
||||
- v1.0.7-b1 [A] Factory dropper (config:experimental) button placement fixed,
|
||||
- v1.0.7-b2 [A] Added Defense System Warning sign (design by J. Carver).
|
||||
[M] Factory dropper non-experimental now. GUI click area tuning.
|
||||
"Fast drop" symbol replaced from arrow to dog icon (thx
|
||||
overchoice for that icon).
|
||||
[M] Lang files updated.
|
||||
|
||||
- v1.0.7-b1 [M] Factory dropper (config:experimental) button placement fixed,
|
||||
GUI vs external view x/y markers added, internal trigger logic
|
||||
simplified. Thx @overchoice for beta testing!
|
||||
|
||||
|
|
@ -37,7 +43,7 @@ Mod sources for Minecraft version 1.12.2.
|
|||
* Sign plates added.
|
||||
* Minor bug fixes.
|
||||
-------------------------------------------------------------------
|
||||
[A] Added sign "Electrical hazzard"/"Caution hot wire".
|
||||
[A] Added sign "Electrical hazard"/"Caution hot wire".
|
||||
[A] Added sign "Caution dangerous there" (skull/bones).
|
||||
|
||||
- v1.0.5-b1 [A] Added passive fluid accumulator.
|
||||
|
|
|
|||
|
|
@ -231,9 +231,9 @@ public class BlockDecorDropper extends BlockDecorDirected
|
|||
} else if(isPointInRegion(129, 50, 44, 10, mouseX, mouseY)) {
|
||||
int period = (mx-135);
|
||||
if(period < -1) {
|
||||
period = container.fields_[6] - 1; // -
|
||||
period = container.fields_[6] - 3; // -
|
||||
} else if(period >= 34) {
|
||||
period = container.fields_[6] + 1; // +
|
||||
period = container.fields_[6] + 3; // +
|
||||
} else {
|
||||
period = (int)(0.5 + ((100.0 * period)/34));
|
||||
}
|
||||
|
|
@ -306,7 +306,7 @@ public class BlockDecorDropper extends BlockDecorDirected
|
|||
}
|
||||
// drop period
|
||||
{
|
||||
int px = ((container.fields_[6] * 34) / 100);
|
||||
int px = (int)Math.round(((33.0 * container.fields_[6]) / 100) + 1);
|
||||
int x = x0 + 134 - 2 + MathHelper.clamp(px, 0, 33);
|
||||
int y = y0 + 56;
|
||||
drawTexturedModalRect(x, y, 190, 31, 5, 5);
|
||||
|
|
|
|||
|
|
@ -242,6 +242,13 @@ public class ModBlocks
|
|||
ModAuxiliaries.getPixeledAABB(2,2,15.6, 14,14,16)
|
||||
);
|
||||
|
||||
public static final BlockDecorDirected SIGN_DEFENSE = new BlockDecorDirected(
|
||||
"sign_defense",
|
||||
BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT|(1<<BlockDecor.CFG_LIGHT_VALUE_SHIFT),
|
||||
Material.WOOD, 0.1f, 1f, SoundType.WOOD,
|
||||
ModAuxiliaries.getPixeledAABB(2,2,15.6, 14,14,16)
|
||||
);
|
||||
|
||||
public static final BlockDecorWasteIncinerator SMALL_WASTE_INCINERATOR = new BlockDecorWasteIncinerator(
|
||||
"small_waste_incinerator",
|
||||
BlockDecor.CFG_DEFAULT|BlockDecor.CFG_ELECTRICAL,
|
||||
|
|
@ -332,11 +339,12 @@ public class ModBlocks
|
|||
SMALL_ELECTRICAL_FURNACE, SMALL_ELECTRICAL_FURNACE_TEI,
|
||||
SIGN_HOTWIRE, SIGN_DANGER,
|
||||
SMALL_WASTE_INCINERATOR, WASTE_INCINERATOR_TEI,
|
||||
SIGN_DEFENSE,
|
||||
FACTORY_DROPPER, FACTORY_DROPPER_TEI
|
||||
};
|
||||
|
||||
private static final Object dev_content[] = {
|
||||
SIGN_MINDSTEP,
|
||||
FACTORY_DROPPER, FACTORY_DROPPER_TEI
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": { "model": "engineersdecor:sign/sign_defense_model" },
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{}],
|
||||
"facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":0}, "down": {"x":0} }
|
||||
}
|
||||
}
|
||||
|
|
@ -132,11 +132,13 @@ tile.engineersdecor.factory_dropper.help=§6Dropper suitable for advanced factor
|
|||
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.
|
||||
tile.engineersdecor.sign_hotwire.name=Sign "Caution Hot Wire"
|
||||
tile.engineersdecor.sign_hotwire.help=§6Placable on walls (horizontally).
|
||||
tile.engineersdecor.sign_hotwire.help=§6Electrical hazard warning. Don't forget to place around HV, or you'll have a mark in the next audit.
|
||||
tile.engineersdecor.sign_mindstep.name=Sign "Mind The Step"
|
||||
tile.engineersdecor.sign_mindstep.help=§6Placable on walls (horizontally).
|
||||
tile.engineersdecor.sign_danger.name=Sign "Caution Really dangerous there"
|
||||
tile.engineersdecor.sign_danger.help=§6Placable on walls (horizontally).
|
||||
tile.engineersdecor.sign_danger.name=Sign "Caution Really Dangerous There"
|
||||
tile.engineersdecor.sign_danger.help=§6General danger warning.
|
||||
tile.engineersdecor.sign_defense.name=Sign "Caution Defense System Ahead"
|
||||
tile.engineersdecor.sign_defense.help=§6Warning sign for turrets, Tesla Coils, and traps.
|
||||
|
||||
#-----------------------------------------------------------------------------------------------------------
|
||||
# EOF
|
||||
|
|
|
|||
|
|
@ -125,11 +125,13 @@ tile.engineersdecor.factory_dropper.name=Factory dropper
|
|||
tile.engineersdecor.sign_decor.name=Sign plate (Engineer's decor logo)
|
||||
#tile.engineersdecor.sign_decor.help=§6This should not be craftable or visible in JEI. Used for creative tab and screenshots.
|
||||
tile.engineersdecor.sign_hotwire.name=Sign "Caution hot wire"
|
||||
#tile.engineersdecor.sign_hotwire.help=§6Placable on walls (horizontally).
|
||||
#tile.engineersdecor.sign_hotwire.help=§6Electrical hazard warning. Don't forget to place around HV, or you'll have a mark in the next audit.
|
||||
tile.engineersdecor.sign_mindstep.name=Sign "Mind the step"
|
||||
#tile.engineersdecor.sign_mindstep.help=§6Placable on walls (horizontally).
|
||||
tile.engineersdecor.sign_danger.name=Sign "Caution really dangerous there"
|
||||
#tile.engineersdecor.sign_danger.help=§6Placable on walls (horizontally).
|
||||
#tile.engineersdecor.sign_danger.help=§6General danger warning.
|
||||
tile.engineersdecor.sign_defense.name=Sign "Caution Defense System Ahead"
|
||||
#tile.engineersdecor.sign_defense.help=§6Warning sign for turrets, Tesla Coils, and traps.
|
||||
|
||||
#-----------------------------------------------------------------------------------------------------------
|
||||
# EOF
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
{
|
||||
"parent": "engineersdecor:block/sign/sign_decor_model",
|
||||
"textures": { "f": "engineersdecor:blocks/sign/sign_defense_texture" }
|
||||
}
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "engineersdecor:grc",
|
||||
"result": "engineersdecor:sign_defense",
|
||||
"required": ["engineersdecor:sign_danger"]
|
||||
}
|
||||
],
|
||||
"type": "minecraft:crafting_shapeless",
|
||||
"ingredients": [
|
||||
{ "item": "engineersdecor:sign_danger" }
|
||||
],
|
||||
"result": {
|
||||
"item": "engineersdecor:sign_defense"
|
||||
}
|
||||
}
|
||||
|
|
@ -3,12 +3,12 @@
|
|||
{
|
||||
"type": "engineersdecor:grc",
|
||||
"result": "engineersdecor:sign_hotwire",
|
||||
"required": ["engineersdecor:sign_danger"]
|
||||
"required": ["engineersdecor:sign_defense"]
|
||||
}
|
||||
],
|
||||
"type": "minecraft:crafting_shapeless",
|
||||
"ingredients": [
|
||||
{ "item": "engineersdecor:sign_danger" }
|
||||
{ "item": "engineersdecor:sign_defense" }
|
||||
],
|
||||
"result": {
|
||||
"item": "engineersdecor:sign_hotwire"
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
Loading…
Add table
Add a link
Reference in a new issue