From 7fdde3654c544780f059808dc0b28354cd2ba89e Mon Sep 17 00:00:00 2001 From: Zontreck Date: Fri, 1 Mar 2024 12:50:33 -0700 Subject: [PATCH] Fix missing data tags, and old references to OTE --- gradle.properties | 2 +- .../tags/blocks/mineable/pickaxe.json | 1 + .../tags/blocks/needs_iron_tool.json | 1 + .../data/minecraft/tags/blocks/slabs.json | 11 ++++++----- .../data/minecraft/tags/blocks/stairs.json | 9 +++++---- .../data/minecraft/tags/blocks/walls.json | 6 +++--- .../minecraft/tags/blocks/wither_immune.json | 19 ++++++++++--------- .../data/minecraft/tags/items/slabs.json | 11 +++++++++++ .../data/minecraft/tags/items/stairs.json | 10 ++++++++++ .../data/minecraft/tags/items/walls.json | 8 ++++++++ 10 files changed, 56 insertions(+), 22 deletions(-) create mode 100644 src/main/resources/data/minecraft/tags/items/slabs.json create mode 100644 src/main/resources/data/minecraft/tags/items/stairs.json create mode 100644 src/main/resources/data/minecraft/tags/items/walls.json diff --git a/gradle.properties b/gradle.properties index 386025a..b3634a3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -48,7 +48,7 @@ mod_name=Aria's Essentials # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=GPLv3 # The mod version. See https://semver.org/ -mod_version=1201.2.030124.0452 +mod_version=1201.2.030124.1249 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 950301c..c5282cf 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -1,4 +1,5 @@ { + "replace": false, "values": [ "#ariasessentials:engineersdecor" diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json index 950301c..c5282cf 100644 --- a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json +++ b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -1,4 +1,5 @@ { + "replace": false, "values": [ "#ariasessentials:engineersdecor" diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/main/resources/data/minecraft/tags/blocks/slabs.json index d62037c..826bfe5 100644 --- a/src/main/resources/data/minecraft/tags/blocks/slabs.json +++ b/src/main/resources/data/minecraft/tags/blocks/slabs.json @@ -1,10 +1,11 @@ { + "replace": false, "values": [ - "otemod:clinker_brick_slab", - "otemod:clinker_brick_stained_slab", - "otemod:slag_brick_slab", - "otemod:rebar_concrete_slab", - "otemod:panzerglass_slab" + "ariasessentials:clinker_brick_slab", + "ariasessentials:clinker_brick_stained_slab", + "ariasessentials:slag_brick_slab", + "ariasessentials:rebar_concrete_slab", + "ariasessentials:panzerglass_slab" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/stairs.json b/src/main/resources/data/minecraft/tags/blocks/stairs.json index accd546..e3608de 100644 --- a/src/main/resources/data/minecraft/tags/blocks/stairs.json +++ b/src/main/resources/data/minecraft/tags/blocks/stairs.json @@ -1,9 +1,10 @@ { + "replace": false, "values": [ - "otemod:clinker_brick_stairs", - "otemod:clinker_brick_stained_stairs", - "otemod:slag_brick_stairs", - "otemod:rebar_concrete_stairs" + "ariasessentials:clinker_brick_stairs", + "ariasessentials:clinker_brick_stained_stairs", + "ariasessentials:slag_brick_stairs", + "ariasessentials:rebar_concrete_stairs" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/walls.json b/src/main/resources/data/minecraft/tags/blocks/walls.json index e9874c9..0b1bd59 100644 --- a/src/main/resources/data/minecraft/tags/blocks/walls.json +++ b/src/main/resources/data/minecraft/tags/blocks/walls.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "otemod:clinker_brick_wall", - "otemod:slag_brick_wall", - "otemod:rebar_concrete_wall" + "ariasessentials:clinker_brick_wall", + "ariasessentials:slag_brick_wall", + "ariasessentials:rebar_concrete_wall" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/wither_immune.json b/src/main/resources/data/minecraft/tags/blocks/wither_immune.json index ac0ffbf..b2f4098 100644 --- a/src/main/resources/data/minecraft/tags/blocks/wither_immune.json +++ b/src/main/resources/data/minecraft/tags/blocks/wither_immune.json @@ -1,14 +1,15 @@ { + "replace": false, "values": [ - "otemod:panzerglass_block", - "otemod:panzerglass_slab", - "otemod:rebar_concrete", - "otemod:rebar_concrete_slab", - "otemod:rebar_concrete_stairs", - "otemod:rebar_concrete_wall", - "otemod:rebar_concrete_tile", - "otemod:rebar_concrete_tile_slab", - "otemod:rebar_concrete_tile_stairs" + "ariasessentials:panzerglass_block", + "ariasessentials:panzerglass_slab", + "ariasessentials:rebar_concrete", + "ariasessentials:rebar_concrete_slab", + "ariasessentials:rebar_concrete_stairs", + "ariasessentials:rebar_concrete_wall", + "ariasessentials:rebar_concrete_tile", + "ariasessentials:rebar_concrete_tile_slab", + "ariasessentials:rebar_concrete_tile_stairs" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/slabs.json b/src/main/resources/data/minecraft/tags/items/slabs.json new file mode 100644 index 0000000..826bfe5 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/slabs.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + + "ariasessentials:clinker_brick_slab", + "ariasessentials:clinker_brick_stained_slab", + "ariasessentials:slag_brick_slab", + "ariasessentials:rebar_concrete_slab", + "ariasessentials:panzerglass_slab" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/stairs.json b/src/main/resources/data/minecraft/tags/items/stairs.json new file mode 100644 index 0000000..e3608de --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/stairs.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + + "ariasessentials:clinker_brick_stairs", + "ariasessentials:clinker_brick_stained_stairs", + "ariasessentials:slag_brick_stairs", + "ariasessentials:rebar_concrete_stairs" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/walls.json b/src/main/resources/data/minecraft/tags/items/walls.json new file mode 100644 index 0000000..0b1bd59 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/walls.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "ariasessentials:clinker_brick_wall", + "ariasessentials:slag_brick_wall", + "ariasessentials:rebar_concrete_wall" + ] +} \ No newline at end of file