MinecraftMods/EngineersDecor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

1.14.3: Fixed issue #35, issue #36, #37. 1.12: Treated Wood Side Table work in progress. 1.12: Release version prepared.

Browse source
This commit is contained in:
stfwi 2019-07-06 15:28:16 +02:00
parent 8b99f38f17
commit d880b90a48
17 changed files with 535 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

2
1.12/gradle.properties
View file

@ -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.9-b3
version_engineersdecor=1.0.10-b1

500
1.12/readme.md
View file

@ -10,290 +10,306 @@ Mod sources for Minecraft version 1.12.2.
----
## Version history
- 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-b1 [I] Features WIP
[A] Treated wood side table added.
[F] Fixed recipe collision of Metal Rung Ladder (issue #37,
thx ProsperCraft for reporting).
- 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.9 [T] In release test.
[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.9-b1 [U] Lang file ru_ru updated (PR#31, yaroslav4167).
[M] Block hardness adaptions (issue #32).
- 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 [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-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.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-b1 [U] Lang file ru_ru updated (PR#31, yaroslav4167).
[M] Block hardness adaptions (issue #32).
- 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.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 [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.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.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-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.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.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.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.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.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-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.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.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.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.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 [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.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-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.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-b8 [F] Fixed stairs rendering without smooth light (thanks rastot9).
[E] Added passive fluid accumulator (experimental feature, see config).
-------------------------------------------------------------------
- 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-b7 [F] Fixed recipe loading issue if IE is not installed.
[M] Valves support IE pressurized fluid transfer.
- 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-b6 [A] Added redstone controlled fluid valve.
[A] Added redstone controlled analog fluid valve.
[M] Check valve recipe adapted (thanks majijn).
- 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-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-b7 [F] Fixed recipe loading issue if IE is not installed.
[M] Valves support IE pressurized fluid transfer.
- 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-b6 [A] Added redstone controlled fluid valve.
[A] Added redstone controlled analog fluid valve.
[M] Check valve recipe adapted (thanks majijn).
- 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-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-b2 [A] Added position dependent texture variation to clinker wall,
slag brick wall and rebar concrete wall.
- 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-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-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 [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-b2 [A] Added position dependent texture variation to clinker wall,
slag brick wall and rebar concrete wall.
- 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-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-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.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-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.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.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
- 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.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.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-b1 [A] Added small laboratory furnace.
[M] Panzer glass opacity/light level set explicitly 0.
- v1.0.3-b1 [A] Added small laboratory furnace.
[M] Panzer glass opacity/light level set explicitly 0.
-------------------------------------------------------------------
- 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.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.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.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.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.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.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.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 [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.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.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.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.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.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.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.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.1-b1 [F] Fixed missing condition for ie:stone_deco in recipe constants.
[A] Added clinker brick wall.
- v1.0.1-b1 [F] Fixed missing condition for ie:stone_deco in recipe constants.
[A] Added clinker brick wall.
-------------------------------------------------------------------
- v1.0.0 [R] Release based on v1.0.0-b4
-------------------------------------------------------------------
-------------------------------------------------------------------
- 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-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-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-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.
- 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.
----

3
1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java
View file

@ -8,7 +8,6 @@
*/
package wile.engineersdecor;
import net.minecraft.item.crafting.IRecipe;
import wile.engineersdecor.detail.*;
import wile.engineersdecor.blocks.*;
import wile.engineersdecor.items.*;
@ -21,6 +20,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Item;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.network.IGuiHandler;
@ -78,6 +78,7 @@ public class ModEngineersDecor
default void init(final FMLInitializationEvent e) {}
default void postInit(final FMLPostInitializationEvent e) {}
default World getWorlClientSide() { return null; }
default EntityPlayer getPlayerClientSide() { return null; }
}
//--------------------------------------------------------------------------------------------------------------------

28
1.12/src/main/java/wile/engineersdecor/blocks/BlockDecor.java
View file

@ -13,6 +13,7 @@
*/
package wile.engineersdecor.blocks;
import net.minecraftforge.fml.common.Mod;
import wile.engineersdecor.ModEngineersDecor;
import wile.engineersdecor.detail.ModAuxiliaries;
import net.minecraft.block.SoundType;
@ -30,6 +31,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.*;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.entity.Entity;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nonnull;
@ -58,9 +60,15 @@ public class BlockDecor extends Block
public static final long CFG_ANALOG = 0x0000000000040000L; // Denotes if a component has analog behaviour
public static final long CFG_HARD_IE_DEPENDENT = 0x8000000000000000L; // Defines that this block abolutely needs IE to be installed.
protected final AxisAlignedBB aabb;
protected final AxisAlignedBB[] aabb;
public BlockDecor(@Nonnull String registryName, long config, @Nullable Material material, float hardness, float resistance, @Nullable SoundType sound)
{ this(registryName, config, material, hardness, resistance, sound, (new AxisAlignedBB[]{FULL_BLOCK_AABB})); }
public BlockDecor(@Nonnull String registryName, long config, @Nullable Material material, float hardness, float resistance, @Nullable SoundType sound, @Nullable AxisAlignedBB boundingbox)
{ this(registryName, config, material, hardness, resistance, sound, (boundingbox==null) ? (new AxisAlignedBB[]{FULL_BLOCK_AABB}) : (new AxisAlignedBB[]{boundingbox})); }
public BlockDecor(@Nonnull String registryName, long config, @Nullable Material material, float hardness, float resistance, @Nullable SoundType sound, @Nonnull AxisAlignedBB[] boundingboxes)
{
super((material!=null) ? (material) : (Material.IRON));
setCreativeTab(ModEngineersDecor.CREATIVE_TAB_ENGINEERSDECOR);
@ -74,12 +82,9 @@ public class BlockDecor extends Block
// @todo double check that instance variable
// not sure here ... if((config & CFG_TRANSLUCENT) != 0) this.translucent = true;
this.config = config;
this.aabb = (boundingbox==null) ? (FULL_BLOCK_AABB) : (boundingbox);
this.aabb = boundingboxes;
}
public BlockDecor(@Nonnull String registryName, long config, @Nullable Material material, float hardness, float resistance, @Nullable SoundType sound)
{ this(registryName, config, material, hardness, resistance, sound, null); }
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag)
@ -166,12 +171,19 @@ public class BlockDecor extends Block
@Override
@SuppressWarnings("deprecation")
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos)
{ return aabb; }
{ return aabb[0]; }
@SideOnly(Side.CLIENT)
@SuppressWarnings("deprecation")
public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World worldIn, BlockPos pos)
{ return state.getBoundingBox(worldIn, pos).offset(pos); }
public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World world, BlockPos pos)
{ return state.getBoundingBox(world, pos).offset(pos); }
@SuppressWarnings("deprecation")
public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entityIn, boolean isActualState)
{
addCollisionBoxToList(pos, entityBox, collidingBoxes, getBoundingBox(state, world, pos));
for(int i=1; i<aabb.length; ++i) addCollisionBoxToList(pos, entityBox, collidingBoxes, aabb[i]);
}
@Override
public boolean hasTileEntity(IBlockState state)

8
1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java
View file

@ -137,6 +137,13 @@ public class ModBlocks
ModAuxiliaries.getPixeledAABB(4.1,0,4.1, 11.8,8.8,11.8)
);
public static final BlockDecor TREATED_WOOD_SIDE_TABLE = new BlockDecor(
"treated_wood_side_table",
BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT,
Material.WOOD, 1.0f, 15f, SoundType.WOOD,
ModAuxiliaries.getPixeledAABB(2,0,2, 14,15.9,14)
);
public static final BlockDecorCraftingTable TREATED_WOOD_CRAFTING_TABLE = new BlockDecorCraftingTable(
"treated_wood_crafting_table",
BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT,
@ -417,6 +424,7 @@ public class ModBlocks
THICK_STEEL_POLE_HEAD,
STEEL_DOUBLE_T_SUPPORT,
SIGN_HOTWIRE, SIGN_DANGER, SIGN_DEFENSE, SIGN_FACTORY_AREA, SIGN_MODLOGO,
TREATED_WOOD_SIDE_TABLE,
HALFSLAB_REBARCONCRETE, HALFSLAB_CONCRETE, HALFSLAB_TREATEDWOOD,
HALFSLAB_SHEETMETALIRON, HALFSLAB_SHEETMETALSTEEL, HALFSLAB_SHEETMETALCOPPER,
HALFSLAB_SHEETMETALGOLD, HALFSLAB_SHEETMETALALUMINIUM,

8
1.12/src/main/java/wile/engineersdecor/detail/ClientProxy.java
View file

@ -8,8 +8,9 @@
*/
package wile.engineersdecor.detail;
import net.minecraft.world.World;
import wile.engineersdecor.ModEngineersDecor;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraft.client.Minecraft;
import net.minecraftforge.client.model.obj.OBJLoader;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@ -23,4 +24,9 @@ public class ClientProxy implements ModEngineersDecor.IProxy
@Override
public World getWorlClientSide()
{ return Minecraft.getMinecraft().world; }
@Override
public EntityPlayer getPlayerClientSide()
{ return Minecraft.getMinecraft().player; }
}

10
1.12/src/main/resources/assets/engineersdecor/blockstates/treated_wood_side_table.json Normal file
View file

@ -0,0 +1,10 @@
{
"forge_marker": 1,
"defaults": {
"model": "engineersdecor:furniture/treated_wood_side_table_model"
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

2
1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang
View file

@ -93,6 +93,8 @@ tile.engineersdecor.treated_wood_crafting_table.help=§6Robust and weather-proof
Click up/down arrow buttons for crafting history selection, output slot for item placement, X-button \
to clear crafting grid and history. Shift-click stack: player-to-storage stack transfer when crafting \
grid empty, otherwise player-to-grid stack transfer. Automatically distributes the clicked stack.
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.iron_inset_light.name=Inset Light
tile.engineersdecor.iron_inset_light.help=§6Small glowstone light source, sunk into the floor, ceiling or wall.§r\n\
Useful to light up places where electrical light installations are problematic.\

2
1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang
View file

@ -90,6 +90,8 @@ 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.iron_inset_light.name=Встраиваемый осветитель
tile.engineersdecor.iron_inset_light.help=§6Маленький источник света, интегрируемый в стены, пол или потолок.§r\n\
Полезно для освещения мест, где проблематичны электрические осветительные установки.\

2
1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang
View file

@ -91,6 +91,8 @@ tile.engineersdecor.treated_wood_crafting_table.name=Treated Wood Crafting Table
Click up/down arrow buttons for crafting history selection, output slot for item placement, X-button \
to clear crafting grid and history. Shift-click stack: player-to-storage stack transfer when crafting \
grid empty, otherwise player-to-grid stack transfer. Automatically distributes the clicked stack.
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.iron_inset_light.name=Inset Light
#tile.engineersdecor.iron_inset_light.help=§6Small glowstone light source, sunk into the floor, ceiling or wall.§r\n\
Useful to light up places where electrical light installations are problematic.\

206
1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_side_table_model.json Normal file
View file

@ -0,0 +1,206 @@
{
"parent": "block/cube",
"textures": {
"o": "engineersdecor:blocks/iestyle/treated_wood_framed_texture",
"particle": "engineersdecor:blocks/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]
}
}
}

4
1.12/src/main/resources/assets/engineersdecor/recipes/standalone/metal_rung_ladder_recipe_standalone.json
View file

@ -14,12 +14,12 @@
],
"key": {
"S": {
"item": "#ingotIron",
"item": "#nuggetIron",
"data": 0
}
},
"result": {
"item": "engineersdecor:metal_rung_ladder",
"count": 4
"count": 1
}
}