Skip to content

Commit

Permalink
Added model/textures/tags for the Thermoregulator
Browse files Browse the repository at this point in the history
  • Loading branch information
Forstride committed Jan 4, 2024
1 parent 9796860 commit 34dca93
Show file tree
Hide file tree
Showing 26 changed files with 253 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-01-03T14:17:14.7413115 Tags for minecraft:item mod id toughasnails
// 1.20.4 2024-01-04T08:50:20.0019248 Tags for minecraft:item mod id toughasnails
f05342856fe99891fa5e94bbe8db82a4f75ac41e data/toughasnails/tags/items/cooling_armor.json
572f6d0748095755aeef0ca7d602f4ebba9bfd76 data/toughasnails/tags/items/cooling_consumed_items.json
7c304628a9c17ca3ba6cd13e199fcf73ad9c974f data/toughasnails/tags/items/cooling_held_items.json
Expand All @@ -20,6 +20,8 @@ a8d4693f32c2dabe2f0ff10cb6ccae93882c8530 data/toughasnails/tags/items/hydration/
f87a1c4dc42b16f1628cfca591895d987e5dc6ca data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/poison_chance/50_poison_chance_drinks.json
cc0aa3bf437ed849deda4e4b64aff3665160dae6 data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json
6f524ffe3a9819336fb57316d3245695a9601368 data/toughasnails/tags/items/thermoregulator_cooling_fuel.json
3d80c1a95b23a8f6e2e0350454fc36e0743ee45a data/toughasnails/tags/items/thermoregulator_heating_fuel.json
0395ed7d6e3d7510a25d2f4ef8b498b0d8c6c9eb data/toughasnails/tags/items/thirst/10_thirst_drinks.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/11_thirst_drinks.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/12_thirst_drinks.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// 1.20.4 2024-01-02T16:58:35.4458416 Tags for minecraft:block mod id toughasnails
// 1.20.4 2024-01-04T08:50:19.999926 Tags for minecraft:block mod id toughasnails
dfed6a08d97cca915d349d312f18532c01063afa data/minecraft/tags/blocks/mineable/axe.json
204b99a448ab27dca7519b0ea2c4e0a422b1f12a data/minecraft/tags/blocks/mineable/pickaxe.json
eed9ca8217c04724f67008aba1a0a5edde5697c2 data/toughasnails/tags/blocks/cooling_blocks.json
d4134d307e68e7865444c0d1d1ab81babc6a27ff data/toughasnails/tags/blocks/heating_blocks.json
658fab0118eb1ac9896e1b9ab89f2d5ed055a967 data/toughasnails/tags/blocks/heating_blocks.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"values": [
"minecraft:fire",
"minecraft:campfire",
"minecraft:lantern",
"minecraft:lava",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"values": [
"minecraft:ice",
"minecraft:packed_ice",
"minecraft:blue_ice",
"minecraft:snowball",
"minecraft:snow",
"minecraft:snow_block",
"minecraft:powder_snow_bucket"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"values": [
"minecraft:magma_block",
"minecraft:magma_cream",
"minecraft:blaze_powder",
"minecraft:blaze_rod",
"minecraft:coal",
"minecraft:charcoal",
"minecraft:coal_block",
"minecraft:lava_bucket"
]
}
3 changes: 3 additions & 0 deletions common/src/main/java/toughasnails/init/ModTags.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ private static void init() {}
public static final TagKey<Item> COOLING_CONSUMED_ITEMS = create(new ResourceLocation(TANAPI.MOD_ID, "cooling_consumed_items"));
public static final TagKey<Item> HEATING_CONSUMED_ITEMS = create(new ResourceLocation(TANAPI.MOD_ID, "heating_consumed_items"));

public static final TagKey<Item> THERMOREGULATOR_COOLING_FUEL = create(new ResourceLocation(TANAPI.MOD_ID, "thermoregulator_cooling_fuel"));
public static final TagKey<Item> THERMOREGULATOR_HEATING_FUEL = create(new ResourceLocation(TANAPI.MOD_ID, "thermoregulator_heating_fuel"));

public static final TagKey<Item> ONE_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/1_thirst_drinks"));
public static final TagKey<Item> TWO_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/2_thirst_drinks"));
public static final TagKey<Item> THREE_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/3_thirst_drinks"));
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"multipart": [
{
"apply": {
"model": "toughasnails:block/thermoregulator_lower_inactive"
},
"when": {
"cooling": "false"
}
},
{
"apply": {
"model": "toughasnails:block/thermoregulator_lower_active"
},
"when": {
"cooling": "true"
}
},
{
"apply": {
"model": "toughasnails:block/thermoregulator_upper_inactive"
},
"when": {
"heating": "false"
}
},
{
"apply": {
"model": "toughasnails:block/thermoregulator_upper_active"
},
"when": {
"heating": "true"
}
},
{
"apply": {
"model": "toughasnails:block/thermoregulator_top_cool_inactive"
},
"when": {
"cooling": "false"
}
},
{
"apply": {
"model": "toughasnails:block/thermoregulator_top_cool_active"
},
"when": {
"cooling": "true"
}
},
{
"apply": {
"model": "toughasnails:block/thermoregulator_top_heat_inactive"
},
"when": {
"heating": "false"
}
},
{
"apply": {
"model": "toughasnails:block/thermoregulator_top_heat_active"
},
"when": {
"heating": "true"
}
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

"block.toughasnails.rain_collector": "Rain Collector",
"block.toughasnails.temperature_gauge": "Temperature Gauge",
"block.toughasnails.thermoregulator": "Thermoregulator",
"block.toughasnails.water_purifier": "Water Purifier",

"item.toughasnails.apple_juice": "Apple Juice",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "minecraft:block/blast_furnace_top",
"side": "toughasnails:block/thermoregulator_side_inactive",
"top": "toughasnails:block/thermoregulator_top_inactive"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"textures": {
"particle": "toughasnails:block/thermoregulator_side_active",
"side": "toughasnails:block/thermoregulator_side_active",
"bottom": "minecraft:block/blast_furnace_top"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 8, 16],
"faces": {
"north": {"uv": [0, 8, 16, 16], "texture": "#side"},
"east": {"uv": [0, 8, 16, 16], "texture": "#side"},
"south": {"uv": [0, 8, 16, 16], "texture": "#side"},
"west": {"uv": [0, 8, 16, 16], "texture": "#side"},
"down": {"uv": [0, 0, 16, 16], "texture": "#bottom"}
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"textures": {
"particle": "toughasnails:block/thermoregulator_side_inactive",
"side": "toughasnails:block/thermoregulator_side_inactive",
"bottom": "minecraft:block/blast_furnace_top"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 8, 16],
"faces": {
"north": {"uv": [0, 8, 16, 16], "texture": "#side"},
"east": {"uv": [0, 8, 16, 16], "texture": "#side"},
"south": {"uv": [0, 8, 16, 16], "texture": "#side"},
"west": {"uv": [0, 8, 16, 16], "texture": "#side"},
"down": {"uv": [0, 0, 16, 16], "texture": "#bottom"}
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"textures": {
"particle": "toughasnails:block/thermoregulator_top_active"
"top": "toughasnails:block/thermoregulator_top_active"
},
"elements": [
{
"from": [8, 16, 0],
"to": [16, 16, 16],
"faces": {
"up": {"uv": [8, 0, 16, 16], "texture": "#top"}
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"textures": {
"particle": "toughasnails:block/thermoregulator_top_inactive"
"top": "toughasnails:block/thermoregulator_top_inactive"
},
"elements": [
{
"from": [8, 16, 0],
"to": [16, 16, 16],
"faces": {
"up": {"uv": [8, 0, 16, 16], "texture": "#top"}
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"textures": {
"particle": "toughasnails:block/thermoregulator_top_active"
"top": "toughasnails:block/thermoregulator_top_active"
},
"elements": [
{
"from": [8, 16, 0],
"to": [16, 16, 16],
"faces": {
"up": {"uv": [8, 0, 16, 16], "texture": "#top"}
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"textures": {
"particle": "toughasnails:block/thermoregulator_top_inactive"
"top": "toughasnails:block/thermoregulator_top_inactive"
},
"elements": [
{
"from": [8, 16, 0],
"to": [16, 16, 16],
"faces": {
"up": {"uv": [8, 0, 16, 16], "texture": "#top"}
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"textures": {
"particle": "toughasnails:block/thermoregulator_side_active",
"side": "toughasnails:block/thermoregulator_side_active"
},
"elements": [
{
"from": [0, 8, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 16, 8], "texture": "#side"},
"east": {"uv": [0, 0, 16, 8], "texture": "#side"},
"south": {"uv": [0, 0, 16, 8], "texture": "#side"},
"west": {"uv": [0, 0, 16, 8], "texture": "#side"}
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"textures": {
"particle": "toughasnails:block/thermoregulator_side_inactive",
"side": "toughasnails:block/thermoregulator_side_inactive"
},
"elements": [
{
"from": [0, 8, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 16, 8], "texture": "#side"},
"east": {"uv": [0, 0, 16, 8], "texture": "#side"},
"south": {"uv": [0, 0, 16, 8], "texture": "#side"},
"west": {"uv": [0, 0, 16, 8], "texture": "#side"}
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "toughasnails:block/thermoregulator"
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ protected void addTags(HolderLookup.Provider provider)

// TAN tags
this.tag(ModTags.Blocks.COOLING_BLOCKS).add(Blocks.SOUL_FIRE, Blocks.SOUL_CAMPFIRE, Blocks.SOUL_LANTERN, Blocks.PACKED_ICE, Blocks.BLUE_ICE, Blocks.POWDER_SNOW_CAULDRON);
this.tag(ModTags.Blocks.HEATING_BLOCKS).add(Blocks.CAMPFIRE, Blocks.LANTERN, Blocks.LAVA, Blocks.MAGMA_BLOCK, Blocks.LAVA_CAULDRON);
this.tag(ModTags.Blocks.HEATING_BLOCKS).add(Blocks.FIRE, Blocks.CAMPFIRE, Blocks.LANTERN, Blocks.LAVA, Blocks.MAGMA_BLOCK, Blocks.LAVA_CAULDRON);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ protected void addTags(HolderLookup.Provider provider)
this.tag(ModTags.Items.COOLING_CONSUMED_ITEMS).add(TANItems.ICE_CREAM);
this.tag(ModTags.Items.HEATING_CONSUMED_ITEMS).add(TANItems.CHARC_0S);

// Thermoregulator fuel
this.tag(ModTags.Items.THERMOREGULATOR_COOLING_FUEL).add(Items.ICE, Items.PACKED_ICE, Items.BLUE_ICE, Items.SNOWBALL, Items.SNOW, Items.SNOW_BLOCK, Items.POWDER_SNOW_BUCKET);
this.tag(ModTags.Items.THERMOREGULATOR_HEATING_FUEL).add(Items.MAGMA_BLOCK, Items.MAGMA_CREAM, Items.BLAZE_POWDER, Items.BLAZE_ROD, Items.COAL, Items.CHARCOAL, Items.COAL_BLOCK, Items.LAVA_BUCKET);

// Drinks
this.tag(ModTags.Items.DRINKS).addTags(
ModTags.Items.ONE_THIRST_DRINKS,
Expand Down

0 comments on commit 34dca93

Please sign in to comment.