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

1.13: Windows and poles ported from 1.12. Both: Removed experimental iron sheet metal roof.

Browse source
This commit is contained in:
stfwi 2019-04-05 19:34:59 +02:00
parent 80bf3fd5f6
commit d93af084f2
11 changed files with 6 additions and 454 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -134,9 +134,6 @@ public class ModBlocks
ModAuxiliaries.getPixeledAABB(1,0,1, 15,15,16.0)
);
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[] = {
TREATED_WOOD_CRAFTING_TABLE,
CLINKER_BRICK_BLOCK,
@ -168,7 +165,6 @@ public class ModBlocks
};
private static final Block devBlocks[] = {
IRON_SHEET_ROOF, // model looks not good enough yet
};
private static ArrayList<Block> registeredBlocks = new ArrayList<>();

55
1.12/src/main/resources/assets/engineersdecor/blockstates/iron_sheet_roof.json
View file

@ -1,55 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "engineersdecor:stairs/decor_straight_roof_model",
"textures": {
"bottom": "engineersdecor:blocks/iestyle/ironsheet_roof_top",
"side": "engineersdecor:blocks/iestyle/ironsheet_roof",
"top": "engineersdecor:blocks/iestyle/ironsheet_roof_top"
}
},
"variants": {
"normal": [{}],
"inventory": [{}],
"facing=east,half=bottom,shape=straight": { "model": "engineersdecor:stairs/decor_straight_roof_model" },
"facing=west,half=bottom,shape=straight": { "model": "engineersdecor:stairs/decor_straight_roof_model", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=straight": { "model": "engineersdecor:stairs/decor_straight_roof_model", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=straight": { "model": "engineersdecor:stairs/decor_straight_roof_model", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_roof_model" },
"facing=west,half=bottom,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_roof_model", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_roof_model", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_roof_model", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_roof_model", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_roof_model", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_roof_model" },
"facing=north,half=bottom,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_roof_model", "y": 180, "uvlock": true },
"facing=east,half=bottom,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_roof_model" },
"facing=west,half=bottom,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_roof_model", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_roof_model", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_roof_model", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_roof_model", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_roof_model", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_roof_model" },
"facing=north,half=bottom,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_roof_model", "y": 180, "uvlock": true },
"facing=east,half=top,shape=straight": { "model": "engineersdecor:stairs/decor_straight_roof_model", "x": 180, "uvlock": true },
"facing=west,half=top,shape=straight": { "model": "engineersdecor:stairs/decor_straight_roof_model", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=straight": { "model": "engineersdecor:stairs/decor_straight_roof_model", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=straight": { "model": "engineersdecor:stairs/decor_straight_roof_model", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_roof_model", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_roof_model", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_roof_model", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_roof_model", "x": 180, "uvlock": true },
"facing=east,half=top,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_roof_model", "x": 180, "uvlock": true },
"facing=west,half=top,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_roof_model", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_roof_model", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_roof_model", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_roof_model", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_roof_model", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_roof_model", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_roof_model", "x": 180, "uvlock": true },
"facing=east,half=top,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_roof_model", "x": 180, "uvlock": true },
"facing=west,half=top,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_roof_model", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_roof_model", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_roof_model", "x": 180, "y": 270, "uvlock": true }
}
}

11
1.12/src/main/resources/assets/engineersdecor/blockstates/iron_sheet_roof_block.json
View file

@ -1,11 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "engineersdecor:decor_full_block_model",
"textures": { "all": "engineersdecor:blocks/iestyle/ironsheet_roof" }
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

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

@ -81,8 +81,5 @@ tile.engineersdecor.small_lab_furnace.help=§6Small metal cased lab kiln.§r Sol
and fuel. Place an external heater into a aux slot and connect power for electrical \
smelting speed boost.
#-----------------------------------------------------------------------------------------------------------
tile.engineersdecor.iron_sheet_roof.name=Iron sheet metal roof (experimental)
tile.engineersdecor.iron_sheet_roof.help=§6Well, I just can't get that model right in a way that I could like it. Gimme some time.
#-----------------------------------------------------------------------------------------------------------
# EOF
#-----------------------------------------------------------------------------------------------------------

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

@ -77,8 +77,5 @@ tile.engineersdecor.steel_framed_window.name=Окно со стальной ра
tile.engineersdecor.small_lab_furnace.name=Компактная лабораторная печь
tile.engineersdecor.small_lab_furnace.help=§6Лабораторная печь в металлическом корпусе.§r Подача твёрдого топлива - сверху. Немного горячее чем каменная, поэтому быстрее. Два внутренних слота для ввода, выхода и топлива.
#-----------------------------------------------------------------------------------------------------------
tile.engineersdecor.iron_sheet_roof.name=Кровля из листового металла
tile.engineersdecor.iron_sheet_roof.help=§6Ну, это кровля.
#-----------------------------------------------------------------------------------------------------------
# EOF
#-----------------------------------------------------------------------------------------------------------

163
1.12/src/main/resources/assets/engineersdecor/models/block/stairs/decor_inner_roof_model.json
View file

@ -1,163 +0,0 @@
{
"ambientocclusion": false,
"textures": {
"side": "engineersdecor:blocks/iestyle/ironsheet_roof",
"particle": "engineersdecor:blocks/iestyle/ironsheet_roof",
"top": "engineersdecor:blocks/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"}
}
}
]
}

99
1.12/src/main/resources/assets/engineersdecor/models/block/stairs/decor_outer_roof_model.json
View file

@ -1,99 +0,0 @@
{
"ambientocclusion": false,
"textures": {
"particle": "engineersdecor:blocks/iestyle/ironsheet_roof",
"side": "engineersdecor:blocks/iestyle/ironsheet_roof",
"top": "engineersdecor:blocks/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"}
}
}
]
}

114
1.12/src/main/resources/assets/engineersdecor/models/block/stairs/decor_straight_roof_model.json
View file

@ -1,114 +0,0 @@
{
"ambientocclusion": false,
"parent": "block/block",
"textures": {
"side": "engineersdecor:blocks/iestyle/ironsheet_roof",
"particle": "engineersdecor:blocks/iestyle/ironsheet_roof",
"top": "engineersdecor:blocks/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]
}
}
}

0
1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_wrapover_recipe - Copy.json → 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_wrapover_recipe.json
View file

5
1.13/readme.md
View file

@ -10,7 +10,10 @@ Mod sources for Minecraft version 1.13.2.
----
## Revision history
~ v1.0.2-b3 [A]
- 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.

3
meta/update.json
View file

@ -21,6 +21,7 @@
"1.0.0-b1": "[A] Initial structure.\n[A] Added clinker bricks and clinker brick stairs.\n[A] Added slag bricks and slag brick stairs.\n[A] Added metal rung ladder.\n[A] Added staggered metal steps ladder.\n[A] Added treated wood ladder.\n[A] Added treated wood pole.\n[A] Added treated wood table."
},
"1.13.2": {
"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.",
@ -31,6 +32,6 @@
"1.12.2-recommended": "1.0.2",
"1.12.2-latest": "1.0.3-b4",
"1.13.2-recommended": "",
"1.13.2-latest": "1.0.2-b2"
"1.13.2-latest": "1.0.2-b3"
}
}