diff --git a/gradle.properties b/gradle.properties index f2e9f46745..0f440a287a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,8 +18,8 @@ forge_range=* parchment_version=2023.09.03 # Build Dependencies -mantle_version=1.11.22 -mantle_range=[1.11.22,) +mantle_version=1.11.26 +mantle_range=[1.11.26,) # Optional compat jei_version=15.20.+ diff --git a/src/generated/resources/assets/tconstruct/blockstates/bloodshroom_hanging_sign.json b/src/generated/resources/assets/tconstruct/blockstates/bloodshroom_hanging_sign.json new file mode 100644 index 0000000000..5b01d9da1e --- /dev/null +++ b/src/generated/resources/assets/tconstruct/blockstates/bloodshroom_hanging_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tconstruct:block/wood/bloodshroom/hanging_sign" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tconstruct/blockstates/bloodshroom_wall_hanging_sign.json b/src/generated/resources/assets/tconstruct/blockstates/bloodshroom_wall_hanging_sign.json new file mode 100644 index 0000000000..5b01d9da1e --- /dev/null +++ b/src/generated/resources/assets/tconstruct/blockstates/bloodshroom_wall_hanging_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tconstruct:block/wood/bloodshroom/hanging_sign" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tconstruct/blockstates/enderbark_hanging_sign.json b/src/generated/resources/assets/tconstruct/blockstates/enderbark_hanging_sign.json new file mode 100644 index 0000000000..8c8c274129 --- /dev/null +++ b/src/generated/resources/assets/tconstruct/blockstates/enderbark_hanging_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tconstruct:block/wood/enderbark/hanging_sign" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tconstruct/blockstates/enderbark_wall_hanging_sign.json b/src/generated/resources/assets/tconstruct/blockstates/enderbark_wall_hanging_sign.json new file mode 100644 index 0000000000..8c8c274129 --- /dev/null +++ b/src/generated/resources/assets/tconstruct/blockstates/enderbark_wall_hanging_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tconstruct:block/wood/enderbark/hanging_sign" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tconstruct/blockstates/greenheart_hanging_sign.json b/src/generated/resources/assets/tconstruct/blockstates/greenheart_hanging_sign.json new file mode 100644 index 0000000000..ed40768261 --- /dev/null +++ b/src/generated/resources/assets/tconstruct/blockstates/greenheart_hanging_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tconstruct:block/wood/greenheart/hanging_sign" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tconstruct/blockstates/greenheart_wall_hanging_sign.json b/src/generated/resources/assets/tconstruct/blockstates/greenheart_wall_hanging_sign.json new file mode 100644 index 0000000000..ed40768261 --- /dev/null +++ b/src/generated/resources/assets/tconstruct/blockstates/greenheart_wall_hanging_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tconstruct:block/wood/greenheart/hanging_sign" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tconstruct/blockstates/skyroot_hanging_sign.json b/src/generated/resources/assets/tconstruct/blockstates/skyroot_hanging_sign.json new file mode 100644 index 0000000000..ced9bb5bff --- /dev/null +++ b/src/generated/resources/assets/tconstruct/blockstates/skyroot_hanging_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tconstruct:block/wood/skyroot/hanging_sign" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tconstruct/blockstates/skyroot_wall_hanging_sign.json b/src/generated/resources/assets/tconstruct/blockstates/skyroot_wall_hanging_sign.json new file mode 100644 index 0000000000..ced9bb5bff --- /dev/null +++ b/src/generated/resources/assets/tconstruct/blockstates/skyroot_wall_hanging_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tconstruct:block/wood/skyroot/hanging_sign" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tconstruct/models/block/wood/bloodshroom/hanging_sign.json b/src/generated/resources/assets/tconstruct/models/block/wood/bloodshroom/hanging_sign.json new file mode 100644 index 0000000000..8baecae4c6 --- /dev/null +++ b/src/generated/resources/assets/tconstruct/models/block/wood/bloodshroom/hanging_sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "tconstruct:block/wood/bloodshroom/stripped_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tconstruct/models/block/wood/enderbark/hanging_sign.json b/src/generated/resources/assets/tconstruct/models/block/wood/enderbark/hanging_sign.json new file mode 100644 index 0000000000..7f0909cd7d --- /dev/null +++ b/src/generated/resources/assets/tconstruct/models/block/wood/enderbark/hanging_sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "tconstruct:block/wood/enderbark/stripped_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tconstruct/models/block/wood/greenheart/hanging_sign.json b/src/generated/resources/assets/tconstruct/models/block/wood/greenheart/hanging_sign.json new file mode 100644 index 0000000000..503979bda6 --- /dev/null +++ b/src/generated/resources/assets/tconstruct/models/block/wood/greenheart/hanging_sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "tconstruct:block/wood/greenheart/stripped_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tconstruct/models/block/wood/skyroot/hanging_sign.json b/src/generated/resources/assets/tconstruct/models/block/wood/skyroot/hanging_sign.json new file mode 100644 index 0000000000..7c3aaf912f --- /dev/null +++ b/src/generated/resources/assets/tconstruct/models/block/wood/skyroot/hanging_sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "tconstruct:block/wood/skyroot/stripped_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tconstruct/models/item/bloodshroom_hanging_sign.json b/src/generated/resources/assets/tconstruct/models/item/bloodshroom_hanging_sign.json new file mode 100644 index 0000000000..48764265e6 --- /dev/null +++ b/src/generated/resources/assets/tconstruct/models/item/bloodshroom_hanging_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tconstruct:item/wood/bloodshroom_hanging_sign" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tconstruct/models/item/enderbark_hanging_sign.json b/src/generated/resources/assets/tconstruct/models/item/enderbark_hanging_sign.json new file mode 100644 index 0000000000..20c2957905 --- /dev/null +++ b/src/generated/resources/assets/tconstruct/models/item/enderbark_hanging_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tconstruct:item/wood/enderbark_hanging_sign" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tconstruct/models/item/greenheart_hanging_sign.json b/src/generated/resources/assets/tconstruct/models/item/greenheart_hanging_sign.json new file mode 100644 index 0000000000..813b2c882a --- /dev/null +++ b/src/generated/resources/assets/tconstruct/models/item/greenheart_hanging_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tconstruct:item/wood/greenheart_hanging_sign" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tconstruct/models/item/skyroot_hanging_sign.json b/src/generated/resources/assets/tconstruct/models/item/skyroot_hanging_sign.json new file mode 100644 index 0000000000..31a87b7d23 --- /dev/null +++ b/src/generated/resources/assets/tconstruct/models/item/skyroot_hanging_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tconstruct:item/wood/skyroot_hanging_sign" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/ceiling_hanging_signs.json b/src/generated/resources/data/minecraft/tags/blocks/ceiling_hanging_signs.json new file mode 100644 index 0000000000..92a73586c6 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/ceiling_hanging_signs.json @@ -0,0 +1,8 @@ +{ + "values": [ + "tconstruct:greenheart_hanging_sign", + "tconstruct:skyroot_hanging_sign", + "tconstruct:bloodshroom_hanging_sign", + "tconstruct:enderbark_hanging_sign" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json index 36116dabe7..306c2c1622 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json @@ -47,6 +47,8 @@ "tconstruct:greenheart_button", "tconstruct:greenheart_sign", "tconstruct:greenheart_wall_sign", + "tconstruct:greenheart_hanging_sign", + "tconstruct:greenheart_wall_hanging_sign", "tconstruct:skyroot_planks", "tconstruct:skyroot_planks_slab", "tconstruct:skyroot_planks_stairs", @@ -60,6 +62,8 @@ "tconstruct:skyroot_button", "tconstruct:skyroot_sign", "tconstruct:skyroot_wall_sign", + "tconstruct:skyroot_hanging_sign", + "tconstruct:skyroot_wall_hanging_sign", "tconstruct:bloodshroom_planks", "tconstruct:bloodshroom_planks_slab", "tconstruct:bloodshroom_planks_stairs", @@ -73,6 +77,8 @@ "tconstruct:bloodshroom_button", "tconstruct:bloodshroom_sign", "tconstruct:bloodshroom_wall_sign", + "tconstruct:bloodshroom_hanging_sign", + "tconstruct:bloodshroom_wall_hanging_sign", "tconstruct:enderbark_planks", "tconstruct:enderbark_planks_slab", "tconstruct:enderbark_planks_stairs", @@ -86,6 +92,8 @@ "tconstruct:enderbark_button", "tconstruct:enderbark_sign", "tconstruct:enderbark_wall_sign", + "tconstruct:enderbark_hanging_sign", + "tconstruct:enderbark_wall_hanging_sign", "tconstruct:earth_enderbark_roots", "tconstruct:sky_enderbark_roots", "tconstruct:ichor_enderbark_roots", diff --git a/src/generated/resources/data/minecraft/tags/blocks/wall_hanging_signs.json b/src/generated/resources/data/minecraft/tags/blocks/wall_hanging_signs.json new file mode 100644 index 0000000000..6a59bf0f52 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/wall_hanging_signs.json @@ -0,0 +1,8 @@ +{ + "values": [ + "tconstruct:greenheart_wall_hanging_sign", + "tconstruct:skyroot_wall_hanging_sign", + "tconstruct:bloodshroom_wall_hanging_sign", + "tconstruct:enderbark_wall_hanging_sign" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/hanging_signs.json b/src/generated/resources/data/minecraft/tags/items/hanging_signs.json new file mode 100644 index 0000000000..92a73586c6 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/hanging_signs.json @@ -0,0 +1,8 @@ +{ + "values": [ + "tconstruct:greenheart_hanging_sign", + "tconstruct:skyroot_hanging_sign", + "tconstruct:bloodshroom_hanging_sign", + "tconstruct:enderbark_hanging_sign" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tconstruct/advancements/recipes/decorations/world/wood/bloodshroom/hanging_sign.json b/src/generated/resources/data/tconstruct/advancements/recipes/decorations/world/wood/bloodshroom/hanging_sign.json new file mode 100644 index 0000000000..b5da2aff6d --- /dev/null +++ b/src/generated/resources/data/tconstruct/advancements/recipes/decorations/world/wood/bloodshroom/hanging_sign.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stripped_logs": { + "conditions": { + "items": [ + { + "items": [ + "tconstruct:stripped_bloodshroom_log" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tconstruct:world/wood/bloodshroom/hanging_sign" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stripped_logs", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tconstruct:world/wood/bloodshroom/hanging_sign" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/tconstruct/advancements/recipes/decorations/world/wood/enderbark/hanging_sign.json b/src/generated/resources/data/tconstruct/advancements/recipes/decorations/world/wood/enderbark/hanging_sign.json new file mode 100644 index 0000000000..146c99608c --- /dev/null +++ b/src/generated/resources/data/tconstruct/advancements/recipes/decorations/world/wood/enderbark/hanging_sign.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stripped_logs": { + "conditions": { + "items": [ + { + "items": [ + "tconstruct:stripped_enderbark_log" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tconstruct:world/wood/enderbark/hanging_sign" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stripped_logs", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tconstruct:world/wood/enderbark/hanging_sign" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/tconstruct/advancements/recipes/decorations/world/wood/greenheart/hanging_sign.json b/src/generated/resources/data/tconstruct/advancements/recipes/decorations/world/wood/greenheart/hanging_sign.json new file mode 100644 index 0000000000..7ed019880d --- /dev/null +++ b/src/generated/resources/data/tconstruct/advancements/recipes/decorations/world/wood/greenheart/hanging_sign.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stripped_logs": { + "conditions": { + "items": [ + { + "items": [ + "tconstruct:stripped_greenheart_log" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tconstruct:world/wood/greenheart/hanging_sign" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stripped_logs", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tconstruct:world/wood/greenheart/hanging_sign" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/tconstruct/advancements/recipes/decorations/world/wood/skyroot/hanging_sign.json b/src/generated/resources/data/tconstruct/advancements/recipes/decorations/world/wood/skyroot/hanging_sign.json new file mode 100644 index 0000000000..18f0e40c21 --- /dev/null +++ b/src/generated/resources/data/tconstruct/advancements/recipes/decorations/world/wood/skyroot/hanging_sign.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stripped_logs": { + "conditions": { + "items": [ + { + "items": [ + "tconstruct:stripped_skyroot_log" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tconstruct:world/wood/skyroot/hanging_sign" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stripped_logs", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tconstruct:world/wood/skyroot/hanging_sign" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/tconstruct/loot_tables/blocks/bloodshroom_hanging_sign.json b/src/generated/resources/data/tconstruct/loot_tables/blocks/bloodshroom_hanging_sign.json new file mode 100644 index 0000000000..dc74262cef --- /dev/null +++ b/src/generated/resources/data/tconstruct/loot_tables/blocks/bloodshroom_hanging_sign.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tconstruct:bloodshroom_hanging_sign" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "tconstruct:blocks/bloodshroom_hanging_sign" +} \ No newline at end of file diff --git a/src/generated/resources/data/tconstruct/loot_tables/blocks/enderbark_hanging_sign.json b/src/generated/resources/data/tconstruct/loot_tables/blocks/enderbark_hanging_sign.json new file mode 100644 index 0000000000..297da53839 --- /dev/null +++ b/src/generated/resources/data/tconstruct/loot_tables/blocks/enderbark_hanging_sign.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tconstruct:enderbark_hanging_sign" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "tconstruct:blocks/enderbark_hanging_sign" +} \ No newline at end of file diff --git a/src/generated/resources/data/tconstruct/loot_tables/blocks/greenheart_hanging_sign.json b/src/generated/resources/data/tconstruct/loot_tables/blocks/greenheart_hanging_sign.json new file mode 100644 index 0000000000..eac72f1e94 --- /dev/null +++ b/src/generated/resources/data/tconstruct/loot_tables/blocks/greenheart_hanging_sign.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tconstruct:greenheart_hanging_sign" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "tconstruct:blocks/greenheart_hanging_sign" +} \ No newline at end of file diff --git a/src/generated/resources/data/tconstruct/loot_tables/blocks/skyroot_hanging_sign.json b/src/generated/resources/data/tconstruct/loot_tables/blocks/skyroot_hanging_sign.json new file mode 100644 index 0000000000..14dad04fc9 --- /dev/null +++ b/src/generated/resources/data/tconstruct/loot_tables/blocks/skyroot_hanging_sign.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tconstruct:skyroot_hanging_sign" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "tconstruct:blocks/skyroot_hanging_sign" +} \ No newline at end of file diff --git a/src/generated/resources/data/tconstruct/recipes/world/wood/bloodshroom/hanging_sign.json b/src/generated/resources/data/tconstruct/recipes/world/wood/bloodshroom/hanging_sign.json new file mode 100644 index 0000000000..6a6423f35a --- /dev/null +++ b/src/generated/resources/data/tconstruct/recipes/world/wood/bloodshroom/hanging_sign.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "hanging_sign", + "key": { + "#": { + "item": "tconstruct:stripped_bloodshroom_log" + }, + "X": { + "item": "minecraft:chain" + } + }, + "pattern": [ + "X X", + "###", + "###" + ], + "result": { + "count": 6, + "item": "tconstruct:bloodshroom_hanging_sign" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/tconstruct/recipes/world/wood/enderbark/hanging_sign.json b/src/generated/resources/data/tconstruct/recipes/world/wood/enderbark/hanging_sign.json new file mode 100644 index 0000000000..8b292546bf --- /dev/null +++ b/src/generated/resources/data/tconstruct/recipes/world/wood/enderbark/hanging_sign.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "hanging_sign", + "key": { + "#": { + "item": "tconstruct:stripped_enderbark_log" + }, + "X": { + "item": "minecraft:chain" + } + }, + "pattern": [ + "X X", + "###", + "###" + ], + "result": { + "count": 6, + "item": "tconstruct:enderbark_hanging_sign" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/tconstruct/recipes/world/wood/greenheart/hanging_sign.json b/src/generated/resources/data/tconstruct/recipes/world/wood/greenheart/hanging_sign.json new file mode 100644 index 0000000000..08b4f7018a --- /dev/null +++ b/src/generated/resources/data/tconstruct/recipes/world/wood/greenheart/hanging_sign.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "hanging_sign", + "key": { + "#": { + "item": "tconstruct:stripped_greenheart_log" + }, + "X": { + "item": "minecraft:chain" + } + }, + "pattern": [ + "X X", + "###", + "###" + ], + "result": { + "count": 6, + "item": "tconstruct:greenheart_hanging_sign" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/tconstruct/recipes/world/wood/skyroot/hanging_sign.json b/src/generated/resources/data/tconstruct/recipes/world/wood/skyroot/hanging_sign.json new file mode 100644 index 0000000000..ac573e9b13 --- /dev/null +++ b/src/generated/resources/data/tconstruct/recipes/world/wood/skyroot/hanging_sign.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "hanging_sign", + "key": { + "#": { + "item": "tconstruct:stripped_skyroot_log" + }, + "X": { + "item": "minecraft:chain" + } + }, + "pattern": [ + "X X", + "###", + "###" + ], + "result": { + "count": 6, + "item": "tconstruct:skyroot_hanging_sign" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/java/slimeknights/tconstruct/common/data/loot/BlockLootTableProvider.java b/src/main/java/slimeknights/tconstruct/common/data/loot/BlockLootTableProvider.java index 24c842a293..661998c526 100644 --- a/src/main/java/slimeknights/tconstruct/common/data/loot/BlockLootTableProvider.java +++ b/src/main/java/slimeknights/tconstruct/common/data/loot/BlockLootTableProvider.java @@ -388,6 +388,7 @@ private void registerWoodLootTables(WoodBlockObject object) { this.dropSelf(object.getButton()); // sign this.dropSelf(object.getSign()); + this.dropSelf(object.getHangingSign()); } private final Function ADD_TABLE = block -> droppingWithFunctions(block, (builder) -> diff --git a/src/main/java/slimeknights/tconstruct/common/data/model/TinkerBlockStateProvider.java b/src/main/java/slimeknights/tconstruct/common/data/model/TinkerBlockStateProvider.java index 19bdc9b3fc..735c629e10 100644 --- a/src/main/java/slimeknights/tconstruct/common/data/model/TinkerBlockStateProvider.java +++ b/src/main/java/slimeknights/tconstruct/common/data/model/TinkerBlockStateProvider.java @@ -125,15 +125,17 @@ protected void addWood(WoodBlockObject wood, boolean trapdoorOrientable, RenderT // helper to get textures for wood, since we put them in a nice folder Function texture = suffix -> blockTexture("wood/" + name + "/" + suffix); ResourceLocation planks = texture.apply("planks"); + ResourceLocation log = texture.apply("log"); + ResourceLocation stripped = texture.apply("stripped_log"); // planks and fences addFenceBuildingBlock(wood, folder, "planks", planks); fenceGate(wood.getFenceGate(), folder + "fence/gate", planks); // logs - axisBlock(wood.getLog(), folder + "log/log", texture.apply("log"), true); - axisBlock(wood.getStrippedLog(), folder + "log/stripped", texture.apply("stripped_log"), true); - axisBlock(wood.getWood(), folder + "log/wood", texture.apply("log"), false); - axisBlock(wood.getStrippedWood(), folder + "log/wood_stripped", texture.apply("stripped_log"), false); + axisBlock(wood.getLog(), folder + "log/log", log, true); + axisBlock(wood.getStrippedLog(), folder + "log/stripped", stripped, true); + axisBlock(wood.getWood(), folder + "log/wood", log, false); + axisBlock(wood.getStrippedWood(), folder + "log/wood_stripped", stripped, false); // doors door(wood.getDoor(), folder, doorRenderType, texture.apply("door_bottom"), texture.apply("door_top")); basicItem(wood.getDoor(), "wood/"); @@ -144,6 +146,10 @@ protected void addWood(WoodBlockObject wood, boolean trapdoorOrientable, RenderT // sign signBlock(wood.getSign(), wood.getWallSign(), models().sign(folder + "sign", planks)); basicItem(wood.getSign(), "wood/"); + ModelFile hangingSign = models().sign(folder + "hanging_sign", stripped); + simpleBlock(wood.getHangingSign(), hangingSign); + simpleBlock(wood.getWallHangingSign(), hangingSign); + basicItem(wood.getHangingSign(), "wood/"); } diff --git a/src/main/java/slimeknights/tconstruct/common/data/tags/BlockTagProvider.java b/src/main/java/slimeknights/tconstruct/common/data/tags/BlockTagProvider.java index e04b2c870d..30b70e6b6f 100644 --- a/src/main/java/slimeknights/tconstruct/common/data/tags/BlockTagProvider.java +++ b/src/main/java/slimeknights/tconstruct/common/data/tags/BlockTagProvider.java @@ -574,7 +574,8 @@ private void tagPlanks(TagKey tag, WoodBlockObject... blocks) { for (WoodBlockObject block : blocks) { tag(tag).add(block.get(), block.getSlab(), block.getStairs(), block.getFence(), block.getStrippedLog(), block.getStrippedWood(), block.getFenceGate(), block.getDoor(), block.getTrapdoor(), - block.getPressurePlate(), block.getButton(), block.getSign(), block.getWallSign()); + block.getPressurePlate(), block.getButton(), + block.getSign(), block.getWallSign(), block.getHangingSign(), block.getWallHangingSign()); } } @@ -626,5 +627,7 @@ private void addWoodTags(WoodBlockObject object, boolean doesBurn) { // signs this.tag(BlockTags.STANDING_SIGNS).add(object.getSign()); this.tag(BlockTags.WALL_SIGNS).add(object.getWallSign()); + this.tag(BlockTags.CEILING_HANGING_SIGNS).add(object.getHangingSign()); + this.tag(BlockTags.WALL_HANGING_SIGNS).add(object.getWallHangingSign()); } } diff --git a/src/main/java/slimeknights/tconstruct/common/data/tags/ItemTagProvider.java b/src/main/java/slimeknights/tconstruct/common/data/tags/ItemTagProvider.java index 1372b39d4d..c6b988863b 100644 --- a/src/main/java/slimeknights/tconstruct/common/data/tags/ItemTagProvider.java +++ b/src/main/java/slimeknights/tconstruct/common/data/tags/ItemTagProvider.java @@ -239,6 +239,7 @@ private void addWorld() { this.copy(BlockTags.WOODEN_BUTTONS, ItemTags.WOODEN_BUTTONS); this.copy(BlockTags.WOODEN_PRESSURE_PLATES, ItemTags.WOODEN_PRESSURE_PLATES); this.copy(BlockTags.STANDING_SIGNS, ItemTags.SIGNS); + this.copy(BlockTags.CEILING_HANGING_SIGNS, ItemTags.HANGING_SIGNS); } private void addTools() { diff --git a/src/main/resources/assets/tconstruct/lang/en_us.json b/src/main/resources/assets/tconstruct/lang/en_us.json index c2fbc4d19f..4702a7fe80 100644 --- a/src/main/resources/assets/tconstruct/lang/en_us.json +++ b/src/main/resources/assets/tconstruct/lang/en_us.json @@ -338,7 +338,6 @@ "item.tconstruct.pick_head_cast": "Pick Head Gold Cast", "item.tconstruct.small_axe_head_cast": "Small Axe Head Gold Cast", "item.tconstruct.small_blade_cast": "Small Blade Gold Cast", - "item.tconstruct.sign_head_cast": "Sign Head Gold Cast", "item.tconstruct.bow_limb_cast": "Bow Limb Gold Cast", "item.tconstruct.bow_grip_cast": "Bow Grip Gold Cast", "item.tconstruct.adze_head_cast": "Adze Head Gold Cast", @@ -388,7 +387,6 @@ "item.tconstruct.pick_head_sand_cast": "Pick Head Sand Cast", "item.tconstruct.small_axe_head_sand_cast": "Small Axe Head Sand Cast", "item.tconstruct.small_blade_sand_cast": "Small Blade Sand Cast", - "item.tconstruct.sign_head_sand_cast": "Sign Head Sand Cast", "item.tconstruct.bow_limb_sand_cast": "Bow Limb Sand Cast", "item.tconstruct.bow_grip_sand_cast": "Bow Grip Sand Cast", "item.tconstruct.adze_head_sand_cast": "Adze Head Sand Cast", @@ -439,7 +437,6 @@ "item.tconstruct.pick_head_red_sand_cast": "Pick Head Red Sand Cast", "item.tconstruct.small_axe_head_red_sand_cast": "Small Axe Head Red Sand Cast", "item.tconstruct.small_blade_red_sand_cast": "Small Blade Red Sand Cast", - "item.tconstruct.sign_head_red_sand_cast": "Sign Head Red Sand Cast", "item.tconstruct.bow_limb_red_sand_cast": "Bow Limb Red Sand Cast", "item.tconstruct.bow_grip_red_sand_cast": "Bow Grip Red Sand Cast", "item.tconstruct.adze_head_red_sand_cast": "Adze Head Red Sand Cast", @@ -1414,6 +1411,8 @@ "block.tconstruct.greenheart_button": "Greenheart Button", "block.tconstruct.greenheart_sign": "Greenheart Sign", "block.tconstruct.greenheart_wall_sign": "Greenheart Sign", + "block.tconstruct.greenheart_hanging_sign": "Greenheart Hanging Sign", + "block.tconstruct.greenheart_wall_hanging_sign": "Greenheart Hanging Sign", "block.tconstruct.skyroot_planks": "Skyroot Planks", "block.tconstruct.skyroot_planks_slab": "Skyroot Slab", @@ -1431,6 +1430,8 @@ "block.tconstruct.skyroot_button": "Skyroot Button", "block.tconstruct.skyroot_sign": "Skyroot Sign", "block.tconstruct.skyroot_wall_sign": "Skyroot Sign", + "block.tconstruct.skyroot_hanging_sign": "Skyroot Hanging Sign", + "block.tconstruct.skyroot_wall_hanging_sign": "Skyroot Hanging Sign", "block.tconstruct.bloodshroom_planks": "Bloodshroom Planks", "block.tconstruct.bloodshroom_planks_slab": "Bloodshroom Slab", @@ -1448,6 +1449,8 @@ "block.tconstruct.bloodshroom_button": "Bloodshroom Button", "block.tconstruct.bloodshroom_sign": "Bloodshroom Sign", "block.tconstruct.bloodshroom_wall_sign": "Bloodshroom Sign", + "block.tconstruct.bloodshroom_hanging_sign": "Bloodshroom Hanging Sign", + "block.tconstruct.bloodshroom_wall_hanging_sign": "Bloodshroom Hanging Sign", "block.tconstruct.enderbark_planks": "Enderbark Planks", "block.tconstruct.enderbark_planks_slab": "Enderbark Slab", @@ -1471,6 +1474,8 @@ "block.tconstruct.enderbark_button": "Enderbark Button", "block.tconstruct.enderbark_sign": "Enderbark Sign", "block.tconstruct.enderbark_wall_sign": "Enderbark Sign", + "block.tconstruct.enderbark_hanging_sign": "Enderbark Hanging Sign", + "block.tconstruct.enderbark_wall_hanging_sign": "Enderbark Hanging Sign", "material.tconstruct.unknown": "Unknown", diff --git a/src/main/resources/assets/tconstruct/textures/entity/signs/hanging/bloodshroom.png b/src/main/resources/assets/tconstruct/textures/entity/signs/hanging/bloodshroom.png new file mode 100644 index 0000000000..2da4a33f23 Binary files /dev/null and b/src/main/resources/assets/tconstruct/textures/entity/signs/hanging/bloodshroom.png differ diff --git a/src/main/resources/assets/tconstruct/textures/entity/signs/hanging/enderbark.png b/src/main/resources/assets/tconstruct/textures/entity/signs/hanging/enderbark.png new file mode 100644 index 0000000000..a4acdb76cf Binary files /dev/null and b/src/main/resources/assets/tconstruct/textures/entity/signs/hanging/enderbark.png differ diff --git a/src/main/resources/assets/tconstruct/textures/entity/signs/hanging/greenheart.png b/src/main/resources/assets/tconstruct/textures/entity/signs/hanging/greenheart.png new file mode 100644 index 0000000000..fbabfbc5a7 Binary files /dev/null and b/src/main/resources/assets/tconstruct/textures/entity/signs/hanging/greenheart.png differ diff --git a/src/main/resources/assets/tconstruct/textures/entity/signs/hanging/skyroot.png b/src/main/resources/assets/tconstruct/textures/entity/signs/hanging/skyroot.png new file mode 100644 index 0000000000..7662c12e4c Binary files /dev/null and b/src/main/resources/assets/tconstruct/textures/entity/signs/hanging/skyroot.png differ diff --git a/src/main/resources/assets/tconstruct/textures/gui/hanging_signs/bloodshroom.png b/src/main/resources/assets/tconstruct/textures/gui/hanging_signs/bloodshroom.png new file mode 100644 index 0000000000..b8c0dbe0cd Binary files /dev/null and b/src/main/resources/assets/tconstruct/textures/gui/hanging_signs/bloodshroom.png differ diff --git a/src/main/resources/assets/tconstruct/textures/gui/hanging_signs/enderbark.png b/src/main/resources/assets/tconstruct/textures/gui/hanging_signs/enderbark.png new file mode 100644 index 0000000000..830f9e99d0 Binary files /dev/null and b/src/main/resources/assets/tconstruct/textures/gui/hanging_signs/enderbark.png differ diff --git a/src/main/resources/assets/tconstruct/textures/gui/hanging_signs/greenheart.png b/src/main/resources/assets/tconstruct/textures/gui/hanging_signs/greenheart.png new file mode 100644 index 0000000000..9b5ca2e346 Binary files /dev/null and b/src/main/resources/assets/tconstruct/textures/gui/hanging_signs/greenheart.png differ diff --git a/src/main/resources/assets/tconstruct/textures/gui/hanging_signs/skyroot.png b/src/main/resources/assets/tconstruct/textures/gui/hanging_signs/skyroot.png new file mode 100644 index 0000000000..910552d4f4 Binary files /dev/null and b/src/main/resources/assets/tconstruct/textures/gui/hanging_signs/skyroot.png differ diff --git a/src/main/resources/assets/tconstruct/textures/item/wood/bloodshroom_hanging_sign.png b/src/main/resources/assets/tconstruct/textures/item/wood/bloodshroom_hanging_sign.png new file mode 100644 index 0000000000..a87cae13a9 Binary files /dev/null and b/src/main/resources/assets/tconstruct/textures/item/wood/bloodshroom_hanging_sign.png differ diff --git a/src/main/resources/assets/tconstruct/textures/item/wood/enderbark_hanging_sign.png b/src/main/resources/assets/tconstruct/textures/item/wood/enderbark_hanging_sign.png new file mode 100644 index 0000000000..8be6dd0914 Binary files /dev/null and b/src/main/resources/assets/tconstruct/textures/item/wood/enderbark_hanging_sign.png differ diff --git a/src/main/resources/assets/tconstruct/textures/item/wood/greenheart_hanging_sign.png b/src/main/resources/assets/tconstruct/textures/item/wood/greenheart_hanging_sign.png new file mode 100644 index 0000000000..2f1865a440 Binary files /dev/null and b/src/main/resources/assets/tconstruct/textures/item/wood/greenheart_hanging_sign.png differ diff --git a/src/main/resources/assets/tconstruct/textures/item/wood/skyroot_hanging_sign.png b/src/main/resources/assets/tconstruct/textures/item/wood/skyroot_hanging_sign.png new file mode 100644 index 0000000000..25166e753a Binary files /dev/null and b/src/main/resources/assets/tconstruct/textures/item/wood/skyroot_hanging_sign.png differ