-
Notifications
You must be signed in to change notification settings - Fork 117
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added assets for Temperature Gauge and Thermometer (Not functional yet)
- Loading branch information
Showing
46 changed files
with
199 additions
and
7 deletions.
There are no files selected for viewing
3 changes: 2 additions & 1 deletion
3
common/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
// 1.20.4 2023-12-25T10:07:37.6375031 Loot Tables | ||
// 1.20.4 2024-01-01T08:38:05.3377628 Loot Tables | ||
8fca2e50f9df3893ec7ecb84fb15e5f83b33508a data/toughasnails/loot_tables/blocks/rain_collector.json | ||
5b982875ef4148c8acb507e82e690b7ffd814749 data/toughasnails/loot_tables/blocks/temperature_gauge.json | ||
1410cb58946442b13107a7153298bdcdc8ccaacc data/toughasnails/loot_tables/blocks/water_purifier.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
// 1.20.4 2023-12-25T10:07:37.6365035 Tags for minecraft:block mod id toughasnails | ||
bffb0fdf09ac6cfbed64666a723e8a78cb784bbd data/minecraft/tags/blocks/mineable/pickaxe.json | ||
// 1.20.4 2024-01-01T08:38:05.3367638 Tags for minecraft:block mod id toughasnails | ||
bdcc25ec3d77d0540777147a5b124a1e15619160 data/minecraft/tags/blocks/mineable/pickaxe.json | ||
eed9ca8217c04724f67008aba1a0a5edde5697c2 data/toughasnails/tags/blocks/cooling_blocks.json | ||
d4134d307e68e7865444c0d1d1ab81babc6a27ff data/toughasnails/tags/blocks/heating_blocks.json |
1 change: 1 addition & 0 deletions
1
common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
{ | ||
"values": [ | ||
"toughasnails:temperature_gauge", | ||
"toughasnails:rain_collector", | ||
"toughasnails:water_purifier" | ||
] | ||
|
34 changes: 34 additions & 0 deletions
34
...enerated/resources/data/toughasnails/advancements/recipes/redstone/temperature_gauge.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
{ | ||
"parent": "minecraft:recipes/root", | ||
"criteria": { | ||
"has_redstone": { | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": [ | ||
"minecraft:redstone" | ||
] | ||
} | ||
] | ||
}, | ||
"trigger": "minecraft:inventory_changed" | ||
}, | ||
"has_the_recipe": { | ||
"conditions": { | ||
"recipe": "toughasnails:temperature_gauge" | ||
}, | ||
"trigger": "minecraft:recipe_unlocked" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_the_recipe", | ||
"has_redstone" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"toughasnails:temperature_gauge" | ||
] | ||
} | ||
} |
21 changes: 21 additions & 0 deletions
21
common/src/generated/resources/data/toughasnails/loot_tables/blocks/temperature_gauge.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
{ | ||
"type": "minecraft:block", | ||
"pools": [ | ||
{ | ||
"bonus_rolls": 0.0, | ||
"conditions": [ | ||
{ | ||
"condition": "minecraft:survives_explosion" | ||
} | ||
], | ||
"entries": [ | ||
{ | ||
"type": "minecraft:item", | ||
"name": "toughasnails:temperature_gauge" | ||
} | ||
], | ||
"rolls": 1.0 | ||
} | ||
], | ||
"random_sequence": "toughasnails:blocks/temperature_gauge" | ||
} |
23 changes: 23 additions & 0 deletions
23
common/src/generated/resources/data/toughasnails/recipes/temperature_gauge.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"type": "minecraft:crafting_shaped", | ||
"category": "redstone", | ||
"key": { | ||
"B": { | ||
"item": "minecraft:brick_slab" | ||
}, | ||
"G": { | ||
"item": "minecraft:glass" | ||
}, | ||
"R": { | ||
"item": "minecraft:redstone" | ||
} | ||
}, | ||
"pattern": [ | ||
"GGG", | ||
"RRR", | ||
"BBB" | ||
], | ||
"result": { | ||
"item": "toughasnails:temperature_gauge" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
common/src/main/java/toughasnails/block/TemperatureGaugeBlock.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
/******************************************************************************* | ||
* Copyright 2021, the Glitchfiend Team. | ||
* All rights reserved. | ||
******************************************************************************/ | ||
package toughasnails.block; | ||
|
||
import net.minecraft.core.BlockPos; | ||
import net.minecraft.world.InteractionHand; | ||
import net.minecraft.world.InteractionResult; | ||
import net.minecraft.world.entity.player.Player; | ||
import net.minecraft.world.level.BlockGetter; | ||
import net.minecraft.world.level.Level; | ||
import net.minecraft.world.level.block.Block; | ||
import net.minecraft.world.level.block.state.BlockState; | ||
import net.minecraft.world.level.block.state.StateDefinition; | ||
import net.minecraft.world.level.block.state.properties.BlockStateProperties; | ||
import net.minecraft.world.level.block.state.properties.BooleanProperty; | ||
import net.minecraft.world.level.gameevent.GameEvent; | ||
import net.minecraft.world.phys.BlockHitResult; | ||
import net.minecraft.world.phys.shapes.CollisionContext; | ||
import net.minecraft.world.phys.shapes.VoxelShape; | ||
|
||
public class TemperatureGaugeBlock extends Block | ||
{ | ||
protected static final VoxelShape SHAPE = Block.box(0.0D, 0.0D, 0.0D, 16.0D, 6.0D, 16.0D); | ||
public static final BooleanProperty INVERTED = BlockStateProperties.INVERTED; | ||
|
||
public TemperatureGaugeBlock(Properties properties) | ||
{ | ||
super(properties); | ||
this.registerDefaultState(this.stateDefinition.any().setValue(INVERTED, false)); | ||
} | ||
|
||
@Override | ||
public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult rayTraceResult) | ||
{ | ||
if (player.mayBuild()) | ||
{ | ||
if (world.isClientSide) | ||
{ | ||
return InteractionResult.SUCCESS; | ||
} | ||
else | ||
{ | ||
BlockState blockstate = (BlockState)state.cycle(INVERTED); | ||
world.setBlock(pos, blockstate, 2); | ||
world.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(player, blockstate)); | ||
// TODO: REPLACE WITH SIGNAL STRENGTH UPDATE | ||
// updateSignalStrength(blockstate, world, pos); | ||
return InteractionResult.CONSUME; | ||
} | ||
} | ||
else | ||
{ | ||
return super.use(state, world, pos, player, hand, rayTraceResult); | ||
} | ||
} | ||
|
||
@Override | ||
public VoxelShape getShape(BlockState state, BlockGetter reader, BlockPos pos, CollisionContext selectionContext) | ||
{ | ||
return SHAPE; | ||
} | ||
|
||
@Override | ||
public boolean useShapeForLightOcclusion(BlockState state) | ||
{ | ||
return true; | ||
} | ||
|
||
@Override | ||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) | ||
{ | ||
builder.add(INVERTED); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
common/src/main/resources/assets/toughasnails/blockstates/temperature_gauge.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
{ | ||
"variants": { | ||
"inverted=false": { | ||
"model": "toughasnails:block/temperature_gauge" | ||
}, | ||
"inverted=true": { | ||
"model": "toughasnails:block/temperature_gauge_inverted" | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
common/src/main/resources/assets/toughasnails/models/block/temperature_gauge.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"parent": "minecraft:block/template_daylight_detector", | ||
"textures": { | ||
"side": "toughasnails:block/temperature_gauge_side", | ||
"top": "toughasnails:block/temperature_gauge_top" | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
common/src/main/resources/assets/toughasnails/models/block/temperature_gauge_inverted.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"parent": "minecraft:block/template_daylight_detector", | ||
"textures": { | ||
"side": "toughasnails:block/temperature_gauge_side", | ||
"top": "toughasnails:block/temperature_gauge_inverted_top" | ||
} | ||
} |
3 changes: 3 additions & 0 deletions
3
common/src/main/resources/assets/toughasnails/models/item/temperature_gauge.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"parent": "toughasnails:block/temperature_gauge" | ||
} |
Binary file added
BIN
+259 Bytes
...resources/assets/toughasnails/textures/block/temperature_gauge_inverted_top.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 added
BIN
+174 Bytes
...rc/main/resources/assets/toughasnails/textures/block/temperature_gauge_side.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 added
BIN
+259 Bytes
...src/main/resources/assets/toughasnails/textures/block/temperature_gauge_top.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
BIN
+366 Bytes
(120%)
common/src/main/resources/assets/toughasnails/textures/gui/icons.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 added
BIN
+326 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_00.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 added
BIN
+332 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_01.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 added
BIN
+327 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_02.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 added
BIN
+329 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_03.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 added
BIN
+330 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_04.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 added
BIN
+331 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_05.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 added
BIN
+332 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_06.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 added
BIN
+332 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_07.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 added
BIN
+332 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_08.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 added
BIN
+326 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_09.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 added
BIN
+327 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_10.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 added
BIN
+333 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_11.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 added
BIN
+333 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_12.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 added
BIN
+334 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_13.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 added
BIN
+332 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_14.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 added
BIN
+331 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_15.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 added
BIN
+332 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_16.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 added
BIN
+333 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_17.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 added
BIN
+333 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_18.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 added
BIN
+326 Bytes
common/src/main/resources/assets/toughasnails/textures/item/thermometer_19.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
BIN
+2 Bytes
(100%)
...n/src/main/resources/assets/toughasnails/textures/mob_effect/internal_chill.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
BIN
-1 Byte
(100%)
.../src/main/resources/assets/toughasnails/textures/mob_effect/internal_warmth.png
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters