Skip to content

Commit

Permalink
Working Doors
Browse files Browse the repository at this point in the history
  • Loading branch information
RavinMaddHatter committed Jun 14, 2024
1 parent a4a2349 commit b90e4ec
Show file tree
Hide file tree
Showing 15 changed files with 62 additions and 9 deletions.
31 changes: 27 additions & 4 deletions Vanilla_Resource_Pack/blocks.json
Original file line number Diff line number Diff line change
Expand Up @@ -974,6 +974,30 @@
"sound": "copper",
"textures": "cut_copper"
},
"waxed_copper_grate" : {
"sound" : "copper_grate",
"textures" : "copper_grate"
},
"copper_grate" : {
"sound" : "copper_grate",
"textures" : "copper_grate"
},
"waxed_exposed_copper_grate" : {
"sound" : "copper_grate",
"textures" : "exposed_copper_grate"
},
"exposed_copper_grate" : {
"sound" : "copper_grate",
"textures" : "exposed_copper_grate"
},
"waxed_weathered_copper_grate" : {
"sound" : "copper_grate",
"textures" : "weathered_copper_grate"
},
"weathered_copper_grate" : {
"sound" : "copper_grate",
"textures" : "weathered_copper_grate"
},
"waxed_copper_trapdoor" : {
"sound" : "copper",
"textures" : "copper_trapdoor"
Expand Down Expand Up @@ -1904,9 +1928,9 @@
"iron_door": {
"sound": "metal",
"textures": {
"down": "door_lower",
"side": "door_upper",
"up": "door_lower"
"down": "iron_door_lower",
"side": "iron_door_upper",
"up": "iron_door_lower"
}
},
"iron_ore": {
Expand Down Expand Up @@ -4267,7 +4291,6 @@
"textures": "planks"
},
"wooden_door": {
"sound": "wood",
"textures": {
"down": "door_lower",
"side": "door_upper",
Expand Down
Binary file modified Vanilla_Resource_Pack/textures/blocks/copper_grate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Vanilla_Resource_Pack/textures/blocks/exposed_copper_grate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Vanilla_Resource_Pack/textures/blocks/weathered_copper_grate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions Vanilla_Resource_Pack/textures/terrain_texture.json
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,15 @@
"bamboo_door_bottom": {
"textures": "textures/blocks/bamboo_door_bottom"
},
"copper_grate": {
"textures": "textures/blocks/copper_grate"
},
"exposed_copper_grate": {
"textures": "textures/blocks/exposed_copper_grate"
},
"weathered_copper_grate": {
"textures": "textures/blocks/weathered_copper_grate"
},
"weathered_copper_bulb": {
"textures": [
"textures/blocks/weathered_copper_bulb",
Expand Down Expand Up @@ -1119,6 +1128,23 @@
"dispenser_top": {
"textures": "textures/blocks/furnace_top"
},
"cherry_door_top": {
"textures": "textures/blocks/cherry_door_top"
},

"cherry_door_bottom": {
"textures": "textures/blocks/cherry_door_bottom"
},
"iron_door_lower": {
"textures": [
"textures/blocks/door_iron_lower"
]
},
"iron_door_upper": {
"textures": [
"textures/blocks/door_iron_upper"
]
},
"door_lower": {
"textures": [
"textures/blocks/door_wood_lower",
Expand Down
5 changes: 1 addition & 4 deletions armor_stand_geo_class.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,7 @@ def make_block(self, x, y, z, block_name, rot=None, top=False,data=0, trap_open=
if str(data) in self.block_shapes[block_type].keys():
block_shapes = self.block_shapes[block_type][str(data)]
if block_type in self.block_rotations.keys() and rot is not None:
try:
self.blocks[ghost_block_name]["rotation"] = copy.deepcopy(self.block_rotations[block_type][str(rot)])
except:
print(f"rotation error on {block_name}-{block_type} - {str(rot)}")
self.blocks[ghost_block_name]["rotation"] = copy.deepcopy(self.block_rotations[block_type][str(rot)])
if big:
self.blocks[ghost_block_name]["rotation"][1]+=180
else:
Expand Down
7 changes: 7 additions & 0 deletions lookups/block_definition.json
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,13 @@
"cobbled_deepslate_stairs": "stairs",
"cobbled_deepslate_wall": "wall",
"copper_block": "cube",
"waxed_copper_grate": "cube",
"copper_grate": "cube",
"waxed_exposed_copper_grate": "cube",
"exposed_copper_grate": "cube",
"waxed_weathered_copper_grate": "cube",
"weathered_copper_grate": "cube",
"waxed_oxidized_copper_grate": "cube",
"waxed_copper_trapdoor": "trapdoor",
"waxed_exposed_copper_trapdoor": "trapdoor",
"waxed_weathered_copper_trapdoor": "trapdoor",
Expand Down
2 changes: 1 addition & 1 deletion lookups/lookup_version.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"author": "RavinMaddHatter",
"update_url": "https://update.structuralab.com/structuraUpdate",
"notes": "Fixed 1.20.72 blocks"
}
}
Binary file modified test_structures/All Blocks World/decorative.mcstructure
Binary file not shown.
Binary file modified test_structures/All Blocks World/gems and redstone.mcstructure
Binary file not shown.
Binary file modified test_structures/All Blocks World/wood.mcstructure
Binary file not shown.
Binary file modified test_structures/All Blocks World/wood2.mcstructure
Binary file not shown.
Binary file modified test_structures/door.mcstructure
Binary file not shown.
Binary file added test_structures/doorBamboo.mcstructure
Binary file not shown.
Binary file added test_structures/singleDoor.mcstructure
Binary file not shown.

0 comments on commit b90e4ec

Please sign in to comment.