diff --git a/1.12/Makefile b/1.12/Makefile index 12a5f78..88c2c73 100644 --- a/1.12/Makefile +++ b/1.12/Makefile @@ -101,5 +101,5 @@ dist: sanatize dist-check clean-all mod @djs tasks.js dist port-languages: - @echo "[1.12] Porting language files to 1.13/1.14 ..." + @echo "[1.12] Porting language files to 1.14 ..." @djs tasks.js port-languages diff --git a/1.12/gradle.properties b/1.12/gradle.properties index d9c4b97..231d5f7 100644 --- a/1.12/gradle.properties +++ b/1.12/gradle.properties @@ -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.10 +version_engineersdecor=1.0.11 diff --git a/1.12/meta/update.json b/1.12/meta/update.json index 9d41106..5fc7390 100644 --- a/1.12/meta/update.json +++ b/1.12/meta/update.json @@ -1,6 +1,10 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": { + "1.0.11": "[R] Release based on v1.0.11-b3. Release-to-release changes: * Steel floor grating improvments. * Minor model box fixes. * Standalone recipes added. * Language updates.", + "1.0.11-b3": "[M] Added missing standalone recipes for pipe valves, passive fluid accumulator, and waste incinerator.", + "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.", "1.0.10-b1": "[A] Treated wood side table added.\n[F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting).\n[A] Added Exit Sign (texture design by J. Carver).", @@ -50,7 +54,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.10", - "1.12.2-latest": "1.0.10" + "1.12.2-recommended": "1.0.11", + "1.12.2-latest": "1.0.11" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index 38b57af..a15defe 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,317 +10,335 @@ Mod sources for Minecraft version 1.12.2. ---- ## Version history - ------------------------------------------------------------------- - - v1.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. - ------------------------------------------------------------------- + ------------------------------------------------------------------- + - v1.0.11 [R] Release based on v1.0.11-b3. Release-to-release changes: + * Steel floor grating improvments. + * Minor model box fixes. + * Standalone recipes added. + * Language updates. + ------------------------------------------------------------------- - - v1.0.10-b2 [A] Steel table added. - [A] Steel floor grating added. + - v1.0.11-b3 [M] Added missing standalone recipes for pipe valves, passive + fluid accumulator, and waste incinerator. - - v1.0.10-b1 [A] Treated wood side table added. - [F] Fixed recipe collision of Metal Rung Ladder (issue #37, - thx ProsperCraft for reporting). - [A] Added Exit Sign (texture design by J. Carver). + - 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.9 [R] Release based on v1.0.9-b3. Release-to-release changes: - * Slabs for clinker, concrete, slag bricks. - * Slab slices for sheet metals, treated wood, and concretes. - * Language updates. - * Block hardness adaptions. - * 1st/3rd person item model fixes. - * Furnace initialisation issue fixed. - ------------------------------------------------------------------- + - v1.0.11-b1 [M] Lang update ru-ru (Shellyoung, PR #45). + [F] Fixed bounding box of the Steel Table. + [M] Steel Floor Frating: Items fall through. - - v1.0.9-b3 [A] Added missing recipes for slabs. - [A] Added slab slices for IE sheet metals, treated wood, - and concretes (stackable "quater-slabs"). - [M] Updated 1st/3rd person item model rotations/translations. - [M] Hardness of valves and furni slightly increased. + ------------------------------------------------------------------- + - v1.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. + ------------------------------------------------------------------- - - v1.0.9-b2 [A] Added slabs for Clinker Brick, Slag Brick, Rebar Concrete, - and Stained Clinker. Texture variations like the base blocks. - Allow fast pick-up (see tooltip help or config). - [F] Fixed lab/electrical furnace initialisation issue (first item - inserted was smelted directly). + - v1.0.10-b2 [A] Steel table added. + [A] Steel floor grating added. - - v1.0.9-b1 [U] Lang file ru_ru updated (PR#31, yaroslav4167). - [M] Block hardness adaptions (issue #32). + - v1.0.10-b1 [A] Treated wood side table added. + [F] Fixed recipe collision of Metal Rung Ladder (issue #37, + thx ProsperCraft for reporting). + [A] Added Exit Sign (texture design by J. Carver). - ------------------------------------------------------------------- - - v1.0.8 [R] Release based on v1.0.8-b2. Release-to-release changes: - * Added factory area sign. - * Added stained clinker. - * Config opt-out fixes, detailed feature selection possible now. - * Recipe adaptions and fixes. - * Lang files updated. - ------------------------------------------------------------------- - [A] Added stained clinker brick block/stairs. Can be mixed with - "normal" clinkers. - [A] Added opt-out option for CTRL-SHIFT tooltips. - [M] Recipe condition requirements updated, recipes categorized. + ------------------------------------------------------------------- + - v1.0.9 [R] Release based on v1.0.9-b3. Release-to-release changes: + * Slabs for clinker, concrete, slag bricks. + * Slab slices for sheet metals, treated wood, and concretes. + * Language updates. + * Block hardness adaptions. + * 1st/3rd person item model fixes. + * Furnace initialisation issue fixed. + ------------------------------------------------------------------- - - v1.0.8-b2 [F] Config opt-out fixed (thx IronPiston for the report #30). - [A] Added opt-out config for detailed including/excluding - of features (using registry name wildcard matching). + - v1.0.9-b3 [A] Added missing recipes for slabs. + [A] Added slab slices for IE sheet metals, treated wood, + and concretes (stackable "quater-slabs"). + [M] Updated 1st/3rd person item model rotations/translations. + [M] Hardness of valves and furni slightly increased. - - v1.0.8-b1 [A] Added "Factory area" sign. - [M] Electrical furnace recipe changed (hoppers to conveyors). - [A] Opt-out config options added. - [F] Lang file fixes for en_us (Angela, PR#29). + - v1.0.9-b2 [A] Added slabs for Clinker Brick, Slag Brick, Rebar Concrete, + and Stained Clinker. Texture variations like the base blocks. + Allow fast pick-up (see tooltip help or config). + [F] Fixed lab/electrical furnace initialisation issue (first item + inserted was smelted directly). - ------------------------------------------------------------------- - - v1.0.7 [R] Release based on v1.0.7-b2. Release-to-release changes: - * Factory dropper added. - * Defense system warning sign added. - * Warning sign backgrounds adapted. - * Standalone recipes added. - * Lang files updated. - ------------------------------------------------------------------- - [A] Added standalone recipes for signs, factory dropper, and - electrical furnace. - [M] Adapted "Caution" sign backgrounds to the yellow defense - system warning background. + - v1.0.9-b1 [U] Lang file ru_ru updated (PR#31, yaroslav4167). + [M] Block hardness adaptions (issue #32). - - 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.8 [R] Release based on v1.0.8-b2. Release-to-release changes: + * Added factory area sign. + * Added stained clinker. + * Config opt-out fixes, detailed feature selection possible now. + * Recipe adaptions and fixes. + * Lang files updated. + ------------------------------------------------------------------- + [A] Added stained clinker brick block/stairs. Can be mixed with + "normal" clinkers. + [A] Added opt-out option for CTRL-SHIFT tooltips. + [M] Recipe condition requirements updated, recipes categorized. - - 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! + - v1.0.8-b2 [F] Config opt-out fixed (thx IronPiston for the report #30). + [A] Added opt-out config for detailed including/excluding + of features (using registry name wildcard matching). - ------------------------------------------------------------------- - - v1.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. - ------------------------------------------------------------------- - [A] Added factory dropper (config:experimental). - [C] Thx to abdurraslan for the detailed issue #25. + - v1.0.8-b1 [A] Added "Factory area" sign. + [M] Electrical furnace recipe changed (hoppers to conveyors). + [A] Opt-out config options added. + [F] Lang file fixes for en_us (Angela, PR#29). - - v1.0.6-b1 [A] Added small waste incinerator (delayed fifo-buffered item disposal). - [M] Fixed item/block name capitalization (by Voxelo). - [M] Metal ladders are easier to break/harvest. - [F] Fixed FML remapping issue by using dedicated IItemHandler instances. + ------------------------------------------------------------------- + - v1.0.7 [R] Release based on v1.0.7-b2. Release-to-release changes: + * Factory dropper added. + * Defense system warning sign added. + * Warning sign backgrounds adapted. + * Standalone recipes added. + * Lang files updated. + ------------------------------------------------------------------- + [A] Added standalone recipes for signs, factory dropper, and + electrical furnace. + [M] Adapted "Caution" sign backgrounds to the yellow defense + system warning background. - ------------------------------------------------------------------- - - v1.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. - ------------------------------------------------------------------- - [A] Added sign "Electrical hazard"/"Caution hot wire". - [A] Added sign "Caution dangerous there" (skull/bones). + - 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.5-b1 [A] Added passive fluid accumulator. - [A] Added small electrical passthrough-furnace. - [F] Fixed version check URL. - [M] Opt-out config options for valves, passive fluid accumulator, - and furni. + - 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! - ------------------------------------------------------------------- - - v1.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. - ------------------------------------------------------------------- - [E] Added pass-through electrical furnace (experimental, see config). + ------------------------------------------------------------------- + - v1.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. + ------------------------------------------------------------------- + [A] Added factory dropper (config:experimental). + [C] Thx to abdurraslan for the detailed issue #25. - - v1.0.4-b9 [F] Inserting fluids with pressurized tag only into IE piping. - [F] Valve redstone connector rendering does not check for - "can connect redstone" but only for "can provide power". - [M] Valves are adapted to be detected as pipe by IE. + - v1.0.6-b1 [A] Added small waste incinerator (delayed fifo-buffered item disposal). + [M] Fixed item/block name capitalization (by Voxelo). + [M] Metal ladders are easier to break/harvest. + [F] Fixed FML remapping issue by using dedicated IItemHandler instances. - - v1.0.4-b8 [F] Fixed stairs rendering without smooth light (thanks rastot9). - [E] Added passive fluid accumulator (experimental feature, see config). + ------------------------------------------------------------------- + - v1.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. + ------------------------------------------------------------------- + [A] Added sign "Electrical hazard"/"Caution hot wire". + [A] Added sign "Caution dangerous there" (skull/bones). - - v1.0.4-b7 [F] Fixed recipe loading issue if IE is not installed. - [M] Valves support IE pressurized fluid transfer. + - v1.0.5-b1 [A] Added passive fluid accumulator. + [A] Added small electrical passthrough-furnace. + [F] Fixed version check URL. + [M] Opt-out config options for valves, passive fluid accumulator, + and furni. - - v1.0.4-b6 [A] Added redstone controlled fluid valve. - [A] Added redstone controlled analog fluid valve. - [M] Check valve recipe adapted (thanks majijn). + ------------------------------------------------------------------- + - v1.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. + ------------------------------------------------------------------- + [E] Added pass-through electrical furnace (experimental, see config). - - v1.0.4-b5 [A] Horizontal steel double-T support beam with pole connections. - [A] Added fluid pipe check valve (straight, conducts only one way). - [M] Internal registration block/te handling changed. + - v1.0.4-b9 [F] Inserting fluids with pressurized tag only into IE piping. + [F] Valve redstone connector rendering does not check for + "can connect redstone" but only for "can provide power". + [M] Valves are adapted to be detected as pipe by IE. - - v1.0.4-b4 [F] Clinker/slag brick wall side cullfacing disabled to prevent - texture leaks when connecting to concrete walls. - [F] Unused treated wood pole texture regions filled (optifine). - [F] Using mipped cutout format for window multi-layer model - (issue #19, thanks rixmswey for reporting and details). - [M] Recipe tuning, added standalone recipe for all mod blocks. - [M] In-game CTRL-SHIFT tooltip documentation updated. - [M] Panzer glass block: Ambient occlusion and light opacity tuned. - [M] Stairs: Light opacity tuned. - [A] Tooltip documentation added for mod stairs. - [E] Horizontal steel double-T support beam (config:experimental). + - v1.0.4-b8 [F] Fixed stairs rendering without smooth light (thanks rastot9). + [E] Added passive fluid accumulator (experimental feature, see config). - - v1.0.4-b3 [A] Added thin (4x4x16) and thick (6x6x16) steel hollow poles. - [A] Added support head/foot components for thin and thick steel poles. + - v1.0.4-b7 [F] Fixed recipe loading issue if IE is not installed. + [M] Valves support IE pressurized fluid transfer. - - v1.0.4-b2 [A] Added position dependent texture variation to clinker wall, - slag brick wall and rebar concrete wall. + - v1.0.4-b6 [A] Added redstone controlled fluid valve. + [A] Added redstone controlled analog fluid valve. + [M] Check valve recipe adapted (thanks majijn). - - v1.0.4-b1 [A] Crafting table: JEI integration for recipe placement added. - [A] Crafting table: History re-fab added, allowing to quickly select - and re-craft recent recipes. Selection with arrow buttons, - ingredient placement by clicking the result slot. Automatic - item distribution on shift-click. Quick-move buttons. - [F] Crafting table textures modified to prevent optifine glitches - on the edges of the legs. + - v1.0.4-b5 [A] Horizontal steel double-T support beam with pole connections. + [A] Added fluid pipe check valve (straight, conducts only one way). + [M] Internal registration block/te handling changed. - ------------------------------------------------------------------- - - v1.0.3 [R] Release based on v1.0.3-b5. Release-to-release changes: - * Small laboratory furnace added. - * Extensive config options for mod packing and tuning added. - * Rendering issues fixes (window bleeding, optifine). - * Steel framed window added. - * Treated wood pole "end pieces" added (two support variants). - * Sitting on treated wood stool added including mobs (but not - villagers, as these are obviously very upright people). - * Lang ru_ru added (github contribution from Yaroslavik). - * Creative tab logo changed to mod logo. - * Table/crafting table bounding boxes refined. - * Standalone "escape" recipes added if IE is not installed. - ------------------------------------------------------------------- + - v1.0.4-b4 [F] Clinker/slag brick wall side cullfacing disabled to prevent + texture leaks when connecting to concrete walls. + [F] Unused treated wood pole texture regions filled (optifine). + [F] Using mipped cutout format for window multi-layer model + (issue #19, thanks rixmswey for reporting and details). + [M] Recipe tuning, added standalone recipe for all mod blocks. + [M] In-game CTRL-SHIFT tooltip documentation updated. + [M] Panzer glass block: Ambient occlusion and light opacity tuned. + [M] Stairs: Light opacity tuned. + [A] Tooltip documentation added for mod stairs. + [E] Horizontal steel double-T support beam (config:experimental). - - v1.0.3-b5 [F] Fixed typo in en-en lang file. - [F] Fixed IE concrete texture missing bailout in log if IE is not installed. - [F] Using forge multi-layer models for windows to circumvent glitches. - [M] Changed creative tab logo to the mod logo. - [A] Added alternative recipes for crafting table and furnace if main - IE ingredients are missing (for "stand-alone" mod usage). + - v1.0.4-b3 [A] Added thin (4x4x16) and thick (6x6x16) steel hollow poles. + [A] Added support head/foot components for thin and thick steel poles. - - v1.0.3-b4 [A] Lab furnace supports electrical speedup when a IE external - is placed in one of the two auxiliary slots. - [F] Fixed window rendering issue (issue #15, thanks to ILLOMIURGE). - [M] Updated ru_ru lang file (Yaroslavik). + - v1.0.4-b2 [A] Added position dependent texture variation to clinker wall, + slag brick wall and rebar concrete wall. - - v1.0.3-b3 [A] Added sitting on treated wood stool, Zombies included. - [A] Added steel framed window. - [A] Added treated wood pole support head/foot and heavy duty support. - [A] Added language Russian language support, thanks to yaroslav4167. - [A] Added config for furnace smelting speed (percent of vanilla furnace). - [A] Added config for furnace fuel efficiency (in percent, ref is vanilla). - [F] Treated pole model changed to circumvent potential texture bleeding. - [M] Treated wood table bounding box aligned with the legs. - [M] Treated wood crafting table bounding box aligned with the legs. - [M] Treated wood window can be vertically placed for rooflights. + - v1.0.4-b1 [A] Crafting table: JEI integration for recipe placement added. + [A] Crafting table: History re-fab added, allowing to quickly select + and re-craft recent recipes. Selection with arrow buttons, + ingredient placement by clicking the result slot. Automatic + item distribution on shift-click. Quick-move buttons. + [F] Crafting table textures modified to prevent optifine glitches + on the edges of the legs. - - v1.0.3-b2 [A] Added config options for selective feature opt-outs (soft opt-out). - [A] Added config skip registration of opt-out features (hard opt-out). - [A] Added config to disable all internal recipes (for packs). - [A] Added JEI API adapter for soft opt-outs. - [A] Added lab furnace recipe override config to smelt ores to nuggets - that would normally be smelted into ingots. Can be changed on-the-fly. + ------------------------------------------------------------------- + - v1.0.3 [R] Release based on v1.0.3-b5. Release-to-release changes: + * Small laboratory furnace added. + * Extensive config options for mod packing and tuning added. + * Rendering issues fixes (window bleeding, optifine). + * Steel framed window added. + * Treated wood pole "end pieces" added (two support variants). + * Sitting on treated wood stool added including mobs (but not + villagers, as these are obviously very upright people). + * Lang ru_ru added (github contribution from Yaroslavik). + * Creative tab logo changed to mod logo. + * Table/crafting table bounding boxes refined. + * Standalone "escape" recipes added if IE is not installed. + ------------------------------------------------------------------- - - v1.0.3-b1 [A] Added small laboratory furnace. - [M] Panzer glass opacity/light level set explicitly 0. + - v1.0.3-b5 [F] Fixed typo in en-en lang file. + [F] Fixed IE concrete texture missing bailout in log if IE is not installed. + [F] Using forge multi-layer models for windows to circumvent glitches. + [M] Changed creative tab logo to the mod logo. + [A] Added alternative recipes for crafting table and furnace if main + IE ingredients are missing (for "stand-alone" mod usage). - ------------------------------------------------------------------- - - v1.0.2 [R] Release based on v1.0.2-b3 - * Fixes: Spawning. - * Crafting table: Shift-click. - * Ladders: Faster climbing/descending. - * Concrete: Rebar tiles, tile stairs. - * Treated wood: window, windowsill. - * Slag brick: wall. - * Panzer glass: added. - * Recipes: Adaptions, added decompositions. - ------------------------------------------------------------------- + - v1.0.3-b4 [A] Lab furnace supports electrical speedup when a IE external + is placed in one of the two auxiliary slots. + [F] Fixed window rendering issue (issue #15, thanks to ILLOMIURGE). + [M] Updated ru_ru lang file (Yaroslavik). - - v1.0.2-b3 [A] Added slag brick wall. - [A] Added wall decomposition recipes. - [A] Added treated wood window. - [M] Climbing/descending mod ladders is faster when - looking up or down and not sneaking. - [M] Panzer glass material definition changed. - [M] Explicitly preventing spawning in and on "non-full" - blocks of the mod. + - v1.0.3-b3 [A] Added sitting on treated wood stool, Zombies included. + [A] Added steel framed window. + [A] Added treated wood pole support head/foot and heavy duty support. + [A] Added language Russian language support, thanks to yaroslav4167. + [A] Added config for furnace smelting speed (percent of vanilla furnace). + [A] Added config for furnace fuel efficiency (in percent, ref is vanilla). + [F] Treated pole model changed to circumvent potential texture bleeding. + [M] Treated wood table bounding box aligned with the legs. + [M] Treated wood crafting table bounding box aligned with the legs. + [M] Treated wood window can be vertically placed for rooflights. - - v1.0.2-b2 [A] Added rebar concrete tile stairs. - [A] Added treated wood window sill. - [A] Added decomposition recipes for stairs and tiles. - [M] Changed stair recipe yield quantity from 9 to 6. + - v1.0.3-b2 [A] Added config options for selective feature opt-outs (soft opt-out). + [A] Added config skip registration of opt-out features (hard opt-out). + [A] Added config to disable all internal recipes (for packs). + [A] Added JEI API adapter for soft opt-outs. + [A] Added lab furnace recipe override config to smelt ores to nuggets + that would normally be smelted into ingots. Can be changed on-the-fly. - - v1.0.2-b1 [A] Added rebar concrete tile. - [A] Added panzer glass (explosion-resistant reinforced glass). - [M] Treated wood crafting table supports shift-click to transfer - stacks between player inventory and crafting table storage - (thanks majijn for the hint). + - v1.0.3-b1 [A] Added small laboratory furnace. + [M] Panzer glass opacity/light level set explicitly 0. - ------------------------------------------------------------------- - - v1.0.1 [R] Release based on v1.0.1-b4 - * Treated wood crafting table - * Clinker brick wall - * Treated wood stool - * Inset spot light - * Recipe fixes - * Logo updated - ------------------------------------------------------------------- + ------------------------------------------------------------------- + - v1.0.2 [R] Release based on v1.0.2-b3 + * Fixes: Spawning. + * Crafting table: Shift-click. + * Ladders: Faster climbing/descending. + * Concrete: Rebar tiles, tile stairs. + * Treated wood: window, windowsill. + * Slag brick: wall. + * Panzer glass: added. + * Recipes: Adaptions, added decompositions. + ------------------------------------------------------------------- - - v1.0.1-b4 [M] Crafting table keeps inventory and has eight storage slots. - [M] Adapted inset light strength and harvest tool. - [M] Crafting table recipe adapted. + - v1.0.2-b3 [A] Added slag brick wall. + [A] Added wall decomposition recipes. + [A] Added treated wood window. + [M] Climbing/descending mod ladders is faster when + looking up or down and not sneaking. + [M] Panzer glass material definition changed. + [M] Explicitly preventing spawning in and on "non-full" + blocks of the mod. - - v1.0.1-b3 [A] Added inset light (glowstone-metal, light level like torch, - can be used as floor/ceiling/wall light). - [M] Crafting table model updated (issue #7, thanks majijn). - [M] Logo image updated. + - v1.0.2-b2 [A] Added rebar concrete tile stairs. + [A] Added treated wood window sill. + [A] Added decomposition recipes for stairs and tiles. + [M] Changed stair recipe yield quantity from 9 to 6. - - v1.0.1-b2 [A] Added treated wood crafting table. - [A] Added treated wood stool. - [F] Fixed ladder bounding boxes to allow climbing connected trap doors - (issue #6, thanks to Forgilageord). - [M] Improved wall-block connections (wall elements only connect to other - walls or gates, as well as to solid blocks if these blocks are in - a straight line with at least two wall elements). - [M] Decor walls are defined "solid" on top, so that e.g. torches and - redstone tracks can be placed on them. + - v1.0.2-b1 [A] Added rebar concrete tile. + [A] Added panzer glass (explosion-resistant reinforced glass). + [M] Treated wood crafting table supports shift-click to transfer + stacks between player inventory and crafting table storage + (thanks majijn for the hint). - - v1.0.1-b1 [F] Fixed missing condition for ie:stone_deco in recipe constants. - [A] Added clinker brick wall. + ------------------------------------------------------------------- + - v1.0.1 [R] Release based on v1.0.1-b4 + * Treated wood crafting table + * Clinker brick wall + * Treated wood stool + * Inset spot light + * Recipe fixes + * Logo updated + ------------------------------------------------------------------- - ------------------------------------------------------------------- - - v1.0.0 [R] Release based on v1.0.0-b4 - ------------------------------------------------------------------- + - v1.0.1-b4 [M] Crafting table keeps inventory and has eight storage slots. + [M] Adapted inset light strength and harvest tool. + [M] Crafting table recipe adapted. - - v1.0.0-b4 [F] Fixed vanished recipe for the rebar concrete wall. - [A] Concrete wall, material: IE concrete. + - v1.0.1-b3 [A] Added inset light (glowstone-metal, light level like torch, + can be used as floor/ceiling/wall light). + [M] Crafting table model updated (issue #7, thanks majijn). + [M] Logo image updated. - - v1.0.0-b3 [A] Textures of rebar concrete and treated wood table improved. - [A] Added rebar concrete wall. + - v1.0.1-b2 [A] Added treated wood crafting table. + [A] Added treated wood stool. + [F] Fixed ladder bounding boxes to allow climbing connected trap doors + (issue #6, thanks to Forgilageord). + [M] Improved wall-block connections (wall elements only connect to other + walls or gates, as well as to solid blocks if these blocks are in + a straight line with at least two wall elements). + [M] Decor walls are defined "solid" on top, so that e.g. torches and + redstone tracks can be placed on them. - - v1.0.0-b2 [A] Added rebar concrete (steel reinforced, expensive, creeper-proof). + - v1.0.1-b1 [F] Fixed missing condition for ie:stone_deco in recipe constants. + [A] Added clinker brick wall. - - v1.0.0-b1 [A] Initial structure. - [A] Added clinker bricks and clinker brick stairs. - [A] Added slag bricks and slag brick stairs. - [A] Added metal rung ladder. - [A] Added staggered metal steps ladder. - [A] Added treated wood ladder. - [A] Added treated wood pole. - [A] Added treated wood table. + ------------------------------------------------------------------- + - v1.0.0 [R] Release based on v1.0.0-b4 + ------------------------------------------------------------------- + + - v1.0.0-b4 [F] Fixed vanished recipe for the rebar concrete wall. + [A] Concrete wall, material: IE concrete. + + - v1.0.0-b3 [A] Textures of rebar concrete and treated wood table improved. + [A] Added rebar concrete wall. + + - v1.0.0-b2 [A] Added rebar concrete (steel reinforced, expensive, creeper-proof). + + - v1.0.0-b1 [A] Initial structure. + [A] Added clinker bricks and clinker brick stairs. + [A] Added slag bricks and slag brick stairs. + [A] Added metal rung ladder. + [A] Added staggered metal steps ladder. + [A] Added treated wood ladder. + [A] Added treated wood pole. + [A] Added treated wood table. ---- diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFloorGrating.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFloorGrating.java index a6b6125..af3a5f1 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFloorGrating.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFloorGrating.java @@ -12,13 +12,17 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.Entity; +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.world.IBlockAccess; +import net.minecraft.world.World; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import java.util.List; public class BlockDecorFloorGrating extends BlockDecor { @@ -39,6 +43,47 @@ public class BlockDecorFloorGrating extends BlockDecor @Override public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing face) - { return BlockFaceShape.SOLID; } + { return BlockFaceShape.UNDEFINED; } + @Override + public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, AxisAlignedBB entityBox, List 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); + } + } } diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java index 523c0bd..a4443aa 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java @@ -251,7 +251,7 @@ public class ModBlocks "steel_table", BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT, Material.IRON, 1.0f, 15f, SoundType.METAL, - ModAuxiliaries.getPixeledAABB(0,0,0, 16,15.9,16) + ModAuxiliaries.getPixeledAABB(0,0,0, 16,16,16) ); public static final BlockDecorFloorGrating STEEL_FLOOR_GRATING = new BlockDecorFloorGrating( diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang b/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang index 4440508..0715adb 100644 --- a/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang +++ b/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang @@ -88,7 +88,7 @@ tile.engineersdecor.treated_wood_table.help=§6Robust four-legged wood table.§r tile.engineersdecor.steel_table.name=Steel Table tile.engineersdecor.steel_table.help=§6Robust four-legged steel table. tile.engineersdecor.steel_floor_grating.name=Steel Floor Grating -tile.engineersdecor.steel_floor_grating.help=§6Decorative steel floor covering.§r Top aligned. +tile.engineersdecor.steel_floor_grating.help=§6Decorative steel floor covering.§r Top aligned. Items fall through. tile.engineersdecor.treated_wood_stool.name=Treated Wood Stool tile.engineersdecor.treated_wood_stool.help=§6Robust Wood Stool.§r Indoor and outdoor use. tile.engineersdecor.treated_wood_crafting_table.name=Treated Wood Crafting Table diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang b/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang index 6c7eea8..3abd875 100644 --- a/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang +++ b/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang @@ -7,68 +7,68 @@ itemGroup.tabengineersdecor=Engineer's Decor engineersdecor.tooltip.hint.extended=§6[§9SHIFT§r Больше информации§6]§r engineersdecor.tooltip.hint.help=§6[§9CTRL-SHIFT§r Помощь§6]§r -#engineersdecor.tooltip.slabpickup.help=§rFast pickup by left-clicking while looking up/down and holding this slab. +engineersdecor.tooltip.slabpickup.help=§rБыстрое поднятие щелчком ЛКМ, смотря вверх/вниз с этой плитой в руках. #----------------------------------------------------------------------------------------------------------- # Stone/"ceramic material" based blocks #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.clinker_brick_block.name=Клинкерный кирпич -tile.engineersdecor.clinker_brick_block.help=§6Кирпичный блок с вариациями текстуры, зависящими от положения.§r\nВыглядит немного темнее и интенсивнее, чем ванильный кирпичный блок. +tile.engineersdecor.clinker_brick_block.help=§6Кирпичный блок с вариациями текстуры, зависящими от положения.§r\nВыглядит темнее и интенсивнее, чем Кирпичный блок. tile.engineersdecor.clinker_brick_stained_block.name=Грязный клинкерный кирпич -tile.engineersdecor.clinker_brick_stained_block.help=§6Кирпичный блок с вариациями текстуры, зависящими от положения.§r\nВыглядит немного темнее и интенсивнее, чем ванильный кирпичный блок. Имеет более заметные следы грязи или пятен. +tile.engineersdecor.clinker_brick_stained_block.help=§6Кирпичный блок с вариациями текстуры, зависящими от положения.§r\nВыглядит темнее и интенсивнее, чем Кирпичный блок. Имеет более заметные следы грязи или пятен. tile.engineersdecor.slag_brick_block.name=Шлакоблок tile.engineersdecor.slag_brick_block.help=§6Серо-коричневый кирпичный блок с зависимыми от положения вариациями текстуры. tile.engineersdecor.rebar_concrete.name=Железобетон tile.engineersdecor.rebar_concrete.help=§6Стальной железобетонный блок.§r Дорогой, но взрывоустойчивый, как обсидиан. tile.engineersdecor.panzerglass_block.name=Бронированное стекло -tile.engineersdecor.panzerglass_block.help=§6Усиленный стеклоблок.§r Дорогой, взрывоустойчивый. Имеет темно-серый оттенок, видны слабые структурные линии, мульти текстура для бесшовного отображения. +tile.engineersdecor.panzerglass_block.help=§6Усиленный стеклоблок.§r Дорогой, взрывоустойчивый. Имеет тёмно-серый оттенок, слегка видны структурные линии, мультитекстура для бесшовного отображения. tile.engineersdecor.rebar_concrete_tile.name=Железобетонная плита tile.engineersdecor.rebar_concrete_tile.help=§6Стальная железобетонная плитка.§r Дорогая, но взрывоустойчивая, как обсидиан. #----------------------------------------------------------------------------------------------------------- -tile.engineersdecor.clinker_brick_slab.name=Clinker Brick Slab -#tile.engineersdecor.clinker_brick_slab.help=§6Slab made from a Clinker Block.§r\nLooks slightly darker and more color intensive than the vanilla brick. -tile.engineersdecor.clinker_brick_stained_slab.name=Stained Clinker Brick Slab -#tile.engineersdecor.clinker_brick_stained_slab.help=§6Slab made from a Stained Clinker Block. -tile.engineersdecor.slag_brick_slab.name=Slag Brick Slab -#tile.engineersdecor.slag_brick_slab.help=§6A gray-brown brick slab. -tile.engineersdecor.rebar_concrete_slab.name=Rebar Concrete Slab -#tile.engineersdecor.rebar_concrete_slab.help=§6Steel reinforced concrete slab.§r Expensive but Creeper-proof like obsidian. -tile.engineersdecor.rebar_concrete_tile_slab.name=Rebar Concrete Tile Slab -#tile.engineersdecor.rebar_concrete_tile_slab.help=§6Steel reinforced concrete tile slab.§r Expensive but Creeper-proof like obsidian. -tile.engineersdecor.panzerglass_slab.name=Panzer Glass Slab -#tile.engineersdecor.panzerglass_slab.help=§6Reinforced glass slab.§r Expensive, explosion-proof. Dark gray tint, faint structural lines visible. +tile.engineersdecor.clinker_brick_slab.name=Клинкерная плита +tile.engineersdecor.clinker_brick_slab.help=§6Плита из клинкерного блока.§r\nВыглядит темнее и интенсивнее, чем Кирпичный блок. +tile.engineersdecor.clinker_brick_stained_slab.name=Плита из окраженного клинкерного кирпича +tile.engineersdecor.clinker_brick_stained_slab.help=§6Плита из Окрашенного клинкерного блока. +tile.engineersdecor.slag_brick_slab.name=Плита из шлакоблока +tile.engineersdecor.slag_brick_slab.help=§6Серо-коричневая кирпичная плита. +tile.engineersdecor.rebar_concrete_slab.name=Железобетонная плита +tile.engineersdecor.rebar_concrete_slab.help=§6Бетонная плита, усиленная сталью.§r Дорогая, но взрывоустойчивая, как обсидиан. +tile.engineersdecor.rebar_concrete_tile_slab.name=Железобетонная плитка +tile.engineersdecor.rebar_concrete_tile_slab.help=§6Бетонная плитка, усиленная сталью.§r Дорогая, но взрывоустойчивая, как обсидиан. +tile.engineersdecor.panzerglass_slab.name=Плита из бронированного стекла +tile.engineersdecor.panzerglass_slab.help=§6Усиленная стеклянная плита.§r Дорогая, взрывоустойчивая. Имеет тёмно-серый оттенок, слегка видны структурные линии. #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.rebar_concrete_wall.name=Железобетонная стена tile.engineersdecor.rebar_concrete_wall.help=§6Стальная железобетонная стена.§r Дорогая, но взрывоустойчивая, как обсидиан. tile.engineersdecor.concrete_wall.name=Бетонная стена -tile.engineersdecor.concrete_wall.help=§6Стена из твердого бетона. +tile.engineersdecor.concrete_wall.help=§6Стена из твёрдого бетона. tile.engineersdecor.clinker_brick_wall.name=Клинкерная кирпичная стена tile.engineersdecor.clinker_brick_wall.help=§6Обыкновенная клинкерная кирпичная стена. tile.engineersdecor.slag_brick_wall.name=Кирпичная стена из шлакоблока tile.engineersdecor.slag_brick_wall.help=§6Обыкновенная стена из шлакоблока. #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.metal_rung_ladder.name=Металлическая лестница -tile.engineersdecor.metal_rung_ladder.help=§6Типичная промышленная настенная лестница, состоящая из горизонтальных металлических стержней.§r Смотри вверх / вниз, чтобы подняться быстрее. +tile.engineersdecor.metal_rung_ladder.help=§6Типичная промышленная настенная лестница, состоящая из горизонтальных металлических стержней.§r Смотри вверх/вниз, чтобы подняться быстрее. tile.engineersdecor.metal_rung_steps.name=Настенные металлические ступеньки -tile.engineersdecor.metal_rung_steps.help=§6Металлические ступеньки, крепятся к стене. Позволяют подыматься / спускаться.§r Смотри вверх / вниз, чтобы подняться быстрее. +tile.engineersdecor.metal_rung_steps.help=§6Металлические ступеньки, крепятся к стене. Позволяют подниматься/спускаться.§r Смотри вверх/вниз, чтобы подняться быстрее. tile.engineersdecor.treated_wood_ladder.name=Лестница из обработанного дерева -tile.engineersdecor.treated_wood_ladder.help=§6Погодоустойчивая деревянная лестница.§r Смотри вверх / вниз, чтобы подняться быстрее. +tile.engineersdecor.treated_wood_ladder.help=§6Погодоустойчивая деревянная лестница.§r Смотри вверх/вниз, чтобы подняться быстрее. #----------------------------------------------------------------------------------------------------------- -tile.engineersdecor.clinker_brick_stairs.name=Клинкерная кирпичная лестница -tile.engineersdecor.clinker_brick_stairs.help=§6По цвету выглядит немного темнее и интенсивнее, чем ванильный кирпичный блок -tile.engineersdecor.clinker_brick_stained_stairs.name=Грязная кирпичная лестница -tile.engineersdecor.clinker_brick_stained_stairs.help=§6Выглядит немного темнее и интенсивнее, чем ванильный кирпичный блок. Имеет более заметные следы грязи или пятен. -tile.engineersdecor.slag_brick_stairs.name=Клинкерная кирпичная лестница -tile.engineersdecor.slag_brick_stairs.help=§6По цвету выглядит немного темнее и интенсивнее, чем ванильный кирпичный блок. -tile.engineersdecor.rebar_concrete_stairs.name=Железобетонная лестница -tile.engineersdecor.rebar_concrete_stairs.help=§6Железобетонная лестница.§r Дорогая, но взрывоустойчивая, как обсидиан. -tile.engineersdecor.rebar_concrete_tile_stairs.name=Железобетонная лестница -tile.engineersdecor.rebar_concrete_tile_stairs.help=§6Железобетонная лестница.§r Дорогая, но взрывоустойчивая, как обсидиан. +tile.engineersdecor.clinker_brick_stairs.name=Клинкерные кирпичные ступеньки +tile.engineersdecor.clinker_brick_stairs.help=§6По цвету выглядят немного темнее и интенсивнее, чем Кирпичный блок +tile.engineersdecor.clinker_brick_stained_stairs.name=Грязные кирпичные ступеньки +tile.engineersdecor.clinker_brick_stained_stairs.help=§6Выглядят немного темнее и интенсивнее, чем Кирпичный блок. Имеют более заметные следы грязи или пятен. +tile.engineersdecor.slag_brick_stairs.name=Клинкерные кирпичные ступеньки +tile.engineersdecor.slag_brick_stairs.help=§6По цвету выглядят немного темнее и интенсивнее, чем Кирпичный блок. +tile.engineersdecor.rebar_concrete_stairs.name=Железобетонные ступеньки +tile.engineersdecor.rebar_concrete_stairs.help=§6Железобетонные ступеньки.§r Дорогие, но взрывоустойчивые, как обсидиан. +tile.engineersdecor.rebar_concrete_tile_stairs.name=Ступеньки из железобетонной плитки +tile.engineersdecor.rebar_concrete_tile_stairs.help=§6Ступеньки из железобетонной плитки.§r Дорогие, но взрывоустойчивые, как обсидиан. #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.treated_wood_pole.name=Прямой обработанный деревянный столб tile.engineersdecor.treated_wood_pole.help=§6Надёжный столб с диаметром, схожим с реле.§r\n\ - Может быть полезен в качестве альтернативы электро-столбам, если требуется особая специальная длина, \ + Может быть полезен в качестве альтернативы столбам для проводов, если требуется особая специальная длина, \ или как опора для конструкций. -tile.engineersdecor.treated_wood_pole_head.name=Прямой обработанный деревянный столб верхняя часть/основание +tile.engineersdecor.treated_wood_pole_head.name=Прямой обработанный деревянный столб (верхняя часть/основание) tile.engineersdecor.treated_wood_pole_head.help=§6Деревянная часть, подходит как основание или наконечник прямых столбов. tile.engineersdecor.treated_wood_pole_support.name=Прямой обработанный деревянный столб tile.engineersdecor.treated_wood_pole_support.help=§6Усиленная деревянная опорная часть, подходит как основание или наконечник прямых столбов. @@ -84,17 +84,17 @@ tile.engineersdecor.steel_double_t_support.name=Стальная двойная tile.engineersdecor.steel_double_t_support.help=§6Фрагмент горизонтальной потолочной опорной балки. #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.treated_wood_table.name=Стол из обработанного дерева -tile.engineersdecor.treated_wood_table.help=§6Прочный деревянный стол с четырьмя ножками .§r Для использования в помещении и на улице. -tile.engineersdecor.steel_table.name=Steel Table -#tile.engineersdecor.steel_table.help=§6Robust four-legged steel table. -tile.engineersdecor.steel_floor_grating.name=Steel Floor Grating -#tile.engineersdecor.steel_floor_grating.help=§6Decorative steel floor covering.§r Top aligned. +tile.engineersdecor.treated_wood_table.help=§6Прочный деревянный стол с четырьмя ножками.§r Для использования в помещении и на улице. +tile.engineersdecor.steel_table.name=Стальной стол +tile.engineersdecor.steel_table.help=§6Прочный стол с четырьмя ножками. +tile.engineersdecor.steel_floor_grating.name=Решётка стального пола +tile.engineersdecor.steel_floor_grating.help=§6Декоративное стальное напольное покрытие.§r Выровнен по верху. tile.engineersdecor.treated_wood_stool.name=Табурет из обработанного дерева tile.engineersdecor.treated_wood_stool.help=§6Крепкий деревянный табурет.§r Для использования в помещении и на улице. tile.engineersdecor.treated_wood_crafting_table.name=Верстак из обработанного дерева tile.engineersdecor.treated_wood_crafting_table.help=§6Прочный и устойчивый к погодным условиям. Восемь слотов для хранения. Хранит инвентарь. tile.engineersdecor.treated_wood_side_table.name=Treated Wood Side Table -#tile.engineersdecor.treated_wood_side_table.help=§6Needed after the work's done. +tile.engineersdecor.treated_wood_side_table.help=§6Needed after the work's done. tile.engineersdecor.iron_inset_light.name=Встраиваемый осветитель tile.engineersdecor.iron_inset_light.help=§6Маленький источник света, интегрируемый в стены, пол или потолок.§r\n\ Полезно для освещения мест, где проблематичны электрические осветительные установки.\ @@ -107,39 +107,39 @@ tile.engineersdecor.steel_framed_window.name=Окно со стальной ра tile.engineersdecor.steel_framed_window.help=§6Стальной каркас окна с тройным остеклением. Хорошо изолирует. §r Не подключается к смежным блокам, таким как стеклянные панели. #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.small_lab_furnace.name=Компактная лабораторная печь -tile.engineersdecor.small_lab_furnace.help=§6Лабораторная печь в металлическом корпусе.§r Подача твёрдого топлива - сверху. Немного горячее чем каменная, поэтому быстрее. Два внутренних слота для ввода, выхода и топлива. +tile.engineersdecor.small_lab_furnace.help=§6Лабораторная печь в металлическом корпусе.§r Подача твёрдого топлива сверху. Немного горячее, чем каменная, поэтому быстрее. Два внутренних слота для ввода, выхода и топлива. tile.engineersdecor.small_electrical_furnace.name=Компактная конвейерная электрическая печь tile.engineersdecor.small_electrical_furnace.help=§6Компактная конвейерная печь в металлическом корпусе.§r \ Автоматически принимает предметы со стороны ввода и складывает в инвентарь со стороны вывода. \ - Предметы могут быть импортированы/вытянуты со всех сторон с помощью воронок. Без проблем пропускает \ - элементы, которые нельзя выплавить или приготовить. Чуть более энергоэффективная и быстра, \ - чем утеплённая булыжная печь. Транспортировка работает стеками. Механизм требует немного энергии. + Предметы можно помещать/забирать со всех сторон с помощью воронок. Без проблем пропускает \ + элементы, которые нельзя выплавить или приготовить. Чуть более энергоэффективная и быстрая, \ + чем утеплённая булыжная печь. Транспортировка работает стеками. Механизм требует мало энергии. tile.engineersdecor.small_waste_incinerator.name=Компактный сжигатель отходов -tile.engineersdecor.small_waste_incinerator.help=§6Отходы с слотами очереди.§r Предметы могут помещаться с любой стороны, и храниться \ - до тех пор, пока в очереди не останется свободного места. После этого самый старый стэк \ +tile.engineersdecor.small_waste_incinerator.help=§6Отходы с слотами для очереди.§r Предметы могут помещаться с любой стороны, и храниться \ + до тех пор, пока в очереди не останется свободного места. После этого самый старый стек \ будет сожжен. Подключите электричество (RF/FE) для увеличения скорости обработки. \ Сохраняет инвентарь при перемещении. #----------------------------------------------------------------------------------------------------------- -tile.engineersdecor.straight_pipe_valve.name=Жидкостный одноканальный клапан -tile.engineersdecor.straight_pipe_valve.help=§6Фрагмент прямой трубы.§r проводит жидкость только в одном направлении. \ +tile.engineersdecor.straight_pipe_valve.name=Одноканальный жидкостный клапан +tile.engineersdecor.straight_pipe_valve.help=§6Фрагмент прямой трубы.§r Проводит жидкость только в одном направлении. \ Не соединяется по бокам. Уменьшает пропускную способность. \ SHIFT для размещения в противоположном направлении. -tile.engineersdecor.straight_pipe_valve_redstone.name=Редстоун-контролируемый жидкостный клапан +tile.engineersdecor.straight_pipe_valve_redstone.name=Краснокаменно-контролируемый жидкостный клапан tile.engineersdecor.straight_pipe_valve_redstone.help=§6Фрагмент прямой трубы.§r Проводит жидкости только в одном направлении. \ - Не соединяется по бокам. SHIFT - чтобы разместить в обратном направлении. \ + Не соединяется по бокам. SHIFT для размещения в обратном направлении. \ Блокирует поток, если присутствует сигнал красного камня. -tile.engineersdecor.straight_pipe_valve_redstone_analog.name=Редстоун-аналоговый клапан для жидкости +tile.engineersdecor.straight_pipe_valve_redstone_analog.name=Краснокаменно-аналоговый жидкостный клапан tile.engineersdecor.straight_pipe_valve_redstone_analog.help=§6Фрагмент прямой трубы.§r Проводит жидкости только в одном направлении. \ - Не соединяется по бокам. SHIFT - чтобы разместить в обратном направлении. \ - Не пропускает при отсутствии красного сигнала, уменьшает расход линейно с мощности 1 до 14, \ - открывается максимально-возможно при уровне красного сигнала 15. + Не соединяется по бокам. SHIFT для размещения в обратном направлении. \ + Не пропускает при отсутствии сигнала красного камня, уменьшает расход линейно с мощности 1 до 14, \ + открывается максимально-возможно при уровне сигнала красного камня 15. tile.engineersdecor.passive_fluid_accumulator.name=Пассивный жидкостный накопитель -tile.engineersdecor.passive_fluid_accumulator.help=§6Вакуумный всасывающий жидкостный коллектор§r Имеет один выход, все остальные стороны - входные. \ +tile.engineersdecor.passive_fluid_accumulator.help=§6Вакуумный всасывающий жидкостный коллектор.§r Имеет один выход, все остальные стороны входные. \ Сливает жидкости из соседних резервуаров при выкачивании жидкости из выходного порта. #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.factory_dropper.name=Фабричный выбрасыватель -tile.engineersdecor.factory_dropper.help=§6Выбрасыватель подходит для продвинутой автоматизации производства.§r Имеет двенадцать выборочных слотов. \ - Сила броска, угол, размер стопки и задержка настраиваются в GUI. Три слота сравнения стека \ +tile.engineersdecor.factory_dropper.help=§6Выбрасыватель подходит для продвинутой автоматизации производства.§r Имеет 12 выборочных слотов. \ + Сила броска, угол, размер стопки и задержка настраиваются в GUI. 3 слота сравнения стека \ с логическим И или ИЛИ могут использоваться в качестве внутреннего источника запуска. \ Внутренний триггер может быть И или ИЛИ с внешним триггерным сигналом красного камня. \ Триггерные кнопки симуляции для тестирования. Предварительно открывает дверцу затвора, \ @@ -154,7 +154,7 @@ tile.engineersdecor.small_mineral_smelter.name=Small Mineral Melting Furnace tile.engineersdecor.sign_decor.name=Табличка с надписью (Логотип Engineer's decor) tile.engineersdecor.sign_decor.help=§Это не должно быть крафтовым или видимым в JEI. Используется для творческой вкладки и скриншотов. tile.engineersdecor.sign_hotwire.name=Знак «Осторожно, под напряжением» -tile.engineersdecor.sign_hotwire.help=§6Предупреждение об опасности поражения электрическим током. Не забудьте разместить вокруг HV, иначе у вас будет штраф при следующей проверке. +tile.engineersdecor.sign_hotwire.help=§6Предупреждение об опасности поражения электрическим током. Не забудьте разместить около высокого напряжения, иначе у вас будет штраф при следующей проверке. tile.engineersdecor.sign_mindstep.name=Знак «Осторожно, там ступеньки!» tile.engineersdecor.sign_mindstep.help=§6Размещается на стенах (горизонтально) tile.engineersdecor.sign_danger.name=Знак «Осторожно, там опасность» @@ -162,8 +162,8 @@ tile.engineersdecor.sign_danger.help=§6Общее предупреждение tile.engineersdecor.sign_defense.name=Знак «Осторожно, впереди система обороны» tile.engineersdecor.sign_defense.help=§6Предупреждающий знак для турелей, катушек Тесла и ловушек. tile.engineersdecor.sign_factoryarea.name=Знак «Заводская зона» -tile.engineersdecor.sign_factoryarea.help=§6Знак для зданий или областей, где находятся действительно большие машины. -tile.engineersdecor.sign_exit.name=Exit Sign +tile.engineersdecor.sign_factoryarea.help=§6Там дверь, пожалуйста... +tile.engineersdecor.sign_exit.name=Знак «Выход» #tile.engineersdecor.sign_factoryarea.help=§6There's the door, please ... #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.halfslab_rebar_concrete.name=Арматура для бетона @@ -184,49 +184,49 @@ tile.engineersdecor.halfslab_sheetmetal_aluminum.name=Часть алюмини tile.engineersdecor.halfslab_sheetmetal_aluminum.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей. #----------------------------------------------------------------------------------------------------------- -engineersdecor.config.title=Engineer's Decor конфигурация +engineersdecor.config.title=Конфигурация "Engineer's Decor" engineersdecor.config.pattern_excludes=Pattern excludes engineersdecor.config.pattern_includes=Pattern includes -engineersdecor.config.without_clinker_bricks=Without clinker bricks -engineersdecor.config.without_slag_bricks=Without slag bricks -engineersdecor.config.without_rebar_concrete=Without rebar concrete -engineersdecor.config.without_walls=Without walls -engineersdecor.config.without_stairs=Without stairs -engineersdecor.config.without_ie_concrete_wall=Without concrete wall -engineersdecor.config.without_panzer_glass=Without panzer glass -engineersdecor.config.without_crafting_table=Without crafting table -engineersdecor.config.without_lab_furnace=Without lab furnace -engineersdecor.config.without_electrical_furnace=Without electrical furnace -engineersdecor.config.without_treated_wood_furniture=Without tr. wood furniture -engineersdecor.config.without_windows=Without windows -engineersdecor.config.without_light_sources=Without lights -engineersdecor.config.without_ladders=Without ladders -engineersdecor.config.without_chair_sitting=Without chair sitting -engineersdecor.config.without_mob_chair_sitting=Without chair mob sitting -engineersdecor.config.without_ladder_speed_boost=Without ladder speed boost -engineersdecor.config.without_crafting_table_history=Without crafting table history -engineersdecor.config.without_valves=Without valves -engineersdecor.config.without_passive_fluid_accumulator=Without fluid accumulator -engineersdecor.config.without_waste_incinerator=Without waste incinerator -engineersdecor.config.without_sign_plates=Without signs -engineersdecor.config.without_factory_dropper=Without factory dropper -engineersdecor.config.without_slabs=Without slabs -engineersdecor.config.without_halfslabs=Without slab slices -engineersdecor.config.without_direct_slab_pickup=Without slab pickup -engineersdecor.config.without_poles=Without poles -engineersdecor.config.without_hsupports=Without h. supports -engineersdecor.config.without_tooltips=Without tooltips -engineersdecor.config.without_recipes=Without recipes -engineersdecor.config.furnace_smelting_speed_percent=Furnace: Smelting speed % -engineersdecor.config.furnace_fuel_efficiency_percent=Furnace: Fuel efficiency % -engineersdecor.config.furnace_boost_energy_consumption=Furnace: Boost energy -engineersdecor.config.chair_mob_sitting_probability_percent=Chairs: Sitting chance % -engineersdecor.config.chair_mob_standup_probability_percent="Chairs: Stand up chance %" -engineersdecor.config.with_crafting_quickmove_buttons=Crafting table: Move buttons -engineersdecor.config.pipevalve_max_flowrate=Valves: Max flow rate -engineersdecor.config.pipevalve_redstone_gain=Valves: Redstone slope -engineersdecor.config.e_furnace_speed_percent=E-furnace: Smelting speed % -engineersdecor.config.e_furnace_power_consumption=E-furnace: Power consumption +engineersdecor.config.without_clinker_bricks=Без клинкерных кирпичей +engineersdecor.config.without_slag_bricks=Без шлаковых кирпичей +engineersdecor.config.without_rebar_concrete=Без железобетона +engineersdecor.config.without_walls=Без стен +engineersdecor.config.without_stairs=Без ступенек +engineersdecor.config.without_ie_concrete_wall=Без бетонных стен +engineersdecor.config.without_panzer_glass=Без бронированного стекла +engineersdecor.config.without_crafting_table=Без верстака +engineersdecor.config.without_lab_furnace=Без лабораторной печи +engineersdecor.config.without_electrical_furnace=Без электрической печи +engineersdecor.config.without_treated_wood_furniture=Без мебели из обр-ого дерева +engineersdecor.config.without_windows=Без окон +engineersdecor.config.without_light_sources=Без светильников +engineersdecor.config.without_ladders=Без лестниц +engineersdecor.config.without_chair_sitting=Без стульев для сидения +engineersdecor.config.without_mob_chair_sitting=Без стульев для сидения для существ +engineersdecor.config.without_ladder_speed_boost=Без ускорения на лестницах +engineersdecor.config.without_crafting_table_history=Без истории крафта в столе +engineersdecor.config.without_valves=Без клапанов +engineersdecor.config.without_passive_fluid_accumulator=Без жидкостного накопителя +engineersdecor.config.without_waste_incinerator=Без сжигателя отходов +engineersdecor.config.without_sign_plates=Без знаков +engineersdecor.config.without_factory_dropper=Без фабричного выбрасывателя +engineersdecor.config.without_slabs=Без плит +engineersdecor.config.without_halfslabs=Без частей плит +engineersdecor.config.without_direct_slab_pickup=Без поднятия плит +engineersdecor.config.without_poles=Без столбов +engineersdecor.config.without_hsupports=Без опор +engineersdecor.config.without_tooltips=Без подсказок +engineersdecor.config.without_recipes=Без рецептов +engineersdecor.config.furnace_smelting_speed_percent=Печь: скорость плавления % +engineersdecor.config.furnace_fuel_efficiency_percent=Печь: Эффективность топлива % +engineersdecor.config.furnace_boost_energy_consumption=Печь: Энергия ускорения +engineersdecor.config.chair_mob_sitting_probability_percent=Стулья: Шанс сесть % +engineersdecor.config.chair_mob_standup_probability_percent="Стулья: шанс встать %" +engineersdecor.config.with_crafting_quickmove_buttons=Верстак из обр-ого дерева: движение кнопок +engineersdecor.config.pipevalve_max_flowrate=Клапаны: максимальная скорость потока +engineersdecor.config.pipevalve_redstone_gain=Клапаны: спад красного камня +engineersdecor.config.e_furnace_speed_percent=Электропечь: скорость плавления % +engineersdecor.config.e_furnace_power_consumption=Электропечь: потребление энергии #----------------------------------------------------------------------------------------------------------- # EOF diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang b/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang index 0fa3582..abaa95b 100644 --- a/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang +++ b/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang @@ -86,7 +86,7 @@ tile.engineersdecor.treated_wood_table.help=§6坚固的四足木桌. tile.engineersdecor.steel_table.name=Steel Table #tile.engineersdecor.steel_table.help=§6Robust four-legged steel table. tile.engineersdecor.steel_floor_grating.name=Steel Floor Grating -#tile.engineersdecor.steel_floor_grating.help=§6Decorative steel floor covering.§r Top aligned. +#tile.engineersdecor.steel_floor_grating.help=§6Decorative steel floor covering.§r Top aligned. Items fall through. tile.engineersdecor.treated_wood_stool.name=Treated Wood Stool #tile.engineersdecor.treated_wood_stool.help=§6Robust Wood Stool.§r Indoor and outdoor use. tile.engineersdecor.treated_wood_crafting_table.name=Treated Wood Crafting Table diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_table_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_table_model.json index 6fddfd3..9df324b 100644 --- a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_table_model.json +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_table_model.json @@ -104,7 +104,7 @@ }, { "from": [0, 14, 14], - "to": [16, 15.875, 16], + "to": [16, 16, 16], "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -116,7 +116,7 @@ }, { "from": [0, 14, 0], - "to": [16, 15.875, 2], + "to": [16, 16, 2], "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -128,7 +128,7 @@ }, { "from": [14, 14, 2], - "to": [16, 15.875, 14], + "to": [16, 16, 14], "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -140,7 +140,7 @@ }, { "from": [2, 15.5, 12.75], - "to": [14, 15.875, 13.25], + "to": [14, 16, 13.25], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, "faces": { "north": {"texture": "#s"}, @@ -153,7 +153,7 @@ }, { "from": [2, 15.5, 13.75], - "to": [14, 15.875, 14], + "to": [14, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, "faces": { "north": {"texture": "#s"}, @@ -166,7 +166,7 @@ }, { "from": [2, 15.5, 11.75], - "to": [14, 15.875, 12.25], + "to": [14, 16, 12.25], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, "faces": { "north": {"texture": "#s"}, @@ -179,7 +179,7 @@ }, { "from": [2, 15.5, 10.75], - "to": [14, 15.875, 11.25], + "to": [14, 16, 11.25], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, "faces": { "north": {"texture": "#s"}, @@ -192,7 +192,7 @@ }, { "from": [2, 15.5, 9.75], - "to": [14, 15.875, 10.25], + "to": [14, 16, 10.25], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, "faces": { "north": {"texture": "#s"}, @@ -205,7 +205,7 @@ }, { "from": [2, 15.5, 8.75], - "to": [14, 15.875, 9.25], + "to": [14, 16, 9.25], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, "faces": { "north": {"texture": "#s"}, @@ -218,7 +218,7 @@ }, { "from": [2, 15.5, 7.75], - "to": [14, 15.875, 8.25], + "to": [14, 16, 8.25], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, "faces": { "north": {"texture": "#s"}, @@ -231,7 +231,7 @@ }, { "from": [2, 15.5, 6.75], - "to": [14, 15.875, 7.25], + "to": [14, 16, 7.25], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, "faces": { "north": {"texture": "#s"}, @@ -244,7 +244,7 @@ }, { "from": [2, 15.5, 5.75], - "to": [14, 15.875, 6.25], + "to": [14, 16, 6.25], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, "faces": { "north": {"texture": "#s"}, @@ -257,7 +257,7 @@ }, { "from": [2, 15.5, 4.75], - "to": [14, 15.875, 5.25], + "to": [14, 16, 5.25], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, "faces": { "north": {"texture": "#s"}, @@ -270,7 +270,7 @@ }, { "from": [2, 15.5, 3.75], - "to": [14, 15.875, 4.25], + "to": [14, 16, 4.25], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, "faces": { "north": {"texture": "#s"}, @@ -283,7 +283,7 @@ }, { "from": [2, 15.5, 2.75], - "to": [14, 15.875, 3.25], + "to": [14, 16, 3.25], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, "faces": { "north": {"texture": "#s"}, @@ -296,7 +296,7 @@ }, { "from": [2, 15.5, 2], - "to": [14, 15.875, 2.25], + "to": [14, 16, 2.25], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, "faces": { "north": {"texture": "#s"}, @@ -309,7 +309,7 @@ }, { "from": [0, 14, 2], - "to": [2, 15.875, 14], + "to": [2, 16, 14], "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_submodel.json b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_submodel.json index 69d270c..aa4b374 100644 --- a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_submodel.json +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_submodel.json @@ -1,5 +1,6 @@ { "parent": "block/cube", + "ambientocclusion": false, "textures": { "frame": "engineersdecor:blocks/iestyle/treated_wood_rough_texture", "particle": "engineersdecor:blocks/iestyle/treated_wood_rough_texture" @@ -9,47 +10,47 @@ "from": [1, 0, 6.5], "to": [15, 1, 9.5], "faces": { - "north": {"uv": [1, 15, 15, 16], "texture": "#frame"}, - "south": {"uv": [1, 15, 15, 16], "texture": "#frame"}, - "up": {"uv": [1, 6.5, 15, 9.5], "texture": "#frame"}, - "down": {"uv": [1, 6.5, 15, 9.5], "texture": "#frame"} + "north": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} } }, { "from": [0, 0, 6.5], "to": [1, 16, 9.5], "faces": { - "north": {"uv": [15, 0, 16, 16], "texture": "#frame"}, - "east": {"uv": [6.5, 0, 9.5, 16], "texture": "#frame"}, - "south": {"uv": [0, 0, 1, 16], "texture": "#frame"}, - "west": {"uv": [6.5, 0, 9.5, 16], "texture": "#frame"}, - "up": {"uv": [0, 6.5, 1, 9.5], "texture": "#frame"}, - "down": {"uv": [0, 6.5, 1, 9.5], "texture": "#frame"} + "north": {"texture": "#frame"}, + "east": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "west": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} } }, { "from": [1, 15, 6.5], "to": [15, 16, 9.5], "faces": { - "north": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "south": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "up": {"uv": [1, 6.5, 15, 9.5], "texture": "#frame"}, - "down": {"uv": [1, 6.5, 15, 9.5], "texture": "#frame"} + "north": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} } }, { "from": [15, 0, 6.5], "to": [16, 16, 9.5], "faces": { - "north": {"uv": [0, 0, 1, 16], "texture": "#frame"}, - "east": {"uv": [6.5, 0, 9.5, 16], "texture": "#frame"}, - "south": {"uv": [15, 0, 16, 16], "texture": "#frame"}, - "west": {"uv": [6.5, 0, 9.5, 16], "texture": "#frame"}, - "up": {"uv": [15, 6.5, 16, 9.5], "texture": "#frame"}, - "down": {"uv": [15, 6.5, 16, 9.5], "texture": "#frame"} + "north": {"texture": "#frame"}, + "east": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "west": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} } } - ], + ], "display": { "ground": { "scale": [0.2, 0.2, 0.2] diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/passive_fluid_accumulator_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/passive_fluid_accumulator_recipe_standalone.json new file mode 100644 index 0000000..b8da4a6 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/passive_fluid_accumulator_recipe_standalone.json @@ -0,0 +1,24 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:passive_fluid_accumulator", + "required": ["engineersdecor:straight_pipe_valve"], + "missing": ["immersiveengineering:fluid_pipe", "immersiveengineering:mechanical_component"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SPS", + "P P", + "SPS" + ], + "key": { + "P": { "item": "engineersdecor:straight_pipe_valve", "data": 0 }, + "S": { "item": "minecraft:iron_ingot", "data": 0 } + }, + "result": { + "item": "engineersdecor:passive_fluid_accumulator", + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/small_waste_incinerator_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/small_waste_incinerator_standalone.json new file mode 100644 index 0000000..cdb464a --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/small_waste_incinerator_standalone.json @@ -0,0 +1,24 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:small_waste_incinerator", + "missing": ["immersiveengineering:material"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "HPP", + "PHP", + "PLP" + ], + "key": { + "H": { "item": "minecraft:hopper", "data": 0 }, + "P": { "item": "minecraft:iron_ingot", "data": 0 }, + "L": { "item": "minecraft:lava_bucket", "data": 0 } + }, + "result": { + "item": "engineersdecor:small_waste_incinerator", + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/straight_pipe_valve_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/straight_pipe_valve_recipe_standalone.json new file mode 100644 index 0000000..a533a58 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/straight_pipe_valve_recipe_standalone.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:straight_pipe_valve", + "required": ["engineersdecor:thick_steel_pole"], + "missing": ["immersiveengineering:fluid_pipe", "immersiveengineering:mechanical_component"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "PIP" + ], + "key": { + "P": { "item": "engineersdecor:thick_steel_pole", "data": 0 }, + "I": { "item": "minecraft:iron_ingot", "data": 0 } + }, + "result": { + "item": "engineersdecor:straight_pipe_valve", + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/straight_pipe_valve_redstone_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/straight_pipe_valve_redstone_recipe_standalone.json new file mode 100644 index 0000000..a4acc67 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/straight_pipe_valve_redstone_recipe_standalone.json @@ -0,0 +1,19 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:straight_pipe_valve", + "required": ["engineersdecor:straight_pipe_valve"], + "missing": ["immersiveengineering:redstone_connector"] + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "engineersdecor:straight_pipe_valve", "data": 0 }, + { "item": "minecraft:repeater", "data": 0 } + ], + "result": { + "item": "engineersdecor:straight_pipe_valve_redstone", + "count": 1 + } +} diff --git a/1.13/.gitignore b/1.13/.gitignore deleted file mode 100644 index af7450c..0000000 --- a/1.13/.gitignore +++ /dev/null @@ -1,37 +0,0 @@ -bin -*.launch -.settings -.metadata -.classpath -.project -out -*.ipr -*.iws -*.iml -.idea -build -.gradle -*.tmp -*.log -*.jks -eclipse -run -tests -/dist -signing.* -src/main/java/archive -src/main/resources/assets/minecraft -.vscode -/classes -/dev -/tmp -/archive -/assets-src -.gimp -*.xcf -desktop.ini -.DS_Store -Thumbs.db -forge*changelog.txt -/*.txt -mcmodsrepo \ No newline at end of file diff --git a/1.13/Makefile b/1.13/Makefile deleted file mode 100644 index 671af46..0000000 --- a/1.13/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -# @file Makefile -# @author Stefan Wilhelm (wile) -# @license MIT -# -# GNU Make makefile based build relay. -# Note for reviewers/clones: This file is a auxiliary script for my setup. -# It's not needed to build the mod. -# -MOD_JAR_PREFIX=engineersdecor- -MOD_JAR=$(filter-out %-sources.jar,$(wildcard build/libs/${MOD_JAR_PREFIX}*.jar)) - -ifeq ($(OS),Windows_NT) -GRADLE=gradlew.bat --no-daemon -GRADLE_STOP=gradlew.bat --stop -DJS=djs -else -GRADLE=./gradlew --no-daemon -GRADLE_STOP=./gradlew --stop -DJS=djs -endif - -wildcardr=$(foreach d,$(wildcard $1*),$(call wildcardr,$d/,$2) $(filter $(subst *,%,$2),$d)) - -# -# Targets -# -.PHONY: default mod init clean clean-all mrproper all run install sanatize dist-check dist start-server - -default: mod - -all: clean clean-all mod | install - -mod: - @echo "[1.13] Building mod using gradle ..." - @$(GRADLE) build $(GRADLE_OPTS) - -clean: - @echo "[1.13] Cleaning ..." - @rm -f build/libs/* - @$(GRADLE) clean - -clean-all: - @echo "[1.13] Cleaning using gradle ..." - @rm -f dist/* - @rm -rf run/logs/ - @rm -rf run/crash-reports/ - @$(GRADLE) clean cleanCache - -mrproper: clean-all - @rm -f meta/*.* - @rm -rf run/ - @rm -rf out/ - @rm -f .project - @rm -f .classpath - -init: - @echo "[1.13] Initialising eclipse workspace using gradle ..." - @$(GRADLE) eclipse - -sanatize: - @echo "[1.13] Running sanatising tasks ..." - @djs tasks.js trailing-whitespaces - @djs tasks.js tabs-to-spaces - @djs tasks.js sync-languages - @djs tasks.js version-check - @djs tasks.js update-json - @git status -s . - -dist-check: - @echo "[1.13] Running dist checks ..." - @djs tasks.js dist-check - -dist: sanatize dist-check clean-all mod - @echo "[1.13] Distribution files ..." - @mkdir -p dist - @cp build/libs/$(MOD_JAR_PREFIX)* dist/ - @djs tasks.js dist diff --git a/1.13/build.gradle b/1.13/build.gradle deleted file mode 100644 index 9b689b8..0000000 --- a/1.13/build.gradle +++ /dev/null @@ -1,98 +0,0 @@ -// @file build.gradle -// Engineer's decor mod gradle build relay (mc1.13.2) -buildscript { - repositories { - maven { url = 'https://files.minecraftforge.net/maven' } - jcenter() - mavenCentral() - } - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true - } -} -apply plugin: 'net.minecraftforge.gradle' -apply plugin: 'eclipse' -apply plugin: 'maven-publish' -sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' -//----------------------------------------------------------------------------- -version = "${version_engineersdecor}" -group = "wile.engineersdecor" -archivesBaseName = "engineersdecor-${version_minecraft}" - -// def signing = { -> -// def sp = new Properties() -// if(file("signing.properties").exists()) file("signing.properties").withInputStream { sp.load(it) } -// return sp -// }() - -// def git_version = { -> -// def stdout = new ByteArrayOutputStream() -// exec { -// commandLine 'git', 'log', '-1', '--format=%h' -// standardOutput = stdout -// } -// return stdout.toString().trim() -// }() - -minecraft { - mappings channel: 'snapshot', version: '20180921-1.13' - // accessTransformer = file('build/resources/main/META-INF/accesstransformer.cfg') - runs { - client { - workingDirectory project.file('run') - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' - property 'forge.logging.console.level', 'debug' - mods { - engineersdecor { - source sourceSets.main - } - } - } - server { - workingDirectory project.file('run') - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' - property 'forge.logging.console.level', 'debug' - mods { - engineersdecor { - source sourceSets.main - } - } - } - } -} - -dependencies { - minecraft "net.minecraftforge:forge:${version_forge_minecraft}" -} - -jar { - manifest { - attributes([ - "Specification-Title": "engineersdecor", - "Specification-Vendor": "wilechaote", - "Specification-Version": "1", // We are version 1 of ourselves - "Implementation-Title": project.name, - "Implementation-Version": "${version_engineersdecor}", - "Implementation-Vendor" :"wilechaote", - "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") - ]) - } -} - -def reobfFile = file("$buildDir/reobfJar/output.jar") -def reobfArtifact = artifacts.add('default', reobfFile) { - type 'jar' - builtBy 'reobfJar' -} -publishing { - publications { - mavenJava(MavenPublication) { - artifact reobfArtifact - } - } - repositories { - maven { - url "file:///${project.projectDir}/mcmodsrepo" - } - } -} diff --git a/1.13/gradle.properties b/1.13/gradle.properties deleted file mode 100644 index 4f7023e..0000000 --- a/1.13/gradle.properties +++ /dev/null @@ -1,14 +0,0 @@ -# @file gradle.properties -org.gradle.daemon=false -org.gradle.jvmargs=-Xmx8G -version_minecraft=1.13.2 -version_forge_minecraft=1.13.2-25.0.219 -version_engineersdecor=1.0.7-b6 -# -# jar signing data loaded from signing.properties in the project root. -# -#signing.keystore_file= -#signing.keystore_alias= -#signing.keystore_pass= -#signing.keystore_keypass= -#fingerprint_sha1.fp_sha1= diff --git a/1.13/gradle/wrapper/gradle-wrapper.jar b/1.13/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7a3265e..0000000 Binary files a/1.13/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/1.13/gradle/wrapper/gradle-wrapper.properties b/1.13/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 949819d..0000000 --- a/1.13/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip diff --git a/1.13/gradlew b/1.13/gradlew deleted file mode 100644 index cccdd3d..0000000 --- a/1.13/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/1.13/gradlew.bat b/1.13/gradlew.bat deleted file mode 100644 index e95643d..0000000 --- a/1.13/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/1.13/meta/update.json b/1.13/meta/update.json deleted file mode 100644 index 14c8075..0000000 --- a/1.13/meta/update.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", - "1.13.2": { - "1.0.7-b5": "[A] Added translation zh_cn (PR#33, XuyuEre)\n[M] Updated textures.\n[M] Updated 1st/3rd person item model rotations/translations.", - "1.0.7-b4": "[A] Added stained clinker brick block/stairs.", - "1.0.7-b3": "[V] Version assignment: All features of v1.0.7-b3-1.12.2 that can be ported to 1.13.2 implemented/prepared, therefore version re-assigned.\n[A] Added \"Factory Area\" sign.\n[M] Sign background colors adapted.\n[M] EN lang file updated (PR#28, Voxelo).", - "1.0.4-b6": "[A] Added Small Electrical Furnace.\n[A] Added Small Waste Incinerator.\n[A] Experimental: Added fluid check valve.\n[A] Experimental: Added fluid redstone controlled valve.\n[A] Experimental: Added fluid redstone analog valve.\n[A] Experimental: Added passive fluid accumulator.", - "1.0.4-b5": "[A] Added Factory Dropper.\n[A] Added \"Caution Defense System Ahead\" sign.", - "1.0.4-b4": "[U] Updated forge dependency: REQUIRES FORGE >= 1.13.2-25.0.214.\n[A] Added sign \"Electrical hazard\"/\"Caution hot wire\".\n[A] Added sign \"Caution dangerous there\" (skull/bones).\n[A] Added horizontal steel double-T support beam with pole connections.", - "1.0.4-b3": "[V] Version assignment: All features of v1.0.4-b3-1.12.2 that can be ported to 1.13.2 implemented/prepared, therefore version re-iterated.\n[A] Lab furnace ported to 1.13.\n[A] Treated wood crafting table: Added crafting table history/quick craft.\n[A] Treated wood stool: Sitting on the stool implemented.\n[A] Steel poles (thick/thin) with support heads/foots added.\n[E] Prepared position dependent texture variation for walls (clinker, slag, rebar concrete), missing one forge feature yet for completion.\n[E] Prepared multi-layer rendering for windows, needs forge feature implementation.", - "1.0.2-b3": "[A] Added treated wood window.\n[A] Added treated wood pole support.\n[A] Added treated wood pole head.\n[A] Added steel framed window.", - "1.0.2-b2": "[A] Added wall decomposition recipes.\n[A] Added slag brick wall.\n[M] Climbing/descending mod ladders is faster when looking up or down and not sneaking.\n[M] Panzer glass material definition changed.", - "1.0.2-b1": "[A] Added Treated wood crafting table.\n[A] Added decomposition recipes for stairs and tiles.\n[N] Note: All v1.0.2-b1-mc1.12.2 blocks are ported to 1.13.2 (alpha -^ beta version).\n[N] Note: Until IE is out for 1.13.2, the recipes are temporary with vanilla items.", - "1.0.0-a3": "[A] Added iron inset light.\n[A] Added rebar concrete tile.\n[A] Added rebar concrete tile stairs.\n[A] Added clinker brick wall.\n[A] Added treated wood stool.\n[A] Added treated window sill.", - "1.0.0-a2": "[A] Added panzer glass.", - "1.0.0-a1": "[A] Initial port to 1.13.2 with Forge beta." - }, - "promos": { - "1.13.2-recommended": "", - "1.13.2-latest": "1.0.7-b5" - } -} \ No newline at end of file diff --git a/1.13/readme.md b/1.13/readme.md deleted file mode 100644 index 73acc8e..0000000 --- a/1.13/readme.md +++ /dev/null @@ -1,79 +0,0 @@ - -## Engineer's Decor (MC1.13.2) - -Mod sources for Minecraft version 1.13.2. - -- Description, credits, and features: Please see the readme in the repository root. - -- Compiled mod distribution channel is curseforge: https://www.curseforge.com/minecraft/mc-mods/engineers-decor/files. - ----- -## Version history - - ~ v1.0.7-b6 [F] Fixed recipe collision of Metal Rung Ladder (issue #37, - thx ProsperCraft for reporting). - - - v1.0.7-b5 [A] Added translation zh_cn (PR#33, XuyuEre) - [M] Updated textures. - [M] Updated 1st/3rd person item model rotations/translations. - - - v1.0.7-b4 [A] Added stained clinker brick block/stairs. - - - v1.0.7-b3 [V] Version assignment: All features of v1.0.7-b3-1.12.2 that can be ported - to 1.13.2 implemented/prepared, therefore version re-assigned. - [A] Added "Factory Area" sign. - [M] Sign background colors adapted. - [M] EN lang file updated (PR#28, Voxelo). - - - v1.0.4-b6 [A] Added Small Electrical Furnace. - [A] Added Small Waste Incinerator. - [A] Experimental: Added fluid check valve. - [A] Experimental: Added fluid redstone controlled valve. - [A] Experimental: Added fluid redstone analog valve. - [A] Experimental: Added passive fluid accumulator. - - - v1.0.4-b5 [A] Added Factory Dropper. - [A] Added "Caution Defense System Ahead" sign. - - - v1.0.4-b4 [U] Updated forge dependency: REQUIRES FORGE >= 1.13.2-25.0.214. - [A] Added sign "Electrical hazard"/"Caution hot wire". - [A] Added sign "Caution dangerous there" (skull/bones). - [A] Added horizontal steel double-T support beam with pole connections. - - - v1.0.4-b3 [V] Version assignment: All features of v1.0.4-b3-1.12.2 that can be ported - to 1.13.2 implemented/prepared, therefore version re-iterated. - [A] Lab furnace ported to 1.13. - [A] Treated wood crafting table: Added crafting table history/quick craft. - [A] Treated wood stool: Sitting on the stool implemented. - [A] Steel poles (thick/thin) with support heads/foots added. - [E] Prepared position dependent texture variation for walls (clinker, slag, rebar concrete), - missing one forge feature yet for completion. - [E] Prepared multi-layer rendering for windows, needs forge feature implementation. - - - v1.0.2-b3 [A] Added treated wood window. - [A] Added treated wood pole support. - [A] Added treated wood pole head. - [A] Added steel framed window. - - - v1.0.2-b2 [A] Added wall decomposition recipes. - [A] Added slag brick wall. - [M] Climbing/descending mod ladders is faster when looking up or down and not sneaking. - [M] Panzer glass material definition changed. - - - v1.0.2-b1 [A] Added Treated wood crafting table. - [A] Added decomposition recipes for stairs and tiles. - [N] Note: All v1.0.2-b1-mc1.12.2 blocks are ported to 1.13.2 (alpha -^ beta version). - [N] Note: Until IE is out for 1.13.2, the recipes are temporary with vanilla items. - - - v1.0.0-a3 [A] Added iron inset light. - [A] Added rebar concrete tile. - [A] Added rebar concrete tile stairs. - [A] Added clinker brick wall. - [A] Added treated wood stool. - [A] Added treated window sill. - - - v1.0.0-a2 [A] Added panzer glass. - - - v1.0.0-a1 [A] Initial port to 1.13.2 with Forge beta. - ----- diff --git a/1.13/src/main/java/wile/engineersdecor/ModEngineersDecor.java b/1.13/src/main/java/wile/engineersdecor/ModEngineersDecor.java deleted file mode 100644 index 48d24da..0000000 --- a/1.13/src/main/java/wile/engineersdecor/ModEngineersDecor.java +++ /dev/null @@ -1,100 +0,0 @@ -package wile.engineersdecor; - -import net.minecraft.item.ItemGroup; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.crafting.CraftingHelper; -import wile.engineersdecor.blocks.ModBlocks; -import wile.engineersdecor.detail.ModConfig; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.model.obj.OBJLoader; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fml.ModLoadingContext; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; -import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; -import net.minecraftforge.fml.event.server.FMLServerStartingEvent; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import wile.engineersdecor.detail.RecipeCondModSpecific; - - -@Mod("engineersdecor") -public class ModEngineersDecor -{ - public static final String MODID = "engineersdecor"; // fixed name for double checks - private static final Logger LOGGER = LogManager.getLogger(); - - public ModEngineersDecor() - { - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onSetup); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onSendImc); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onRecvImc); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onClientSetup); - MinecraftForge.EVENT_BUS.register(this); - } - - public static final Logger logger() { return LOGGER; } - - // - // Events - // - - private void onSetup(final FMLCommonSetupEvent event) - { - ModLoadingContext.get().registerConfig(net.minecraftforge.fml.config.ModConfig.Type.COMMON, ModConfig.conf_spec); - LOGGER.info("Registering recipe condition processor ..."); - CraftingHelper.register(new ResourceLocation(MODID, "grc"), new RecipeCondModSpecific()); - } - - private void onClientSetup(final FMLClientSetupEvent event) - {} // Currently not needed: OBJLoader.INSTANCE.addDomain(ModEngineersDecor.MODID); - - private void onSendImc(final InterModEnqueueEvent event) - {} - - private void onRecvImc(final InterModProcessEvent event) - {} - - @SubscribeEvent - public void onServerStarting(FMLServerStartingEvent event) - {} - - @Mod.EventBusSubscriber(bus=Mod.EventBusSubscriber.Bus.MOD) - public static class RegistryEvents - { - @SubscribeEvent - public static void onBlocksRegistry(final RegistryEvent.Register event) - { ModBlocks.registerBlocks(event); } - - @SubscribeEvent - public static void onItemRegistry(final RegistryEvent.Register event) - { ModBlocks.registerItemBlocks(event); } - } - - // - // Sided proxy functionality (skel) - // - public static ISidedProxy proxy = DistExecutor.runForDist(()->ClientProxy::new, ()->ServerProxy::new); - public interface ISidedProxy {} - public static final class ClientProxy implements ISidedProxy {} - public static final class ServerProxy implements ISidedProxy {} - - // - // Item group / creative tab - // - public static final ItemGroup ITEMGROUP = (new ItemGroup("tab" + MODID) { - @OnlyIn(Dist.CLIENT) - public ItemStack createIcon() - { return new ItemStack(ModBlocks.TREATED_WOOD_LADDER); } - }); -} diff --git a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecor.java b/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecor.java deleted file mode 100644 index 5c0018b..0000000 --- a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecor.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * @file BlockDecorFull.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * Common functionality class for decor blocks. - * Mainly needed for: - * - MC block defaults. - * - Tooltip functionality - * - Model initialisation - */ -package wile.engineersdecor.blocks; - -import wile.engineersdecor.detail.ModAuxiliaries; -import net.minecraft.block.Block; -import net.minecraft.block.material.EnumPushReaction; -import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.world.IBlockReader; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.util.*; -import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import javax.annotation.Nullable; -import java.util.List; - -public class BlockDecor extends Block -{ - - // The config combines some aspects of blocks, allowing to define different behaviour at construction time, without excessive polymorphy. - // It's an old school flag set as it is used internally only and shall not have as littlt impact on performance as possible. - public final long config; - public static final long CFG_DEFAULT = 0x0000000000000000L; // no special config - public static final long CFG_CUTOUT = 0x0000000000000001L; // cutout rendering - public static final long CFG_HORIZIONTAL = 0x0000000000000002L; // horizontal block, affects bounding box calculation at construction time - public static final long CFG_HORIZIONTAL_PLACEMENT = 0x0000000000000004L; // placed in the horizontzal direction the player is looking when placing. - public static final long CFG_WALL_DOOR_CONNECTION = 0x0000000000000008L; // wall block connects to fence gates and doors. - - public BlockDecor(long config, Block.Properties properties) - { super(properties); this.config = config; } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, @Nullable IBlockReader world, List tooltip, ITooltipFlag flag) - { ModAuxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true); } - - @Override - @OnlyIn(Dist.CLIENT) - public BlockRenderLayer getRenderLayer() - { return ((config & CFG_CUTOUT)!=0) ? BlockRenderLayer.CUTOUT : BlockRenderLayer.SOLID; } - - @Override - @SuppressWarnings("deprecation") - public boolean isFullCube(IBlockState state) - { return ((config & CFG_CUTOUT)==0); } - - @Override - @SuppressWarnings("deprecation") - public boolean isNormalCube(IBlockState state) - { return ((config & CFG_CUTOUT)==0); } - - @Override - public boolean canSpawnInBlock() - { return false; } - - @Override - @SuppressWarnings("deprecation") - public EnumPushReaction getPushReaction(IBlockState state) - { return EnumPushReaction.NORMAL; } - -} diff --git a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorDirected.java b/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorDirected.java deleted file mode 100644 index 0801e72..0000000 --- a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorDirected.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * @file BlockDecorDirected.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * Smaller (cutout) block with a defined facing. - */ -package wile.engineersdecor.blocks; - -import net.minecraft.state.StateContainer; -import net.minecraft.util.math.shapes.VoxelShapes; -import wile.engineersdecor.detail.ModAuxiliaries; -import net.minecraft.item.BlockItemUseContext; -import net.minecraft.state.DirectionProperty; -import net.minecraft.block.Block; -import net.minecraft.block.BlockDirectional; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.world.IBlockReader; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Arrays; - - -public class BlockDecorDirected extends BlockDecor -{ - public static final DirectionProperty FACING = BlockDirectional.FACING; - protected final ArrayList AABBs; - - public BlockDecorDirected(long config, Block.Properties builder, final AxisAlignedBB unrotatedAABB) - { - super(config, builder); - setDefaultState(stateContainer.getBaseState().with(FACING, EnumFacing.UP)); - final boolean is_horizontal = ((config & BlockDecor.CFG_HORIZIONTAL)!=0); - AABBs = new ArrayList(Arrays.asList( - VoxelShapes.create(ModAuxiliaries.getRotatedAABB(unrotatedAABB, EnumFacing.DOWN, is_horizontal)), - VoxelShapes.create(ModAuxiliaries.getRotatedAABB(unrotatedAABB, EnumFacing.UP, is_horizontal)), - VoxelShapes.create(ModAuxiliaries.getRotatedAABB(unrotatedAABB, EnumFacing.NORTH, is_horizontal)), - VoxelShapes.create(ModAuxiliaries.getRotatedAABB(unrotatedAABB, EnumFacing.SOUTH, is_horizontal)), - VoxelShapes.create(ModAuxiliaries.getRotatedAABB(unrotatedAABB, EnumFacing.WEST, is_horizontal)), - VoxelShapes.create(ModAuxiliaries.getRotatedAABB(unrotatedAABB, EnumFacing.EAST, is_horizontal)), - VoxelShapes.create(unrotatedAABB), - VoxelShapes.create(unrotatedAABB) - )); - } - - @Override - public boolean isFullCube(IBlockState state) - { return false; } - - @Override - public boolean isNormalCube(IBlockState state) - { return false; } - - @Override - public boolean canSpawnInBlock() - { return false; } - - @Override - @SuppressWarnings("deprecation") - public BlockFaceShape getBlockFaceShape(IBlockReader world, IBlockState state, BlockPos pos, EnumFacing face) - { return BlockFaceShape.UNDEFINED; } - - @Override - @SuppressWarnings("deprecation") - public VoxelShape getShape(IBlockState state, IBlockReader source, BlockPos pos) - { return AABBs.get(((EnumFacing)state.get(FACING)).getIndex() & 0x7); } - - @Override - @SuppressWarnings("deprecation") - public VoxelShape getCollisionShape(IBlockState state, IBlockReader world, BlockPos pos) - { return getShape(state, world, pos); } - - @Override - protected void fillStateContainer(StateContainer.Builder builder) - { builder.add(FACING); } - - @Override - @Nullable - public IBlockState getStateForPlacement(BlockItemUseContext context) { - if((config & CFG_HORIZIONTAL_PLACEMENT)!=0) { - // placement in direction the player is facing - return getDefaultState().with(FACING, context.getPlacementHorizontalFacing()); - } else { - // default: placement on the face the player clicking - return getDefaultState().with(FACING, context.getFace()); - } - } - - @Override - @OnlyIn(Dist.CLIENT) - public BlockRenderLayer getRenderLayer() - { return BlockRenderLayer.CUTOUT; } - -} diff --git a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorFull.java b/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorFull.java deleted file mode 100644 index f18eabf..0000000 --- a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorFull.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * @file BlockDecorFull.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * Full block characteristics class. Explicitly overrides some - * `Block` methods to return faster due to exclusive block properties. - */ -package wile.engineersdecor.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.IBlockReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wile.engineersdecor.detail.ModAuxiliaries; -import javax.annotation.Nullable; -import java.util.List; - - -public class BlockDecorFull extends BlockDecor -{ - public BlockDecorFull(long config, Block.Properties properties) - { super(config, properties); } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, @Nullable IBlockReader world, List tooltip, ITooltipFlag flag) - { ModAuxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true); } - - @Override - @SuppressWarnings("deprecation") - public boolean isFullCube(IBlockState state) - { return true; } - - @Override - @SuppressWarnings("deprecation") - public boolean isNormalCube(IBlockState state) - { return true; } - - @Override - public boolean canSpawnInBlock() - { return false; } - -} diff --git a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorLadder.java b/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorLadder.java deleted file mode 100644 index c91a98c..0000000 --- a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorLadder.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * @file BlockDecorLadder.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * Ladder block. The implementation is based on the vanilla - * net.minecraft.block.BlockLadder. Minor changes to enable - * later configuration (for block list based construction - * time configuration), does not drop when the block behind - * is broken, etc. - */ -package wile.engineersdecor.blocks; - -import wile.engineersdecor.detail.ModAuxiliaries; -import net.minecraft.block.state.IBlockState; -import net.minecraft.block.*; -import net.minecraft.block.material.EnumPushReaction; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; -import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.world.IBlockReader; -import net.minecraft.util.*; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import javax.annotation.Nullable; -import java.util.List; - - -public class BlockDecorLadder extends BlockLadder -{ - protected static final AxisAlignedBB EDLADDER_UNROTATED_AABB = ModAuxiliaries.getPixeledAABB(3, 0, 0, 13, 16, 2); - protected static final VoxelShape EDLADDER_SOUTH_AABB = VoxelShapes.create(ModAuxiliaries.getRotatedAABB(EDLADDER_UNROTATED_AABB, EnumFacing.SOUTH, false)); - protected static final VoxelShape EDLADDER_EAST_AABB = VoxelShapes.create(ModAuxiliaries.getRotatedAABB(EDLADDER_UNROTATED_AABB, EnumFacing.EAST, false)); - protected static final VoxelShape EDLADDER_WEST_AABB = VoxelShapes.create(ModAuxiliaries.getRotatedAABB(EDLADDER_UNROTATED_AABB, EnumFacing.WEST, false)); - protected static final VoxelShape EDLADDER_NORTH_AABB = VoxelShapes.create(ModAuxiliaries.getRotatedAABB(EDLADDER_UNROTATED_AABB, EnumFacing.NORTH, false)); - - public BlockDecorLadder(long config, Block.Properties builder) - { super(builder); } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, @Nullable IBlockReader world, List tooltip, ITooltipFlag flag) - { ModAuxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true); } - - public VoxelShape getShape(IBlockState state, IBlockReader worldIn, BlockPos pos) - { - switch ((EnumFacing)state.get(FACING)) { - case NORTH: return EDLADDER_NORTH_AABB; - case SOUTH: return EDLADDER_SOUTH_AABB; - case WEST: return EDLADDER_WEST_AABB; - default: return EDLADDER_EAST_AABB; - } - } - - @Override - public boolean canSpawnInBlock() - { return false; } - - @Override - @SuppressWarnings("deprecation") - public EnumPushReaction getPushReaction(IBlockState state) - { return EnumPushReaction.NORMAL; } - -} diff --git a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorStairs.java b/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorStairs.java deleted file mode 100644 index f0433db..0000000 --- a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorStairs.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * @file BlockDecorStairs.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * Stairs and roof blocks, almost entirely based on vanilla stairs. - */ -package wile.engineersdecor.blocks; - -import net.minecraft.block.*; -import net.minecraft.block.material.EnumPushReaction; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.IBlockReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wile.engineersdecor.detail.ModAuxiliaries; - -import javax.annotation.Nullable; -import java.util.List; - - -public class BlockDecorStairs extends BlockStairs -{ - public BlockDecorStairs(long config, IBlockState state, Block.Properties properties) - { super(state, properties); } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, @Nullable IBlockReader world, List tooltip, ITooltipFlag flag) - { ModAuxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true); } - - @Override - public boolean canSpawnInBlock() - { return false; } - - @Override - @SuppressWarnings("deprecation") - public EnumPushReaction getPushReaction(IBlockState state) - { return EnumPushReaction.NORMAL; } - -} diff --git a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorWall.java b/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorWall.java deleted file mode 100644 index 916a970..0000000 --- a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorWall.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * @file BlockDecorWall.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * Wall blocks. - */ -package wile.engineersdecor.blocks; - -import net.minecraft.block.*; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.init.Fluids; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wile.engineersdecor.detail.ModAuxiliaries; - -import javax.annotation.Nullable; -import java.util.List; - - -public class BlockDecorWall extends BlockWall -{ - private final VoxelShape[] shape_voxels; - private final VoxelShape[] collision_shape_voxels; - - public BlockDecorWall(long config, Block.Properties builder) - { - super(builder); - this.shape_voxels = buildWallShapes(4.0F, 4.0F, 16.0F, 0.0F, 16.0F); - this.collision_shape_voxels = buildWallShapes(4.0F, 4.0F, 24.0F, 0.0F, 24.0F); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, @Nullable IBlockReader world, List tooltip, ITooltipFlag flag) - { ModAuxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true); } - - protected VoxelShape[] buildWallShapes(float pole_width_x, float pole_width_z, float pole_height, float side_min_y, float side_max_y) - { return super.func_196408_a(pole_width_x, pole_width_z, pole_height, side_min_y, side_max_y); } - - @Override - public VoxelShape getShape(IBlockState state, IBlockReader world, BlockPos pos) - { return shape_voxels[this.getIndex(state)]; } - - @Override - public VoxelShape getCollisionShape(IBlockState state, IBlockReader world, BlockPos pos) - { return collision_shape_voxels[this.getIndex(state)]; } - - private boolean attachesTo(IBlockState state, BlockFaceShape shape) - { final Block block = state.getBlock(); return (shape==BlockFaceShape.SOLID) && (!isExcepBlockForAttachWithPiston(block)) || (shape==BlockFaceShape.MIDDLE_POLE_THICK) || ((shape==BlockFaceShape.MIDDLE_POLE) && (block instanceof BlockFenceGate)); } - - @Override - public IBlockState updatePostPlacement(IBlockState state, EnumFacing facing, IBlockState facingState, IWorld world, BlockPos currentPos, BlockPos facingPos) - { - if(state.get(WATERLOGGED)) world.getPendingFluidTicks().scheduleTick(currentPos, Fluids.WATER, Fluids.WATER.getTickRate(world)); - if(facing == EnumFacing.DOWN) return super.updatePostPlacement(state, facing, facingState, world, currentPos, facingPos); - boolean n = (facing==EnumFacing.NORTH) ? this.attachesTo(facingState, facingState.getBlockFaceShape(world, facingPos, facing.getOpposite())) : state.get(NORTH); - boolean e = (facing==EnumFacing.EAST) ? this.attachesTo(facingState, facingState.getBlockFaceShape(world, facingPos, facing.getOpposite())) : state.get(EAST); - boolean s = (facing==EnumFacing.SOUTH) ? this.attachesTo(facingState, facingState.getBlockFaceShape(world, facingPos, facing.getOpposite())) : state.get(SOUTH); - boolean w = (facing==EnumFacing.WEST) ? this.attachesTo(facingState, facingState.getBlockFaceShape(world, facingPos, facing.getOpposite())) : state.get(WEST); - boolean not_straight = (!n || !s || e || w) && (n || s || !e || !w); - return state.with(UP, not_straight).with(NORTH, n).with(EAST, e).with(SOUTH, s).with(WEST, w); - } - -} diff --git a/1.13/src/main/java/wile/engineersdecor/blocks/ModBlocks.java b/1.13/src/main/java/wile/engineersdecor/blocks/ModBlocks.java deleted file mode 100644 index e736ad6..0000000 --- a/1.13/src/main/java/wile/engineersdecor/blocks/ModBlocks.java +++ /dev/null @@ -1,164 +0,0 @@ -/* - * @file ModBlocks.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2018 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * Definition and initialisation of blocks of this - * module, along with their tile entities if applicable. - * - * Note: Straight forward definition of different blocks/entities - * to make recipes, models and texture definitions easier. - */ -package wile.engineersdecor.blocks; - -import wile.engineersdecor.ModEngineersDecor; -import wile.engineersdecor.detail.ModAuxiliaries; -import net.minecraft.block.material.MaterialColor; -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.event.RegistryEvent; -import java.util.ArrayList; -import java.util.List; -import java.util.Collections; -import javax.annotation.Nonnull; - -@SuppressWarnings("unused") -public class ModBlocks -{ - public static final BlockDecorFull CLINKER_BRICK_BLOCK = (BlockDecorFull)(new BlockDecorFull( - BlockDecor.CFG_DEFAULT, - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 50f).sound(SoundType.STONE) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "clinker_brick_block")); - - public static final BlockDecorStairs CLINKER_BRICK_STAIRS = (BlockDecorStairs)(new BlockDecorStairs( - BlockDecor.CFG_DEFAULT, - CLINKER_BRICK_BLOCK.getDefaultState(), - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 50f).sound(SoundType.STONE) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "clinker_brick_stairs")); - - public static final BlockDecorFull SLAG_BRICK_BLOCK = (BlockDecorFull)(new BlockDecorFull( - BlockDecor.CFG_DEFAULT, - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 50f).sound(SoundType.STONE) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "slag_brick_block")); - - public static final BlockDecorStairs SLAG_BRICK_STAIRS = (BlockDecorStairs)(new BlockDecorStairs( - BlockDecor.CFG_DEFAULT, - SLAG_BRICK_BLOCK.getDefaultState(), - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 50f).sound(SoundType.STONE) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "slag_brick_stairs")); - - public static final BlockDecorFull REBAR_CONCRETE_BLOCK = (BlockDecorFull)(new BlockDecorFull( - BlockDecor.CFG_DEFAULT, - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(6f, 2000f).sound(SoundType.STONE) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "rebar_concrete")); - - public static final BlockDecorStairs REBAR_CONCRETE_STAIRS = (BlockDecorStairs)(new BlockDecorStairs( - BlockDecor.CFG_DEFAULT, - REBAR_CONCRETE_BLOCK.getDefaultState(), - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 2000f).sound(SoundType.STONE) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "rebar_concrete_stairs")); - - public static final BlockDecorWall REBAR_CONCRETE_WALL = (BlockDecorWall)(new BlockDecorWall( - BlockDecor.CFG_DEFAULT, - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 2000f).sound(SoundType.STONE) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "rebar_concrete_wall")); - - public static final BlockDecorWall CONCRETE_WALL = (BlockDecorWall)(new BlockDecorWall( - BlockDecor.CFG_DEFAULT, - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 50f).sound(SoundType.STONE) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "concrete_wall")); - - public static final BlockDecorLadder METAL_RUNG_LADDER = (BlockDecorLadder)(new BlockDecorLadder( - BlockDecor.CFG_DEFAULT, - Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(1.8f, 25f).sound(SoundType.METAL) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "metal_rung_ladder")); - - public static final BlockDecorLadder METAL_RUNG_STEPS = (BlockDecorLadder)(new BlockDecorLadder( - BlockDecor.CFG_DEFAULT, - Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(1.8f, 25f).sound(SoundType.METAL) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "metal_rung_steps")); - - public static final BlockDecorLadder TREATED_WOOD_LADDER = (BlockDecorLadder)(new BlockDecorLadder( - BlockDecor.CFG_DEFAULT, - Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1.8f, 25f).sound(SoundType.WOOD) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "treated_wood_ladder")); - - public static final BlockDecor TREATED_WOOD_TABLE = (BlockDecor)(new BlockDecor( - BlockDecor.CFG_CUTOUT, - Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1.0f, 15f).sound(SoundType.WOOD) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "treated_wood_table")); - - public static final BlockDecorDirected TREATED_WOOD_POLE = (BlockDecorDirected)(new BlockDecorDirected( - BlockDecor.CFG_CUTOUT, - Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1.0f, 15f).sound(SoundType.WOOD), - ModAuxiliaries.getPixeledAABB(5.8,5.8,0, 10.2,10.2,16) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "treated_wood_pole")); - - // public static final BlockDecorFull IRON_SHEET_ROOF_FULLBLOCK = new BlockDecorFull("iron_sheet_roof_block", 0, Material.IRON, 1.8f, 25f, SoundType.METAL); - // public static final BlockDecorStairs IRON_SHEET_ROOF = new BlockDecorStairs("iron_sheet_roof", IRON_SHEET_ROOF_FULLBLOCK.getDefaultState()); - - private static final Block modBlocks[] = { - CLINKER_BRICK_BLOCK, - CLINKER_BRICK_STAIRS, - SLAG_BRICK_BLOCK, - SLAG_BRICK_STAIRS, - REBAR_CONCRETE_BLOCK, - REBAR_CONCRETE_STAIRS, - REBAR_CONCRETE_WALL, - - METAL_RUNG_LADDER, - METAL_RUNG_STEPS, - TREATED_WOOD_LADDER, - - TREATED_WOOD_POLE, - TREATED_WOOD_TABLE, - }; - - private static final Block ieDependentBlocks[] = { - CONCRETE_WALL - }; - - private static final Block devBlocks[] = { -// IRON_SHEET_ROOF, // model looks not good enough yet - }; - - private static ArrayList registeredBlocks = new ArrayList<>(); - - @Nonnull - public static List getRegisteredBlocks() - { return Collections.unmodifiableList(registeredBlocks); } - - public static final void registerBlocks(RegistryEvent.Register event) - { - ArrayList allBlocks = new ArrayList<>(); - Collections.addAll(allBlocks, modBlocks); - // @todo: find way to remove items from JEI, creative tab, etc instead of omitting registration. - if(ModAuxiliaries.isModLoaded("immersiveengineering")) ModAuxiliaries.logInfo("Immersive Engineering also installed ..."); - Collections.addAll(allBlocks, ieDependentBlocks); - // @todo: config not available yet, other registration control for experimental features needed. - //if(ModConfig.MISC.with_experimental.get()) Collections.addAll(allBlocks, devBlocks); - registeredBlocks.addAll(allBlocks); - for(Block e:registeredBlocks) event.getRegistry().register(e); - ModAuxiliaries.logInfo("Registered " + Integer.toString(registeredBlocks.size()) + " blocks."); - } - - /** - * Registers items for all blocks. Requires registerBlocks() event to be received first. - */ - public static final void registerItemBlocks(RegistryEvent.Register event) - { - int n = 0; - for(Block e:registeredBlocks) { - ResourceLocation rl = e.getRegistryName(); - if(rl == null) continue; - event.getRegistry().register(new ItemBlock(e, (new ItemBlock.Properties().group(ModEngineersDecor.ITEMGROUP))).setRegistryName(rl)); - ++n; - } - } - -} diff --git a/1.13/src/main/java/wile/engineersdecor/detail/ModAuxiliaries.java b/1.13/src/main/java/wile/engineersdecor/detail/ModAuxiliaries.java deleted file mode 100644 index f26125f..0000000 --- a/1.13/src/main/java/wile/engineersdecor/detail/ModAuxiliaries.java +++ /dev/null @@ -1,167 +0,0 @@ -/* - * @file ModAuxiliaries.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2018 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * General commonly used functionality. - * - * @TODO KEYBOARD INPUT - */ -package wile.engineersdecor.detail; - -import net.minecraft.util.EnumFacing; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentString; -import net.minecraft.world.IBlockReader; -import net.minecraftforge.fml.ModList; -import org.lwjgl.glfw.GLFW; -import wile.engineersdecor.ModEngineersDecor; -import net.minecraft.item.ItemStack; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.client.util.InputMappings; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - - -import javax.annotation.Nullable; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class ModAuxiliaries -{ - /** - * Text localisation wrapper, implicitly prepends `ModEngineersDecor.MODID` to the - * translation keys. Forces formatting argument, nullable if no special formatting shall be applied.. - */ - public static TextComponentTranslation localizable(String modtrkey, @Nullable TextFormatting color, Object... args) - { - TextComponentTranslation tr = new TextComponentTranslation(ModEngineersDecor.MODID+"."+modtrkey, args); - if(color!=null) tr.getStyle().setColor(color); - return tr; - } - - @OnlyIn(Dist.CLIENT) - public static String localize(String translationKey, Object... args) - { - TextComponentTranslation tr = new TextComponentTranslation(translationKey, args); - tr.getStyle().setColor(TextFormatting.RESET); - final String ft = tr.getFormattedText(); - if(ft.contains("${")) { - // Non-recursive, non-argument lang file entry cross referencing. - Pattern pt = Pattern.compile("\\$\\{([\\w\\.]+)\\}"); - Matcher mt = pt.matcher(ft); - StringBuffer sb = new StringBuffer(); - while(mt.find()) mt.appendReplacement(sb, (new TextComponentTranslation(mt.group(1))).getFormattedText().trim()); - mt.appendTail(sb); - return sb.toString(); - } else { - return ft; - } - } - - /** - * Returns true if a given key is translated for the current language. - */ - @OnlyIn(Dist.CLIENT) - public static boolean hasTranslation(String key) - { return net.minecraft.client.resources.I18n.hasKey(key); } - - public static final class Tooltip - { - @OnlyIn(Dist.CLIENT) - public static boolean extendedTipCondition() - { return InputMappings.isKeyDown(GLFW.GLFW_KEY_LEFT_SHIFT) || InputMappings.isKeyDown(GLFW.GLFW_KEY_RIGHT_SHIFT); } - - @OnlyIn(Dist.CLIENT) - public static boolean helpCondition() - { return extendedTipCondition() && (InputMappings.isKeyDown(GLFW.GLFW_KEY_LEFT_CONTROL) || InputMappings.isKeyDown(GLFW.GLFW_KEY_RIGHT_CONTROL)); } - - /** - * Adds an extended tooltip or help tooltip depending on the key states of CTRL and SHIFT. - * Returns true if the localisable help/tip was added, false if not (either not CTL/SHIFT or - * no translation found). - */ - @OnlyIn(Dist.CLIENT) - public static boolean addInformation(@Nullable String advancedTooltipTranslationKey, @Nullable String helpTranslationKey, List tooltip, ITooltipFlag flag, boolean addAdvancedTooltipHints) - { - // Note: intentionally not using keybinding here, this must be `control` or `shift`. MC uses lwjgl Keyboard, - // so using this also here should be ok. - final boolean help_available = (helpTranslationKey != null) && ModAuxiliaries.hasTranslation(helpTranslationKey + ".help"); - final boolean tip_available = (advancedTooltipTranslationKey != null) && ModAuxiliaries.hasTranslation(helpTranslationKey + ".tip"); - if((!help_available) && (!tip_available)) return false; - if(helpCondition()) { - if(!help_available) return false; - String s = localize(helpTranslationKey + ".help"); - if(s.isEmpty()) return false; - tooltip.add(new TextComponentString(s)); // @todo: check how to optimise that (to use TextComponentTranslation directly without compat losses) - return true; - } else if(extendedTipCondition()) { - if(!tip_available) return false; - String s = localize(advancedTooltipTranslationKey + ".tip"); - if(s.isEmpty()) return false; - tooltip.add(new TextComponentString(s)); - return true; - } else if(addAdvancedTooltipHints) { - String s = ""; - if(tip_available) s += localize(ModEngineersDecor.MODID + ".tooltip.hint.extended") + (help_available ? " " : ""); - if(help_available) s += localize(ModEngineersDecor.MODID + ".tooltip.hint.help"); - tooltip.add(new TextComponentString(s)); - } - return false; - } - - /** - * Adds an extended tooltip or help tooltip for a given stack depending on the key states of CTRL and SHIFT. - * Format in the lang file is (e.g. for items): "item.MODID.REGISTRYNAME.tip" and "item.MODID.REGISTRYNAME.help". - * Return value see method pattern above. - */ - @OnlyIn(Dist.CLIENT) - public static boolean addInformation(ItemStack stack, @Nullable IBlockReader world, List tooltip, ITooltipFlag flag, boolean addAdvancedTooltipHints) - { return addInformation(stack.getTranslationKey(), stack.getTranslationKey(), tooltip, flag, addAdvancedTooltipHints); } - } - - public static final AxisAlignedBB getPixeledAABB(double x0, double y0, double z0, double x1, double y1, double z1) - { return new AxisAlignedBB(x0/16.0, y0/16.0, z0/16.0, x1/16.0, y1/16.0, z1/16.0); } - - public static final AxisAlignedBB getRotatedAABB(AxisAlignedBB bb, EnumFacing new_facing, boolean horizontal_rotation) - { - if(!horizontal_rotation) { - switch(new_facing.getIndex()) { - case 0: return new AxisAlignedBB(1-bb.maxX, 1-bb.maxZ, 1-bb.maxY, 1-bb.minX, 1-bb.minZ, 1-bb.minY); // D - case 1: return new AxisAlignedBB(1-bb.maxX, bb.minZ, bb.minY, 1-bb.minX, bb.maxZ, bb.maxY); // U - case 2: return new AxisAlignedBB(1-bb.maxX, bb.minY, 1-bb.maxZ, 1-bb.minX, bb.maxY, 1-bb.minZ); // N - case 3: return new AxisAlignedBB( bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); // S --> bb - case 4: return new AxisAlignedBB(1-bb.maxZ, bb.minY, bb.minX, 1-bb.minZ, bb.maxY, bb.maxX); // W - case 5: return new AxisAlignedBB( bb.minZ, bb.minY, 1-bb.maxX, bb.maxZ, bb.maxY, 1-bb.minX); // E - } - } else { - switch(new_facing.getIndex()) { - case 0: return new AxisAlignedBB( bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); // D --> bb - case 1: return new AxisAlignedBB( bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); // U --> bb - case 2: return new AxisAlignedBB( bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); // N --> bb - case 3: return new AxisAlignedBB(1-bb.maxX, bb.minY, 1-bb.maxZ, 1-bb.minX, bb.maxY, 1-bb.minZ); // S - case 4: return new AxisAlignedBB( bb.minZ, bb.minY, 1-bb.maxX, bb.maxZ, bb.maxY, 1-bb.minX); // W - case 5: return new AxisAlignedBB(1-bb.maxZ, bb.minY, bb.minX, 1-bb.minZ, bb.maxY, bb.maxX); // E - } - } - return bb; - } - - public static final boolean isModLoaded(final String registry_name) - { return ModList.get().isLoaded(registry_name); } - - public static final void logInfo(final String msg) - { ModEngineersDecor.logger().info(msg); } - - public static final void logWarn(final String msg) - { ModEngineersDecor.logger().warn(msg); } - - public static final void logError(final String msg) - { ModEngineersDecor.logger().error(msg); } - -} diff --git a/1.13/src/main/java/wile/engineersdecor/detail/ModConfig.java b/1.13/src/main/java/wile/engineersdecor/detail/ModConfig.java deleted file mode 100644 index 7e9600a..0000000 --- a/1.13/src/main/java/wile/engineersdecor/detail/ModConfig.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * @file ModConfig.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2018 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * Main class for module settings. Handles reading and - * saving the config file. - */ -package wile.engineersdecor.detail; - -import wile.engineersdecor.ModEngineersDecor; -import net.minecraftforge.common.ForgeConfigSpec; - -public class ModConfig -{ - private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder(); - public static final Miscellaneous MISC = new Miscellaneous(BUILDER); - public static final ForgeConfigSpec conf_spec = BUILDER.build(); - - public static final class Miscellaneous - { - public final ForgeConfigSpec.ConfigValue with_experimental; - - public Miscellaneous(ForgeConfigSpec.Builder builder) - { - builder.push("Miscellaneous"); - with_experimental = builder - .translation(ModEngineersDecor.MODID + ".config.with_experimental") - .comment("Enables experimental features. Use at own risk.") - .define("with_experimental", false); - builder.pop(); - } - } -} diff --git a/1.13/src/main/java/wile/engineersdecor/detail/RecipeCondModSpecific.java b/1.13/src/main/java/wile/engineersdecor/detail/RecipeCondModSpecific.java deleted file mode 100644 index bc6f7f9..0000000 --- a/1.13/src/main/java/wile/engineersdecor/detail/RecipeCondModSpecific.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * @file RecipeCondRegistered.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2018 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * Recipe condition to enable opt'ing out JSON based recipes, referenced - * in assets/engineersdecor/recipes/_factories.json with full path (therefore - * I had to make a separate file for that instead of a few lines in - * ModAuxiliaries). - */ -package wile.engineersdecor.detail; - - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.crafting.IConditionSerializer; -import net.minecraftforge.registries.IForgeRegistry; -import net.minecraftforge.registries.ForgeRegistries; - -import com.google.gson.*; -import javax.annotation.Nullable; -import javax.annotation.Nonnull; -import java.util.function.BooleanSupplier; - - -public class RecipeCondModSpecific implements IConditionSerializer -{ - public static final BooleanSupplier RECIPE_INCLUDE = ()->true; - public static final BooleanSupplier RECIPE_EXCLUDE = ()->false; - - @Override - public @Nonnull BooleanSupplier parse(@Nullable JsonObject json) { - try { - if(json==null) return RECIPE_EXCLUDE; - final IForgeRegistry block_registry = ForgeRegistries.BLOCKS; - final IForgeRegistry item_registry = ForgeRegistries.ITEMS; - final JsonArray items = json.getAsJsonArray("required"); - if(items!=null) { - for(JsonElement e: items) { - if(!e.isJsonPrimitive()) continue; - final ResourceLocation rl = new ResourceLocation(((JsonPrimitive)e).getAsString()); - if((!block_registry.containsKey(rl)) && (!item_registry.containsKey(rl))) return RECIPE_EXCLUDE; // required item not registered - } - } - final JsonPrimitive result = json.getAsJsonPrimitive("result"); - if(result != null) { - final ResourceLocation rl = new ResourceLocation(result.getAsString()); - if((!block_registry.containsKey(rl)) && (!item_registry.containsKey(rl))) return RECIPE_EXCLUDE; // required result not registered - } - final JsonArray missing = json.getAsJsonArray("missing"); - if((missing!=null) && (missing.size() > 0)) { - for(JsonElement e: missing) { - if(!e.isJsonPrimitive()) continue; - final ResourceLocation rl = new ResourceLocation(((JsonPrimitive)e).getAsString()); - // At least one item missing, enable this recipe as alternative recipe for another one that check the missing item as required item. - // --> e.g. if IE not installed there is no slag. One recipe requires slag, and another one (for the same result) is used if there - // is no slag. - if((!block_registry.containsKey(rl)) && (!item_registry.containsKey(rl))) return RECIPE_INCLUDE; - } - return RECIPE_EXCLUDE; // all required there, but there is no item missing, so another recipe - } else { - return RECIPE_INCLUDE; // no missing given, means include if result and required are all there. - } - } catch(Throwable ex) { - ModAuxiliaries.logError("rsgauges::ResultRegisteredCondition failed: " + ex.toString()); - } - return RECIPE_EXCLUDE; // skip on exception. - } -} diff --git a/1.13/src/main/resources/META-INF/mods.toml b/1.13/src/main/resources/META-INF/mods.toml deleted file mode 100644 index ca3f229..0000000 --- a/1.13/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,31 +0,0 @@ -# @file mods.toml -# @spec TOML v0.5.0 (https://github.com/toml-lang/toml) -modLoader="javafml" # forge FML java -loaderVersion="[25,)" -issueTrackerURL="https://github.com/stfwi/engineers-decor/issues/" - -[[mods]] - -modId="engineersdecor" -version="${file.jarVersion}" -displayName="Engineer's Decor" -description="Adds cosmetic blocks for the engineer's workshop, factory and home." -authors="wilechaote" -credits="BluSunrize, malte0811, et al., the Forge Smiths, the Modders of the World." -updateJSONURL="https://raw.githubusercontent.com/stfwi/engineers-decor/develop/meta/update.json" -displayURL="https://github.com/stfwi/engineers-decor/" -logoFile="engineersdecor.png" # Double check: A file name (in the root of the mod JAR) containing a logo for display - -[[dependencies.engineersdecor]] - modId="forge" - mandatory=true - versionRange="[25,)" #mandatory - ordering="NONE" - side="BOTH" - -[[dependencies.engineersdecor]] - modId="minecraft" - mandatory=true - versionRange="[1.13.2]" - ordering="NONE" - side="BOTH" diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_block.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_block.json deleted file mode 100644 index ed80404..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_block.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "variants": { - "": [ - { "model": "engineersdecor:block/brick/clinker_brick_model0" }, - { "model": "engineersdecor:block/brick/clinker_brick_model1" }, - { "model": "engineersdecor:block/brick/clinker_brick_model2" }, - { "model": "engineersdecor:block/brick/clinker_brick_model3" }, - { "model": "engineersdecor:block/brick/clinker_brick_model4" }, - { "model": "engineersdecor:block/brick/clinker_brick_model5" }, - { "model": "engineersdecor:block/brick/clinker_brick_model6" }, - { "model": "engineersdecor:block/brick/clinker_brick_model7" } - ] - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_stairs.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_stairs.json deleted file mode 100644 index 2a934f4..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_stairs.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "engineersdecor:block/brick/clinker_brick_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "engineersdecor:block/brick/clinker_brick_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "engineersdecor:block/brick/clinker_brick_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "engineersdecor:block/brick/clinker_brick_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "engineersdecor:block/brick/clinker_brick_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "engineersdecor:block/brick/clinker_brick_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "engineersdecor:block/brick/clinker_brick_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "engineersdecor:block/brick/clinker_brick_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/concrete_wall.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/concrete_wall.json deleted file mode 100644 index c9525c6..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/concrete_wall.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "multipart": [ - { "when": { "up": "true" }, "apply": { "model": "engineersdecor:block/concrete/concrete_wall_post" } }, - { "when": { "north": "true" }, "apply": { "model": "engineersdecor:block/concrete/concrete_wall_side", "uvlock": true } }, - { "when": { "east": "true" }, "apply": { "model": "engineersdecor:block/concrete/concrete_wall_side", "y": 90, "uvlock": true } }, - { "when": { "south": "true" }, "apply": { "model": "engineersdecor:block/concrete/concrete_wall_side", "y": 180, "uvlock": true } }, - { "when": { "west": "true" }, "apply": { "model": "engineersdecor:block/concrete/concrete_wall_side", "y": 270, "uvlock": true } } - ] -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/iron_sheet_roof.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/iron_sheet_roof.json deleted file mode 100644 index 1bf9c8e..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/iron_sheet_roof.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "engineersdecor:block/stairs/decor_straight_roof_model", - "textures": { - "bottom": "engineersdecor:block/iestyle/ironsheet_roof_top", - "side": "engineersdecor:block/iestyle/ironsheet_roof", - "top": "engineersdecor:block/iestyle/ironsheet_roof_top" - } - }, - "variants": { - "": [{}], - "inventory": [{}], - "facing=east,half=bottom,shape=straight": { "model": "engineersdecor:block/stairs/decor_straight_roof_model" }, - "facing=west,half=bottom,shape=straight": { "model": "engineersdecor:block/stairs/decor_straight_roof_model", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "engineersdecor:block/stairs/decor_straight_roof_model", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "engineersdecor:block/stairs/decor_straight_roof_model", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "engineersdecor:block/stairs/decor_outer_roof_model" }, - "facing=west,half=bottom,shape=outer_right": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "engineersdecor:block/stairs/decor_outer_roof_model" }, - "facing=north,half=bottom,shape=outer_left": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "engineersdecor:block/stairs/decor_inner_roof_model" }, - "facing=west,half=bottom,shape=inner_right": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "engineersdecor:block/stairs/decor_inner_roof_model" }, - "facing=north,half=bottom,shape=inner_left": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "engineersdecor:block/stairs/decor_straight_roof_model", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "engineersdecor:block/stairs/decor_straight_roof_model", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "engineersdecor:block/stairs/decor_straight_roof_model", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "engineersdecor:block/stairs/decor_straight_roof_model", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/iron_sheet_roof_block.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/iron_sheet_roof_block.json deleted file mode 100644 index a7ff079..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/iron_sheet_roof_block.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "engineersdecor:block/std/decor_full_block_model", - "textures": { "all": "engineersdecor:block/iestyle/ironsheet_roof" } - }, - "variants": { - "": [{}], - "inventory": [{}] - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/metal_rung_ladder.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/metal_rung_ladder.json deleted file mode 100644 index 07c32af..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/metal_rung_ladder.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "engineersdecor:block/ladder/metal_rung_ladder_model" }, - "facing=south": { "model": "engineersdecor:block/ladder/metal_rung_ladder_model", "y":180 }, - "facing=west": { "model": "engineersdecor:block/ladder/metal_rung_ladder_model", "y":270 }, - "facing=east": { "model": "engineersdecor:block/ladder/metal_rung_ladder_model", "y":90 } - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/metal_rung_steps.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/metal_rung_steps.json deleted file mode 100644 index 794103c..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/metal_rung_steps.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "engineersdecor:block/ladder/metal_rung_steps_model" }, - "facing=south": { "model": "engineersdecor:block/ladder/metal_rung_steps_model", "y":180 }, - "facing=west": { "model": "engineersdecor:block/ladder/metal_rung_steps_model", "y":270 }, - "facing=east": { "model": "engineersdecor:block/ladder/metal_rung_steps_model", "y":90 } - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete.json deleted file mode 100644 index a4d790a..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "variants": { - "": [ - { "model": "engineersdecor:block/concrete/rebar_concrete_model0" }, - { "model": "engineersdecor:block/concrete/rebar_concrete_model1" }, - { "model": "engineersdecor:block/concrete/rebar_concrete_model2" }, - { "model": "engineersdecor:block/concrete/rebar_concrete_model3" }, - { "model": "engineersdecor:block/concrete/rebar_concrete_model4" }, - { "model": "engineersdecor:block/concrete/rebar_concrete_model5" }, - { "model": "engineersdecor:block/concrete/rebar_concrete_model6" }, - { "model": "engineersdecor:block/concrete/rebar_concrete_model7" } - ] - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_stairs.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_stairs.json deleted file mode 100644 index a137d62..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_stairs.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_wall.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_wall.json deleted file mode 100644 index dee0d7c..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_wall.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "multipart": [ - { "when": { "up": "true" }, "apply": { "model": "engineersdecor:block/concrete/rebar_concrete_wall_post" } }, - { "when": { "north": "true" }, "apply": { "model": "engineersdecor:block/concrete/rebar_concrete_wall_side", "uvlock": true } }, - { "when": { "east": "true" }, "apply": { "model": "engineersdecor:block/concrete/rebar_concrete_wall_side", "y": 90, "uvlock": true } }, - { "when": { "south": "true" }, "apply": { "model": "engineersdecor:block/concrete/rebar_concrete_wall_side", "y": 180, "uvlock": true } }, - { "when": { "west": "true" }, "apply": { "model": "engineersdecor:block/concrete/rebar_concrete_wall_side", "y": 270, "uvlock": true } } - ] -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/slag_brick_block.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/slag_brick_block.json deleted file mode 100644 index 41db44e..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/slag_brick_block.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "variants": { - "": [ - { "model": "engineersdecor:block/brick/slag_brick_model0" }, - { "model": "engineersdecor:block/brick/slag_brick_model1" }, - { "model": "engineersdecor:block/brick/slag_brick_model2" }, - { "model": "engineersdecor:block/brick/slag_brick_model3" }, - { "model": "engineersdecor:block/brick/slag_brick_model4" }, - { "model": "engineersdecor:block/brick/slag_brick_model5" }, - { "model": "engineersdecor:block/brick/slag_brick_model6" }, - { "model": "engineersdecor:block/brick/slag_brick_model7" } - ] - } -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/slag_brick_stairs.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/slag_brick_stairs.json deleted file mode 100644 index c89f2a2..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/slag_brick_stairs.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "engineersdecor:block/brick/slag_brick_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "engineersdecor:block/brick/slag_brick_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "engineersdecor:block/brick/slag_brick_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "engineersdecor:block/brick/slag_brick_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "engineersdecor:block/brick/slag_brick_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "engineersdecor:block/brick/slag_brick_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "engineersdecor:block/brick/slag_brick_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "engineersdecor:block/brick/slag_brick_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/treated_wood_ladder.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/treated_wood_ladder.json deleted file mode 100644 index b17f5a4..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/treated_wood_ladder.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "engineersdecor:block/ladder/treated_wood_ladder_model" }, - "facing=south": { "model": "engineersdecor:block/ladder/treated_wood_ladder_model", "y":180 }, - "facing=west": { "model": "engineersdecor:block/ladder/treated_wood_ladder_model", "y":270 }, - "facing=east": { "model": "engineersdecor:block/ladder/treated_wood_ladder_model", "y":90 } - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/treated_wood_pole.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/treated_wood_pole.json deleted file mode 100644 index eb3a59b..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/treated_wood_pole.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "engineersdecor:pole/straight_pole_model", - "textures": { - "particle": "engineersdecor:block/pole/treated_wood_pole_side_texture", - "side": "engineersdecor:block/pole/treated_wood_pole_side_texture", - "top": "engineersdecor:block/pole/treated_wood_pole_top_texture" - } - }, - "variants": { - "facing": { "north": {"y":180}, "south": {"y":0}, "west": {"y":90}, "east": {"y":270}, "up": {"x":90}, "down": {"x":270}} - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/treated_wood_table.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/treated_wood_table.json deleted file mode 100644 index 80afd09..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/treated_wood_table.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { "model": "engineersdecor:furniture/treated_wood_table_model" }, - "variants": { "": [{}] } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/lang/en_us.json b/1.13/src/main/resources/assets/engineersdecor/lang/en_us.json deleted file mode 100644 index 0d5b675..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/lang/en_us.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "language": "English", - "language.region": "United States", - "language.code": "en_us", - - "itemGroup.tabengineersdecor":"Engineer's Decor", - - "engineersdecor.config.title":"Engineer's Decor Config", - "engineersdecor.tooltip.hint.extended":"§6[§9SHIFT§r More info§6]§r", - "engineersdecor.tooltip.hint.help":"§6[§9CTRL-SHIFT§r Help§6]§r", - - "block.engineersdecor.clinker_brick_block":"Clinker Brick", - "block.engineersdecor.clinker_brick_block.help":"§6A brick block with position dependent texture variations.§r\nLooks slightly darker and more color intensive than the vanilla brick block.", - "block.engineersdecor.clinker_brick_stairs":"Clinker Brick Stairs", - "block.engineersdecor.clinker_brick_stairs.help":"§6Looks slightly darker and more color intensive than the vanilla brick block.", - - "block.engineersdecor.slag_brick_block":"Slag Brick", - "block.engineersdecor.slag_brick_block.help":"§6A gray-brown brick block with position dependent texture variations.", - "block.engineersdecor.slag_brick_stairs":"Slag Brick Stairs", - "block.engineersdecor.slag_brick_stairs.help":"§6Gray-brown brick stairs.", - - "block.engineersdecor.rebar_concrete":"Rebar Concrete", - "block.engineersdecor.rebar_concrete.help":"§6Steel reinforced concrete block.§r Expensive but Creeper-proof like obsidian.", - "block.engineersdecor.rebar_concrete_stairs":"Rebar Concrete Stairs", - "block.engineersdecor.rebar_concrete_stairs.help":"§6Steel reinforced concrete stairs.§r Expensive but Creeper-proof like obsidian.", - "block.engineersdecor.rebar_concrete_wall":"Rebar Concrete Wall", - "block.engineersdecor.rebar_concrete_wall.help":"§6Steel reinforced concrete wall.§r Expensive but Creeper-proof like obsidian.", - - "block.engineersdecor.concrete_wall":"Concrete Wall", - "block.engineersdecor.concrete_wall.help":"§6Wall made of solid concrete.", - - "block.engineersdecor.metal_rung_ladder":"Metal Rung Ladder", - "block.engineersdecor.metal_rung_ladder.help":"§6Typical industrial wall ladder, consisting of horizontal metal rod rungs.", - - "block.engineersdecor.metal_rung_steps":"Staggered Metal Steps", - "block.engineersdecor.metal_rung_steps.help":"§6Staggered rod rungs affixed to a wall, allowing to climb up, fall down, and so on.", - - "block.engineersdecor.treated_wood_ladder":"Treated Wood Ladder", - "block.engineersdecor.treated_wood_ladder.help":"§6Weather-proof wooden ladder.", - - - - - "block.engineersdecor.iron_sheet_roof":"Iron Sheet Metal Roof", - "block.engineersdecor.iron_sheet_roof.help":"§6Well, it's a roof.", - - "block.engineersdecor.treated_wood_pole":"Straight Treated Wood Pole", - "block.engineersdecor.treated_wood_pole.help":"§6Straight pole fragment with the diameter of a wire relay.§r\nCan be useful as alternative to the wire posts if special special lengths are needed, or as support for structures.", - - "block.engineersdecor.treated_wood_table":"Treated Wood Table", - "block.engineersdecor.treated_wood_table.help":"§6Robust four-legged wood table." - -} diff --git a/1.13/src/main/resources/assets/engineersdecor/lang/zh_cn.json b/1.13/src/main/resources/assets/engineersdecor/lang/zh_cn.json deleted file mode 100644 index 08710a4..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/lang/zh_cn.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "language": "Chinese", - "language.region": "China", - "language.code": "zh_cn", - - "itemGroup.tabengineersdecor":"工程师的装饰", - - "engineersdecor.config.title":"工程师的装饰配置", - "engineersdecor.tooltip.hint.extended":"§6[按§9SHIFT§r获取更多信息§6]§r", - "engineersdecor.tooltip.hint.help":"§6[按§9CTRL-SHIFT§r获取帮助§6]§r", - - "block.engineersdecor.clinker_brick_block":"熟料砖", - "block.engineersdecor.clinker_brick_block.help":"§6具有位置相关纹理变化的砖块.§r\n看起来比原版砖块稍暗,颜色更浓.", - "block.engineersdecor.clinker_brick_stairs":"熟料砖楼梯", - "block.engineersdecor.clinker_brick_stairs.help":"§6看起来比原版砖块稍暗,颜色更浓.", - - "block.engineersdecor.slag_brick_block":"炉渣砖", - "block.engineersdecor.slag_brick_block.help":"§6灰褐色砖块,具有位置相关的纹理变化.", - "block.engineersdecor.slag_brick_stairs":"炉渣砖楼梯", - "block.engineersdecor.slag_brick_stairs.help":"§6灰褐色砖块楼梯.", - - "block.engineersdecor.rebar_concrete":"钢筋混凝土", - "block.engineersdecor.rebar_concrete.help":"§6钢筋混凝土砌块.§r 昂贵,但像黑曜石一样防苦力怕.", - "block.engineersdecor.rebar_concrete_stairs":"钢筋混凝土楼梯", - "block.engineersdecor.rebar_concrete_stairs.help":"§6钢筋混凝土楼梯.§r 昂贵,但像黑曜石一样防苦力怕.", - "block.engineersdecor.rebar_concrete_wall":"钢筋混凝土墙", - "block.engineersdecor.rebar_concrete_wall.help":"§6钢筋混凝土墙.§r 昂贵,但像黑曜石一样防苦力怕.", - - "block.engineersdecor.concrete_wall":"水泥墙", - "block.engineersdecor.concrete_wall.help":"§6墙由坚固的混凝土制成.", - - "block.engineersdecor.metal_rung_ladder":"金属环梯", - "block.engineersdecor.metal_rung_ladder.help":"§6典型的工业墙梯,包括水平金属杆横档.", - - "block.engineersdecor.metal_rung_steps":"交错的金属台阶", - "block.engineersdecor.metal_rung_steps.help":"§6贴在墙上的交错的杆横档,允许爬上,爬下等等.", - - "block.engineersdecor.treated_wood_ladder":"经过处理的木梯", - "block.engineersdecor.treated_wood_ladder.help":"§6防风雨的木梯.", - - - - - "block.engineersdecor.iron_sheet_roof":"铁板金属屋顶", - "block.engineersdecor.iron_sheet_roof.help":"§6嗯,这是一个屋顶.", - - "block.engineersdecor.treated_wood_pole":"直立处理木杆", - "block.engineersdecor.treated_wood_pole.help":"§6具有导线继电器直径的直极片段.§r\n如果需要特殊的特殊长度,或作为结构的支撑,可以作为线柱的替代品.", - - "block.engineersdecor.treated_wood_table":"经过处理的木桌", - "block.engineersdecor.treated_wood_table.help":"§6坚固的四足木桌." - -} diff --git a/1.13/src/main/resources/assets/engineersdecor/logo.png b/1.13/src/main/resources/assets/engineersdecor/logo.png deleted file mode 100644 index 567f937..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/logo.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model0.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model0.json deleted file mode 100644 index 5f7fcf3..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model0.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/clinker_brick/clinker_brick_texture0" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model1.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model1.json deleted file mode 100644 index 831dc09..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model1.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/clinker_brick/clinker_brick_texture1" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model2.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model2.json deleted file mode 100644 index 3a712ce..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model2.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/clinker_brick/clinker_brick_texture2" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model3.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model3.json deleted file mode 100644 index 1abe010..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model3.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/clinker_brick/clinker_brick_texture3" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model4.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model4.json deleted file mode 100644 index 3854790..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model4.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/clinker_brick/clinker_brick_texture4" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model5.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model5.json deleted file mode 100644 index 3acb321..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model5.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/clinker_brick/clinker_brick_texture5" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model6.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model6.json deleted file mode 100644 index 8e9f23f..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model6.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/clinker_brick/clinker_brick_texture6" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model7.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model7.json deleted file mode 100644 index 943acaf..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model7.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/clinker_brick/clinker_brick_texture7" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_stairs.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_stairs.json deleted file mode 100644 index caf694a..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "engineersdecor:block/clinker_brick/clinker_brick_texture0", - "top": "engineersdecor:block/clinker_brick/clinker_brick_texture0", - "side": "engineersdecor:block/clinker_brick/clinker_brick_texture0" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_stairs_inner.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_stairs_inner.json deleted file mode 100644 index f0f846f..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "engineersdecor:block/clinker_brick/clinker_brick_texture0", - "top": "engineersdecor:block/clinker_brick/clinker_brick_texture0", - "side": "engineersdecor:block/clinker_brick/clinker_brick_texture0" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_stairs_outer.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_stairs_outer.json deleted file mode 100644 index c231a1b..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "engineersdecor:block/clinker_brick/clinker_brick_texture0", - "top": "engineersdecor:block/clinker_brick/clinker_brick_texture0", - "side": "engineersdecor:block/clinker_brick/clinker_brick_texture0" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model0.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model0.json deleted file mode 100644 index 2980acf..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model0.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/slag_brick/slag_brick_texture0" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model1.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model1.json deleted file mode 100644 index 4bf5cef..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model1.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/slag_brick/slag_brick_texture1" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model2.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model2.json deleted file mode 100644 index c256403..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model2.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/slag_brick/slag_brick_texture2" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model3.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model3.json deleted file mode 100644 index f554b58..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model3.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/slag_brick/slag_brick_texture3" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model4.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model4.json deleted file mode 100644 index 3e33703..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model4.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/slag_brick/slag_brick_texture4" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model5.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model5.json deleted file mode 100644 index cc5d796..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model5.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/slag_brick/slag_brick_texture5" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model6.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model6.json deleted file mode 100644 index 74999bb..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model6.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/slag_brick/slag_brick_texture6" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model7.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model7.json deleted file mode 100644 index ade69c1..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model7.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/slag_brick/slag_brick_texture7" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_stairs.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_stairs.json deleted file mode 100644 index 2be0d00..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "engineersdecor:block/slag_brick/slag_brick_texture0", - "top": "engineersdecor:block/slag_brick/slag_brick_texture0", - "side": "engineersdecor:block/slag_brick/slag_brick_texture0" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_stairs_inner.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_stairs_inner.json deleted file mode 100644 index 82576d5..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "engineersdecor:block/slag_brick/slag_brick_texture0", - "top": "engineersdecor:block/slag_brick/slag_brick_texture1", - "side": "engineersdecor:block/slag_brick/slag_brick_texture2" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_stairs_outer.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_stairs_outer.json deleted file mode 100644 index 9242715..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "engineersdecor:block/slag_brick/slag_brick_texture0", - "top": "engineersdecor:block/slag_brick/slag_brick_texture0", - "side": "engineersdecor:block/slag_brick/slag_brick_texture0" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_default.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_default.json deleted file mode 100644 index 5d32d22..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_default.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"engineersdecor:block/wall/concrete_wall_default", - "textures": { - "wall": "engineersdecor:block/ieoriginal/ie_stone_decoration_concrete", - "particle": "engineersdecor:block/ieoriginal/ie_stone_decoration_concrete" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_inventory.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_inventory.json deleted file mode 100644 index 7edb877..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"engineersdecor:block/wall/concrete_wall_inventory", - "textures": { - "wall": "engineersdecor:block/ieoriginal/ie_stone_decoration_concrete", - "particle": "engineersdecor:block/ieoriginal/ie_stone_decoration_concrete" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_post.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_post.json deleted file mode 100644 index 77ebaa5..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"engineersdecor:block/wall/concrete_wall_post", - "textures": { - "wall": "engineersdecor:block/ieoriginal/ie_stone_decoration_concrete", - "particle": "engineersdecor:block/ieoriginal/ie_stone_decoration_concrete" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_side.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_side.json deleted file mode 100644 index 1e1ba7f..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"engineersdecor:block/wall/concrete_wall_side", - "textures": { - "wall": "engineersdecor:block/ieoriginal/ie_stone_decoration_concrete", - "particle": "engineersdecor:block/ieoriginal/ie_stone_decoration_concrete" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model0.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model0.json deleted file mode 100644 index 08e166a..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model0.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/concrete/rebar_concrete_texture0" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model1.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model1.json deleted file mode 100644 index 275a434..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model1.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/concrete/rebar_concrete_texture1" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model2.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model2.json deleted file mode 100644 index c685dcf..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model2.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/concrete/rebar_concrete_texture2" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model3.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model3.json deleted file mode 100644 index fac71fb..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model3.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/concrete/rebar_concrete_texture3" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model4.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model4.json deleted file mode 100644 index 08b007c..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model4.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/concrete/rebar_concrete_texture4" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model5.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model5.json deleted file mode 100644 index 53c1799..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model5.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/concrete/rebar_concrete_texture5" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model6.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model6.json deleted file mode 100644 index c1ee5ce..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model6.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/concrete/rebar_concrete_texture6" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model7.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model7.json deleted file mode 100644 index 893d1c1..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model7.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/concrete/rebar_concrete_texture7" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_stairs.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_stairs.json deleted file mode 100644 index b082edd..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "engineersdecor:block/concrete/rebar_concrete_texture0", - "top": "engineersdecor:block/concrete/rebar_concrete_texture1", - "side": "engineersdecor:block/concrete/rebar_concrete_texture2" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_stairs_inner.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_stairs_inner.json deleted file mode 100644 index 96fe26d..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "engineersdecor:block/concrete/rebar_concrete_texture0", - "top": "engineersdecor:block/concrete/rebar_concrete_texture1", - "side": "engineersdecor:block/concrete/rebar_concrete_texture2" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_stairs_outer.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_stairs_outer.json deleted file mode 100644 index ff881a2..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "engineersdecor:block/concrete/rebar_concrete_texture0", - "top": "engineersdecor:block/concrete/rebar_concrete_texture1", - "side": "engineersdecor:block/concrete/rebar_concrete_texture2" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_default.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_default.json deleted file mode 100644 index 5ac9d0c..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_default.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"engineersdecor:block/wall/concrete_wall_default", - "textures": { - "wall": "engineersdecor:block/concrete/rebar_concrete_texture0", - "particle": "engineersdecor:block/concrete/rebar_concrete_texture0" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_inventory.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_inventory.json deleted file mode 100644 index 98c15ce..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"engineersdecor:block/wall/concrete_wall_inventory", - "textures": { - "wall": "engineersdecor:block/concrete/rebar_concrete_texture0", - "particle": "engineersdecor:block/concrete/rebar_concrete_texture0" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_post.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_post.json deleted file mode 100644 index 2dded83..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"engineersdecor:block/wall/concrete_wall_post", - "textures": { - "wall": "engineersdecor:block/concrete/rebar_concrete_texture0", - "particle": "engineersdecor:block/concrete/rebar_concrete_texture0" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_side.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_side.json deleted file mode 100644 index 0994e40..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"engineersdecor:block/wall/concrete_wall_side", - "textures": { - "wall": "engineersdecor:block/concrete/rebar_concrete_texture0", - "particle": "engineersdecor:block/concrete/rebar_concrete_texture0" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_table_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_table_model.json deleted file mode 100644 index a6db2bc..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_table_model.json +++ /dev/null @@ -1,190 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "parent": "block/cube", - "textures": { - "o": "engineersdecor:block/iestyle/treated_wood_framed_texture", - "particle": "engineersdecor:block/iestyle/treated_wood_framed_texture" - }, - "elements": [ - { - "from": [1, 0, 1], - "to": [3, 14, 3], - "faces": { - "north": {"uv": [13, 2, 15, 16], "texture": "#o"}, - "east": {"uv": [13, 2, 15, 16], "texture": "#o"}, - "south": {"uv": [1, 2, 3, 16], "texture": "#o"}, - "west": {"uv": [1, 2, 3, 16], "texture": "#o"}, - "up": {"uv": [1, 1, 3, 3], "texture": "#o"}, - "down": {"uv": [1, 13, 3, 15], "texture": "#o", "cullface": "down"} - } - }, - { - "from": [13, 0, 1], - "to": [15, 14, 3], - "faces": { - "north": {"uv": [1, 2, 3, 16], "texture": "#o"}, - "east": {"uv": [13, 2, 15, 16], "texture": "#o"}, - "south": {"uv": [13, 2, 15, 16], "texture": "#o"}, - "west": {"uv": [1, 2, 3, 16], "texture": "#o"}, - "up": {"uv": [13, 1, 15, 3], "texture": "#o"}, - "down": {"uv": [13, 13, 15, 15], "texture": "#o", "cullface": "down"} - } - }, - { - "from": [13, 0, 13], - "to": [15, 14, 15], - "faces": { - "north": {"uv": [1, 2, 3, 16], "texture": "#o"}, - "east": {"uv": [1, 2, 3, 16], "texture": "#o"}, - "south": {"uv": [13, 2, 15, 16], "texture": "#o"}, - "west": {"uv": [13, 2, 15, 16], "texture": "#o"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#o"}, - "down": {"uv": [13, 1, 15, 3], "texture": "#o", "cullface": "down"} - } - }, - { - "from": [1, 0, 13], - "to": [3, 14, 15], - "faces": { - "north": {"uv": [13, 2, 15, 16], "texture": "#o"}, - "east": {"uv": [1, 2, 3, 16], "texture": "#o"}, - "south": {"uv": [1, 2, 3, 16], "texture": "#o"}, - "west": {"uv": [13, 2, 15, 16], "texture": "#o"}, - "up": {"uv": [1, 13, 3, 15], "texture": "#o"}, - "down": {"uv": [1, 1, 3, 3], "texture": "#o", "cullface": "down"} - } - }, - { - "from": [0, 14, 0], - "to": [16, 15.875, 16], - "faces": { - "north": {"uv": [0, 0.125, 16, 2], "texture": "#o"}, - "east": {"uv": [0, 0.125, 16, 2], "texture": "#o"}, - "south": {"uv": [0, 0.125, 16, 2], "texture": "#o"}, - "west": {"uv": [0, 0.125, 16, 2], "texture": "#o"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#o"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#o"} - } - }, - { - "from": [0.125, 15.875, 0.125], - "to": [15.875, 16, 15.875], - "faces": { - "north": {"uv": [0.25, 0, 15.75, 0.125], "texture": "#o"}, - "east": {"uv": [0.25, 0, 15.75, 0.125], "texture": "#o"}, - "south": {"uv": [0.25, 0, 15.75, 0.125], "texture": "#o"}, - "west": {"uv": [0.25, 0, 15.75, 0.125], "texture": "#o"}, - "up": {"uv": [0.25, 0.25, 15.75, 15.75], "texture": "#o"}, - "down": {"uv": [0.25, 0.25, 15.75, 15.75], "texture": "#o"} - } - }, - { - "from": [13, 13.5, 3], - "to": [15, 14, 5], - "faces": { - "north": {"uv": [1, 2, 3, 2.5], "texture": "#o"}, - "east": {"uv": [11, 2, 13, 2.5], "texture": "#o"}, - "south": {"uv": [13, 2, 15, 2.5], "texture": "#o"}, - "west": {"uv": [3, 2, 5, 2.5], "texture": "#o"}, - "up": {"uv": [13, 3, 15, 5], "texture": "#o"}, - "down": {"uv": [13, 11, 15, 13], "texture": "#o"} - } - }, - { - "from": [13, 13.5, 11], - "to": [15, 14, 13], - "faces": { - "north": {"uv": [1, 2, 3, 2.5], "texture": "#o"}, - "east": {"uv": [3, 2, 5, 2.5], "texture": "#o"}, - "south": {"uv": [13, 2, 15, 2.5], "texture": "#o"}, - "west": {"uv": [11, 2, 13, 2.5], "texture": "#o"}, - "up": {"uv": [13, 11, 15, 13], "texture": "#o"}, - "down": {"uv": [13, 3, 15, 5], "texture": "#o"} - } - }, - { - "from": [1, 13.5, 11], - "to": [3, 14, 13], - "faces": { - "north": {"uv": [13, 2, 15, 2.5], "texture": "#o"}, - "east": {"uv": [3, 2, 5, 2.5], "texture": "#o"}, - "south": {"uv": [1, 2, 3, 2.5], "texture": "#o"}, - "west": {"uv": [11, 2, 13, 2.5], "texture": "#o"}, - "up": {"uv": [1, 11, 3, 13], "texture": "#o"}, - "down": {"uv": [1, 3, 3, 5], "texture": "#o"} - } - }, - { - "from": [1, 13.5, 3], - "to": [3, 14, 5], - "faces": { - "north": {"uv": [13, 2, 15, 2.5], "texture": "#o"}, - "east": {"uv": [11, 2, 13, 2.5], "texture": "#o"}, - "south": {"uv": [1, 2, 3, 2.5], "texture": "#o"}, - "west": {"uv": [3, 2, 5, 2.5], "texture": "#o"}, - "up": {"uv": [1, 3, 3, 5], "texture": "#o"}, - "down": {"uv": [1, 11, 3, 13], "texture": "#o"} - } - }, - { - "from": [11, 13.5, 1], - "to": [13, 14, 3], - "faces": { - "north": {"uv": [3, 2, 5, 2.5], "texture": "#o"}, - "east": {"uv": [13, 2, 15, 2.5], "texture": "#o"}, - "south": {"uv": [11, 2, 13, 2.5], "texture": "#o"}, - "west": {"uv": [1, 2, 3, 2.5], "texture": "#o"}, - "up": {"uv": [11, 1, 13, 3], "texture": "#o"}, - "down": {"uv": [11, 13, 13, 15], "texture": "#o"} - } - }, - { - "from": [3, 13.5, 1], - "to": [5, 14, 3], - "faces": { - "north": {"uv": [11, 2, 13, 2.5], "texture": "#o"}, - "east": {"uv": [13, 2, 15, 2.5], "texture": "#o"}, - "south": {"uv": [3, 2, 5, 2.5], "texture": "#o"}, - "west": {"uv": [1, 2, 3, 2.5], "texture": "#o"}, - "up": {"uv": [3, 1, 5, 3], "texture": "#o"}, - "down": {"uv": [3, 13, 5, 15], "texture": "#o"} - } - }, - { - "from": [11, 13.5, 13], - "to": [13, 14, 15], - "faces": { - "north": {"uv": [3, 2, 5, 2.5], "texture": "#o"}, - "east": {"uv": [1, 2, 3, 2.5], "texture": "#o"}, - "south": {"uv": [11, 2, 13, 2.5], "texture": "#o"}, - "west": {"uv": [13, 2, 15, 2.5], "texture": "#o"}, - "up": {"uv": [11, 13, 13, 15], "texture": "#o"}, - "down": {"uv": [11, 1, 13, 3], "texture": "#o"} - } - }, - { - "from": [3, 13.5, 13], - "to": [5, 14, 15], - "faces": { - "north": {"uv": [11, 2, 13, 2.5], "texture": "#o"}, - "east": {"uv": [1, 2, 3, 2.5], "texture": "#o"}, - "south": {"uv": [3, 2, 5, 2.5], "texture": "#o"}, - "west": {"uv": [13, 2, 15, 2.5], "texture": "#o"}, - "up": {"uv": [3, 13, 5, 15], "texture": "#o"}, - "down": {"uv": [3, 1, 5, 3], "texture": "#o"} - } - } - ], - "display": { - "ground": { - "scale": [0.2, 0.2, 0.2] - }, - "gui": { - "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/ladder/metal_rung_ladder_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/ladder/metal_rung_ladder_model.json deleted file mode 100644 index f09e516..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/ladder/metal_rung_ladder_model.json +++ /dev/null @@ -1,159 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "parent": "block/cube", - "textures": { - "particle": "engineersdecor:block/iestyle/steel_texture", - "o": "engineersdecor:block/iestyle/steel_texture" - }, - "display": { - "gui": { "rotation": [ 30, 225, 0 ], "scale": [0.625, 0.625, 0.625] }, - "fixed": { "scale": [0.5, 0.5, 0.5] }, - "ground": { "scale": [0.2, 0.2, 0.2] } - }, - "elements": [ - { - "from": [3, 2, 14], - "to": [13, 3, 15], - "faces": { - "north": {"uv": [1, 13, 16, 15], "texture": "#o"}, - "east": {"uv": [12, 13, 14, 15], "texture": "#o"}, - "south": {"uv": [1, 13, 16, 15], "texture": "#o"}, - "west": {"uv": [13, 11, 15, 13], "texture": "#o"}, - "up": {"uv": [1, 11, 16, 13], "texture": "#o"}, - "down": {"uv": [1, 13, 16, 15], "texture": "#o"} - } - }, - { - "from": [3, 6, 14], - "to": [13, 7, 15], - "faces": { - "north": {"uv": [3, 13, 16, 15], "texture": "#o"}, - "east": {"uv": [6, 14, 8, 16], "texture": "#o"}, - "south": {"uv": [3, 13, 16, 15], "texture": "#o"}, - "west": {"uv": [7, 9, 9, 11], "texture": "#o"}, - "up": {"uv": [0, 13, 13, 15], "texture": "#o"}, - "down": {"uv": [3, 13, 16, 15], "texture": "#o"} - } - }, - { - "from": [3, 14, 14], - "to": [13, 15, 15], - "faces": { - "north": {"uv": [2, 6, 16, 8], "texture": "#o"}, - "east": {"uv": [7, 3, 9, 5], "texture": "#o"}, - "south": {"uv": [2, 6, 16, 8], "texture": "#o"}, - "west": {"uv": [2, 6, 4, 8], "texture": "#o"}, - "up": {"uv": [0, 4, 14, 6], "texture": "#o"}, - "down": {"uv": [2, 6, 16, 8], "texture": "#o"} - } - }, - { - "from": [3, 10, 14], - "to": [13, 11, 15], - "faces": { - "north": {"uv": [0, 11, 13, 13], "texture": "#o"}, - "east": {"uv": [1, 13, 3, 15], "texture": "#o"}, - "south": {"uv": [0, 11, 13, 13], "texture": "#o"}, - "west": {"uv": [0, 11, 2, 13], "texture": "#o"}, - "up": {"uv": [0, 9, 13, 11], "texture": "#o"}, - "down": {"uv": [0, 11, 13, 13], "texture": "#o"} - } - }, - { - "from": [12, 2, 15], - "to": [13.25, 3, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [7, 9, 9, 11], "texture": "#o"}, - "south": {"uv": [1, 12, 4.25, 14], "texture": "#o"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "up": {"uv": [13, 4, 16, 6], "texture": "#o"}, - "down": {"uv": [1, 12, 4, 14], "texture": "#o"} - } - }, - { - "from": [2.75, 2, 15], - "to": [4, 3, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "south": {"uv": [11, 1, 14.25, 3], "texture": "#o"}, - "west": {"uv": [11, 9, 13, 11], "texture": "#o"}, - "up": {"uv": [12, 11, 15, 13], "texture": "#o"}, - "down": {"uv": [7, 3, 10, 5], "texture": "#o"} - } - }, - { - "from": [2.75, 10, 15], - "to": [4, 11, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "south": {"uv": [12, 14, 15.25, 16], "texture": "#o"}, - "west": {"uv": [7, 10, 9, 12], "texture": "#o"}, - "up": {"uv": [5, 12, 8, 14], "texture": "#o"}, - "down": {"uv": [4, 14, 7, 16], "texture": "#o"} - } - }, - { - "from": [12, 10, 15], - "to": [13.25, 11, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1.25], "texture": "#o"}, - "east": {"uv": [2, 4, 5, 6.25], "texture": "#o"}, - "south": {"uv": [10, 10, 13, 12], "texture": "#o"}, - "west": {"uv": [0, 0, 1, 1.25], "texture": "#o"}, - "up": {"uv": [7, 11, 9, 13], "texture": "#o"}, - "down": {"uv": [8, 0, 11, 2], "texture": "#o"} - } - }, - { - "from": [2.75, 6, 15], - "to": [4, 7, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "south": {"uv": [4, 7, 7.25, 9], "texture": "#o"}, - "west": {"uv": [11, 9, 13, 11], "texture": "#o"}, - "up": {"uv": [0, 13, 3, 15], "texture": "#o"}, - "down": {"uv": [4, 7, 7, 9], "texture": "#o"} - } - }, - { - "from": [12, 6, 15], - "to": [13.25, 7, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [8, 9, 10, 11], "texture": "#o"}, - "south": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "up": {"uv": [5, 13, 8, 15], "texture": "#o"}, - "down": {"uv": [8, 14, 11, 16], "texture": "#o"} - } - }, - { - "from": [2.75, 14, 15], - "to": [4, 15, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "south": {"uv": [3, 11, 6, 13], "texture": "#o"}, - "west": {"uv": [14, 7, 16, 9], "texture": "#o"}, - "up": {"uv": [7, 12, 10, 14], "texture": "#o"}, - "down": {"uv": [12, 7, 15, 9], "texture": "#o"} - } - }, - { - "from": [12, 14, 15], - "to": [13.25, 15, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1.25], "texture": "#o"}, - "east": {"uv": [0, 0, 3, 2.25], "texture": "#o"}, - "south": {"uv": [0, 13, 3, 15], "texture": "#o"}, - "west": {"uv": [0, 0, 1, 1.25], "texture": "#o"}, - "up": {"uv": [3, 7, 5.25, 9], "texture": "#o"}, - "down": {"uv": [0, 0, 1.25, 1], "texture": "#o"} - } - } - ] -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/ladder/metal_rung_steps_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/ladder/metal_rung_steps_model.json deleted file mode 100644 index efa86fa..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/ladder/metal_rung_steps_model.json +++ /dev/null @@ -1,166 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "parent": "block/cube", - "textures": { - "o": "engineersdecor:block/iestyle/steel_texture", - "particle": "engineersdecor:block/iestyle/steel_texture" - }, - "elements": [ - { - "from": [3, 2, 14], - "to": [7, 3, 15], - "faces": { - "north": {"uv": [1, 13, 9, 15], "texture": "#o"}, - "east": {"uv": [12, 13, 14, 15], "texture": "#o"}, - "south": {"uv": [4, 10, 11, 12], "texture": "#o"}, - "west": {"uv": [13, 11, 15, 13], "texture": "#o"}, - "up": {"uv": [1, 11, 9, 13], "texture": "#o"}, - "down": {"uv": [7, 2, 14, 4], "texture": "#o"} - } - }, - { - "from": [9, 6, 14], - "to": [13, 7, 15], - "faces": { - "north": {"uv": [3, 13, 9, 15], "texture": "#o"}, - "east": {"uv": [6, 14, 8, 16], "texture": "#o"}, - "south": {"uv": [4, 10, 11, 12], "texture": "#o"}, - "west": {"uv": [7, 9, 9, 11], "texture": "#o"}, - "up": {"uv": [6, 11, 13, 13], "texture": "#o"}, - "down": {"uv": [9, 12, 16, 14], "texture": "#o"} - } - }, - { - "from": [9, 14, 14], - "to": [13, 15, 15], - "faces": { - "north": {"uv": [2, 6, 9, 8], "texture": "#o"}, - "east": {"uv": [7, 3, 9, 5], "texture": "#o"}, - "south": {"uv": [5, 13, 13, 15], "texture": "#o"}, - "west": {"uv": [2, 6, 4, 8], "texture": "#o"}, - "up": {"uv": [6, 9, 13, 11], "texture": "#o"}, - "down": {"uv": [4, 10, 11, 12], "texture": "#o"} - } - }, - { - "from": [3, 10, 14], - "to": [7, 11, 15], - "faces": { - "north": {"uv": [0, 11, 6, 13], "texture": "#o"}, - "east": {"uv": [1, 13, 3, 15], "texture": "#o"}, - "south": {"uv": [4, 6, 12, 8], "texture": "#o"}, - "west": {"uv": [0, 11, 2, 13], "texture": "#o"}, - "up": {"uv": [3, 5, 11, 7], "texture": "#o"}, - "down": {"uv": [5, 7, 12, 9], "texture": "#o"} - } - }, - { - "from": [6, 2, 15], - "to": [7.25, 3, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [7, 9, 9, 11], "texture": "#o"}, - "south": {"uv": [1, 12, 4.25, 14], "texture": "#o"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "up": {"uv": [13, 4, 16, 6], "texture": "#o"}, - "down": {"uv": [1, 12, 4, 14], "texture": "#o"} - } - }, - { - "from": [2.75, 2, 15], - "to": [4, 3, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "south": {"uv": [11, 1, 14.25, 3], "texture": "#o"}, - "west": {"uv": [11, 9, 13, 11], "texture": "#o"}, - "up": {"uv": [12, 11, 15, 13], "texture": "#o"}, - "down": {"uv": [7, 3, 10, 5], "texture": "#o"} - } - }, - { - "from": [2.75, 10, 15], - "to": [4, 11, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "south": {"uv": [12, 14, 15.25, 16], "texture": "#o"}, - "west": {"uv": [7, 10, 9, 12], "texture": "#o"}, - "up": {"uv": [5, 12, 8, 14], "texture": "#o"}, - "down": {"uv": [4, 14, 7, 16], "texture": "#o"} - } - }, - { - "from": [6, 10, 15], - "to": [7.25, 11, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1.25], "texture": "#o"}, - "east": {"uv": [2, 4, 5, 6.25], "texture": "#o"}, - "south": {"uv": [10, 10, 13, 12], "texture": "#o"}, - "west": {"uv": [0, 0, 1, 1.25], "texture": "#o"}, - "up": {"uv": [7, 11, 9, 13], "texture": "#o"}, - "down": {"uv": [8, 0, 11, 2], "texture": "#o"} - } - }, - { - "from": [8.75, 6, 15], - "to": [10, 7, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "south": {"uv": [4, 7, 7.25, 9], "texture": "#o"}, - "west": {"uv": [11, 9, 13, 11], "texture": "#o"}, - "up": {"uv": [0, 13, 3, 15], "texture": "#o"}, - "down": {"uv": [4, 7, 7, 9], "texture": "#o"} - } - }, - { - "from": [12, 6, 15], - "to": [13.25, 7, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [8, 9, 10, 11], "texture": "#o"}, - "south": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "up": {"uv": [5, 13, 8, 15], "texture": "#o"}, - "down": {"uv": [8, 14, 11, 16], "texture": "#o"} - } - }, - { - "from": [8.75, 14, 15], - "to": [10, 15, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "south": {"uv": [3, 11, 6, 13], "texture": "#o"}, - "west": {"uv": [14, 7, 16, 9], "texture": "#o"}, - "up": {"uv": [7, 12, 10, 14], "texture": "#o"}, - "down": {"uv": [12, 7, 15, 9], "texture": "#o"} - } - }, - { - "from": [12, 14, 15], - "to": [13.25, 15, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1.25], "texture": "#o"}, - "east": {"uv": [0, 0, 3, 2.25], "texture": "#o"}, - "south": {"uv": [0, 13, 3, 15], "texture": "#o"}, - "west": {"uv": [0, 0, 1, 1.25], "texture": "#o"}, - "up": {"uv": [3, 7, 5.25, 9], "texture": "#o"}, - "down": {"uv": [0, 0, 1.25, 1], "texture": "#o"} - } - } - ], - "display": { - "ground": { - "scale": [0.2, 0.2, 0.2] - }, - "gui": { - "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/ladder/treated_wood_ladder_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/ladder/treated_wood_ladder_model.json deleted file mode 100644 index dbf9523..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/ladder/treated_wood_ladder_model.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "parent": "block/cube", - "textures": { - "o": "engineersdecor:block/iestyle/treated_wood_rough_texture", - "particle": "engineersdecor:block/iestyle/treated_wood_rough_texture" - }, - "elements": [ - { - "from": [4, 2, 14.625], - "to": [12, 3, 15.625], - "faces": { - "north": {"uv": [0, 11, 15, 13], "texture": "#o"}, - "east": {"uv": [12, 13, 14, 15], "texture": "#o"}, - "south": {"uv": [1, 13, 16, 15], "texture": "#o"}, - "west": {"uv": [13, 11, 15, 13], "texture": "#o"}, - "up": {"uv": [1, 11, 16, 13], "texture": "#o"}, - "down": {"uv": [1, 13, 16, 15], "texture": "#o"} - } - }, - { - "from": [4, 6, 14.625], - "to": [12, 7, 15.625], - "faces": { - "north": {"uv": [1, 6, 14, 8], "texture": "#o"}, - "east": {"uv": [6, 14, 8, 16], "texture": "#o"}, - "south": {"uv": [3, 13, 16, 15], "texture": "#o"}, - "west": {"uv": [7, 9, 9, 11], "texture": "#o"}, - "up": {"uv": [0, 13, 13, 15], "texture": "#o"}, - "down": {"uv": [3, 13, 16, 15], "texture": "#o"} - } - }, - { - "from": [4, 14, 14.625], - "to": [12, 15, 15.625], - "faces": { - "north": {"uv": [0, 4, 14, 6], "texture": "#o"}, - "east": {"uv": [7, 3, 9, 5], "texture": "#o"}, - "south": {"uv": [2, 6, 16, 8], "texture": "#o"}, - "west": {"uv": [2, 6, 4, 8], "texture": "#o"}, - "up": {"uv": [0, 4, 14, 6], "texture": "#o"}, - "down": {"uv": [2, 6, 16, 8], "texture": "#o"} - } - }, - { - "from": [4, 10, 14.625], - "to": [12, 11, 15.625], - "faces": { - "north": {"uv": [3, 5, 16, 7], "texture": "#o"}, - "east": {"uv": [1, 13, 3, 15], "texture": "#o"}, - "south": {"uv": [0, 11, 13, 13], "texture": "#o"}, - "west": {"uv": [0, 11, 2, 13], "texture": "#o"}, - "up": {"uv": [0, 9, 13, 11], "texture": "#o"}, - "down": {"uv": [0, 11, 13, 13], "texture": "#o"} - } - }, - { - "from": [2.75, 0, 14.5], - "to": [4, 16, 16], - "faces": { - "north": {"uv": [2, 0, 4, 16], "texture": "#o"}, - "east": {"uv": [2, 0, 4, 16], "texture": "#o"}, - "south": {"uv": [5, 0, 7, 16], "texture": "#o"}, - "west": {"uv": [8, 0, 11, 16], "texture": "#o"}, - "up": {"uv": [11, 9, 13, 12], "texture": "#o"}, - "down": {"uv": [13, 9, 15, 12], "texture": "#o"} - } - }, - { - "from": [12, 0, 14.5], - "to": [13.25, 16, 16], - "faces": { - "north": {"uv": [1, 0, 3, 16], "texture": "#o"}, - "east": {"uv": [5, 0, 7, 16], "texture": "#o"}, - "south": {"uv": [13, 0, 15, 16], "texture": "#o"}, - "west": {"uv": [1, 0, 3, 16], "texture": "#o"}, - "up": {"uv": [6, 6, 8, 9], "texture": "#o"}, - "down": {"uv": [8, 5, 10, 8], "texture": "#o"} - } - } - ], - "display": { - "ground": { - "scale": [0.2, 0.2, 0.2] - }, - "gui": { - "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/pole/straight_pole_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/pole/straight_pole_model.json deleted file mode 100644 index 064dcc4..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/pole/straight_pole_model.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "parent": "block/cube", - "textures": { - "side": "engineersdecor:block/pole/treated_wood_pole_side_texture", - "particle": "engineersdecor:block/pole/treated_wood_pole_side_texture", - "top": "engineersdecor:block/pole/treated_wood_pole_top_texture" - }, - "elements": [ - { - "from": [5.75, 5.75, 0], - "to": [10.25, 10.25, 16], - "faces": { - "north": {"uv": [5.25, 5.25, 10.75, 10.75], "texture": "#top", "cullface": "north"}, - "south": {"uv": [5.25, 5.25, 10.75, 10.75], "texture": "#top", "cullface": "south"} - } - }, - { - "from": [5.75, 10.25, 0], - "to": [10.25, 10.5, 16], - "faces": { - "north": {"uv": [5.25, 10.75, 10.75, 11], "texture": "#top", "cullface": "north"}, - "east": {"uv": [10.75, 0, 11, 16], "rotation": 90, "texture": "#side"}, - "south": {"uv": [5.25, 5, 10.75, 5.25], "texture": "#top", "cullface": "south"}, - "west": {"uv": [5, 0, 5.25, 16], "rotation": 90, "texture": "#side"}, - "up": {"uv": [5.25, 0, 10.75, 16], "texture": "#side"} - } - }, - { - "from": [5.75, 5.5, 0], - "to": [10.25, 5.75, 16], - "faces": { - "north": {"uv": [5.25, 5, 10.75, 5.25], "texture": "#top", "cullface": "north"}, - "east": {"uv": [5, 0, 5.25, 16], "rotation": 90, "texture": "#side"}, - "south": {"uv": [5.25, 10.75, 10.75, 11], "texture": "#top", "cullface": "south"}, - "west": {"uv": [10.75, 0, 11, 16], "rotation": 90, "texture": "#side"}, - "down": {"uv": [5.25, 0, 10.75, 16], "rotation": 180, "texture": "#side"} - } - }, - { - "from": [10.25, 5.75, 0], - "to": [10.5, 10.25, 16], - "faces": { - "north": {"uv": [10.75, 5.25, 11, 10.75], "texture": "#top", "cullface": "north"}, - "east": {"uv": [5.25, 0, 10.75, 16], "rotation": 90, "texture": "#side"}, - "south": {"uv": [10.75, 5.25, 11, 10.75], "texture": "#top", "cullface": "south"}, - "up": {"uv": [5, 0, 5.25, 16], "texture": "#side"}, - "down": {"uv": [10.75, 0, 11, 16], "rotation": 180, "texture": "#side"} - } - }, - { - "from": [5.5, 5.75, 0], - "to": [5.75, 10.25, 16], - "faces": { - "north": {"uv": [5, 5.25, 5.25, 10.75], "texture": "#top", "cullface": "north"}, - "south": {"uv": [5, 5.25, 5.25, 10.75], "texture": "#top", "cullface": "south"}, - "west": {"uv": [5.25, 0, 10.75, 16], "rotation": 90, "texture": "#side"}, - "up": {"uv": [10.75, 0, 11, 16], "texture": "#side"}, - "down": {"uv": [5, 0, 5.25, 16], "rotation": 180, "texture": "#side"} - } - } - ], - "display": { - "ground": { - "scale": [0.2, 0.2, 0.2] - }, - "gui": { - "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/pole/straight_pole_up_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/pole/straight_pole_up_model.json deleted file mode 100644 index 9b919eb..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/pole/straight_pole_up_model.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "parent": "block/cube", - "textures": { - "side": "engineersdecor:block/pole/treated_wood_pole_side_texture", - "particle": "engineersdecor:block/pole/treated_wood_pole_side_texture", - "top": "engineersdecor:block/pole/treated_wood_pole_top_texture" - }, - "elements": [ - { - "from": [5.75, 0, 5.75], - "to": [10.25, 16, 10.25], - "faces": { - "up": {"uv": [5.25, 5.25, 10.75, 10.75], "rotation": 180, "texture": "#top", "cullface": "north"}, - "down": {"uv": [5.25, 5.25, 10.75, 10.75], "texture": "#top", "cullface": "south"} - } - }, - { - "from": [5.75, 0, 10.25], - "to": [10.25, 16, 10.5], - "faces": { - "east": {"uv": [10.75, 0, 11, 16], "texture": "#side"}, - "south": {"uv": [5.25, 0, 10.75, 16], "texture": "#side"}, - "west": {"uv": [5, 0, 5.25, 16], "rotation": 180, "texture": "#side"}, - "up": {"uv": [5.25, 10.75, 10.75, 11], "rotation": 180, "texture": "#top", "cullface": "north"}, - "down": {"uv": [5.25, 5, 10.75, 5.25], "texture": "#top", "cullface": "south"} - } - }, - { - "from": [5.75, 0, 5.5], - "to": [10.25, 16, 5.75], - "faces": { - "north": {"uv": [5.25, 0, 10.75, 16], "texture": "#side"}, - "east": {"uv": [5, 0, 5.25, 16], "texture": "#side"}, - "west": {"uv": [10.75, 0, 11, 16], "rotation": 180, "texture": "#side"}, - "up": {"uv": [5.25, 5, 10.75, 5.25], "rotation": 180, "texture": "#top", "cullface": "north"}, - "down": {"uv": [5.25, 10.75, 10.75, 11], "texture": "#top", "cullface": "south"} - } - }, - { - "from": [10.25, 0, 5.75], - "to": [10.5, 16, 10.25], - "faces": { - "north": {"uv": [10.75, 0, 11, 16], "texture": "#side"}, - "east": {"uv": [5.25, 0, 10.75, 16], "texture": "#side"}, - "south": {"uv": [5, 0, 5.25, 16], "texture": "#side"}, - "up": {"uv": [10.75, 5.25, 11, 10.75], "rotation": 180, "texture": "#top", "cullface": "north"}, - "down": {"uv": [10.75, 5.25, 11, 10.75], "texture": "#top", "cullface": "south"} - } - }, - { - "from": [5.5, 0, 5.75], - "to": [5.75, 16, 10.25], - "faces": { - "north": {"uv": [5, 0, 5.25, 16], "texture": "#side"}, - "south": {"uv": [10.75, 0, 11, 16], "texture": "#side"}, - "west": {"uv": [5.25, 0, 10.75, 16], "rotation": 180, "texture": "#side"}, - "up": {"uv": [5, 5.25, 5.25, 10.75], "rotation": 180, "texture": "#top", "cullface": "north"}, - "down": {"uv": [5, 5.25, 5.25, 10.75], "texture": "#top", "cullface": "south"} - } - } - ], - "display": { - "ground": { - "scale": [0.2, 0.2, 0.2] - }, - "gui": { - "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_full_block_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_full_block_model.json deleted file mode 100644 index 7fa7672..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_full_block_model.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { "all": "engineersdecor:block/clinker_brick/clinker_brick_texture0" } -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_inner_roof_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_inner_roof_model.json deleted file mode 100644 index 9e964fd..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_inner_roof_model.json +++ /dev/null @@ -1,163 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "textures": { - "side": "engineersdecor:block/iestyle/ironsheet_roof", - "particle": "engineersdecor:block/iestyle/ironsheet_roof", - "top": "engineersdecor:block/iestyle/ironsheet_roof_top" - }, - "elements": [ - { - "from": [6, 0, 0], - "to": [8, 8, 8], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [14, 0, 0], - "to": [16, 16, 16], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top", "cullface": "up"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [0, 0, 14], - "to": [14, 16, 16], - "faces": { - "north": {"texture": "#top"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#side", "cullface": "west"}, - "up": {"rotation": 270, "texture": "#top", "cullface": "up"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [10, 0, 0], - "to": [12, 12, 12], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [0, 0, 10], - "to": [10, 12, 12], - "faces": { - "north": {"texture": "#top"}, - "west": {"texture": "#side", "cullface": "west"}, - "up": {"rotation": 90, "texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [0, 0, 6], - "to": [6, 8, 8], - "faces": { - "north": {"texture": "#top"}, - "west": {"texture": "#side", "cullface": "west"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [0, 0, 0], - "to": [2, 2, 2], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "west": {"texture": "#side", "cullface": "west"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [12, 0, 0], - "to": [14, 14, 14], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [0, 0, 12], - "to": [12, 14, 14], - "faces": { - "north": {"texture": "#top"}, - "west": {"texture": "#side", "cullface": "west"}, - "up": {"rotation": 270, "texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [8, 0, 0], - "to": [10, 10, 10], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [0, 0, 8], - "to": [8, 10, 10], - "faces": { - "north": {"texture": "#top"}, - "west": {"texture": "#side", "cullface": "west"}, - "up": {"rotation": 90, "texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [4, 0, 0], - "to": [6, 6, 4], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [0, 0, 4], - "to": [6, 6, 6], - "faces": { - "north": {"texture": "#side"}, - "west": {"texture": "#side", "cullface": "west"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [0, 0, 2], - "to": [4, 4, 4], - "faces": { - "north": {"texture": "#top"}, - "west": {"texture": "#side", "cullface": "west"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [2, 0, 0], - "to": [4, 4, 2], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - } - ] -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_outer_roof_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_outer_roof_model.json deleted file mode 100644 index 492bb6f..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_outer_roof_model.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "textures": { - "particle": "engineersdecor:block/iestyle/ironsheet_roof", - "side": "engineersdecor:block/iestyle/ironsheet_roof", - "top": "engineersdecor:block/iestyle/ironsheet_roof_top" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"texture": "#top", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top", "cullface": "west"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [2, 2, 2], - "to": [16, 4, 16], - "faces": { - "north": {"texture": "#top"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [4, 4, 4], - "to": [16, 6, 16], - "faces": { - "north": {"texture": "#top"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [6, 6, 6], - "to": [16, 8, 16], - "faces": { - "north": {"texture": "#top"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [8, 8, 8], - "to": [16, 10, 16], - "faces": { - "north": {"texture": "#top"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [10, 10, 10], - "to": [16, 12, 16], - "faces": { - "north": {"texture": "#top"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [12, 12, 12], - "to": [16, 14, 16], - "faces": { - "north": {"texture": "#top"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [14, 14, 14], - "to": [16, 16, 16], - "faces": { - "north": {"texture": "#top"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - } - ] -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_straight_roof_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_straight_roof_model.json deleted file mode 100644 index 5013b30..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_straight_roof_model.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "parent": "block/block", - "textures": { - "side": "engineersdecor:block/iestyle/ironsheet_roof", - "particle": "engineersdecor:block/iestyle/ironsheet_roof", - "top": "engineersdecor:block/iestyle/ironsheet_roof_top" - }, - "elements": [ - { - "from": [2, 2, 0], - "to": [16, 4, 16], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [14, 14, 0], - "to": [16, 16, 16], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top", "cullface": "up"} - } - }, - { - "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top", "cullface": "west"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [4, 4, 0], - "to": [16, 6, 16], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [6, 6, 0], - "to": [16, 8, 16], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [12, 12, 0], - "to": [16, 14, 16], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [10, 10, 0], - "to": [16, 12, 16], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [8, 8, 0], - "to": [16, 10, 16], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - } - ], - "display": { - "thirdperson_lefthand": { - "rotation": [75, -135, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "gui": { - "rotation": [30, 135, 0], - "scale": [0.625, 0.625, 0.625] - }, - "head": { - "rotation": [0, -90, 0] - } - } -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_default.json b/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_default.json deleted file mode 100644 index 32b23df..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_default.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "textures": { - "wall": "engineersdecor:block/concrete/rebar_concrete_texture0", - "particle": "engineersdecor:block/concrete/rebar_concrete_texture0" - }, - "elements": [{ - "from": [7.9, 7.9, 7.9], "to": [8, 8, 8], "faces": { "down": {"texture": "#wall"} } - }] -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_inventory.json b/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_inventory.json deleted file mode 100644 index 25b37f6..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_inventory.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "parent": "block/block", - "ambientocclusion": false, - "textures": { - "wall": "engineersdecor:block/concrete/rebar_concrete_texture0", - "particle": "engineersdecor:block/concrete/rebar_concrete_texture0" - }, - "elements": [ - { - "name": "Center post", - "from": [4, 0, 4], - "to": [12, 16, 12], - "faces": { - "north": {"uv": [4, 0, 12, 16], "texture": "#wall"}, - "east": {"uv": [4, 0, 12, 16], "texture": "#wall"}, - "south": {"uv": [4, 0, 12, 16], "texture": "#wall"}, - "west": {"uv": [4, 0, 12, 16], "texture": "#wall"}, - "up": {"uv": [4, 4, 12, 12], "texture": "#wall"}, - "down": {"uv": [4, 4, 12, 12], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [5, 0, 12], - "to": [11, 16, 16], - "faces": { - "north": {"uv": [5, 1, 11, 16], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [0, 1, 4, 16], "texture": "#wall"}, - "south": {"uv": [5, 1, 11, 16], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [12, 1, 16, 16], "texture": "#wall"}, - "up": {"uv": [5, 12, 11, 16], "texture": "#wall"}, - "down": {"uv": [5, 0, 11, 4], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [11, 0, 12], - "to": [12, 1, 16], - "faces": { - "north": {"uv": [4, 15, 5, 16], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [0, 15, 4, 16], "texture": "#wall"}, - "south": {"uv": [11, 15, 12, 16], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [12, 15, 16, 16], "texture": "#wall"}, - "up": {"uv": [11, 12, 12, 16], "texture": "#wall"}, - "down": {"uv": [11, 0, 12, 4], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [5, 0, 0], - "to": [11, 16, 4], - "faces": { - "north": {"uv": [5, 1, 11, 16], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [12, 1, 16, 16], "texture": "#wall"}, - "south": {"uv": [5, 1, 11, 16], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [0, 1, 4, 16], "texture": "#wall"}, - "up": {"uv": [5, 0, 11, 4], "texture": "#wall"}, - "down": {"uv": [5, 12, 11, 16], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [11, 0, 0], - "to": [12, 1, 4], - "faces": { - "north": {"uv": [4, 15, 5, 16], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [12, 15, 16, 16], "texture": "#wall"}, - "south": {"uv": [11, 15, 12, 16], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [0, 15, 4, 16], "texture": "#wall"}, - "up": {"uv": [11, 0, 12, 4], "texture": "#wall"}, - "down": {"uv": [11, 12, 12, 16], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [11, 14, 12], - "to": [12, 16, 16], - "faces": { - "north": {"uv": [4, 0, 5, 2], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [0, 0, 4, 2], "texture": "#wall"}, - "south": {"uv": [11, 0, 12, 2], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [12, 0, 16, 2], "texture": "#wall"}, - "up": {"uv": [11, 12, 12, 16], "texture": "#wall"}, - "down": {"uv": [11, 0, 12, 4], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [11, 14, 0], - "to": [12, 16, 4], - "faces": { - "north": {"uv": [4, 0, 5, 2], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [12, 0, 16, 2], "texture": "#wall"}, - "south": {"uv": [11, 0, 12, 2], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [0, 0, 4, 2], "texture": "#wall"}, - "up": {"uv": [11, 0, 12, 4], "texture": "#wall"}, - "down": {"uv": [11, 12, 12, 16], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [4, 0, 12], - "to": [5, 1, 16], - "faces": { - "north": {"uv": [11, 15, 12, 16], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [0, 15, 4, 16], "texture": "#wall"}, - "south": {"uv": [4, 15, 5, 16], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [12, 15, 16, 16], "texture": "#wall"}, - "up": {"uv": [4, 12, 5, 16], "texture": "#wall"}, - "down": {"uv": [4, 0, 5, 4], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [4, 0, 0], - "to": [5, 1, 4], - "faces": { - "north": {"uv": [11, 15, 12, 16], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [12, 15, 16, 16], "texture": "#wall"}, - "south": {"uv": [4, 15, 5, 16], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [0, 15, 4, 16], "texture": "#wall"}, - "up": {"uv": [4, 0, 5, 4], "texture": "#wall"}, - "down": {"uv": [4, 12, 5, 16], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [4, 14, 0], - "to": [5, 16, 4], - "faces": { - "north": {"uv": [11, 0, 12, 2], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [12, 0, 16, 2], "texture": "#wall"}, - "south": {"uv": [4, 0, 5, 2], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [0, 0, 4, 2], "texture": "#wall"}, - "up": {"uv": [4, 0, 5, 4], "texture": "#wall"}, - "down": {"uv": [4, 12, 5, 16], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [4, 14, 12], - "to": [5, 16, 16], - "faces": { - "north": {"uv": [11, 0, 12, 2], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [0, 0, 4, 2], "texture": "#wall"}, - "south": {"uv": [4, 0, 5, 2], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [12, 0, 16, 2], "texture": "#wall"}, - "up": {"uv": [4, 12, 5, 16], "texture": "#wall"}, - "down": {"uv": [4, 0, 5, 4], "texture": "#wall", "cullface": "down"} - } - } - ], - "display": { - "gui": { - "rotation": [30, 135, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "rotation": [0, 90, 0], - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_post.json b/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_post.json deleted file mode 100644 index 3012ac0..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_post.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "textures": { - "wall": "engineersdecor:block/concrete/rebar_concrete_texture0", - "particle": "engineersdecor:block/concrete/rebar_concrete_texture0" - }, - "elements": [ - { - "name": "Center post", - "from": [4, 0, 4], - "to": [12, 16, 12], - "faces": { - "north": {"uv": [4, 0, 12, 16], "texture": "#wall"}, - "east": {"uv": [4, 0, 12, 16], "texture": "#wall"}, - "south": {"uv": [4, 0, 12, 16], "texture": "#wall"}, - "west": {"uv": [4, 0, 12, 16], "texture": "#wall"}, - "up": {"uv": [4, 4, 12, 12], "texture": "#wall", "cullface": "up"}, - "down": {"uv": [4, 4, 12, 12], "texture": "#wall", "cullface": "down"} - } - } - ] -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_side.json b/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_side.json deleted file mode 100644 index c39c2e1..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_side.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "textures": { - "wall": "engineersdecor:block/concrete/rebar_concrete_texture0", - "particle": "engineersdecor:block/concrete/rebar_concrete_texture0" - }, - "elements": [ - { - "name": "wall", - "from": [5, 0, 0], - "to": [11, 16, 8], - "faces": { - "north": {"uv": [5, 0, 11, 16], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [8, 0, 16, 16], "texture": "#wall"}, - "west": {"uv": [0, 0, 8, 16], "texture": "#wall"}, - "up": {"uv": [5, 0, 11, 8], "texture": "#wall"}, - "down": {"uv": [5, 8, 11, 16], "texture": "#wall"} - } - }, - { - "name": "wall", - "from": [11, 14, 0], - "to": [11.875, 16, 8], - "faces": { - "north": {"uv": [4.25, 0, 5, 1.875], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [8, 0, 16, 1.875], "texture": "#wall"}, - "up": {"uv": [11, 0, 11.75, 8], "texture": "#wall"}, - "down": {"uv": [11, 8, 11.75, 16], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "wall", - "from": [11, 0, 0], - "to": [11.875, 1, 8], - "faces": { - "north": {"uv": [4.125, 15, 5, 16], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [8, 15, 16, 16], "texture": "#wall"}, - "up": {"uv": [11, 0, 11.875, 8], "texture": "#wall"}, - "down": {"uv": [11, 8, 11.875, 16], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "wall", - "from": [4.125, 14, 0], - "to": [5, 16, 8], - "faces": { - "north": {"uv": [11, 0, 11.75, 1.875], "texture": "#wall", "cullface": "north"}, - "west": {"uv": [0, 0, 8, 1.875], "texture": "#wall"}, - "up": {"uv": [4.25, 0, 5, 8], "texture": "#wall"}, - "down": {"uv": [4.25, 8, 5, 16], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "wall", - "from": [4.125, 0, 0], - "to": [5, 1, 8], - "faces": { - "north": {"uv": [10.875, 15, 11.75, 16], "texture": "#wall", "cullface": "north"}, - "west": {"uv": [0, 15, 8, 16], "texture": "#wall"}, - "up": {"uv": [4.25, 0, 5.125, 8], "texture": "#wall"}, - "down": {"uv": [4.25, 8, 5.125, 16], "texture": "#wall", "cullface": "down"} - } - } - ] -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/clinker_brick_block.json b/1.13/src/main/resources/assets/engineersdecor/models/item/clinker_brick_block.json deleted file mode 100644 index 62cf8c5..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/clinker_brick_block.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/brick/clinker_brick_model0" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/clinker_brick_stairs.json b/1.13/src/main/resources/assets/engineersdecor/models/item/clinker_brick_stairs.json deleted file mode 100644 index 8e07eed..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/clinker_brick_stairs.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/brick/clinker_brick_stairs" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/concrete_wall.json b/1.13/src/main/resources/assets/engineersdecor/models/item/concrete_wall.json deleted file mode 100644 index 32b7819..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/concrete_wall.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/concrete/concrete_wall_inventory" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/metal_rung_ladder.json b/1.13/src/main/resources/assets/engineersdecor/models/item/metal_rung_ladder.json deleted file mode 100644 index 330536f..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/metal_rung_ladder.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/ladder/metal_rung_ladder_model" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/metal_rung_steps.json b/1.13/src/main/resources/assets/engineersdecor/models/item/metal_rung_steps.json deleted file mode 100644 index e951242..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/metal_rung_steps.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/ladder/metal_rung_steps_model" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/rebar_concrete.json b/1.13/src/main/resources/assets/engineersdecor/models/item/rebar_concrete.json deleted file mode 100644 index dbd6702..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/rebar_concrete.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/concrete/rebar_concrete_model0" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/rebar_concrete_stairs.json b/1.13/src/main/resources/assets/engineersdecor/models/item/rebar_concrete_stairs.json deleted file mode 100644 index dd9a672..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/rebar_concrete_stairs.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/concrete/rebar_concrete_stairs" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/rebar_concrete_wall.json b/1.13/src/main/resources/assets/engineersdecor/models/item/rebar_concrete_wall.json deleted file mode 100644 index 61ad001..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/rebar_concrete_wall.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/concrete/rebar_concrete_wall_inventory" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/slag_brick_block.json b/1.13/src/main/resources/assets/engineersdecor/models/item/slag_brick_block.json deleted file mode 100644 index 3095b6c..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/slag_brick_block.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/brick/slag_brick_model0" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/slag_brick_stairs.json b/1.13/src/main/resources/assets/engineersdecor/models/item/slag_brick_stairs.json deleted file mode 100644 index efc9526..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/slag_brick_stairs.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/brick/slag_brick_stairs" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/treated_wood_ladder.json b/1.13/src/main/resources/assets/engineersdecor/models/item/treated_wood_ladder.json deleted file mode 100644 index b707210..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/treated_wood_ladder.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/ladder/treated_wood_ladder_model" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/treated_wood_pole.json b/1.13/src/main/resources/assets/engineersdecor/models/item/treated_wood_pole.json deleted file mode 100644 index 492d632..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/treated_wood_pole.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/pole/straight_pole_up_model" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/treated_wood_table.json b/1.13/src/main/resources/assets/engineersdecor/models/item/treated_wood_table.json deleted file mode 100644 index e294add..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/treated_wood_table.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/furniture/treated_wood_table_model" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture0.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture0.png deleted file mode 100644 index 5a06481..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture0.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture1.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture1.png deleted file mode 100644 index 1d536e6..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture1.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture2.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture2.png deleted file mode 100644 index 04b7f03..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture2.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture3.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture3.png deleted file mode 100644 index cb6f0f7..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture3.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture4.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture4.png deleted file mode 100644 index 77541ae..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture4.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture5.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture5.png deleted file mode 100644 index a73f43f..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture5.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture6.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture6.png deleted file mode 100644 index 6002fdf..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture6.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture7.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture7.png deleted file mode 100644 index 5b39955..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture7.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture0.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture0.png deleted file mode 100644 index c0157c1..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture0.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture1.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture1.png deleted file mode 100644 index 5645eab..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture1.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture2.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture2.png deleted file mode 100644 index f1a97db..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture2.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture3.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture3.png deleted file mode 100644 index 6e39b40..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture3.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture4.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture4.png deleted file mode 100644 index 8773119..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture4.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture5.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture5.png deleted file mode 100644 index c9aab19..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture5.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture6.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture6.png deleted file mode 100644 index 99e6367..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture6.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture7.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture7.png deleted file mode 100644 index 8ee5d60..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture7.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/ieoriginal/ie_stone_decoration_concrete.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/ieoriginal/ie_stone_decoration_concrete.png deleted file mode 100644 index b19d0ef..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/ieoriginal/ie_stone_decoration_concrete.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/ironsheet_roof.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/ironsheet_roof.png deleted file mode 100644 index 23dff87..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/ironsheet_roof.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/ironsheet_roof_top.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/ironsheet_roof_top.png deleted file mode 100644 index a5f0382..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/ironsheet_roof_top.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/steel_texture.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/steel_texture.png deleted file mode 100644 index 9584364..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/steel_texture.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood.png deleted file mode 100644 index a1d0537..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_framed_nailed_texture.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_framed_nailed_texture.png deleted file mode 100644 index 6c7a9c6..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_framed_nailed_texture.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_framed_texture.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_framed_texture.png deleted file mode 100644 index 3ce7527..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_framed_texture.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_pole_texture.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_pole_texture.png deleted file mode 100644 index 8c50fc8..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_pole_texture.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_rough_texture.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_rough_texture.png deleted file mode 100644 index fccfc82..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_rough_texture.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/pole/treated_wood_pole_side_texture.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/pole/treated_wood_pole_side_texture.png deleted file mode 100644 index 533f852..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/pole/treated_wood_pole_side_texture.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/pole/treated_wood_pole_top_texture.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/pole/treated_wood_pole_top_texture.png deleted file mode 100644 index 4605187..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/pole/treated_wood_pole_top_texture.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture0.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture0.png deleted file mode 100644 index 8378625..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture0.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture1.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture1.png deleted file mode 100644 index 1e56869..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture1.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture2.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture2.png deleted file mode 100644 index 8832f88..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture2.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture3.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture3.png deleted file mode 100644 index d1edf88..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture3.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture4.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture4.png deleted file mode 100644 index dea4b97..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture4.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture5.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture5.png deleted file mode 100644 index baa5672..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture5.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture6.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture6.png deleted file mode 100644 index 6895552..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture6.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture7.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture7.png deleted file mode 100644 index 966aee4..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture7.png and /dev/null differ diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/_constants.json b/1.13/src/main/resources/data/engineersdecor/recipes/_constants.json deleted file mode 100644 index 3099a1d..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/_constants.json +++ /dev/null @@ -1,89 +0,0 @@ -[ - { - "items": [ - { "item": "minecraft:brick" }, - { "item": "minecraft:nether_brick" } - ], - "name": "engineersdecor:any_brick_ingot" - }, - { - "items": [ - { "item": "minecraft:bricks" }, - { "item": "minecraft:nether_bricks" } - ], - "name": "engineersdecor:any_brick_block" - }, - { - "items": [ - { "item": "minecraft:black_concrete_powder" }, - { "item": "minecraft:blue_concrete_powder" }, - { "item": "minecraft:brown_concrete_powder" }, - { "item": "minecraft:cyan_concrete_powder" }, - { "item": "minecraft:gray_concrete_powder" }, - { "item": "minecraft:green_concrete_powder" }, - { "item": "minecraft:light_blue_concrete_powder" }, - { "item": "minecraft:light_gray_concrete_powder" }, - { "item": "minecraft:lime_concrete_powder" }, - { "item": "minecraft:magenta_concrete_powder" }, - { "item": "minecraft:orange_concrete_powder" }, - { "item": "minecraft:pink_concrete_powder" }, - { "item": "minecraft:purple_concrete_powder" }, - { "item": "minecraft:red_concrete_powder" }, - { "item": "minecraft:white_concrete_powder" }, - { "item": "minecraft:yellow_concrete_powder" }, - { "item": "minecraft:black_concrete" }, - { "item": "minecraft:blue_concrete" }, - { "item": "minecraft:brown_concrete" }, - { "item": "minecraft:cyan_concrete" }, - { "item": "minecraft:gray_concrete" }, - { "item": "minecraft:green_concrete" }, - { "item": "minecraft:light_blue_concrete" }, - { "item": "minecraft:light_gray_concrete" }, - { "item": "minecraft:lime_concrete" }, - { "item": "minecraft:magenta_concrete" }, - { "item": "minecraft:orange_concrete" }, - { "item": "minecraft:pink_concrete" }, - { "item": "minecraft:purple_concrete" }, - { "item": "minecraft:red_concrete" }, - { "item": "minecraft:white_concrete" }, - { "item": "minecraft:yellow_concrete" } - ], - "name": "engineersdecor:concrete" - }, - { - "items": [ - { "item": "minecraft:bone_meal" } - ], - "name": "engineersdecor:any_slag" - }, - { - "items": [ - { "item": "minecraft:iron_nugget" } - ], - "name": "engineersdecor:any_ferro_metal_stick" - }, - { - "items": [ - { "item": "minecraft:iron_nugget" } - ], - "name": "engineersdecor:steel_stick" - }, - { - "items": [ - { "item": "minecraft:stick" } - ], - "name": "engineersdecor:treated_wood_stick" - }, - { - "items": [ - { "item": "minecraft:dark_oak_planks" } - ], - "name": "engineersdecor:treated_wood_planks" - }, - { - "items": [ - { "item": "minecraft:dark_oak_slab" } - ], - "name": "engineersdecor:treated_wood_slab" - } -] \ No newline at end of file diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/clinker_brick_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/clinker_brick_recipe.json deleted file mode 100644 index 25f383d..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/clinker_brick_recipe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:clinker_brick_block" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "BBB", - "BNB", - "BBB" - ], - "key": { - "B": { "constant": "engineersdecor:any_brick_ingot" }, - "N": { "constant": "engineersdecor:any_brick_block" } - }, - "result": { - "item": "engineersdecor:clinker_brick_block", - "count": 4 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/clinker_brick_stairs_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/clinker_brick_stairs_recipe.json deleted file mode 100644 index a4cea28..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/clinker_brick_stairs_recipe.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:clinker_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "C ", - "CC ", - "CCC" - ], - "key": { - "C": { - "item": "engineersdecor:clinker_brick_block" - } - }, - "result": { - "item": "engineersdecor:clinker_brick_stairs", - "count": 9 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/clinker_brick_stairs_recipe_decompose.json b/1.13/src/main/resources/data/engineersdecor/recipes/clinker_brick_stairs_recipe_decompose.json deleted file mode 100644 index 7cd85bc..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/clinker_brick_stairs_recipe_decompose.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:clinker_brick_block" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "SS", - "SS" - ], - "key": { - "S": { - "item": "engineersdecor:clinker_brick_stairs" - } - }, - "result": { - "item": "engineersdecor:clinker_brick_block", - "count": 3 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/metal_rung_ladder_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/metal_rung_ladder_recipe.json deleted file mode 100644 index 1e457b2..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/metal_rung_ladder_recipe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:metal_rung_ladder", - "later_required": ["immersiveengineering:material"] - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "S S", - "SSS", - " " - ], - "key": { - "S": { "constant": "engineersdecor:any_ferro_metal_stick" } - }, - "result": { - "item": "engineersdecor:metal_rung_ladder", - "count": 4 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/metal_rung_steps_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/metal_rung_steps_recipe.json deleted file mode 100644 index 44abd9f..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/metal_rung_steps_recipe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:metal_rung_steps", -"later_required": ["immersiveengineering:material"] - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " SS", - "SS ", - " SS" - ], - "key": { - "S": { "constant": "engineersdecor:any_ferro_metal_stick" } - }, - "result": { - "item": "engineersdecor:metal_rung_steps", - "count": 4 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/rebar_concrete_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/rebar_concrete_recipe.json deleted file mode 100644 index 8b61f31..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/rebar_concrete_recipe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "SCS", - "CSC", - "SCS" - ], - "key": { - "C": { "constant": "engineersdecor:concrete" }, - "S": { "constant": "engineersdecor:steel_stick" } - }, - "result": { - "item": "engineersdecor:rebar_concrete", - "count": 4 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/rebar_concrete_stairs_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/rebar_concrete_stairs_recipe.json deleted file mode 100644 index 1b05f55..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/rebar_concrete_stairs_recipe.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "C ", - "CC ", - "CCC" - ], - "key": { - "C": { "item": "engineersdecor:rebar_concrete" } - }, - "result": { - "item": "engineersdecor:rebar_concrete_stairs", - "count": 9 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/rebar_concrete_wall_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/rebar_concrete_wall_recipe.json deleted file mode 100644 index 9afdf8d..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/rebar_concrete_wall_recipe.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " ", - "CCC", - "CCC" - ], - "key": { - "C": { - "item": "engineersdecor:rebar_concrete" - } - }, - "result": { - "item": "engineersdecor:rebar_concrete_wall", - "count": 6 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/slag_brick_recipe_with_slag.json b/1.13/src/main/resources/data/engineersdecor/recipes/slag_brick_recipe_with_slag.json deleted file mode 100644 index 9f07a06..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/slag_brick_recipe_with_slag.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:slag_brick_block" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "BBB", - "BSB", - "BBB" - ], - "key": { - "B": { "constant": "engineersdecor:any_brick_ingot" }, - "S": { "constant": "engineersdecor:any_slag" } - }, - "result": { - "item": "engineersdecor:slag_brick_block", - "count": 4 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/slag_brick_stairs_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/slag_brick_stairs_recipe.json deleted file mode 100644 index 20adf39..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/slag_brick_stairs_recipe.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:slag_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "C ", - "CC ", - "CCC" - ], - "key": { - "C": { - "item": "engineersdecor:slag_brick_block" - } - }, - "result": { - "item": "engineersdecor:slag_brick_stairs", - "count": 9 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/treated_wood_ladder_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/treated_wood_ladder_recipe.json deleted file mode 100644 index 8db74e1..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/treated_wood_ladder_recipe.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:treated_wood_ladder", -"later_required": ["immersiveengineering:material"] - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "S#S", - "SSS", - "S#S" - ], - "key": { - "S": { "constant": "engineersdecor:treated_wood_stick" }, - "#": { "item": "minecraft:bone_meal" } - }, - "result": { - "item": "engineersdecor:treated_wood_ladder", - "count": 4 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/treated_wood_pole_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/treated_wood_pole_recipe.json deleted file mode 100644 index 8d16ec3..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/treated_wood_pole_recipe.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:treated_wood_pole", -"later_required": ["immersiveengineering:material"] - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " S ", - " W ", - " W " - ], - "key": { - "W": { "constant": "engineersdecor:treated_wood_planks" }, - "S": { "constant": "engineersdecor:treated_wood_slab" } - }, - "result": { - "item": "engineersdecor:treated_wood_pole", - "count": 6 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/treated_wood_table_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/treated_wood_table_recipe.json deleted file mode 100644 index d366991..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/treated_wood_table_recipe.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:treated_wood_table", -"later_required": ["immersiveengineering:material"] - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "WWW", - "S S", - "S S" - ], - "key": { - "W": { "constant": "engineersdecor:treated_wood_slab" }, - "S": { "item": "engineersdecor:treated_wood_pole" } - }, - "result": { - "item": "engineersdecor:treated_wood_table", - "count": 1 - } -} diff --git a/1.13/src/main/resources/pack.mcmeta b/1.13/src/main/resources/pack.mcmeta deleted file mode 100644 index f642e0f..0000000 --- a/1.13/src/main/resources/pack.mcmeta +++ /dev/null @@ -1,7 +0,0 @@ -{ - "pack": { - "description": "engineersdecor resources", - "pack_format": 4, - "_comment": "A pack_format of 4 requires json lang files. Note: we require v4 pack meta for all mods." - } -} diff --git a/1.13/tasks.js b/1.13/tasks.js deleted file mode 100644 index 69e1a44..0000000 --- a/1.13/tasks.js +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/djs -// Note for reviewers/clones: This file is a auxiliary script for my setup. It's not needed to build the mod. -"use strict"; -const constants = include("../meta/lib/constants.js")(); -const libtask = include("../meta/lib/libtask.js")(constants); -const liblang = include("../meta/lib/liblang.1.13.js")(constants); -var tasks = {}; - -tasks["sync-languages"] = function() { - liblang.sync_languages(); -}; - -libtask.run(tasks, sys.args); diff --git a/1.14/Makefile b/1.14/Makefile index 4874f82..e6cad4f 100644 --- a/1.14/Makefile +++ b/1.14/Makefile @@ -81,4 +81,5 @@ dist: sanatize dist-check clean-all mod assets: @echo "[1.14] Running asset generators ..." @djs tasks.js create-slab-assets - @djs tasks.js create-half-slab-assets \ No newline at end of file + @djs tasks.js create-half-slab-assets + @djs tasks.js assets diff --git a/1.14/build.gradle b/1.14/build.gradle index ee605f1..0f376da 100644 --- a/1.14/build.gradle +++ b/1.14/build.gradle @@ -1,5 +1,5 @@ // @file build.gradle -// Engineer's decor mod gradle build relay (mc1.13.2) +// Engineer's decor mod gradle build relay (mc1.14.4) buildscript { repositories { maven { url = 'https://files.minecraftforge.net/maven' } diff --git a/1.14/gradle.properties b/1.14/gradle.properties index 71965fb..6040ba4 100644 --- a/1.14/gradle.properties +++ b/1.14/gradle.properties @@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx8G version_minecraft=1.14.4 version_forge_minecraft=1.14.4-28.0.40 version_fml_mappings=20190719-1.14.3 -version_jei=1.14.3:6.0.0.8 -version_engineersdecor=1.0.9-b10 +version_jei=1.14.4:6.0.0.10 +version_engineersdecor=1.0.11-b2 # # jar signing data loaded from signing.properties in the project root. # diff --git a/1.14/meta/update.json b/1.14/meta/update.json index a03895a..357c1a0 100644 --- a/1.14/meta/update.json +++ b/1.14/meta/update.json @@ -1,6 +1,8 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.14.4": { + "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).", + "1.0.11-b1": "[A] Added Steel Table\n[A] Added Treated Wood Side Table\n[A] Added Exit Sign\n[A] Added Steel Floor Grating\n[M] Sign orientation fixed, only blocked vertical placement.", "1.0.9-b9": "[U] Update to Forge 1.14.4-28.0.40/20190719-1.14.3 for Forge testing.", "1.0.9-b8": "[U] UPDATE TO 1.14.4. Forge 1.14.4-28.0.11/20190719-1.14.3.", "1.0.9-b7": "[U] Updated to Forge 1.14.3-27.0.60/20190719-1.14.3.\n[F] Disabled all early implemented fuild handling of valves and the Fluid Accumulator to prevent world loading hang-ups (issue #42, thx TheOhmegha for reporting). Will be re-enabled after fluid handling released in Forge.\n[F] Fixed blockstate model locations for signs and crafting table (issue #43, thx ProsperCraft for the beta test).", @@ -19,6 +21,6 @@ }, "promos": { "1.14.4-recommended": "", - "1.14.4-latest": "1.0.9-b9" + "1.14.4-latest": "1.0.11-b2" } } \ No newline at end of file diff --git a/1.14/readme.md b/1.14/readme.md index f29ea32..b09b402 100644 --- a/1.14/readme.md +++ b/1.14/readme.md @@ -10,7 +10,15 @@ Mod sources for Minecraft version 1.14.3. ---- ## Version history - ~ v1.0.9-b10 [U] + - v1.0.11-b2 [U] JEI dependency update 1.14.4:6.0.0.10. + [F] Fixed creative ghost block issue (issue #48). + [M] Updated ru_ru lang file (Shellyoung, PR#47). + + - v1.0.11-b1 [A] Added Steel Table + [A] Added Treated Wood Side Table + [A] Added Exit Sign + [A] Added Steel Floor Grating + [M] Sign orientation fixed, only blocked vertical placement. - v1.0.9-b9 [U] Update to Forge 1.14.4-28.0.40/20190719-1.14.3 for Forge testing. diff --git a/1.14/src/main/java/wile/engineersdecor/ModContent.java b/1.14/src/main/java/wile/engineersdecor/ModContent.java index 0b29260..6c4376f 100644 --- a/1.14/src/main/java/wile/engineersdecor/ModContent.java +++ b/1.14/src/main/java/wile/engineersdecor/ModContent.java @@ -196,6 +196,12 @@ public class ModContent ModAuxiliaries.getPixeledAABB(4.1,0,4.1, 11.8,8.8,11.8) )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "treated_wood_stool")); + public static final BlockDecor TREATED_WOOD_SIDE_TABLE = (BlockDecor)(new BlockDecor( + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT, + Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(2f, 15f).sound(SoundType.WOOD), + ModAuxiliaries.getPixeledAABB(2,0,2, 14,15.9,14) + )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "treated_wood_side_table")); + public static final BlockDecorDirected TREATED_WOOD_WINDOWSILL = (BlockDecorDirected)(new BlockDecorDirected( BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_FACING_PLACEMENT, Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(2f, 15f).sound(SoundType.WOOD), @@ -208,6 +214,18 @@ public class ModContent ModAuxiliaries.getPixeledAABB(5.2,5.2,15.7, 10.8,10.8,16.0) )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "iron_inset_light")); + public static final BlockDecor STEEL_TABLE = (BlockDecor)(new BlockDecor( + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT, + Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(2f, 15f).sound(SoundType.WOOD), + ModAuxiliaries.getPixeledAABB(0,0,0, 16,16,16) + )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "steel_table")); + + public static final BlockDecor STEEL_FLOOR_GRATING = (BlockDecorFloorGrating)(new BlockDecorFloorGrating( + BlockDecor.CFG_CUTOUT, + Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL), + ModAuxiliaries.getPixeledAABB(0,14,0, 16,16,16) + )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "steel_floor_grating")); + // ------------------------------------------------------------------------------------------------------------------- public static final BlockDecorWindow TREATED_WOOD_WINDOW = (BlockDecorWindow)(new BlockDecorWindow( @@ -275,35 +293,42 @@ public class ModContent // ------------------------------------------------------------------------------------------------------------------- public static final BlockDecorDirected SIGN_MODLOGO = (BlockDecorDirected)(new BlockDecorDirected( - BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT, + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_HORIZIONTAL, Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1f, 1000f).sound(SoundType.WOOD).lightValue(1), ModAuxiliaries.getPixeledAABB(0,0,15.6, 16,16,16.0) )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "sign_decor")); public static final BlockDecorDirected SIGN_HOTWIRE = (BlockDecorDirected)(new BlockDecorDirected( - BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT, + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_HORIZIONTAL, Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1f, 1f).sound(SoundType.WOOD), ModAuxiliaries.getPixeledAABB(2,2,15.6, 14,14,16) )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "sign_hotwire")); public static final BlockDecorDirected SIGN_DANGER = (BlockDecorDirected)(new BlockDecorDirected( - BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT, + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_HORIZIONTAL, Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1f, 1f).sound(SoundType.WOOD), ModAuxiliaries.getPixeledAABB(2,2,15.6, 14,14,16) )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "sign_danger")); public static final BlockDecorDirected SIGN_DEFENSE = (BlockDecorDirected)(new BlockDecorDirected( - BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT, + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_HORIZIONTAL, Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1f, 1f).sound(SoundType.WOOD), ModAuxiliaries.getPixeledAABB(2,2,15.6, 14,14,16) )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "sign_defense")); public static final BlockDecorDirected SIGN_FACTORY_AREA = (BlockDecorDirected)(new BlockDecorDirected( - BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT, + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_HORIZIONTAL, Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1f, 1f).sound(SoundType.WOOD), ModAuxiliaries.getPixeledAABB(2,2,15.6, 14,14,16) )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "sign_factoryarea")); + public static final BlockDecorDirected SIGN_EXIT = (BlockDecorDirected)(new BlockDecorDirected( + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_HORIZIONTAL, + Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1f, 1f).sound(SoundType.WOOD), + ModAuxiliaries.getPixeledAABB(3,7,15.6, 13,13,16) + )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "sign_exit")); + + // ------------------------------------------------------------------------------------------------------------------- public static final BlockDecorCraftingTable TREATED_WOOD_CRAFTING_TABLE = (BlockDecorCraftingTable)(new BlockDecorCraftingTable( @@ -411,6 +436,7 @@ public class ModContent // ------------------------------------------------------------------------------------------------------------------- private static final Block modBlocks[] = { + TREATED_WOOD_CRAFTING_TABLE, SMALL_LAB_FURNACE, FACTORY_DROPPER, SMALL_ELECTRICAL_FURNACE, @@ -443,31 +469,34 @@ public class ModContent //HALFSLAB_SHEETMETALGOLD, //HALFSLAB_SHEETMETALALUMINIUM, CONCRETE_WALL, + PANZERGLASS_BLOCK, + PANZERGLASS_SLAB, METAL_RUNG_LADDER, METAL_RUNG_STEPS, TREATED_WOOD_LADDER, - TREATED_WOOD_POLE, TREATED_WOOD_TABLE, - PANZERGLASS_BLOCK, - PANZERGLASS_SLAB, - INSET_LIGHT_IRON, TREATED_WOOD_STOOL, + TREATED_WOOD_SIDE_TABLE, TREATED_WOOD_WINDOWSILL, - TREATED_WOOD_CRAFTING_TABLE, - STEEL_FRAMED_WINDOW, TREATED_WOOD_WINDOW, + STEEL_FRAMED_WINDOW, + STEEL_TABLE, + INSET_LIGHT_IRON, + STEEL_FLOOR_GRATING, + TREATED_WOOD_POLE, TREATED_WOOD_POLE_HEAD, TREATED_WOOD_POLE_SUPPORT, - SIGN_MODLOGO, THIN_STEEL_POLE, THIN_STEEL_POLE_HEAD, THICK_STEEL_POLE, THICK_STEEL_POLE_HEAD, + STEEL_DOUBLE_T_SUPPORT, SIGN_HOTWIRE, SIGN_DANGER, - STEEL_DOUBLE_T_SUPPORT, SIGN_DEFENSE, - SIGN_FACTORY_AREA + SIGN_FACTORY_AREA, + SIGN_EXIT, + SIGN_MODLOGO, }; private static final Block devBlocks[] = { diff --git a/1.14/src/main/java/wile/engineersdecor/blocks/BlockDecorFloorGrating.java b/1.14/src/main/java/wile/engineersdecor/blocks/BlockDecorFloorGrating.java new file mode 100644 index 0000000..6a13333 --- /dev/null +++ b/1.14/src/main/java/wile/engineersdecor/blocks/BlockDecorFloorGrating.java @@ -0,0 +1,55 @@ +/* + * @file BlockDecorFloorGrating.java + * @author Stefan Wilhelm (wile) + * @copyright (C) 2019 Stefan Wilhelm + * @license MIT (see https://opensource.org/licenses/MIT) + * + * Floor gratings. + */ +package wile.engineersdecor.blocks; + + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockReader; + +public class BlockDecorFloorGrating extends BlockDecor +{ + + public BlockDecorFloorGrating(long config, Block.Properties builder, final AxisAlignedBB unrotatedAABB) + { super(config, builder); } + + @Override + public boolean propagatesSkylightDown(BlockState state, IBlockReader reader, BlockPos pos) + { return true; } + + +// @Override +// public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, AxisAlignedBB entityBox, List 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.setVelocity(0,-0.2,0); +// } +// } +// +// @Override +// public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity) +// { +// if(!(entity instanceof EntityItem)) return; +// 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); +// } +// } +} diff --git a/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_danger.json b/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_danger.json index 5e27252..15986ed 100644 --- a/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_danger.json +++ b/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_danger.json @@ -2,6 +2,6 @@ "forge_marker": 1, "defaults": { "model": "engineersdecor:block/sign/sign_danger_model" }, "variants": { - "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":-90}, "down": {"x":90} } + "facing": { "north":{"y":180}, "south":{"y":0}, "west":{"y":90}, "east":{"y":270}, "up": {"x":0}, "down": {"x":0} } } } diff --git a/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_decor.json b/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_decor.json index 98c0d41..4962ffe 100644 --- a/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_decor.json +++ b/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_decor.json @@ -2,6 +2,6 @@ "forge_marker": 1, "defaults": { "model": "engineersdecor:block/sign/sign_decor_model" }, "variants": { - "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":-90}, "down": {"x":90} } + "facing": { "north":{"y":180}, "south":{"y":0}, "west":{"y":90}, "east":{"y":270}, "up": {"x":0}, "down": {"x":0} } } } diff --git a/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_defense.json b/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_defense.json index f1f7abe..712d904 100644 --- a/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_defense.json +++ b/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_defense.json @@ -2,6 +2,6 @@ "forge_marker": 1, "defaults": { "model": "engineersdecor:block/sign/sign_defense_model" }, "variants": { - "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":0}, "down": {"x":0} } + "facing": { "north":{"y":180}, "south":{"y":0}, "west":{"y":90}, "east":{"y":270}, "up": {"x":0}, "down": {"x":0} } } } diff --git a/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_exit.json b/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_exit.json new file mode 100644 index 0000000..7c43028 --- /dev/null +++ b/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_exit.json @@ -0,0 +1,7 @@ +{ + "forge_marker": 1, + "defaults": { "model": "engineersdecor:block/sign/sign_exit_model" }, + "variants": { + "facing": { "north":{"y":180}, "south":{"y":0}, "west":{"y":90}, "east":{"y":270}, "up": {"x":0}, "down": {"x":0} } + } +} diff --git a/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_factoryarea.json b/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_factoryarea.json index 946c3f4..9e1538c 100644 --- a/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_factoryarea.json +++ b/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_factoryarea.json @@ -2,6 +2,6 @@ "forge_marker": 1, "defaults": { "model": "engineersdecor:block/sign/sign_factoryarea_model" }, "variants": { - "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":0}, "down": {"x":0} } + "facing": { "north":{"y":180}, "south":{"y":0}, "west":{"y":90}, "east":{"y":270}, "up": {"x":0}, "down": {"x":0} } } } diff --git a/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_hotwire.json b/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_hotwire.json index 5fc71a2..619056f 100644 --- a/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_hotwire.json +++ b/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_hotwire.json @@ -2,6 +2,6 @@ "forge_marker": 1, "defaults": { "model": "engineersdecor:block/sign/sign_hotwire_model" }, "variants": { - "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":-90}, "down": {"x":90} } + "facing": { "north":{"y":180}, "south":{"y":0}, "west":{"y":90}, "east":{"y":270}, "up": {"x":0}, "down": {"x":0} } } } diff --git a/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_mindstep.json b/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_mindstep.json index df8c489..9505adf 100644 --- a/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_mindstep.json +++ b/1.14/src/main/resources/assets/engineersdecor/blockstates/sign_mindstep.json @@ -2,6 +2,6 @@ "forge_marker": 1, "defaults": { "model": "engineersdecor:block/sign/sign_mindstep_model" }, "variants": { - "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":0}, "down": {"x":0} } + "facing": { "north":{"y":180}, "south":{"y":0}, "west":{"y":90}, "east":{"y":270}, "up": {"x":0}, "down": {"x":0} } } } diff --git a/1.14/src/main/resources/assets/engineersdecor/blockstates/steel_floor_grating.json b/1.14/src/main/resources/assets/engineersdecor/blockstates/steel_floor_grating.json new file mode 100644 index 0000000..3258777 --- /dev/null +++ b/1.14/src/main/resources/assets/engineersdecor/blockstates/steel_floor_grating.json @@ -0,0 +1,7 @@ +{ + "forge_marker": 1, + "defaults": { "model": "engineersdecor:block/furniture/steel_floor_grating_model" }, + "variants": { + "": [{}] + } +} diff --git a/1.14/src/main/resources/assets/engineersdecor/blockstates/steel_table.json b/1.14/src/main/resources/assets/engineersdecor/blockstates/steel_table.json new file mode 100644 index 0000000..efa5019 --- /dev/null +++ b/1.14/src/main/resources/assets/engineersdecor/blockstates/steel_table.json @@ -0,0 +1,7 @@ +{ + "forge_marker": 1, + "defaults": { "model": "engineersdecor:block/furniture/steel_table_model" }, + "variants": { + "": [{}] + } +} diff --git a/1.14/src/main/resources/assets/engineersdecor/blockstates/treated_wood_side_table.json b/1.14/src/main/resources/assets/engineersdecor/blockstates/treated_wood_side_table.json new file mode 100644 index 0000000..067391b --- /dev/null +++ b/1.14/src/main/resources/assets/engineersdecor/blockstates/treated_wood_side_table.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "engineersdecor:block/furniture/treated_wood_side_table_model" + }, + "variants": { + "": [{}] + } +} diff --git a/1.14/src/main/resources/assets/engineersdecor/lang/en_us.json b/1.14/src/main/resources/assets/engineersdecor/lang/en_us.json index e10e773..f14ff5d 100644 --- a/1.14/src/main/resources/assets/engineersdecor/lang/en_us.json +++ b/1.14/src/main/resources/assets/engineersdecor/lang/en_us.json @@ -115,6 +115,10 @@ "block.engineersdecor.steel_double_t_support.help": "§6Horizontal ceiling support beam fragment.", "block.engineersdecor.treated_wood_table": "Treated Wood Table", "block.engineersdecor.treated_wood_table.help": "§6Robust four-legged wood table.§r Indoor and outdoor use.", + "block.engineersdecor.steel_table": "Steel Table", + "block.engineersdecor.steel_table.help": "§6Robust four-legged steel table.", + "block.engineersdecor.steel_floor_grating": "Steel Floor Grating", + "block.engineersdecor.steel_floor_grating.help": "§6Decorative steel floor covering.§r Top aligned. Items fall through.", "block.engineersdecor.treated_wood_stool": "Treated Wood Stool", "block.engineersdecor.treated_wood_stool.help": "§6Robust Wood Stool.§r Indoor and outdoor use.", "block.engineersdecor.treated_wood_crafting_table": "Treated Wood Crafting Table", @@ -158,7 +162,8 @@ "block.engineersdecor.sign_defense": "Sign \"Caution Defense System Ahead\"", "block.engineersdecor.sign_defense.help": "§6Warning sign for turrets, Tesla Coils, and traps.", "block.engineersdecor.sign_factoryarea": "Sign \"Factory Area\"", - "block.engineersdecor.sign_factoryarea.help": "§6Marker sign for buildings or areas where the really big machines are located.", + "block.engineersdecor.sign_factoryarea.help": "§6There's the door, please ...", + "block.engineersdecor.sign_exit": "Exit Sign", "block.engineersdecor.halfslab_rebar_concrete": "Rebar Concrete Slice", "block.engineersdecor.halfslab_rebar_concrete.help": "§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices.", "block.engineersdecor.halfslab_concrete": "Concrete Slice", diff --git a/1.14/src/main/resources/assets/engineersdecor/lang/ru_ru.json b/1.14/src/main/resources/assets/engineersdecor/lang/ru_ru.json index d3f55c2..8670a3c 100644 --- a/1.14/src/main/resources/assets/engineersdecor/lang/ru_ru.json +++ b/1.14/src/main/resources/assets/engineersdecor/lang/ru_ru.json @@ -3,96 +3,103 @@ "language.code": "ru_ru", "language.region": "Russia", "itemGroup.tabengineersdecor": "Engineer's Decor", - "engineersdecor.config.title": "Engineer's Decor конфигурация", + "engineersdecor.config.title": "Конфигурация \"Engineer's Decor\"", "engineersdecor.tooltip.hint.extended": "§6[§9SHIFT§r Больше информации§6]§r", "engineersdecor.tooltip.hint.help": "§6[§9CTRL-SHIFT§r Помощь§6]§r", + "engineersdecor.tooltip.slabpickup.help": "§rБыстрое поднятие щелчком ЛКМ, смотря вверх/вниз с этой плитой в руках.", "engineersdecor.config.pattern_excludes": "Pattern excludes", "engineersdecor.config.pattern_includes": "Pattern includes", - "engineersdecor.config.without_clinker_bricks": "Without clinker bricks", - "engineersdecor.config.without_slag_bricks": "Without slag bricks", - "engineersdecor.config.without_rebar_concrete": "Without rebar concrete", - "engineersdecor.config.without_walls": "Without walls", - "engineersdecor.config.without_stairs": "Without stairs", - "engineersdecor.config.without_ie_concrete_wall": "Without concrete wall", - "engineersdecor.config.without_panzer_glass": "Without panzer glass", - "engineersdecor.config.without_crafting_table": "Without crafting table", - "engineersdecor.config.without_lab_furnace": "Without lab furnace", - "engineersdecor.config.without_electrical_furnace": "Without electrical furnace", - "engineersdecor.config.without_treated_wood_furniture": "Without tr. wood furniture", - "engineersdecor.config.without_windows": "Without windows", - "engineersdecor.config.without_light_sources": "Without lights", - "engineersdecor.config.without_ladders": "Without ladders", - "engineersdecor.config.without_chair_sitting": "Without chair sitting", - "engineersdecor.config.without_mob_chair_sitting": "Without chair mob sitting", - "engineersdecor.config.without_ladder_speed_boost": "Without ladder speed boost", - "engineersdecor.config.without_crafting_table_history": "Without crafting table history", - "engineersdecor.config.without_valves": "Without valves", - "engineersdecor.config.without_passive_fluid_accumulator": "Without fluid accumulator", - "engineersdecor.config.without_waste_incinerator": "Without waste incinerator", - "engineersdecor.config.without_sign_plates": "Without signs", - "engineersdecor.config.without_factory_dropper": "Without factory dropper", - "engineersdecor.config.without_slabs": "Without slabs", - "engineersdecor.config.without_halfslabs": "Without slab slices", - "engineersdecor.config.without_direct_slab_pickup": "Without slab pickup", - "engineersdecor.config.without_poles": "Without poles", - "engineersdecor.config.without_hsupports": "Without h. supports", - "engineersdecor.config.without_tooltips": "Without tooltips", - "engineersdecor.config.without_recipes": "Without recipes", - "engineersdecor.config.furnace_smelting_speed_percent": "Furnace: Smelting speed %", - "engineersdecor.config.furnace_fuel_efficiency_percent": "Furnace: Fuel efficiency %", - "engineersdecor.config.furnace_boost_energy_consumption": "Furnace: Boost energy", - "engineersdecor.config.chair_mob_sitting_probability_percent": "Chairs: Sitting chance %", - "engineersdecor.config.chair_mob_standup_probability_percent": "\"Chairs: Stand up chance %\"", - "engineersdecor.config.with_crafting_quickmove_buttons": "Crafting table: Move buttons", - "engineersdecor.config.pipevalve_max_flowrate": "Valves: Max flow rate", - "engineersdecor.config.pipevalve_redstone_gain": "Valves: Redstone slope", - "engineersdecor.config.e_furnace_speed_percent": "E-furnace: Smelting speed %", - "engineersdecor.config.e_furnace_power_consumption": "E-furnace: Power consumption", + "engineersdecor.config.without_clinker_bricks": "Без клинкерных кирпичей", + "engineersdecor.config.without_slag_bricks": "Без шлаковых кирпичей", + "engineersdecor.config.without_rebar_concrete": "Без железобетона", + "engineersdecor.config.without_walls": "Без стен", + "engineersdecor.config.without_stairs": "Без ступенек", + "engineersdecor.config.without_ie_concrete_wall": "Без бетонных стен", + "engineersdecor.config.without_panzer_glass": "Без бронированного стекла", + "engineersdecor.config.without_crafting_table": "Без верстака", + "engineersdecor.config.without_lab_furnace": "Без лабораторной печи", + "engineersdecor.config.without_electrical_furnace": "Без электрической печи", + "engineersdecor.config.without_treated_wood_furniture": "Без мебели из обр-ого дерева", + "engineersdecor.config.without_windows": "Без окон", + "engineersdecor.config.without_light_sources": "Без светильников", + "engineersdecor.config.without_ladders": "Без лестниц", + "engineersdecor.config.without_chair_sitting": "Без стульев для сидения", + "engineersdecor.config.without_mob_chair_sitting": "Без стульев для сидения для существ", + "engineersdecor.config.without_ladder_speed_boost": "Без ускорения на лестницах", + "engineersdecor.config.without_crafting_table_history": "Без истории крафта в столе", + "engineersdecor.config.without_valves": "Без клапанов", + "engineersdecor.config.without_passive_fluid_accumulator": "Без жидкостного накопителя", + "engineersdecor.config.without_waste_incinerator": "Без сжигателя отходов", + "engineersdecor.config.without_sign_plates": "Без знаков", + "engineersdecor.config.without_factory_dropper": "Без фабричного выбрасывателя", + "engineersdecor.config.without_slabs": "Без плит", + "engineersdecor.config.without_halfslabs": "Без частей плит", + "engineersdecor.config.without_direct_slab_pickup": "Без поднятия плит", + "engineersdecor.config.without_poles": "Без столбов", + "engineersdecor.config.without_hsupports": "Без опор", + "engineersdecor.config.without_tooltips": "Без подсказок", + "engineersdecor.config.without_recipes": "Без рецептов", + "engineersdecor.config.furnace_smelting_speed_percent": "Печь: скорость плавления %", + "engineersdecor.config.furnace_fuel_efficiency_percent": "Печь: Эффективность топлива %", + "engineersdecor.config.furnace_boost_energy_consumption": "Печь: Энергия ускорения", + "engineersdecor.config.chair_mob_sitting_probability_percent": "Стулья: Шанс сесть %", + "engineersdecor.config.chair_mob_standup_probability_percent": "\"Стулья: шанс встать %\"", + "engineersdecor.config.with_crafting_quickmove_buttons": "Верстак из обр-ого дерева: движение кнопок", + "engineersdecor.config.pipevalve_max_flowrate": "Клапаны: максимальная скорость потока", + "engineersdecor.config.pipevalve_redstone_gain": "Клапаны: спад красного камня", + "engineersdecor.config.e_furnace_speed_percent": "Электропечь: скорость плавления %", + "engineersdecor.config.e_furnace_power_consumption": "Электропечь: потребление энергии", "block.engineersdecor.clinker_brick_block": "Клинкерный кирпич", - "block.engineersdecor.clinker_brick_block.help": "§6Кирпичный блок с вариациями текстуры, зависящими от положения.§r\nВыглядит немного темнее и интенсивнее, чем ванильный кирпичный блок.", + "block.engineersdecor.clinker_brick_block.help": "§6Кирпичный блок с вариациями текстуры, зависящими от положения.§r\nВыглядит темнее и интенсивнее, чем Кирпичный блок.", "block.engineersdecor.clinker_brick_stained_block": "Грязный клинкерный кирпич", - "block.engineersdecor.clinker_brick_stained_block.help": "§6Кирпичный блок с вариациями текстуры, зависящими от положения.§r\nВыглядит немного темнее и интенсивнее, чем ванильный кирпичный блок. Имеет более заметные следы грязи или пятен.", + "block.engineersdecor.clinker_brick_stained_block.help": "§6Кирпичный блок с вариациями текстуры, зависящими от положения.§r\nВыглядит темнее и интенсивнее, чем Кирпичный блок. Имеет более заметные следы грязи или пятен.", "block.engineersdecor.slag_brick_block": "Шлакоблок", "block.engineersdecor.slag_brick_block.help": "§6Серо-коричневый кирпичный блок с зависимыми от положения вариациями текстуры.", "block.engineersdecor.rebar_concrete": "Железобетон", "block.engineersdecor.rebar_concrete.help": "§6Стальной железобетонный блок.§r Дорогой, но взрывоустойчивый, как обсидиан.", "block.engineersdecor.panzerglass_block": "Бронированное стекло", - "block.engineersdecor.panzerglass_block.help": "§6Усиленный стеклоблок.§r Дорогой, взрывоустойчивый. Имеет темно-серый оттенок, видны слабые структурные линии, мульти текстура для бесшовного отображения.", + "block.engineersdecor.panzerglass_block.help": "§6Усиленный стеклоблок.§r Дорогой, взрывоустойчивый. Имеет тёмно-серый оттенок, слегка видны структурные линии, мультитекстура для бесшовного отображения.", "block.engineersdecor.rebar_concrete_tile": "Железобетонная плита", "block.engineersdecor.rebar_concrete_tile.help": "§6Стальная железобетонная плитка.§r Дорогая, но взрывоустойчивая, как обсидиан.", - "block.engineersdecor.clinker_brick_slab": "Clinker Brick Slab", - "block.engineersdecor.clinker_brick_stained_slab": "Stained Clinker Brick Slab", - "block.engineersdecor.slag_brick_slab": "Slag Brick Slab", - "block.engineersdecor.rebar_concrete_slab": "Rebar Concrete Slab", - "block.engineersdecor.rebar_concrete_tile_slab": "Rebar Concrete Tile Slab", - "block.engineersdecor.panzerglass_slab": "Panzer Glass Slab", + "block.engineersdecor.clinker_brick_slab": "Клинкерная плита", + "block.engineersdecor.clinker_brick_slab.help": "§6Плита из клинкерного блока.§r\nВыглядит темнее и интенсивнее, чем Кирпичный блок.", + "block.engineersdecor.clinker_brick_stained_slab": "Плита из окраженного клинкерного кирпича", + "block.engineersdecor.clinker_brick_stained_slab.help": "§6Плита из Окрашенного клинкерного блока.", + "block.engineersdecor.slag_brick_slab": "Плита из шлакоблока", + "block.engineersdecor.slag_brick_slab.help": "§6Серо-коричневая кирпичная плита.", + "block.engineersdecor.rebar_concrete_slab": "Железобетонная плита", + "block.engineersdecor.rebar_concrete_slab.help": "§6Бетонная плита, усиленная сталью.§r Дорогая, но взрывоустойчивая, как обсидиан.", + "block.engineersdecor.rebar_concrete_tile_slab": "Железобетонная плитка", + "block.engineersdecor.rebar_concrete_tile_slab.help": "§6Бетонная плитка, усиленная сталью.§r Дорогая, но взрывоустойчивая, как обсидиан.", + "block.engineersdecor.panzerglass_slab": "Плита из бронированного стекла", + "block.engineersdecor.panzerglass_slab.help": "§6Усиленная стеклянная плита.§r Дорогая, взрывоустойчивая. Имеет тёмно-серый оттенок, слегка видны структурные линии.", "block.engineersdecor.rebar_concrete_wall": "Железобетонная стена", "block.engineersdecor.rebar_concrete_wall.help": "§6Стальная железобетонная стена.§r Дорогая, но взрывоустойчивая, как обсидиан.", "block.engineersdecor.concrete_wall": "Бетонная стена", - "block.engineersdecor.concrete_wall.help": "§6Стена из твердого бетона.", + "block.engineersdecor.concrete_wall.help": "§6Стена из твёрдого бетона.", "block.engineersdecor.clinker_brick_wall": "Клинкерная кирпичная стена", "block.engineersdecor.clinker_brick_wall.help": "§6Обыкновенная клинкерная кирпичная стена.", "block.engineersdecor.slag_brick_wall": "Кирпичная стена из шлакоблока", "block.engineersdecor.slag_brick_wall.help": "§6Обыкновенная стена из шлакоблока.", "block.engineersdecor.metal_rung_ladder": "Металлическая лестница", - "block.engineersdecor.metal_rung_ladder.help": "§6Типичная промышленная настенная лестница, состоящая из горизонтальных металлических стержней.§r Смотри вверх / вниз, чтобы подняться быстрее.", + "block.engineersdecor.metal_rung_ladder.help": "§6Типичная промышленная настенная лестница, состоящая из горизонтальных металлических стержней.§r Смотри вверх/вниз, чтобы подняться быстрее.", "block.engineersdecor.metal_rung_steps": "Настенные металлические ступеньки", - "block.engineersdecor.metal_rung_steps.help": "§6Металлические ступеньки, крепятся к стене. Позволяют подыматься / спускаться.§r Смотри вверх / вниз, чтобы подняться быстрее.", + "block.engineersdecor.metal_rung_steps.help": "§6Металлические ступеньки, крепятся к стене. Позволяют подниматься/спускаться.§r Смотри вверх/вниз, чтобы подняться быстрее.", "block.engineersdecor.treated_wood_ladder": "Лестница из обработанного дерева", - "block.engineersdecor.treated_wood_ladder.help": "§6Погодоустойчивая деревянная лестница.§r Смотри вверх / вниз, чтобы подняться быстрее.", - "block.engineersdecor.clinker_brick_stairs": "Клинкерная кирпичная лестница", - "block.engineersdecor.clinker_brick_stairs.help": "§6По цвету выглядит немного темнее и интенсивнее, чем ванильный кирпичный блок", - "block.engineersdecor.clinker_brick_stained_stairs": "Грязная кирпичная лестница", - "block.engineersdecor.clinker_brick_stained_stairs.help": "§6Выглядит немного темнее и интенсивнее, чем ванильный кирпичный блок. Имеет более заметные следы грязи или пятен.", - "block.engineersdecor.slag_brick_stairs": "Клинкерная кирпичная лестница", - "block.engineersdecor.slag_brick_stairs.help": "§6По цвету выглядит немного темнее и интенсивнее, чем ванильный кирпичный блок.", - "block.engineersdecor.rebar_concrete_stairs": "Железобетонная лестница", - "block.engineersdecor.rebar_concrete_stairs.help": "§6Железобетонная лестница.§r Дорогая, но взрывоустойчивая, как обсидиан.", - "block.engineersdecor.rebar_concrete_tile_stairs": "Железобетонная лестница", - "block.engineersdecor.rebar_concrete_tile_stairs.help": "§6Железобетонная лестница.§r Дорогая, но взрывоустойчивая, как обсидиан.", + "block.engineersdecor.treated_wood_ladder.help": "§6Погодоустойчивая деревянная лестница.§r Смотри вверх/вниз, чтобы подняться быстрее.", + "block.engineersdecor.clinker_brick_stairs": "Клинкерные кирпичные ступеньки", + "block.engineersdecor.clinker_brick_stairs.help": "§6По цвету выглядят немного темнее и интенсивнее, чем Кирпичный блок", + "block.engineersdecor.clinker_brick_stained_stairs": "Грязные кирпичные ступеньки", + "block.engineersdecor.clinker_brick_stained_stairs.help": "§6Выглядят немного темнее и интенсивнее, чем Кирпичный блок. Имеют более заметные следы грязи или пятен.", + "block.engineersdecor.slag_brick_stairs": "Клинкерные кирпичные ступеньки", + "block.engineersdecor.slag_brick_stairs.help": "§6По цвету выглядят немного темнее и интенсивнее, чем Кирпичный блок.", + "block.engineersdecor.rebar_concrete_stairs": "Железобетонные ступеньки", + "block.engineersdecor.rebar_concrete_stairs.help": "§6Железобетонные ступеньки.§r Дорогие, но взрывоустойчивые, как обсидиан.", + "block.engineersdecor.rebar_concrete_tile_stairs": "Ступеньки из железобетонной плитки", + "block.engineersdecor.rebar_concrete_tile_stairs.help": "§6Ступеньки из железобетонной плитки.§r Дорогие, но взрывоустойчивые, как обсидиан.", "block.engineersdecor.treated_wood_pole": "Прямой обработанный деревянный столб", - "block.engineersdecor.treated_wood_pole.help": "§6Надёжный столб с диаметром, схожим с реле.§r\n Может быть полезен в качестве альтернативы электро-столбам, если требуется особая специальная длина, или как опора для конструкций.", - "block.engineersdecor.treated_wood_pole_head": "Прямой обработанный деревянный столб верхняя часть/основание", + "block.engineersdecor.treated_wood_pole.help": "§6Надёжный столб с диаметром, схожим с реле.§r\n Может быть полезен в качестве альтернативы столбам для проводов, если требуется особая специальная длина, или как опора для конструкций.", + "block.engineersdecor.treated_wood_pole_head": "Прямой обработанный деревянный столб (верхняя часть/основание)", "block.engineersdecor.treated_wood_pole_head.help": "§6Деревянная часть, подходит как основание или наконечник прямых столбов.", "block.engineersdecor.treated_wood_pole_support": "Прямой обработанный деревянный столб", "block.engineersdecor.treated_wood_pole_support.help": "§6Усиленная деревянная опорная часть, подходит как основание или наконечник прямых столбов.", @@ -107,12 +114,17 @@ "block.engineersdecor.steel_double_t_support": "Стальная двойная Т-образная опора", "block.engineersdecor.steel_double_t_support.help": "§6Фрагмент горизонтальной потолочной опорной балки.", "block.engineersdecor.treated_wood_table": "Стол из обработанного дерева", - "block.engineersdecor.treated_wood_table.help": "§6Прочный деревянный стол с четырьмя ножками .§r Для использования в помещении и на улице.", + "block.engineersdecor.treated_wood_table.help": "§6Прочный деревянный стол с четырьмя ножками.§r Для использования в помещении и на улице.", + "block.engineersdecor.steel_table": "Стальной стол", + "block.engineersdecor.steel_table.help": "§6Прочный стол с четырьмя ножками.", + "block.engineersdecor.steel_floor_grating": "Решётка стального пола", + "block.engineersdecor.steel_floor_grating.help": "§6Декоративное стальное напольное покрытие.§r Выровнен по верху.", "block.engineersdecor.treated_wood_stool": "Табурет из обработанного дерева", "block.engineersdecor.treated_wood_stool.help": "§6Крепкий деревянный табурет.§r Для использования в помещении и на улице.", "block.engineersdecor.treated_wood_crafting_table": "Верстак из обработанного дерева", "block.engineersdecor.treated_wood_crafting_table.help": "§6Прочный и устойчивый к погодным условиям. Восемь слотов для хранения. Хранит инвентарь.", "block.engineersdecor.treated_wood_side_table": "Treated Wood Side Table", + "block.engineersdecor.treated_wood_side_table.help": "§6Needed after the work's done.", "block.engineersdecor.iron_inset_light": "Встраиваемый осветитель", "block.engineersdecor.iron_inset_light.help": "§6Маленький источник света, интегрируемый в стены, пол или потолок.§r\n Полезно для освещения мест, где проблематичны электрические осветительные установки. Уровень света - как факел.", "block.engineersdecor.treated_wood_window": "Обработанное деревянное окно", @@ -122,26 +134,26 @@ "block.engineersdecor.steel_framed_window": "Окно со стальной рамой", "block.engineersdecor.steel_framed_window.help": "§6Стальной каркас окна с тройным остеклением. Хорошо изолирует. §r Не подключается к смежным блокам, таким как стеклянные панели.", "block.engineersdecor.small_lab_furnace": "Компактная лабораторная печь", - "block.engineersdecor.small_lab_furnace.help": "§6Лабораторная печь в металлическом корпусе.§r Подача твёрдого топлива - сверху. Немного горячее чем каменная, поэтому быстрее. Два внутренних слота для ввода, выхода и топлива.", + "block.engineersdecor.small_lab_furnace.help": "§6Лабораторная печь в металлическом корпусе.§r Подача твёрдого топлива сверху. Немного горячее, чем каменная, поэтому быстрее. Два внутренних слота для ввода, выхода и топлива.", "block.engineersdecor.small_electrical_furnace": "Компактная конвейерная электрическая печь", - "block.engineersdecor.small_electrical_furnace.help": "§6Компактная конвейерная печь в металлическом корпусе.§r Автоматически принимает предметы со стороны ввода и складывает в инвентарь со стороны вывода. Предметы могут быть импортированы/вытянуты со всех сторон с помощью воронок. Без проблем пропускает элементы, которые нельзя выплавить или приготовить. Чуть более энергоэффективная и быстра, чем утеплённая булыжная печь. Транспортировка работает стеками. Механизм требует немного энергии.", + "block.engineersdecor.small_electrical_furnace.help": "§6Компактная конвейерная печь в металлическом корпусе.§r Автоматически принимает предметы со стороны ввода и складывает в инвентарь со стороны вывода. Предметы можно помещать/забирать со всех сторон с помощью воронок. Без проблем пропускает элементы, которые нельзя выплавить или приготовить. Чуть более энергоэффективная и быстрая, чем утеплённая булыжная печь. Транспортировка работает стеками. Механизм требует мало энергии.", "block.engineersdecor.small_waste_incinerator": "Компактный сжигатель отходов", - "block.engineersdecor.small_waste_incinerator.help": "§6Отходы с слотами очереди.§r Предметы могут помещаться с любой стороны, и храниться до тех пор, пока в очереди не останется свободного места. После этого самый старый стэк будет сожжен. Подключите электричество (RF/FE) для увеличения скорости обработки. Сохраняет инвентарь при перемещении.", - "block.engineersdecor.straight_pipe_valve": "Жидкостный одноканальный клапан", - "block.engineersdecor.straight_pipe_valve.help": "§6Фрагмент прямой трубы.§r проводит жидкость только в одном направлении. Не соединяется по бокам. Уменьшает пропускную способность. SHIFT для размещения в противоположном направлении.", - "block.engineersdecor.straight_pipe_valve_redstone": "Редстоун-контролируемый жидкостный клапан", - "block.engineersdecor.straight_pipe_valve_redstone.help": "§6Фрагмент прямой трубы.§r Проводит жидкости только в одном направлении. Не соединяется по бокам. SHIFT - чтобы разместить в обратном направлении. Блокирует поток, если присутствует сигнал красного камня.", - "block.engineersdecor.straight_pipe_valve_redstone_analog": "Редстоун-аналоговый клапан для жидкости", - "block.engineersdecor.straight_pipe_valve_redstone_analog.help": "§6Фрагмент прямой трубы.§r Проводит жидкости только в одном направлении. Не соединяется по бокам. SHIFT - чтобы разместить в обратном направлении. Не пропускает при отсутствии красного сигнала, уменьшает расход линейно с мощности 1 до 14, открывается максимально-возможно при уровне красного сигнала 15.", + "block.engineersdecor.small_waste_incinerator.help": "§6Отходы с слотами для очереди.§r Предметы могут помещаться с любой стороны, и храниться до тех пор, пока в очереди не останется свободного места. После этого самый старый стек будет сожжен. Подключите электричество (RF/FE) для увеличения скорости обработки. Сохраняет инвентарь при перемещении.", + "block.engineersdecor.straight_pipe_valve": "Одноканальный жидкостный клапан", + "block.engineersdecor.straight_pipe_valve.help": "§6Фрагмент прямой трубы.§r Проводит жидкость только в одном направлении. Не соединяется по бокам. Уменьшает пропускную способность. SHIFT для размещения в противоположном направлении.", + "block.engineersdecor.straight_pipe_valve_redstone": "Краснокаменно-контролируемый жидкостный клапан", + "block.engineersdecor.straight_pipe_valve_redstone.help": "§6Фрагмент прямой трубы.§r Проводит жидкости только в одном направлении. Не соединяется по бокам. SHIFT для размещения в обратном направлении. Блокирует поток, если присутствует сигнал красного камня.", + "block.engineersdecor.straight_pipe_valve_redstone_analog": "Краснокаменно-аналоговый жидкостный клапан", + "block.engineersdecor.straight_pipe_valve_redstone_analog.help": "§6Фрагмент прямой трубы.§r Проводит жидкости только в одном направлении. Не соединяется по бокам. SHIFT для размещения в обратном направлении. Не пропускает при отсутствии сигнала красного камня, уменьшает расход линейно с мощности 1 до 14, открывается максимально-возможно при уровне сигнала красного камня 15.", "block.engineersdecor.passive_fluid_accumulator": "Пассивный жидкостный накопитель", - "block.engineersdecor.passive_fluid_accumulator.help": "§6Вакуумный всасывающий жидкостный коллектор§r Имеет один выход, все остальные стороны - входные. Сливает жидкости из соседних резервуаров при выкачивании жидкости из выходного порта.", + "block.engineersdecor.passive_fluid_accumulator.help": "§6Вакуумный всасывающий жидкостный коллектор.§r Имеет один выход, все остальные стороны входные. Сливает жидкости из соседних резервуаров при выкачивании жидкости из выходного порта.", "block.engineersdecor.factory_dropper": "Фабричный выбрасыватель", - "block.engineersdecor.factory_dropper.help": "§6Выбрасыватель подходит для продвинутой автоматизации производства.§r Имеет двенадцать выборочных слотов. Сила броска, угол, размер стопки и задержка настраиваются в GUI. Три слота сравнения стека с логическим И или ИЛИ могут использоваться в качестве внутреннего источника запуска. Внутренний триггер может быть И или ИЛИ с внешним триггерным сигналом красного камня. Триггерные кнопки симуляции для тестирования. Предварительно открывает дверцу затвора, когда выполняются условия внутреннего запуска. Сбрасывает все соответствующие стеки одновременно. Нажмите на все элементы в GUI, чтобы увидеть, как это работает.", + "block.engineersdecor.factory_dropper.help": "§6Выбрасыватель подходит для продвинутой автоматизации производства.§r Имеет 12 выборочных слотов. Сила броска, угол, размер стопки и задержка настраиваются в GUI. 3 слота сравнения стека с логическим И или ИЛИ могут использоваться в качестве внутреннего источника запуска. Внутренний триггер может быть И или ИЛИ с внешним триггерным сигналом красного камня. Триггерные кнопки симуляции для тестирования. Предварительно открывает дверцу затвора, когда выполняются условия внутреннего запуска. Сбрасывает все соответствующие стеки одновременно. Нажмите на все элементы в GUI, чтобы увидеть, как это работает.", "block.engineersdecor.small_mineral_smelter": "Small Mineral Melting Furnace", "block.engineersdecor.sign_decor": "Табличка с надписью (Логотип Engineer's decor)", "block.engineersdecor.sign_decor.help": "§Это не должно быть крафтовым или видимым в JEI. Используется для творческой вкладки и скриншотов.", "block.engineersdecor.sign_hotwire": "Знак «Осторожно, под напряжением»", - "block.engineersdecor.sign_hotwire.help": "§6Предупреждение об опасности поражения электрическим током. Не забудьте разместить вокруг HV, иначе у вас будет штраф при следующей проверке.", + "block.engineersdecor.sign_hotwire.help": "§6Предупреждение об опасности поражения электрическим током. Не забудьте разместить около высокого напряжения, иначе у вас будет штраф при следующей проверке.", "block.engineersdecor.sign_mindstep": "Знак «Осторожно, там ступеньки!»", "block.engineersdecor.sign_mindstep.help": "§6Размещается на стенах (горизонтально)", "block.engineersdecor.sign_danger": "Знак «Осторожно, там опасность»", @@ -149,7 +161,8 @@ "block.engineersdecor.sign_defense": "Знак «Осторожно, впереди система обороны»", "block.engineersdecor.sign_defense.help": "§6Предупреждающий знак для турелей, катушек Тесла и ловушек.", "block.engineersdecor.sign_factoryarea": "Знак «Заводская зона»", - "block.engineersdecor.sign_factoryarea.help": "§6Знак для зданий или областей, где находятся действительно большие машины.", + "block.engineersdecor.sign_factoryarea.help": "§6Там дверь, пожалуйста...", + "block.engineersdecor.sign_exit": "Знак «Выход»", "block.engineersdecor.halfslab_rebar_concrete": "Арматура для бетона", "block.engineersdecor.halfslab_rebar_concrete.help": "§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей.", "block.engineersdecor.halfslab_concrete": "Бетонный срез", diff --git a/1.14/src/main/resources/assets/engineersdecor/lang/zh_cn.json b/1.14/src/main/resources/assets/engineersdecor/lang/zh_cn.json index ca59239..2d3614d 100644 --- a/1.14/src/main/resources/assets/engineersdecor/lang/zh_cn.json +++ b/1.14/src/main/resources/assets/engineersdecor/lang/zh_cn.json @@ -94,6 +94,8 @@ "block.engineersdecor.steel_double_t_support": "Steel Double T Support", "block.engineersdecor.treated_wood_table": "经过处理的木桌", "block.engineersdecor.treated_wood_table.help": "§6坚固的四足木桌.", + "block.engineersdecor.steel_table": "Steel Table", + "block.engineersdecor.steel_floor_grating": "Steel Floor Grating", "block.engineersdecor.treated_wood_stool": "Treated Wood Stool", "block.engineersdecor.treated_wood_crafting_table": "Treated Wood Crafting Table", "block.engineersdecor.treated_wood_side_table": "Treated Wood Side Table", @@ -116,6 +118,7 @@ "block.engineersdecor.sign_danger": "Sign \"Caution Really Dangerous There\"", "block.engineersdecor.sign_defense": "Sign \"Caution Defense System Ahead\"", "block.engineersdecor.sign_factoryarea": "Sign \"Factory Area\"", + "block.engineersdecor.sign_exit": "Exit Sign", "block.engineersdecor.halfslab_rebar_concrete": "Rebar Concrete Slice", "block.engineersdecor.halfslab_concrete": "Concrete Slice", "block.engineersdecor.halfslab_treated_wood": "Treated Wood Slice", diff --git a/1.14/src/main/resources/assets/engineersdecor/models/block/furniture/steel_floor_grating_model.json b/1.14/src/main/resources/assets/engineersdecor/models/block/furniture/steel_floor_grating_model.json new file mode 100644 index 0000000..5d6f83d --- /dev/null +++ b/1.14/src/main/resources/assets/engineersdecor/models/block/furniture/steel_floor_grating_model.json @@ -0,0 +1,187 @@ +{ + "parent": "block/cube", + "textures": { + "s": "engineersdecor:block/furniture/steel_table_side_texture", + "particle": "engineersdecor:block/furniture/steel_table_side_texture", + "t": "engineersdecor:block/furniture/steel_table_top_texture" + }, + "elements": [ + { + "from": [0, 14, 15], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 2], "texture": "#s"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#s"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#s"}, + "west": {"uv": [15, 0, 16, 2], "texture": "#s"}, + "up": {"uv": [0, 15, 16, 16], "texture": "#t"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#s"} + } + }, + { + "from": [0, 14, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 0, 16, 2], "texture": "#s"}, + "east": {"uv": [15, 0, 16, 2], "texture": "#s"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#s"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#s"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#t"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#s"} + } + }, + { + "from": [15, 14, 0.75], + "to": [16, 16, 15.25], + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#s"}, + "east": {"uv": [0.75, 0, 15.25, 2], "texture": "#s"}, + "south": {"uv": [15, 0, 16, 2], "texture": "#s"}, + "west": {"uv": [0.75, 0, 15.25, 2], "texture": "#s"}, + "up": {"uv": [15, 0.75, 16, 15.25], "texture": "#t"}, + "down": {"uv": [15, 0.75, 16, 15.25], "texture": "#s"} + } + }, + { + "from": [1, 15, 13.625], + "to": [15, 15.875, 14.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "faces": { + "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "east": {"uv": [1.625, 0.125, 2.375, 1], "texture": "#s"}, + "south": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "west": {"uv": [13.625, 0.125, 14.375, 1], "texture": "#s"}, + "up": {"uv": [1, 13.625, 15, 14.375], "texture": "#t"}, + "down": {"uv": [1, 1.625, 15, 2.375], "texture": "#t"} + } + }, + { + "from": [1, 15, 12.125], + "to": [15, 15.875, 12.875], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "faces": { + "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "east": {"uv": [3.125, 0.125, 3.875, 1], "texture": "#s"}, + "south": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "west": {"uv": [12.125, 0.125, 12.875, 1], "texture": "#s"}, + "up": {"uv": [1, 12.125, 15, 12.875], "texture": "#t"}, + "down": {"uv": [1, 3.125, 15, 3.875], "texture": "#t"} + } + }, + { + "from": [1, 15, 10.625], + "to": [15, 15.875, 11.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "faces": { + "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "east": {"uv": [4.625, 0.125, 5.375, 1], "texture": "#s"}, + "south": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "west": {"uv": [10.625, 0.125, 11.375, 1], "texture": "#s"}, + "up": {"uv": [1, 10.625, 15, 11.375], "texture": "#t"}, + "down": {"uv": [1, 4.625, 15, 5.375], "texture": "#t"} + } + }, + { + "from": [1, 15, 9.125], + "to": [15, 15.875, 9.875], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "faces": { + "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "east": {"uv": [6.125, 0.125, 6.875, 1], "texture": "#s"}, + "south": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "west": {"uv": [9.125, 0.125, 9.875, 1], "texture": "#s"}, + "up": {"uv": [1, 9.125, 15, 9.875], "texture": "#t"}, + "down": {"uv": [1, 6.125, 15, 6.875], "texture": "#t"} + } + }, + { + "from": [1, 15, 7.625], + "to": [15, 15.875, 8.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "faces": { + "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "east": {"uv": [7.625, 0.125, 8.375, 1], "texture": "#s"}, + "south": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "west": {"uv": [7.625, 0.125, 8.375, 1], "texture": "#s"}, + "up": {"uv": [1, 7.625, 15, 8.375], "texture": "#t"}, + "down": {"uv": [1, 7.625, 15, 8.375], "texture": "#t"} + } + }, + { + "from": [1, 15, 6.125], + "to": [15, 15.875, 6.875], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "faces": { + "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "east": {"uv": [9.125, 0.125, 9.875, 1], "texture": "#s"}, + "south": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "west": {"uv": [6.125, 0.125, 6.875, 1], "texture": "#s"}, + "up": {"uv": [1, 6.125, 15, 6.875], "texture": "#t"}, + "down": {"uv": [1, 9.125, 15, 9.875], "texture": "#t"} + } + }, + { + "from": [1, 15, 4.625], + "to": [15, 15.875, 5.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "faces": { + "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "east": {"uv": [10.625, 0.125, 11.375, 1], "texture": "#s"}, + "south": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "west": {"uv": [4.625, 0.125, 5.375, 1], "texture": "#s"}, + "up": {"uv": [1, 4.625, 15, 5.375], "texture": "#t"}, + "down": {"uv": [1, 10.625, 15, 11.375], "texture": "#t"} + } + }, + { + "from": [1, 15, 3.125], + "to": [15, 15.875, 3.875], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "faces": { + "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "east": {"uv": [12.125, 0.125, 12.875, 1], "texture": "#s"}, + "south": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "west": {"uv": [3.125, 0.125, 3.875, 1], "texture": "#s"}, + "up": {"uv": [1, 3.125, 15, 3.875], "texture": "#t"}, + "down": {"uv": [1, 12.125, 15, 12.875], "texture": "#t"} + } + }, + { + "from": [1, 15, 1.625], + "to": [15, 15.875, 2.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "faces": { + "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "east": {"uv": [13.625, 0.125, 14.375, 1], "texture": "#s"}, + "south": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "west": {"uv": [1.625, 0.125, 2.375, 1], "texture": "#s"}, + "up": {"uv": [1, 1.625, 15, 2.375], "texture": "#t"}, + "down": {"uv": [1, 13.625, 15, 14.375], "texture": "#t"} + } + }, + { + "from": [0, 14, 1], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [15, 0, 16, 2], "texture": "#s"}, + "east": {"uv": [1, 0, 15, 2], "texture": "#s"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#s"}, + "west": {"uv": [1, 0, 15, 2], "texture": "#s"}, + "up": {"uv": [0, 1, 1, 15], "texture": "#t"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#s"} + } + } + ], + "display": { + "ground": { + "scale": [0.2, 0.2, 0.2] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/1.14/src/main/resources/assets/engineersdecor/models/block/furniture/steel_table_model.json b/1.14/src/main/resources/assets/engineersdecor/models/block/furniture/steel_table_model.json new file mode 100644 index 0000000..1d0d6ed --- /dev/null +++ b/1.14/src/main/resources/assets/engineersdecor/models/block/furniture/steel_table_model.json @@ -0,0 +1,383 @@ +{ + "parent": "block/cube", + "textures": { + "s": "engineersdecor:block/furniture/steel_table_side_texture", + "particle": "engineersdecor:block/furniture/steel_table_side_texture", + "t": "engineersdecor:block/furniture/steel_table_top_texture" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [2, 14, 1], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s", "cullface": "down"} + } + }, + { + "from": [14, 0, 0], + "to": [16, 14, 1], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s", "cullface": "down"} + } + }, + { + "from": [14, 0, 15], + "to": [16, 14, 16], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s", "cullface": "down"} + } + }, + { + "from": [0, 0, 15], + "to": [2, 14, 16], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s", "cullface": "down"} + } + }, + { + "from": [0, 0, 14], + "to": [1, 14, 15], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s", "cullface": "down"} + } + }, + { + "from": [0, 0, 1], + "to": [1, 14, 2], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s", "cullface": "down"} + } + }, + { + "from": [15, 0, 1], + "to": [16, 14, 2], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s", "cullface": "down"} + } + }, + { + "from": [15, 0, 14], + "to": [16, 14, 15], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s", "cullface": "down"} + } + }, + { + "from": [0, 14, 14], + "to": [16, 16, 16], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#s"} + } + }, + { + "from": [0, 14, 0], + "to": [16, 16, 2], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#s"} + } + }, + { + "from": [14, 14, 2], + "to": [16, 16, 14], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#s"} + } + }, + { + "from": [2, 15.5, 12.75], + "to": [14, 16, 13.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 13.75], + "to": [14, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 11.75], + "to": [14, 16, 12.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 10.75], + "to": [14, 16, 11.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 9.75], + "to": [14, 16, 10.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 8.75], + "to": [14, 16, 9.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 7.75], + "to": [14, 16, 8.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 6.75], + "to": [14, 16, 7.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 5.75], + "to": [14, 16, 6.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 4.75], + "to": [14, 16, 5.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 3.75], + "to": [14, 16, 4.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 2.75], + "to": [14, 16, 3.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 2], + "to": [14, 16, 2.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [0, 14, 2], + "to": [2, 16, 14], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#s"} + } + }, + { + "from": [14, 13.5, 14], + "to": [15, 14, 15], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "from": [1, 13.5, 14], + "to": [2, 14, 15], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "from": [14, 13.5, 1], + "to": [15, 14, 2], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "from": [1, 13.5, 1], + "to": [2, 14, 2], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + } + ], + "display": { + "ground": { + "scale": [0.2, 0.2, 0.2] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/1.14/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_side_table_model.json b/1.14/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_side_table_model.json new file mode 100644 index 0000000..f6cf7d1 --- /dev/null +++ b/1.14/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_side_table_model.json @@ -0,0 +1,206 @@ +{ + "parent": "block/cube", + "textures": { + "o": "engineersdecor:block/iestyle/treated_wood_framed_texture", + "particle": "engineersdecor:block/iestyle/treated_wood_framed_texture" + }, + "elements": [ + { + "from": [7, 2.5, 7], + "to": [9, 14, 9], + "faces": { + "north": {"uv": [7, 1, 9, 13.5], "texture": "#o"}, + "east": {"uv": [7, 1, 9, 13.5], "texture": "#o"}, + "south": {"uv": [7, 1, 9, 13.5], "texture": "#o"}, + "west": {"uv": [7, 1, 9, 13.5], "texture": "#o"}, + "down": {"uv": [7, 7, 9, 9], "texture": "#o", "cullface": "down"} + } + }, + { + "from": [9.375, 0.375, 7.25], + "to": [10.875, 4.875, 8.75], + "rotation": {"angle": 45, "axis": "z", "origin": [10.5, 2.375, 8]}, + "faces": { + "north": {"uv": [5, 11, 6, 15], "texture": "#o"}, + "east": {"uv": [7.5, 9, 9.5, 15], "texture": "#o"}, + "south": {"uv": [10, 10, 12, 15], "texture": "#o"}, + "west": {"uv": [7.5, 11, 8.5, 15], "texture": "#o"} + } + }, + { + "from": [3, 14, 3], + "to": [13, 15, 13], + "faces": { + "north": {"uv": [3, 1, 13, 2], "texture": "#o"}, + "east": {"uv": [3, 1, 13, 2], "texture": "#o"}, + "south": {"uv": [3, 1, 13, 2], "texture": "#o"}, + "west": {"uv": [3, 1, 13, 2], "texture": "#o"}, + "up": {"uv": [3, 3, 13, 13], "texture": "#o"}, + "down": {"uv": [3, 3, 13, 13], "texture": "#o"} + } + }, + { + "from": [11, 0, 7], + "to": [14, 1.25, 9], + "faces": { + "north": {"uv": [2, 14.75, 5, 16], "texture": "#o"}, + "east": {"uv": [7, 14.75, 9, 16], "texture": "#o"}, + "south": {"uv": [11, 14.75, 14, 16], "texture": "#o"}, + "west": {"uv": [7, 14.75, 9, 16], "texture": "#o"}, + "up": {"uv": [11, 7, 14, 9], "texture": "#o"}, + "down": {"uv": [11, 7, 14, 9], "texture": "#o"} + } + }, + { + "from": [2, 0, 7], + "to": [5, 1.25, 9], + "faces": { + "north": {"uv": [11, 14.75, 14, 16], "texture": "#o"}, + "east": {"uv": [7, 14.75, 9, 16], "texture": "#o"}, + "south": {"uv": [2, 14.75, 5, 16], "texture": "#o"}, + "west": {"uv": [7, 14.75, 9, 16], "texture": "#o"}, + "up": {"uv": [2, 7, 5, 9], "texture": "#o"}, + "down": {"uv": [2, 7, 5, 9], "texture": "#o"} + } + }, + { + "from": [7, 0, 2], + "to": [9, 1.25, 5], + "faces": { + "north": {"uv": [7, 14.75, 9, 16], "texture": "#o"}, + "east": {"uv": [11, 14.75, 14, 16], "texture": "#o"}, + "south": {"uv": [7, 14.75, 9, 16], "texture": "#o"}, + "west": {"uv": [2, 14.75, 5, 16], "texture": "#o"}, + "up": {"uv": [7, 2, 9, 5], "rotation": 270, "texture": "#o"}, + "down": {"uv": [7, 11, 9, 14], "rotation": 90, "texture": "#o"} + } + }, + { + "from": [7, 0, 11], + "to": [9, 1.25, 14], + "faces": { + "north": {"uv": [7, 14.75, 9, 16], "texture": "#o"}, + "east": {"uv": [2, 14.75, 5, 16], "texture": "#o"}, + "south": {"uv": [7, 14.75, 9, 16], "texture": "#o"}, + "west": {"uv": [11, 14.75, 14, 16], "texture": "#o"}, + "up": {"uv": [7, 11, 9, 14], "rotation": 270, "texture": "#o"}, + "down": {"uv": [7, 2, 9, 5], "rotation": 90, "texture": "#o"} + } + }, + { + "from": [5.125, 0.375, 7.25], + "to": [6.625, 4.875, 8.75], + "rotation": {"angle": -45, "axis": "z", "origin": [5.5, 2.375, 8]}, + "faces": { + "north": {"uv": [5, 11, 6, 15], "texture": "#o"}, + "east": {"uv": [7.5, 9, 9.5, 15], "texture": "#o"}, + "south": {"uv": [10, 10, 12, 15], "texture": "#o"}, + "west": {"uv": [7.5, 11, 8.5, 15], "texture": "#o"} + } + }, + { + "from": [7.25, 0.375, 9.375], + "to": [8.75, 4.875, 10.875], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 2.375, 10.5]}, + "faces": { + "north": {"uv": [5, 11, 6, 15], "texture": "#o"}, + "east": {"uv": [7.5, 9, 9.5, 15], "texture": "#o"}, + "south": {"uv": [10, 10, 12, 15], "texture": "#o"}, + "west": {"uv": [7.5, 11, 8.5, 15], "texture": "#o"} + } + }, + { + "from": [7.25, 0.375, 5.125], + "to": [8.75, 4.875, 6.625], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 2.375, 5.5]}, + "faces": { + "north": {"uv": [5, 11, 6, 15], "texture": "#o"}, + "east": {"uv": [7.5, 9, 9.5, 15], "texture": "#o"}, + "south": {"uv": [10, 10, 12, 15], "texture": "#o"}, + "west": {"uv": [7.5, 11, 8.5, 15], "texture": "#o"} + } + }, + { + "from": [2, 15, 2], + "to": [14, 16, 14], + "faces": { + "north": {"uv": [2, 0, 14, 1], "texture": "#o"}, + "east": {"uv": [2, 0, 14, 1], "texture": "#o"}, + "south": {"uv": [2, 0, 14, 1], "texture": "#o"}, + "west": {"uv": [2, 0, 14, 1], "texture": "#o"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#o"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#o"} + } + }, + { + "from": [1, 15, 3], + "to": [2, 16, 13], + "faces": { + "north": {"uv": [14, 0, 15, 1], "texture": "#o"}, + "east": {"uv": [3, 0, 13, 1], "texture": "#o"}, + "south": {"uv": [1, 0, 2, 1], "texture": "#o"}, + "west": {"uv": [3, 0, 13, 1], "texture": "#o"}, + "up": {"uv": [1, 3, 2, 13], "texture": "#o"}, + "down": {"uv": [1, 3, 2, 13], "texture": "#o"} + } + }, + { + "from": [14, 15, 3], + "to": [15, 16, 13], + "faces": { + "north": {"uv": [1, 0, 2, 1], "texture": "#o"}, + "east": {"uv": [3, 0, 13, 1], "texture": "#o"}, + "south": {"uv": [14, 0, 15, 1], "texture": "#o"}, + "west": {"uv": [3, 0, 13, 1], "texture": "#o"}, + "up": {"uv": [14, 3, 15, 13], "texture": "#o"}, + "down": {"uv": [14, 3, 15, 13], "texture": "#o"} + } + }, + { + "from": [3, 15, 1], + "to": [13, 16, 2], + "faces": { + "north": {"uv": [3, 0, 13, 1], "texture": "#o"}, + "east": {"uv": [14, 0, 15, 1], "texture": "#o"}, + "south": {"uv": [3, 0, 13, 1], "texture": "#o"}, + "west": {"uv": [1, 0, 2, 1], "texture": "#o"}, + "up": {"uv": [3, 1, 13, 2], "texture": "#o"}, + "down": {"uv": [3, 14, 13, 15], "texture": "#o"} + } + }, + { + "from": [3, 15, 14], + "to": [13, 16, 15], + "faces": { + "north": {"uv": [3, 0, 13, 1], "texture": "#o"}, + "east": {"uv": [1, 0, 2, 1], "texture": "#o"}, + "south": {"uv": [3, 0, 13, 1], "texture": "#o"}, + "west": {"uv": [14, 0, 15, 1], "texture": "#o"}, + "up": {"uv": [3, 14, 13, 15], "texture": "#o"}, + "down": {"uv": [3, 1, 13, 2], "texture": "#o"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [24, -27, 10], + "translation": [0.75, -1.25, -0.25], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_righthand": { + "rotation": [-15, 20, 0], + "translation": [0.5, -0.25, 0.75], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "scale": [0.2, 0.2, 0.2] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/1.14/src/main/resources/assets/engineersdecor/models/block/sign/sign_exit_model.json b/1.14/src/main/resources/assets/engineersdecor/models/block/sign/sign_exit_model.json new file mode 100644 index 0000000..d85001d --- /dev/null +++ b/1.14/src/main/resources/assets/engineersdecor/models/block/sign/sign_exit_model.json @@ -0,0 +1,45 @@ +{ + "parent": "block/cube", + "textures": { + "s": "engineersdecor:block/iestyle/treated_wood_rough_texture", + "particle": "engineersdecor:block/iestyle/treated_wood_rough_texture", + "f": "engineersdecor:block/sign/sign_exit_texture" + }, + "elements": [ + { + "from": [3, 7, 0], + "to": [13, 13, 0.5], + "faces": { + "north": {"uv": [3, 3, 13, 9], "texture": "#s"}, + "east": {"uv": [15.5, 3, 16, 9], "texture": "#s"}, + "south": {"uv": [0, 2, 16, 12], "texture": "#f"}, + "west": {"uv": [0, 3, 0.5, 9], "texture": "#s"}, + "up": {"uv": [3, 0, 13, 0.5], "texture": "#s"}, + "down": {"uv": [3, 15.5, 13, 16], "texture": "#s"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [27, -68, 7], + "translation": [-3, -1, -0.75], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_righthand": { + "rotation": [1, -58, 7], + "translation": [0.5, 0, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 0, 7], + "scale": [0.7, 0.7, 0.7] + }, + "gui": { + "translation": [0, 0.5, 0] + }, + "fixed": { + "rotation": [0, 180, 0], + "translation": [0, 0, -7.8] + } + } +} \ No newline at end of file diff --git a/1.14/src/main/resources/assets/engineersdecor/models/item/sign_exit.json b/1.14/src/main/resources/assets/engineersdecor/models/item/sign_exit.json new file mode 100644 index 0000000..03f0798 --- /dev/null +++ b/1.14/src/main/resources/assets/engineersdecor/models/item/sign_exit.json @@ -0,0 +1 @@ +{ "parent": "engineersdecor:block/sign/sign_exit_model" } \ No newline at end of file diff --git a/1.14/src/main/resources/assets/engineersdecor/models/item/steel_floor_grating.json b/1.14/src/main/resources/assets/engineersdecor/models/item/steel_floor_grating.json new file mode 100644 index 0000000..38be511 --- /dev/null +++ b/1.14/src/main/resources/assets/engineersdecor/models/item/steel_floor_grating.json @@ -0,0 +1 @@ +{ "parent": "engineersdecor:block/furniture/steel_floor_grating_model" } \ No newline at end of file diff --git a/1.14/src/main/resources/assets/engineersdecor/models/item/steel_table.json b/1.14/src/main/resources/assets/engineersdecor/models/item/steel_table.json new file mode 100644 index 0000000..b54d0ac --- /dev/null +++ b/1.14/src/main/resources/assets/engineersdecor/models/item/steel_table.json @@ -0,0 +1 @@ +{ "parent": "engineersdecor:block/furniture/steel_table_model" } \ No newline at end of file diff --git a/1.14/src/main/resources/assets/engineersdecor/models/item/treated_wood_side_table.json b/1.14/src/main/resources/assets/engineersdecor/models/item/treated_wood_side_table.json new file mode 100644 index 0000000..0710aa6 --- /dev/null +++ b/1.14/src/main/resources/assets/engineersdecor/models/item/treated_wood_side_table.json @@ -0,0 +1 @@ +{ "parent": "engineersdecor:block/furniture/treated_wood_side_table_model" } \ No newline at end of file diff --git a/1.14/src/main/resources/assets/engineersdecor/textures/block/furniture/steel_table_side_texture.png b/1.14/src/main/resources/assets/engineersdecor/textures/block/furniture/steel_table_side_texture.png new file mode 100644 index 0000000..758bc24 Binary files /dev/null and b/1.14/src/main/resources/assets/engineersdecor/textures/block/furniture/steel_table_side_texture.png differ diff --git a/1.14/src/main/resources/assets/engineersdecor/textures/block/furniture/steel_table_top_texture.png b/1.14/src/main/resources/assets/engineersdecor/textures/block/furniture/steel_table_top_texture.png new file mode 100644 index 0000000..9035c68 Binary files /dev/null and b/1.14/src/main/resources/assets/engineersdecor/textures/block/furniture/steel_table_top_texture.png differ diff --git a/1.14/src/main/resources/assets/engineersdecor/textures/block/sign/sign_exit_texture.png b/1.14/src/main/resources/assets/engineersdecor/textures/block/sign/sign_exit_texture.png new file mode 100644 index 0000000..16c2a67 Binary files /dev/null and b/1.14/src/main/resources/assets/engineersdecor/textures/block/sign/sign_exit_texture.png differ diff --git a/1.14/tasks.js b/1.14/tasks.js index f0920ad..c8001a6 100644 --- a/1.14/tasks.js +++ b/1.14/tasks.js @@ -1,15 +1,22 @@ #!/usr/bin/djs // Note for reviewers/clones: This file is a auxiliary script for my setup. It's not needed to build the mod. "use strict"; -const constants = include("../meta/lib/constants.js")(); -const libtask = include("../meta/lib/libtask.js")(constants); -const liblang = include("../meta/lib/liblang.1.13.js")(constants); // 1.14 lang same as 1.13 +const constants = include("../meta/lib/constants.js")(); +constants.options.without_ref_repository_check = true; +const libtask = include("../meta/lib/libtask.js")(constants); +const liblang = include("../meta/lib/liblang.1.13.js")(constants); // 1.14 lang same as 1.13 +const libassets = include("../meta/lib/libassets.js")(constants); +const libtask114 = include("../meta/lib/libtask.1.14.js")(constants, libassets, liblang); var tasks = {}; tasks["sync-languages"] = function() { liblang.sync_languages(); }; +tasks["assets"] = function() { + libtask114.stdtasks["assets"](); +}; + tasks["create-slab-assets"] = function() { const libassets = include("../meta/lib/libassets.js")(constants); const slab_assets = include("meta/lib/slab_assets.js")(constants, libassets); diff --git a/Makefile b/Makefile index dbbd626..c887f15 100644 --- a/Makefile +++ b/Makefile @@ -14,17 +14,14 @@ dist: default clean: -@cd 1.12; make -s clean - -@cd 1.13; make -s clean -@cd 1.14; make -s clean clean-all: -@cd 1.12; make -s clean-all - -@cd 1.13; make -s clean-all -@cd 1.14; make -s clean-all mrproper: -@cd 1.12; make -s mrproper - -@cd 1.13; make -s mrproper -@cd 1.14; make -s mrproper update-json: @@ -33,7 +30,6 @@ update-json: sanatize: @cd 1.12; make -s sanatize - @cd 1.13; make -s sanatize @cd 1.14; make -s sanatize @make -s update-json diff --git a/meta/lib/libtask.1.14.js b/meta/lib/libtask.1.14.js new file mode 100644 index 0000000..1393b69 --- /dev/null +++ b/meta/lib/libtask.1.14.js @@ -0,0 +1,350 @@ +#!/usr/bin/djs +"use strict"; + +(function(constants, libassets, liblang){ + const me = {'tasks':{}, 'parsing':{},'sanatizing':{}}; + + const note = function() { + var args = ["[note]"]; + for(var i in arguments) args.push(arguments[i]); + print.apply(this, args); + } + const warn = function() { + var args = ["[warn]"]; + for(var i in arguments) args.push(arguments[i]); + print.apply(this, args); + } + const pass = function() { + var args = ["[pass]"]; + for(var i in arguments) args.push(arguments[i]); + print.apply(this, args); + } + const fail = function() { + var args = ["[fail]"]; + for(var i in arguments) args.push(arguments[i]); + print.apply(this, args); + } + + me.tasks.map_regnames_blockstate_filenames = function() { + const cwd = fs.cwd(); + const rnmap = constants.registryname_map_112_114; + if(rnmap === undefined) { + note("Blockstate file renaming skipped, no mapping defined."); + return; + } + try { + if(!fs.chdir(constants.local_assets_root()+"/blockstates")) throw new Error("Failed to switch to blockstates dir."); + for(var oldname in rnmap) { + const oldfile = oldname+".json"; + const newfile = rnmap[oldname]+".json"; + if(oldfile==newfile) continue; + if(fs.isfile(oldname+".json")) { + if(fs.isfile(newfile)) { + note("blockstate file skipped: '" + oldfile + "' -> '" + newfile + "' (new file already exists)"); + } else if(!fs.rename(oldfile, newfile)) { + note("blockstate file rename failed: '" + oldfile + "' -> '" + newfile + "'"); + } else { + note("blockstate file: '" + oldfile + "' -> '" + newfile + "'"); + } + } + } + pass("Blockstate file renaming done."); + } catch(ex) { + fail("Blockstate file renaming failed:"+ex); + } finally { + fs.chdir(cwd); + } + }; + + me.tasks.map_regnames_lang_file_keys = function() { + const cwd = fs.cwd(); + const rnmap = constants.registryname_map_112_114; + const block_prefix = "block." + constants.modid + "."; + const item_prefix = "item." + constants.modid + "."; + try { + if(!fs.chdir(constants.local_assets_root()+"/lang")) throw new Error("Failed to switch to lang dir."); + const langfiles = fs.readdir(); + for(var i_langfile in langfiles) { + const original_lang = JSON.parse(fs.readfile(langfiles[i_langfile])); + const replaced_lang = {} + for(var key in original_lang) { + if(key.search(block_prefix)===0) { + const regname = key.replace(block_prefix,"").replace(/[\.].*$/,""); + if(rnmap[regname] !== undefined) { + const sfind = block_prefix + regname; + const srepl = block_prefix + rnmap[regname]; + const newkey = key.replace(sfind, srepl); + replaced_lang[newkey] = original_lang[key]; + continue; + } + } else if(key.search(item_prefix)===0) { + const regname = key.replace(item_prefix,"").replace(/[\.].*$/,""); + if(rnmap[regname] !== undefined) { + const sfind = item_prefix + regname; + const srepl = item_prefix + rnmap[regname]; + const newkey = key.replace(sfind, srepl); + replaced_lang[newkey] = original_lang[key]; + continue; + } + } + // replacements must continue + replaced_lang[key] = original_lang[key]; + } + fs.writefile(langfiles[i_langfile], JSON.stringify(replaced_lang,null,1)); + } + pass("Lang file key mappings done."); + } catch(ex) { + warn("Lang file key mapping failed:"+ex); + } finally { + fs.chdir(cwd); + } + }; + + me.tasks.patch_texture_paths_in_models = function() { + const cwd = fs.cwd(); + const replacements = {}; + replacements['"' + constants.modid+":blocks/"] = '"' + constants.modid+":block/" + try { + if(!fs.chdir(constants.local_assets_root()+"/models")) throw new Error("Failed to switch to models dir."); + fs.find(".", "*.json", function(path){ + const original_text = fs.readfile(path); + var replaced_text = ""+original_text; + JSON.parse(replaced_text); // to throw on load error + for(var sfind in replacements) replaced_text = replaced_text.split(sfind).join(replacements[sfind]); + if(replaced_text !== original_text) { + note("Replacements in model '"+path+"'"); + fs.writefile(path, replaced_text); + } + return false; + }); + pass("Model file texture paths done."); + } catch(ex) { + fail("Model file texture paths failed:"+ex); + } finally { + fs.chdir(cwd); + } + }; + + me.tasks.create_missing_block_items = function() { + const cwd = fs.cwd(); + const blockstate_models = {}; + try { + if(!fs.chdir(constants.local_assets_root())) throw new Error("Failed to switch to assets dir."); + fs.find("blockstates", "*.json", function(path){ + const blockstate = fs.basename(path).replace(".json",""); + const json = JSON.parse(fs.readfile(path)); + if(json["forge_marker"] !== undefined) { + var model = json["defaults"]["model"]; + if(model.search(constants.modid+":block/") < 0) { + model = model.replace(constants.modid+":", constants.modid+":block/"); + } + blockstate_models[blockstate] = model; + } + if(blockstate_models[blockstate] === undefined) { + throw new Error("IMPLEMENT use first found model."); + } + return false; + }); + for(var blockstate in blockstate_models) { + const item_model_file = "models/item/"+blockstate+".json"; + if(fs.isfile(item_model_file)) continue; + if(!fs.writefile(item_model_file, JSON.stringify({parent:blockstate_models[blockstate]}))) { + throw new Error("Failed to write item model file '" + item_model_file + "'"); + } + } + pass("Missing item models done."); + } catch(ex) { + fail("Missing item models failed:"+ex); + } finally { + fs.chdir(cwd); + } + }; + + me.tasks.patch_registry_names_in_java_files = function() { + const cwd = fs.cwd(); + const rnmap = constants.registryname_map_112_114; + if(rnmap === undefined) { + pass("Registry name mapping in java files skipped, no mappings defined."); + return; + } + try { + if(!fs.chdir("src/main/java")) throw new Error("Failed to switch to 'src/main/java'."); + fs.find(".", "*.java", function(path){ + const original_code = fs.readfile(path); + var replaced_code = ""+original_code; + if(original_code===undefined) throw new Error("Failed to read '"+ path +"'."); + for(var oldname in rnmap) { + if(oldname == rnmap[oldname]) { + continue; + } + { + const sfind = '"'+constants.modid+':'+oldname+'"'; + const srepl = '"'+constants.modid+':'+rnmap[oldname]+'"'; + if(replaced_code.search(sfind) >= 0) { + replaced_code = replaced_code.split(sfind).join(srepl); + note(fs.basename(path), ":", sfind, "->" , srepl); + } + } + { + const sfind = '"'+oldname+'"'; + const srepl = '"'+rnmap[oldname]+'"'; + if(replaced_code.search(sfind) >= 0) { + replaced_code = replaced_code.split(sfind).join(srepl); + note(fs.basename(path), ":", sfind, "->" , srepl); + } + } + } + if(replaced_code !== original_code) { + if(!fs.writefile(path, replaced_code)) throw new Error("Failed to write '"+ path +"'."); + } + return false; + }); + pass("Registry name mapping in java files patched."); + } catch(ex) { + fail("Registry name mapping in java files failed:"+ex); + } finally { + fs.chdir(cwd); + } + }; + + me.tasks.patch_forge_blockstates = function() { + const cwd = fs.cwd(); + try { + if(!fs.chdir(constants.local_assets_root()+"/blockstates")) throw new Error("Failed to switch to blockstates dir."); + const blockstate_files = fs.readdir("."); + for(var fit in blockstate_files) { + const jtxt = fs.readfile(blockstate_files[fit]); + if(!jtxt) throw new Error("Failed read blockstate file '" + blockstate_files[fit] + "'."); + const json = JSON.parse(jtxt); + if(json["forge_marker"] !== 1) continue; + // now simply text replace to keep the formatting + var njtext = jtxt.replace(/"normal"[\s]*:/, '"":'); + njtext = njtext.replace(/"inventory"[\s]*:[\s]*\[[\s]*\{[\s]*\}[\s]*][\s]*[,]?[\s]*/, ''); + njtext = njtext.replace(/"model":[\s]*"/g, '"model": "'); + const pref = '"model": "' + constants.modid + ':'; + njtext = njtext.replace(new RegExp(pref, "g"), pref + 'block/'); // actually faster to simply replace all and correct doubles. + njtext = njtext.replace(new RegExp(pref + 'block/block/', "g"), pref + 'block/'); + njtext = njtext.replace("\n\n", "\n"); + if(jtxt !== njtext) { + fs.writefile(blockstate_files[fit], njtext); + note("Forge blockstate '"+ fs.basename(blockstate_files[fit]) +"' patched."); + } + } + pass("Forge blockstates patched."); + } catch(ex) { + fail("Forge blockstate patching failed:"+ex); + } finally { + fs.chdir(cwd); + } + }; + + me.tasks.map_recipe_filenames = function() { + const cwd = fs.cwd(); + const rnmap = constants.registryname_map_112_114; + if(rnmap === undefined) { + pass("Recipe file name mapping skipped, no mappings defined."); + return; + } + try { + if(!fs.chdir(constants.local_data_root()+"/recipes")) throw new Error("Failed to switch to recipes dir."); + fs.find(".", "*.json", function(path){ + const file_name = fs.basename(path); + if(file_name.search("_")===0) return; + const oldfile = path; + var newfile = ""; + for(var oldname in rnmap) { + const newname = rnmap[oldname]; + if(file_name.search(oldname)===0) { + newfile = fs.dirname(path) + "/" + fs.basename(path).replace(oldname, newname); + newfile = newfile.replace(".json",""); + if((newfile.search(/_recipe$/)<0) && (newfile.search(/_backcycle$/)<0) && (newfile.search(/_standalone$/)<0)) { + newfile += "_recipe"; + } + newfile += ".json"; + break; + } + } + if(newfile == "") { + // no match + } else if(oldfile === newfile) { + note("skip identical file " + newfile); + } else { + note(oldfile + " -> " + newfile); + fs.rename(oldfile, newfile); + } + }); + pass("Recipe file name mapping done."); + } catch(ex) { + fail("Recipe file name mapping failed:"+ex); + } finally { + fs.chdir(cwd); + } + }; + + me.tasks.map_recipe_contents = function() { + const modid = constants.modid; + const cwd = fs.cwd(); + const rnmap = constants.registryname_map_112_114; + if(rnmap === undefined) { + pass("Recipe json data mapping skipped, no mappings defined."); + return; + } + try { + if(!fs.chdir(constants.local_data_root()+"/recipes")) throw new Error("Failed to switch to recipes dir."); + fs.find(".", "*.json", function(path){ + if(fs.basename(path).search("_")===0) return; + const txt = fs.readfile(path); + if(txt === undefined) { + note("Failed to read file '" + path + "'"); + return; + } + // The easy stuff fist, text replace regnames + for(var key in rnmap) { + const oldname = modid+":"+key + const newname = modid+":"+rnmap[key]; + txt = txt.split('"'+oldname+'"').join('"'+newname+'"'); + } + txt = JSON.stringify(JSON.parse(txt)); + txt = txt.replace(/,"data":0/g, ""); + var recipe = JSON.parse(txt); + if(recipe.conditions === undefined) recipe.conditions = {}; + recipe.conditions.type = modid+":grc" + recipe.conditions.result = recipe.result; + fs.writefile(path, JSON.stringify(recipe,null,1)); + if((recipe.result===undefined) || (recipe.result.item===undefined)) { + warn("Recipe '" + path + "': No result item?!"); + return; + } + const filename_check = recipe.result.item.replace(/^.*?:/,""); + if(fs.basename(path).search(filename_check) < 0) { + warn("Recipe filename '" + path + "' does not contain the result '"+ filename_check +"'."); + //const newfile = fs.dirname(path) + "/" + filename_check + "_recipe.json"; + //if(!fs.isfile(newfile)) fs.rename(path, newfile); + } + }); + pass("Recipe json data mappings done."); + } catch(ex) { + fail("Recipe json data mappings failed:"+ex); + } finally { + fs.chdir(cwd); + } + }; + + me.stdtasks = {}; + me.stdtasks["assets"] = function() { + me.tasks.map_regnames_blockstate_filenames(); + me.tasks.patch_texture_paths_in_models(); + me.tasks.create_missing_block_items(); + me.tasks.patch_registry_names_in_java_files(); + me.tasks.patch_forge_blockstates(); + me.tasks.map_recipe_filenames(); + me.tasks.map_recipe_contents(); + me.tasks.map_regnames_lang_file_keys(); + }; + + Object.freeze(me); + Object.freeze(me.tasks); + Object.freeze(me.parsing); + Object.freeze(me.sanatizing); + return me; +}); diff --git a/meta/lib/libtask.js b/meta/lib/libtask.js index 9625359..6bf2940 100644 --- a/meta/lib/libtask.js +++ b/meta/lib/libtask.js @@ -324,7 +324,8 @@ stdtasks["version-check"] = function(args) { var r = me.tasks.version_check(!args.join().search("--no-preversions")>=0); if(r.fails.length == 0) return; - for(var i in r.fails) r.fails[i] = " - " + r.fails[i]; + alert("Version check failed:"); + for(var i in r.fails) alert(" - " + r.fails[i]); alert("Version data:"); alert(" - version_mod : '" + r.version_mod + "'"); alert(" - combined_version : '" + r.combined_version + "'"); diff --git a/meta/update.json b/meta/update.json index 3bc1ff3..2a7a0fa 100644 --- a/meta/update.json +++ b/meta/update.json @@ -1,14 +1,16 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "promos": { - "1.12.2-recommended": "1.0.10", - "1.12.2-latest": "1.0.10", - "1.13.2-recommended": "", - "1.13.2-latest": "1.0.7-b5", + "1.12.2-recommended": "1.0.11", + "1.12.2-latest": "1.0.11", "1.14.4-recommended": "", - "1.14.4-latest": "1.0.9-b9" + "1.14.4-latest": "1.0.11-b2" }, "1.12.2": { + "1.0.11": "[R] Release based on v1.0.11-b3. Release-to-release changes: * Steel floor grating improvments. * Minor model box fixes. * Standalone recipes added. * Language updates.", + "1.0.11-b3": "[M] Added missing standalone recipes for pipe valves, passive fluid accumulator, and waste incinerator.", + "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.", "1.0.10-b1": "[A] Treated wood side table added.\n[F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting).\n[A] Added Exit Sign (texture design by J. Carver).", @@ -57,22 +59,9 @@ "1.0.0-b2": "[A] Added rebar concrete (steel reinforced, expensive, creeper-proof).", "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.13.2": { - "1.0.7-b5": "[A] Added translation zh_cn (PR#33, XuyuEre)\n[M] Updated textures.\n[M] Updated 1st/3rd person item model rotations/translations.", - "1.0.7-b4": "[A] Added stained clinker brick block/stairs.", - "1.0.7-b3": "[V] Version assignment: All features of v1.0.7-b3-1.12.2 that can be ported to 1.13.2 implemented/prepared, therefore version re-assigned.\n[A] Added \"Factory Area\" sign.\n[M] Sign background colors adapted.\n[M] EN lang file updated (PR#28, Voxelo).", - "1.0.4-b6": "[A] Added Small Electrical Furnace.\n[A] Added Small Waste Incinerator.\n[A] Experimental: Added fluid check valve.\n[A] Experimental: Added fluid redstone controlled valve.\n[A] Experimental: Added fluid redstone analog valve.\n[A] Experimental: Added passive fluid accumulator.", - "1.0.4-b5": "[A] Added Factory Dropper.\n[A] Added \"Caution Defense System Ahead\" sign.", - "1.0.4-b4": "[U] Updated forge dependency: REQUIRES FORGE >= 1.13.2-25.0.214.\n[A] Added sign \"Electrical hazard\"/\"Caution hot wire\".\n[A] Added sign \"Caution dangerous there\" (skull/bones).\n[A] Added horizontal steel double-T support beam with pole connections.", - "1.0.4-b3": "[V] Version assignment: All features of v1.0.4-b3-1.12.2 that can be ported to 1.13.2 implemented/prepared, therefore version re-iterated.\n[A] Lab furnace ported to 1.13.\n[A] Treated wood crafting table: Added crafting table history/quick craft.\n[A] Treated wood stool: Sitting on the stool implemented.\n[A] Steel poles (thick/thin) with support heads/foots added.\n[E] Prepared position dependent texture variation for walls (clinker, slag, rebar concrete), missing one forge feature yet for completion.\n[E] Prepared multi-layer rendering for windows, needs forge feature implementation.", - "1.0.2-b3": "[A] Added treated wood window.\n[A] Added treated wood pole support.\n[A] Added treated wood pole head.\n[A] Added steel framed window.", - "1.0.2-b2": "[A] Added wall decomposition recipes.\n[A] Added slag brick wall.\n[M] Climbing/descending mod ladders is faster when looking up or down and not sneaking.\n[M] Panzer glass material definition changed.", - "1.0.2-b1": "[A] Added Treated wood crafting table.\n[A] Added decomposition recipes for stairs and tiles.\n[N] Note: All v1.0.2-b1-mc1.12.2 blocks are ported to 1.13.2 (alpha -^ beta version).\n[N] Note: Until IE is out for 1.13.2, the recipes are temporary with vanilla items.", - "1.0.0-a3": "[A] Added iron inset light.\n[A] Added rebar concrete tile.\n[A] Added rebar concrete tile stairs.\n[A] Added clinker brick wall.\n[A] Added treated wood stool.\n[A] Added treated window sill.", - "1.0.0-a2": "[A] Added panzer glass.", - "1.0.0-a1": "[A] Initial port to 1.13.2 with Forge beta." - }, "1.14.4": { + "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).", + "1.0.11-b1": "[A] Added Steel Table\n[A] Added Treated Wood Side Table\n[A] Added Exit Sign\n[A] Added Steel Floor Grating\n[M] Sign orientation fixed, only blocked vertical placement.", "1.0.9-b9": "[U] Update to Forge 1.14.4-28.0.40/20190719-1.14.3 for Forge testing.", "1.0.9-b8": "[U] UPDATE TO 1.14.4. Forge 1.14.4-28.0.11/20190719-1.14.3.", "1.0.9-b7": "[U] Updated to Forge 1.14.3-27.0.60/20190719-1.14.3.\n[F] Disabled all early implemented fuild handling of valves and the Fluid Accumulator to prevent world loading hang-ups (issue #42, thx TheOhmegha for reporting). Will be re-enabled after fluid handling released in Forge.\n[F] Fixed blockstate model locations for signs and crafting table (issue #43, thx ProsperCraft for the beta test).", diff --git a/readme.md b/readme.md index 308bc57..4e4ed35 100644 --- a/readme.md +++ b/readme.md @@ -175,8 +175,6 @@ commits. - [1.12](1.12/readme.md) - - [1.13](1.13/readme.md) - - [1.14](1.14/readme.md) ### Community references diff --git a/tasks.js b/tasks.js index 61a9911..a992372 100644 --- a/tasks.js +++ b/tasks.js @@ -5,7 +5,6 @@ const constants = include("meta/lib/constants.js")(); const libtask = include("meta/lib/libtask.js")(constants); const libassets = include("meta/lib/libassets.js")(constants); const modid = constants.mod_registry_name(); -const with_113 = false; var tasks = {}; tasks["update-json"] = function() { @@ -16,7 +15,6 @@ tasks["update-json"] = function() { }; var update_json_src = []; fs.find(root_dir + "/1.12/meta/", "update*.json", function(path){ update_json_src.push(JSON.parse(fs.readfile(path))); }); - fs.find(root_dir + "/1.13/meta/", "update*.json", function(path){ update_json_src.push(JSON.parse(fs.readfile(path))); }); fs.find(root_dir + "/1.14/meta/", "update*.json", function(path){ update_json_src.push(JSON.parse(fs.readfile(path))); }); for(var i in update_json_src) { const version_update_json = update_json_src[i]; @@ -58,7 +56,6 @@ tasks["sync-main-repository"] = function() { sys.shell("rm -rf documentation meta"); sys.shell("rm -f .gitignore credits.md license Makefile readme.md tasks.js"); cd_main("1.12"); sys.shell("rm -rf meta gradle src"); - cd_main("1.13"); sys.shell("rm -rf meta gradle"); cd_main("1.14"); sys.shell("rm -rf meta gradle src"); cd_dev(); sys.shell("cp -f .gitignore credits.md license Makefile readme.md tasks.js \"" + main_repo_local + "/\"") @@ -68,11 +65,6 @@ tasks["sync-main-repository"] = function() { sys.shell("cp -f .gitignore build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js.* \"" + main_repo_local + "/1.12/\"") sys.shell("cp -r gradle meta src \"" + main_repo_local + "/1.12/\"") } - { - cd_dev("1.13"); - sys.shell("cp -f .gitignore build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js \"" + main_repo_local + "/1.13/\"") - sys.shell("cp -r gradle meta \"" + main_repo_local + "/1.13/\"") - } { cd_dev("1.14"); sys.shell("cp -f .gitignore build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js \"" + main_repo_local + "/1.14/\"") @@ -120,7 +112,6 @@ tasks["compare-textures"] = function(args) { } } var ok = true; - if(with_113 && !compare("1.12", "1.13")) ok = false; if(!compare("1.12", "1.14")) ok = false; return ok; }; @@ -157,7 +148,6 @@ tasks["compare-blockstates"] = function(args) { } } var ok = true; - if(with_113 && !compare("1.12", "1.13")) ok = false; if(!compare("1.12", "1.14")) ok = false; return ok; };