diff options
Diffstat (limited to 'src/main/resources')
59 files changed, 567 insertions, 32 deletions
diff --git a/src/main/resources/assets/sparkt/blockstates/driver_electric.json b/src/main/resources/assets/sparkt/blockstates/driver_electric.json new file mode 100644 index 0000000..1caa02d --- /dev/null +++ b/src/main/resources/assets/sparkt/blockstates/driver_electric.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=east,lit=false": { + "model": "sparkt:block/driver_electric", + "x": 90, + "y": 90 + }, + "facing=north,lit=false": { + "model": "sparkt:block/driver_electric", + "x": 90 + }, + "facing=south,lit=false": { + "model": "sparkt:block/driver_electric", + "x": 90, + "y": 180 + }, + "facing=west,lit=false": { + "model": "sparkt:block/driver_electric", + "x": 90, + "y": 270 + }, + "facing=up,lit=false": { + "model": "sparkt:block/driver_electric" + }, + "facing=down,lit=false": { + "model": "sparkt:block/driver_electric", + "x": 180 + } + } +} diff --git a/src/main/resources/assets/sparkt/blockstates/driver_mechanical.json b/src/main/resources/assets/sparkt/blockstates/driver_mechanical.json index f01b009..6b292df 100644 --- a/src/main/resources/assets/sparkt/blockstates/driver_mechanical.json +++ b/src/main/resources/assets/sparkt/blockstates/driver_mechanical.json @@ -1,5 +1,30 @@ { "variants": { - "": { "model": "sparkt:block/driver_mechanical" } + "facing=east,lit=false": { + "model": "sparkt:block/driver_mechanical", + "x": 90, + "y": 90 + }, + "facing=north,lit=false": { + "model": "sparkt:block/driver_mechanical", + "x": 90 + }, + "facing=south,lit=false": { + "model": "sparkt:block/driver_mechanical", + "x": 90, + "y": 180 + }, + "facing=west,lit=false": { + "model": "sparkt:block/driver_mechanical", + "x": 90, + "y": 270 + }, + "facing=up,lit=false": { + "model": "sparkt:block/driver_mechanical" + }, + "facing=down,lit=false": { + "model": "sparkt:block/driver_mechanical", + "x": 180 + } } -}
\ No newline at end of file +} diff --git a/src/main/resources/assets/sparkt/blockstates/machine_block.json b/src/main/resources/assets/sparkt/blockstates/machine_block.json deleted file mode 100644 index c58ab84..0000000 --- a/src/main/resources/assets/sparkt/blockstates/machine_block.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "sparkt:block/machine_block" } - } -}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/blockstates/machine_frame.json b/src/main/resources/assets/sparkt/blockstates/machine_frame.json new file mode 100644 index 0000000..2e5c3e6 --- /dev/null +++ b/src/main/resources/assets/sparkt/blockstates/machine_frame.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=east,lit=false": { + "model": "sparkt:block/machine_frame", + "y": 90 + }, + "facing=north,lit=false": { + "model": "sparkt:block/machine_frame" + }, + "facing=south,lit=false": { + "model": "sparkt:block/machine_frame", + "y": 180 + }, + "facing=west,lit=false": { + "model": "sparkt:block/machine_frame", + "y": 270 + }, + "facing=east,lit=true": { + "model": "sparkt:block/machine_frame", + "y": 90 + }, + "facing=north,lit=true": { + "model": "sparkt:block/machine_frame" + }, + "facing=south,lit=true": { + "model": "sparkt:block/machine_frame", + "y": 180 + }, + "facing=west,lit=true": { + "model": "sparkt:block/machine_frame", + "y": 270 + } + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/blockstates/machine_furnace.json b/src/main/resources/assets/sparkt/blockstates/machine_furnace.json index 2c115f2..7903eec 100644 --- a/src/main/resources/assets/sparkt/blockstates/machine_furnace.json +++ b/src/main/resources/assets/sparkt/blockstates/machine_furnace.json @@ -1,5 +1,34 @@ { - "variants": { - "": { "model": "sparkt:block/machine_furnace" } - } + "variants": { + "facing=east,lit=false": { + "model": "sparkt:block/machine_furnace", + "y": 90 + }, + "facing=north,lit=false": { + "model": "sparkt:block/machine_furnace" + }, + "facing=south,lit=false": { + "model": "sparkt:block/machine_furnace", + "y": 180 + }, + "facing=west,lit=false": { + "model": "sparkt:block/machine_furnace", + "y": 270 + }, + "facing=east,lit=true": { + "model": "sparkt:block/machine_furnace_on", + "y": 90 + }, + "facing=north,lit=true": { + "model": "sparkt:block/machine_furnace_on" + }, + "facing=south,lit=true": { + "model": "sparkt:block/machine_furnace_on", + "y": 180 + }, + "facing=west,lit=true": { + "model": "sparkt:block/machine_furnace_on", + "y": 270 + } + } }
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/blockstates/machine_grinder.json b/src/main/resources/assets/sparkt/blockstates/machine_grinder.json index 5e233bf..7a5a0ce 100644 --- a/src/main/resources/assets/sparkt/blockstates/machine_grinder.json +++ b/src/main/resources/assets/sparkt/blockstates/machine_grinder.json @@ -1,5 +1,34 @@ { - "variants": { - "": { "model": "sparkt:block/machine_grinder" } - } + "variants": { + "facing=east,lit=false": { + "model": "sparkt:block/machine_grinder", + "y": 90 + }, + "facing=north,lit=false": { + "model": "sparkt:block/machine_grinder" + }, + "facing=south,lit=false": { + "model": "sparkt:block/machine_grinder", + "y": 180 + }, + "facing=west,lit=false": { + "model": "sparkt:block/machine_grinder", + "y": 270 + }, + "facing=east,lit=true": { + "model": "sparkt:block/machine_grinder_on", + "y": 90 + }, + "facing=north,lit=true": { + "model": "sparkt:block/machine_grinder_on" + }, + "facing=south,lit=true": { + "model": "sparkt:block/machine_grinder_on", + "y": 180 + }, + "facing=west,lit=true": { + "model": "sparkt:block/machine_grinder_on", + "y": 270 + } + } }
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/blockstates/ore_deepslate_tungsten.json b/src/main/resources/assets/sparkt/blockstates/ore_deepslate_tungsten.json new file mode 100644 index 0000000..e109934 --- /dev/null +++ b/src/main/resources/assets/sparkt/blockstates/ore_deepslate_tungsten.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "sparkt:block/ore_deepslate_tungsten" + } + } + }
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/blockstates/ore_tungsten.json b/src/main/resources/assets/sparkt/blockstates/ore_tungsten.json new file mode 100644 index 0000000..909ba46 --- /dev/null +++ b/src/main/resources/assets/sparkt/blockstates/ore_tungsten.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "sparkt:block/ore_tungsten" + } + } + }
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/lang/en_us.json b/src/main/resources/assets/sparkt/lang/en_us.json index 28005eb..c826e94 100644 --- a/src/main/resources/assets/sparkt/lang/en_us.json +++ b/src/main/resources/assets/sparkt/lang/en_us.json @@ -1,8 +1,17 @@ { - "block.sparkt.machine_block": "Machine Block", + "block.sparkt.ore_tungsten": "Tungsten Ore", + "block.sparkt.ore_deepslate_tungsten": "Deepslate Tungsten Ore", + + "item.sparkt.raw_tungsten": "Raw Tungsten", + "item.sparkt.ingot_tungsten": "Tungsten Ingot", + + "block.sparkt.machine_frame": "Machine Frame", "block.sparkt.machine_furnace": "Electric Furnace", "block.sparkt.wire": "Wire", - "block.sparkt.machine_grinder": "Electric Crusher", + "block.sparkt.machine_grinder": "Electric Grinder", "block.sparkt.driver_mechanical": "Mechanical Driver", - "block.sparkt.driver_thermal": "Thermal Driver" + "block.sparkt.driver_electric": "Electric Driver", + "block.sparkt.driver_thermal": "Thermal Driver", + + "item.sparkt.heating_element": "Heating Element" }
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/block/driver.json b/src/main/resources/assets/sparkt/models/block/driver.json new file mode 100644 index 0000000..e6d5824 --- /dev/null +++ b/src/main/resources/assets/sparkt/models/block/driver.json @@ -0,0 +1,9 @@ +{ + "parent": "block/orientable_with_bottom", + "textures": { + "top": "sparkt:block/driver_top", + "side": "#side", + "front": "#side", + "bottom": "sparkt:block/machine_bottom" + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/block/driver_electric.json b/src/main/resources/assets/sparkt/models/block/driver_electric.json new file mode 100644 index 0000000..19647b7 --- /dev/null +++ b/src/main/resources/assets/sparkt/models/block/driver_electric.json @@ -0,0 +1,6 @@ +{ + "parent": "sparkt:block/driver", + "textures": { + "side": "sparkt:block/driver_electric_side" + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/block/driver_mechanical.json b/src/main/resources/assets/sparkt/models/block/driver_mechanical.json index f3bdf7b..fe7a3b4 100644 --- a/src/main/resources/assets/sparkt/models/block/driver_mechanical.json +++ b/src/main/resources/assets/sparkt/models/block/driver_mechanical.json @@ -1,9 +1,6 @@ { - "parent": "block/orientable_with_bottom", - "textures": { - "top": "sparkt:block/driver_top", - "side": "sparkt:block/driver_side", - "front": "sparkt:block/driver_side", - "bottom": "sparkt:block/machine_bottom" - } + "parent": "sparkt:block/driver", + "textures": { + "side": "sparkt:block/driver_mechanical_side" + } }
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/block/machine_block.json b/src/main/resources/assets/sparkt/models/block/machine_frame.json index 679b548..679b548 100644 --- a/src/main/resources/assets/sparkt/models/block/machine_block.json +++ b/src/main/resources/assets/sparkt/models/block/machine_frame.json diff --git a/src/main/resources/assets/sparkt/models/block/machine_furnace_on.json b/src/main/resources/assets/sparkt/models/block/machine_furnace_on.json new file mode 100644 index 0000000..f6d8c8d --- /dev/null +++ b/src/main/resources/assets/sparkt/models/block/machine_furnace_on.json @@ -0,0 +1,6 @@ +{ + "parent": "sparkt:block/machine", + "textures": { + "front": "sparkt:block/furnace_side_on" + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/block/machine_grinder_on.json b/src/main/resources/assets/sparkt/models/block/machine_grinder_on.json new file mode 100644 index 0000000..4f28e03 --- /dev/null +++ b/src/main/resources/assets/sparkt/models/block/machine_grinder_on.json @@ -0,0 +1,6 @@ +{ + "parent": "sparkt:block/machine", + "textures": { + "front": "sparkt:block/grinder_side_on" + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/block/ore_deepslate_tungsten.json b/src/main/resources/assets/sparkt/models/block/ore_deepslate_tungsten.json new file mode 100644 index 0000000..fd7b09a --- /dev/null +++ b/src/main/resources/assets/sparkt/models/block/ore_deepslate_tungsten.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "sparkt:block/ore_deepslate_tungsten" + } + }
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/block/ore_tungsten.json b/src/main/resources/assets/sparkt/models/block/ore_tungsten.json new file mode 100644 index 0000000..a2b4235 --- /dev/null +++ b/src/main/resources/assets/sparkt/models/block/ore_tungsten.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "sparkt:block/ore_tungsten" + } + }
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/item/driver_electric.json b/src/main/resources/assets/sparkt/models/item/driver_electric.json new file mode 100644 index 0000000..05a68ef --- /dev/null +++ b/src/main/resources/assets/sparkt/models/item/driver_electric.json @@ -0,0 +1,3 @@ +{ + "parent": "sparkt:block/driver_electric" +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/item/heating_element.json b/src/main/resources/assets/sparkt/models/item/heating_element.json new file mode 100644 index 0000000..25717f8 --- /dev/null +++ b/src/main/resources/assets/sparkt/models/item/heating_element.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "sparkt:item/heating_element" + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/item/ingot_tungsten.json b/src/main/resources/assets/sparkt/models/item/ingot_tungsten.json new file mode 100644 index 0000000..dfa78d8 --- /dev/null +++ b/src/main/resources/assets/sparkt/models/item/ingot_tungsten.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "sparkt:item/ingot_tungsten" + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/item/machine_block.json b/src/main/resources/assets/sparkt/models/item/machine_block.json deleted file mode 100644 index a405f71..0000000 --- a/src/main/resources/assets/sparkt/models/item/machine_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "sparkt:block/machine_block" -}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/item/machine_frame.json b/src/main/resources/assets/sparkt/models/item/machine_frame.json new file mode 100644 index 0000000..29ae308 --- /dev/null +++ b/src/main/resources/assets/sparkt/models/item/machine_frame.json @@ -0,0 +1,3 @@ +{ + "parent": "sparkt:block/machine_frame" +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/item/ore_deepslate_tungsten.json b/src/main/resources/assets/sparkt/models/item/ore_deepslate_tungsten.json new file mode 100644 index 0000000..6694b29 --- /dev/null +++ b/src/main/resources/assets/sparkt/models/item/ore_deepslate_tungsten.json @@ -0,0 +1,3 @@ +{ + "parent": "sparkt:block/ore_deepslate_tungsten" +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/item/ore_tungsten.json b/src/main/resources/assets/sparkt/models/item/ore_tungsten.json new file mode 100644 index 0000000..5f60378 --- /dev/null +++ b/src/main/resources/assets/sparkt/models/item/ore_tungsten.json @@ -0,0 +1,3 @@ +{ + "parent": "sparkt:block/ore_tungsten" +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/item/raw_tungsten.json b/src/main/resources/assets/sparkt/models/item/raw_tungsten.json new file mode 100644 index 0000000..3afb8a7 --- /dev/null +++ b/src/main/resources/assets/sparkt/models/item/raw_tungsten.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "sparkt:item/raw_tungsten" + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/textures/block/driver_electric_side.png b/src/main/resources/assets/sparkt/textures/block/driver_electric_side.png Binary files differnew file mode 100644 index 0000000..f609606 --- /dev/null +++ b/src/main/resources/assets/sparkt/textures/block/driver_electric_side.png diff --git a/src/main/resources/assets/sparkt/textures/block/driver_mechanical_side.png b/src/main/resources/assets/sparkt/textures/block/driver_mechanical_side.png Binary files differnew file mode 100644 index 0000000..dbff087 --- /dev/null +++ b/src/main/resources/assets/sparkt/textures/block/driver_mechanical_side.png diff --git a/src/main/resources/assets/sparkt/textures/block/driver_side.png b/src/main/resources/assets/sparkt/textures/block/driver_side.png Binary files differdeleted file mode 100644 index 51d0c2c..0000000 --- a/src/main/resources/assets/sparkt/textures/block/driver_side.png +++ /dev/null diff --git a/src/main/resources/assets/sparkt/textures/block/driver_top.png b/src/main/resources/assets/sparkt/textures/block/driver_top.png Binary files differindex 2e85d33..37ea8f1 100644 --- a/src/main/resources/assets/sparkt/textures/block/driver_top.png +++ b/src/main/resources/assets/sparkt/textures/block/driver_top.png diff --git a/src/main/resources/assets/sparkt/textures/block/furnace_side.png b/src/main/resources/assets/sparkt/textures/block/furnace_side.png Binary files differindex e7ba9c2..8c95dee 100644 --- a/src/main/resources/assets/sparkt/textures/block/furnace_side.png +++ b/src/main/resources/assets/sparkt/textures/block/furnace_side.png diff --git a/src/main/resources/assets/sparkt/textures/block/furnace_side_on.png b/src/main/resources/assets/sparkt/textures/block/furnace_side_on.png Binary files differnew file mode 100644 index 0000000..6f6b483 --- /dev/null +++ b/src/main/resources/assets/sparkt/textures/block/furnace_side_on.png diff --git a/src/main/resources/assets/sparkt/textures/block/furnace_side_on.png.mcmeta b/src/main/resources/assets/sparkt/textures/block/furnace_side_on.png.mcmeta new file mode 100644 index 0000000..0645f48 --- /dev/null +++ b/src/main/resources/assets/sparkt/textures/block/furnace_side_on.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/sparkt/textures/block/grinder_side.png b/src/main/resources/assets/sparkt/textures/block/grinder_side.png Binary files differindex 1f384f8..536f5f2 100644 --- a/src/main/resources/assets/sparkt/textures/block/grinder_side.png +++ b/src/main/resources/assets/sparkt/textures/block/grinder_side.png diff --git a/src/main/resources/assets/sparkt/textures/block/grinder_side_on.png b/src/main/resources/assets/sparkt/textures/block/grinder_side_on.png Binary files differnew file mode 100644 index 0000000..d4559e7 --- /dev/null +++ b/src/main/resources/assets/sparkt/textures/block/grinder_side_on.png diff --git a/src/main/resources/assets/sparkt/textures/block/grinder_side_on.png.mcmeta b/src/main/resources/assets/sparkt/textures/block/grinder_side_on.png.mcmeta new file mode 100644 index 0000000..0645f48 --- /dev/null +++ b/src/main/resources/assets/sparkt/textures/block/grinder_side_on.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/sparkt/textures/block/machine_bottom.png b/src/main/resources/assets/sparkt/textures/block/machine_bottom.png Binary files differindex 48d3f40..35162e2 100644 --- a/src/main/resources/assets/sparkt/textures/block/machine_bottom.png +++ b/src/main/resources/assets/sparkt/textures/block/machine_bottom.png diff --git a/src/main/resources/assets/sparkt/textures/block/machine_side.png b/src/main/resources/assets/sparkt/textures/block/machine_side.png Binary files differindex 6e1fb14..cfd6382 100644 --- a/src/main/resources/assets/sparkt/textures/block/machine_side.png +++ b/src/main/resources/assets/sparkt/textures/block/machine_side.png diff --git a/src/main/resources/assets/sparkt/textures/block/machine_top.png b/src/main/resources/assets/sparkt/textures/block/machine_top.png Binary files differindex 7d4463f..3a165c0 100644 --- a/src/main/resources/assets/sparkt/textures/block/machine_top.png +++ b/src/main/resources/assets/sparkt/textures/block/machine_top.png diff --git a/src/main/resources/assets/sparkt/textures/block/ore_deepslate_tungsten.png b/src/main/resources/assets/sparkt/textures/block/ore_deepslate_tungsten.png Binary files differnew file mode 100644 index 0000000..04100ca --- /dev/null +++ b/src/main/resources/assets/sparkt/textures/block/ore_deepslate_tungsten.png diff --git a/src/main/resources/assets/sparkt/textures/block/ore_tungsten.png b/src/main/resources/assets/sparkt/textures/block/ore_tungsten.png Binary files differnew file mode 100644 index 0000000..c824085 --- /dev/null +++ b/src/main/resources/assets/sparkt/textures/block/ore_tungsten.png diff --git a/src/main/resources/assets/sparkt/textures/item/heating_element.png b/src/main/resources/assets/sparkt/textures/item/heating_element.png Binary files differnew file mode 100644 index 0000000..65e9f6f --- /dev/null +++ b/src/main/resources/assets/sparkt/textures/item/heating_element.png diff --git a/src/main/resources/assets/sparkt/textures/item/ingot_tungsten.png b/src/main/resources/assets/sparkt/textures/item/ingot_tungsten.png Binary files differnew file mode 100644 index 0000000..5d7bdae --- /dev/null +++ b/src/main/resources/assets/sparkt/textures/item/ingot_tungsten.png diff --git a/src/main/resources/assets/sparkt/textures/item/raw_tungsten.png b/src/main/resources/assets/sparkt/textures/item/raw_tungsten.png Binary files differnew file mode 100644 index 0000000..2a9ac6a --- /dev/null +++ b/src/main/resources/assets/sparkt/textures/item/raw_tungsten.png diff --git a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json new file mode 100644 index 0000000..2eeba2f --- /dev/null +++ b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "sparkt:ore_tungsten", + "sparkt:ore_deepslate_tungsten" + ] +}
\ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json b/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json new file mode 100644 index 0000000..2eeba2f --- /dev/null +++ b/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "sparkt:ore_tungsten", + "sparkt:ore_deepslate_tungsten" + ] +}
\ No newline at end of file diff --git a/src/main/resources/data/sparkt/loot_tables/block/machine_block.json b/src/main/resources/data/sparkt/loot_table/blocks/machine_frame.json index 5c6db56..10e03be 100644 --- a/src/main/resources/data/sparkt/loot_tables/block/machine_block.json +++ b/src/main/resources/data/sparkt/loot_table/blocks/machine_frame.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "sparkt:machine_block" + "name": "sparkt:machine_frame" } ], "conditions": [ diff --git a/src/main/resources/data/sparkt/loot_table/blocks/ore_deepslate_tungsten.json b/src/main/resources/data/sparkt/loot_table/blocks/ore_deepslate_tungsten.json new file mode 100644 index 0000000..4e2f050 --- /dev/null +++ b/src/main/resources/data/sparkt/loot_table/blocks/ore_deepslate_tungsten.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "sparkt:ore_deepslate_tungsten" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "sparkt:raw_tungsten" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "sparkt:blocks/ore_deepslate_tungsten" + }
\ No newline at end of file diff --git a/src/main/resources/data/sparkt/loot_table/blocks/ore_tungsten.json b/src/main/resources/data/sparkt/loot_table/blocks/ore_tungsten.json new file mode 100644 index 0000000..0cff1a3 --- /dev/null +++ b/src/main/resources/data/sparkt/loot_table/blocks/ore_tungsten.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "sparkt:ore_tungsten" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "sparkt:raw_tungsten" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "sparkt:blocks/ore_tungsten" + }
\ No newline at end of file diff --git a/src/main/resources/data/sparkt/recipe/heating_element.json b/src/main/resources/data/sparkt/recipe/heating_element.json new file mode 100644 index 0000000..c5ee59f --- /dev/null +++ b/src/main/resources/data/sparkt/recipe/heating_element.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " w ", + "wfw", + " c " + ], + "key": { + "w": { + "item": "sparkt:ingot_tungsten" + }, + "f": { + "item": "minecraft:iron_ingot" + }, + "c": { + "item": "minecraft:copper_ingot" + } + }, + "result": { + "id": "sparkt:heating_element", + "count": 3 + } +}
\ No newline at end of file diff --git a/src/main/resources/data/sparkt/recipe/ingot_tungsten_blast_ore.json b/src/main/resources/data/sparkt/recipe/ingot_tungsten_blast_ore.json new file mode 100644 index 0000000..c8b636c --- /dev/null +++ b/src/main/resources/data/sparkt/recipe/ingot_tungsten_blast_ore.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:blasting", + "category": "misc", + "cookingtime": 100, + "experience": 0.7, + "group": "ingot_tungsten", + "ingredient": { + "item": "sparkt:ore_tungsten" + }, + "result": { + "id": "sparkt:ingot_tungsten" + } + }
\ No newline at end of file diff --git a/src/main/resources/data/sparkt/recipe/ingot_tungsten_blast_ore_deepslate.json b/src/main/resources/data/sparkt/recipe/ingot_tungsten_blast_ore_deepslate.json new file mode 100644 index 0000000..24096f5 --- /dev/null +++ b/src/main/resources/data/sparkt/recipe/ingot_tungsten_blast_ore_deepslate.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:blasting", + "category": "misc", + "cookingtime": 100, + "experience": 0.7, + "group": "ingot_tungsten", + "ingredient": { + "item": "sparkt:ore_deepslate_tungsten" + }, + "result": { + "id": "sparkt:ingot_tungsten" + } + }
\ No newline at end of file diff --git a/src/main/resources/data/sparkt/recipe/ingot_tungsten_blast_raw.json b/src/main/resources/data/sparkt/recipe/ingot_tungsten_blast_raw.json new file mode 100644 index 0000000..8758117 --- /dev/null +++ b/src/main/resources/data/sparkt/recipe/ingot_tungsten_blast_raw.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:blasting", + "category": "misc", + "cookingtime": 100, + "experience": 0.7, + "group": "ingot_tungsten", + "ingredient": { + "item": "sparkt:raw_tungsten" + }, + "result": { + "id": "sparkt:ingot_tungsten" + } + }
\ No newline at end of file diff --git a/src/main/resources/data/sparkt/recipe/ingot_tungsten_smelt_ore.json b/src/main/resources/data/sparkt/recipe/ingot_tungsten_smelt_ore.json new file mode 100644 index 0000000..7c049cf --- /dev/null +++ b/src/main/resources/data/sparkt/recipe/ingot_tungsten_smelt_ore.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.7, + "group": "ingot_tungsten", + "ingredient": { + "item": "sparkt:ore_tungsten" + }, + "result": { + "id": "sparkt:ingot_tungsten" + } + }
\ No newline at end of file diff --git a/src/main/resources/data/sparkt/recipe/ingot_tungsten_smelt_ore_deepslate.json b/src/main/resources/data/sparkt/recipe/ingot_tungsten_smelt_ore_deepslate.json new file mode 100644 index 0000000..7d8b984 --- /dev/null +++ b/src/main/resources/data/sparkt/recipe/ingot_tungsten_smelt_ore_deepslate.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.7, + "group": "ingot_tungsten", + "ingredient": { + "item": "sparkt:ore_deepslate_tungsten" + }, + "result": { + "id": "sparkt:ingot_tungsten" + } + }
\ No newline at end of file diff --git a/src/main/resources/data/sparkt/recipe/ingot_tungsten_smelt_raw.json b/src/main/resources/data/sparkt/recipe/ingot_tungsten_smelt_raw.json new file mode 100644 index 0000000..3ea83f6 --- /dev/null +++ b/src/main/resources/data/sparkt/recipe/ingot_tungsten_smelt_raw.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.7, + "group": "ingot_tungsten", + "ingredient": { + "item": "sparkt:raw_tungsten" + }, + "result": { + "id": "sparkt:ingot_tungsten" + } + }
\ No newline at end of file diff --git a/src/main/resources/data/sparkt/recipe/machine_frame.json b/src/main/resources/data/sparkt/recipe/machine_frame.json new file mode 100644 index 0000000..06d2760 --- /dev/null +++ b/src/main/resources/data/sparkt/recipe/machine_frame.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "isi", + "s s", + "isi" + ], + "key": { + "s": { + "item": "minecraft:smooth_stone" + }, + "i": { + "item": "minecraft:iron_ingot" + } + }, + "result": { + "id": "sparkt:machine_frame", + "count": 2 + } +}
\ No newline at end of file diff --git a/src/main/resources/data/sparkt/recipe/machine_furnace.json b/src/main/resources/data/sparkt/recipe/machine_furnace.json new file mode 100644 index 0000000..9ab9dc4 --- /dev/null +++ b/src/main/resources/data/sparkt/recipe/machine_furnace.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "rmr", + "hfh", + "rhr" + ], + "key": { + "r": { + "item": "minecraft:redstone" + }, + "m": { + "item": "sparkt:machine_frame" + }, + "h": { + "item": "sparkt:heating_element" + }, + "f": { + "item": "minecraft:furnace" + } + }, + "result": { + "id": "sparkt:machine_furnace", + "count": 1 + } +}
\ No newline at end of file diff --git a/src/main/resources/data/sparkt/recipe/machine_grinder.json b/src/main/resources/data/sparkt/recipe/machine_grinder.json new file mode 100644 index 0000000..37cee40 --- /dev/null +++ b/src/main/resources/data/sparkt/recipe/machine_grinder.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "rir", + "pmp", + "ccc" + ], + "key": { + "r": { + "item": "minecraft:redstone" + }, + "i": { + "item": "minecraft:iron_block" + }, + "p": { + "item": "minecraft:piston" + }, + "m": { + "item": "sparkt:machine_frame" + }, + "c": { + "item": "minecraft:copper_ingot" + } + }, + "result": { + "id": "sparkt:machine_grinder", + "count": 1 + } +}
\ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 69935ee..c90ca38 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -18,15 +18,18 @@ "environment": "*", "entrypoints": { "main": [ - "net.cshift.sparkt.SparktInit" + "net.cshift.mc.sparkt.SparktInit" + ], + "client": [ + "net.cshift.mc.sparkt.SparktClientInit" ] }, "depends": { - "fabricloader": ">=0.8.0", - "fabric": "*", - "minecraft": "1.20.x", + "fabricloader": ">=0.16.0", + "fabric-api-base": "*", + "minecraft": "1.21.x", - "transit-api": "=3.0.0-alpha-2" + "transit-api": "=3.0.1-rc-1" } } |