Skip to content

Commit

Permalink
Added Raw Blazegold
Browse files Browse the repository at this point in the history
  • Loading branch information
Direwolf20-MC committed Feb 29, 2024
1 parent 7b3a207 commit e35264a
Show file tree
Hide file tree
Showing 33 changed files with 215 additions and 36 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// 1.20.4 2024-02-28T16:35:48.8266354 JustDireThings Tags
f4b7ee8e8135c282b2c52bf2dad098ac76c666e9 data/minecraft/tags/blocks/mineable/pickaxe.json
// 1.20.4 2024-02-28T21:04:17.6216664 JustDireThings Tags
dff9db68e86925ee97c0161c983644c87debb3c3 data/minecraft/tags/blocks/mineable/pickaxe.json
11232a655ecdf0e32c632d145759b8a0de2e09fa data/minecraft/tags/blocks/mineable/shovel.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// 1.20.4 2024-02-28T17:15:26.8011117 Loot Tables
// 1.20.4 2024-02-28T21:04:17.6261703 Loot Tables
16a0ab61513717ab1cb8c1df9718722a643d9728 data/justdirethings/loot_tables/blocks/blazegold_block.json
1374ed53b2d6c1462b64a99f3ca1b290388d36c5 data/justdirethings/loot_tables/blocks/ferricore_block.json
9d62cc762313305bbe032473310bafd15bcdb8bd data/justdirethings/loot_tables/blocks/gooblock_tier1.json
7e92782ed4881463b836c32c2504d92fee72cbfb data/justdirethings/loot_tables/blocks/gooblock_tier2.json
fcef2a947be7443c277f0bc8a7ac5379f2084822 data/justdirethings/loot_tables/blocks/goopatternblock.json
af64563b94925676515ac80e8244ce9f2d09210b data/justdirethings/loot_tables/blocks/raw_ferricore_ore.json
8358a340790581bc3bdaeb54fc65a001c2f76e27 data/justdirethings/loot_tables/blocks/raw_blazegold_ore.json
554c12dc93850baa65ce201f6c276c90708d76fa data/justdirethings/loot_tables/blocks/raw_ferricore_ore.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// 1.20.4 2024-02-28T17:15:26.7986098 Item Models: justdirethings
// 1.20.4 2024-02-28T21:05:57.3037979 Item Models: justdirethings
6396fb6e503760080534bc26337236d4d09a4cb8 assets/justdirethings/models/item/blazegold_block.json
b0950f50f6a6d742e497a6275b3ee049055b941d assets/justdirethings/models/item/blazegold_ingot.json
6c85011e764ec697b9be64a2f7fc12ddacf56f74 assets/justdirethings/models/item/ferricore_block.json
759ac9a72139623d3d7933c1b72eea98d1a30748 assets/justdirethings/models/item/ferricore_ingot.json
dd859b0b386ad41b819dc6e7d46a8979373ef257 assets/justdirethings/models/item/ferricore_raw.json
af62c31381c904f86fde9370e374e01d828fa643 assets/justdirethings/models/item/fuel_canister.json
2ec271fed6a1fb15d49837326283ca1f0e269689 assets/justdirethings/models/item/gooblock_tier1.json
8e2f93de57bf331b80c25882febe5601d1b9d26a assets/justdirethings/models/item/gooblock_tier2.json
3f50e98f22d6abc6b3edab6c01b82deec145ec78 assets/justdirethings/models/item/pocket_generator.json
d8ea68a75b8b49f7765e715d62ad23c2f1939281 assets/justdirethings/models/item/raw_blazegold.json
0eb4cfb03ddec169426214f46beb6f8781ce9421 assets/justdirethings/models/item/raw_blazegold_ore.json
dd859b0b386ad41b819dc6e7d46a8979373ef257 assets/justdirethings/models/item/raw_ferricore.json
97542b1def735985bb9c9ea40bfb51992ea786e3 assets/justdirethings/models/item/raw_ferricore_ore.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.4 2024-02-28T17:15:26.8006113 Languages: en_us for mod: justdirethings
840120fa358026e5cb3ec8262bd685a206af59f6 assets/justdirethings/lang/en_us.json
// 1.20.4 2024-02-28T21:04:17.6251698 Languages: en_us for mod: justdirethings
c161a881ff193941393f219f67267e95cd9ce648 assets/justdirethings/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
// 1.20.4 2024-02-28T17:17:45.5332277 Recipes
// 1.20.4 2024-02-28T21:04:17.6266707 Recipes
a7b97214b98dd1f7bba73e89704509570fff39b1 data/justdirethings/advancements/recipes/building_blocks/blazegold_ingot.json
4bbe1508cce69937d4eb2942ba175688025552e0 data/justdirethings/advancements/recipes/building_blocks/ferricore_ingot.json
10722b37102209b5c18a250c0ad58feccf89c2e9 data/justdirethings/advancements/recipes/misc/blazegold_block-goospread.json
b8a171d51deb8fb20aa73d4747d32466b2ed95db data/justdirethings/advancements/recipes/misc/blazegold_block.json
1c0b7bb7dc6b14386108c451d13c96e92f315e2f data/justdirethings/advancements/recipes/misc/blazegold_ingot_smelted.json
df9153e85c7cd7b9b2ba0347624ed9cbd5963b2b data/justdirethings/advancements/recipes/misc/ferricore_block.json
601bcf0afb24d10401a25a7fc61d922552b1b730 data/justdirethings/advancements/recipes/misc/ferricore_ingot_smelted.json
7862023f7a4c7c942c6ea97af356664df4e8ee29 data/justdirethings/advancements/recipes/misc/ferricore_ingot_smelted.json
08a464b9106de5bf0e3d81194dc205ed42ef7db4 data/justdirethings/advancements/recipes/misc/fuel_canister.json
40cce3bcf79345790efed77343905f6e29a3e0aa data/justdirethings/advancements/recipes/misc/gooblock_tier1.json
47100c90c790bbe1cd08e412e3bb7d4f19c961da data/justdirethings/advancements/recipes/misc/gooblock_tier2.json
591f2dd8d997ccead841061e70aedc4a4984a60d data/justdirethings/advancements/recipes/misc/pocket_generator.json
8b754485663be06dd091f1b221d0523bfacca088 data/justdirethings/advancements/recipes/misc/raw_blazegold_ore-goospread.json
2e7f18748d1dfb5082ff77aa180c979e16a032e5 data/justdirethings/advancements/recipes/misc/raw_ferricore_ore-goospread.json
4cb8fc7db4317b10a3bde4de30868c2034e60ef9 data/justdirethings/recipes/blazegold_block-goospread.json
65c9338e15965cd0721ba91f51d216bbad04bbdf data/justdirethings/recipes/blazegold_block.json
9c7a43a1edd52034d612078073184ea06f9e637e data/justdirethings/recipes/blazegold_ingot.json
82b776d5e708a496d968bc9ef55ab2d5f89d4fc6 data/justdirethings/recipes/blazegold_ingot_smelted.json
c06a5a5eebf086901080a64ea86a7a6dee08c9b5 data/justdirethings/recipes/ferricore_block.json
558075e165773346d831b6cd09e7d6001db3a342 data/justdirethings/recipes/ferricore_ingot.json
9d4da64f52a1c4c4facca00858cac4096628f6c7 data/justdirethings/recipes/ferricore_ingot_smelted.json
7334cc702fe2ef68e0590903e0cdc47e047379d4 data/justdirethings/recipes/ferricore_ingot_smelted.json
be43fb76c8ff5e0964f378abece4cf4d77ecd06e data/justdirethings/recipes/fuel_canister.json
291d1d5894c21e8f05454c13674e98e249af83c1 data/justdirethings/recipes/gooblock_tier1.json
e5917a0e540128bfbb34b7c27c9bbefcb791b043 data/justdirethings/recipes/gooblock_tier2.json
f3525c90d81a757a6c44f0b1b15164ea62867e29 data/justdirethings/recipes/pocket_generator.json
e6b824e89c9b85c5e91b2d1a1dc00d63dcb23e0e data/justdirethings/recipes/raw_blazegold_ore-goospread.json
dbd8a27f78b0f2ecc66f7d582fbfead734671b26 data/justdirethings/recipes/raw_ferricore_ore-goospread.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
// 1.20.4 2024-02-28T16:52:11.6114855 Block States: justdirethings
// 1.20.4 2024-02-28T21:04:17.6241684 Block States: justdirethings
e5976480ed9485e0bae43d4edde0c8aecaabe8a5 assets/justdirethings/blockstates/blazegold_block.json
81a237aa7f50c82d19f0cbf52a672edf3d805e23 assets/justdirethings/blockstates/ferricore_block.json
5a4cd222f3bde8915594a1363e2758ee5208517c assets/justdirethings/blockstates/gooblock_tier1.json
cc1d5dd5cf3cdaf4e89a9b0dae5372b43c27b88c assets/justdirethings/blockstates/gooblock_tier2.json
2c7ba1dbdfd5b10ee0de988f03472b4af57f9378 assets/justdirethings/blockstates/goopatternblock.json
a684d58dade9e2961c5c6b994704e43321dd2d30 assets/justdirethings/blockstates/raw_blazegold_ore.json
a7d2fa74c5e65b5a5f46b68932e99144d08123ee assets/justdirethings/blockstates/raw_ferricore_ore.json
9bd3946cfa107459786529b2af21eb125a901fb7 assets/justdirethings/models/block/blazegold_block.json
183c8ed95d7386a12307a44d3ff68f4085961ed3 assets/justdirethings/models/block/ferricore_block.json
Expand All @@ -21,4 +22,5 @@ de99198085ba7892b69b20c7fba7574aa387c99b assets/justdirethings/models/block/goop
1017892293e8c2c1fbd6668493696513da801921 assets/justdirethings/models/block/goopatternblock7.json
7c4b15daa716408edd217af3bdd5f4d40a507116 assets/justdirethings/models/block/goopatternblock8.json
a8285d4ea09e26951b3019b6e96a43d3d4654269 assets/justdirethings/models/block/goopatternblock9.json
934652a811b9657b7fc80acc101da40b37d14315 assets/justdirethings/models/block/raw_blazegold_ore.json
382857a602e9f295c8e682db8c4cbc5299701263 assets/justdirethings/models/block/raw_ferricore_ore.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "justdirethings:block/raw_blazegold_ore"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
"block.justdirethings.ferricore_block": "Ferricore Block",
"block.justdirethings.gooblock_tier1": "Primogel Goo",
"block.justdirethings.gooblock_tier2": "Blazebloom Goo",
"block.justdirethings.raw_blazegold_ore": "Raw Blazegold Ore",
"block.justdirethings.raw_ferricore_ore": "Raw Ferricore Ore",
"item.justdirethings.blazegold_ingot": "Blazegold Ingot",
"item.justdirethings.ferricore_ingot": "Ferricore Ingot",
"item.justdirethings.ferricore_raw": "Raw Ferricore",
"item.justdirethings.fuel_canister": "Fuel Canister",
"item.justdirethings.pocket_generator": "Pocket Generator",
"item.justdirethings.raw_blazegold": "Raw Blazegold",
"item.justdirethings.raw_ferricore": "Raw Ferricore",
"itemGroup.DeferredHolder{ResourceKey[minecraft:creative_mode_tab / justdirethings:justdirethings]}": "Just Dire Things",
"justdirethings.fuelcanisteramt": "Cook time (ticks): %d",
"justdirethings.fuelcanisteramtstack": "Stack Cook time (ticks): %d",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_all",
"render_type": "minecraft:translucent",
"textures": {
"all": "justdirethings:block/raw_blazegold_ore"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "justdirethings:item/raw_blazegold"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "justdirethings:block/raw_blazegold_ore"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_blazegold_raw": {
"conditions": {
"items": [
{
"items": [
"justdirethings:raw_blazegold"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "justdirethings:blazegold_ingot_smelted"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_blazegold_raw"
]
],
"rewards": {
"recipes": [
"justdirethings:blazegold_ingot_smelted"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"items": [
{
"items": [
"justdirethings:ferricore_raw"
"justdirethings:raw_ferricore"
]
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "justdirethings:blazegold_block-goospread"
"recipe": "justdirethings:raw_blazegold_ore-goospread"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"justdirethings:blazegold_block-goospread"
"justdirethings:raw_blazegold_ore-goospread"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"name": "justdirethings:raw_blazegold_ore"
},
{
"type": "minecraft:item",
"functions": [
{
"add": false,
"count": {
"type": "minecraft:uniform",
"max": 5.0,
"min": 4.0
},
"function": "minecraft:set_count"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "justdirethings:raw_blazegold"
}
]
}
],
"rolls": 1.0
}
],
"random_sequence": "justdirethings:blocks/raw_blazegold_ore"
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"function": "minecraft:explosion_decay"
}
],
"name": "justdirethings:ferricore_raw"
"name": "justdirethings:raw_ferricore"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 400,
"experience": 1.0,
"ingredient": {
"item": "justdirethings:raw_blazegold"
},
"result": "justdirethings:blazegold_ingot"
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"cookingtime": 400,
"experience": 1.0,
"ingredient": {
"item": "justdirethings:ferricore_raw"
"item": "justdirethings:raw_ferricore"
},
"result": "justdirethings:ferricore_ingot"
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"Name": "minecraft:gold_block"
},
"output": {
"Name": "justdirethings:blazegold_block"
"Name": "justdirethings:raw_blazegold_ore"
},
"tierRequirement": 2
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"values": [
"justdirethings:ferricore_block",
"justdirethings:raw_ferricore_ore",
"justdirethings:blazegold_block"
"justdirethings:blazegold_block",
"justdirethings:raw_blazegold_ore"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.direwolf20.justdirethings.common.blocks.resources;

import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.SoundType;

public class RawBlazegoldOre extends Block {
public RawBlazegoldOre() {
super(Properties.of()
.sound(SoundType.AMETHYST)
.requiresCorrectToolForDrops()
.noOcclusion()
.strength(5.0F, 6.0F)
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import net.minecraft.world.item.Item;

public class FerricoreRaw extends Item {
public FerricoreRaw() {
public class RawBlazegold extends Item {
public RawBlazegold() {
super(new Properties());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.direwolf20.justdirethings.common.items.resources;

import net.minecraft.world.item.Item;

public class RawFerricore extends Item {
public RawFerricore() {
super(new Properties());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ protected void registerStatesAndModels() {
simpleBlock(Registration.FerricoreBlock.get(), models().cubeAll(Registration.FerricoreBlock_ITEM.getId().getPath(), blockTexture(Registration.FerricoreBlock.get())));
simpleBlock(Registration.RawFerricoreOre.get(), models().cubeAll(Registration.RawFerricoreOre_ITEM.getId().getPath(), blockTexture(Registration.RawFerricoreOre.get())).renderType("translucent"));
simpleBlock(Registration.BlazeGoldBlock.get(), models().cubeAll(Registration.BlazeGoldBlock_ITEM.getId().getPath(), blockTexture(Registration.BlazeGoldBlock.get())));
simpleBlock(Registration.RawBlazegoldOre.get(), models().cubeAll(Registration.RawBlazegoldOre_ITEM.getId().getPath(), blockTexture(Registration.RawBlazegoldOre.get())).renderType("translucent"));
patternBlock();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ protected void addTags(HolderLookup.Provider provider) {
.add(Registration.RawFerricoreOre.get());
tag(net.minecraft.tags.BlockTags.MINEABLE_WITH_PICKAXE)
.add(Registration.BlazeGoldBlock.get());
tag(net.minecraft.tags.BlockTags.MINEABLE_WITH_PICKAXE)
.add(Registration.RawBlazegoldOre.get());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@ protected void registerModels() {
withExistingParent(Registration.FerricoreBlock_ITEM.getId().getPath(), modLoc("block/ferricore_block"));
withExistingParent(Registration.RawFerricoreOre_ITEM.getId().getPath(), modLoc("block/raw_ferricore_ore"));
withExistingParent(Registration.BlazeGoldBlock_ITEM.getId().getPath(), modLoc("block/blazegold_block"));
withExistingParent(Registration.RawBlazegoldOre_ITEM.getId().getPath(), modLoc("block/raw_blazegold_ore"));

//Item items
singleTexture(Registration.Fuel_Canister.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/fuel_canister"));
singleTexture(Registration.Pocket_Generator.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/pocketgenerator"));
singleTexture(Registration.FerricoreRaw.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/raw_ferricore"));
singleTexture(Registration.RawFerricore.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/raw_ferricore"));
singleTexture(Registration.FerricoreIngot.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/ferricore_ingot"));
singleTexture(Registration.BlazeGoldIngot.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/blazegold_ingot"));
singleTexture(Registration.RawBlazegold.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/raw_blazegold"));
singleTexture(Registration.BlazegoldIngot.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/blazegold_ingot"));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,17 @@ protected void addTranslations() {
add(Registration.FerricoreBlock.get(), "Ferricore Block");
add(Registration.RawFerricoreOre.get(), "Raw Ferricore Ore");
add(Registration.BlazeGoldBlock.get(), "Blazegold Block");
add(Registration.RawBlazegoldOre.get(), "Raw Blazegold Ore");

//Items
add(Registration.Fuel_Canister.get(), "Fuel Canister");
add(Registration.Pocket_Generator.get(), "Pocket Generator");

//Resources
add(Registration.FerricoreIngot.get(), "Ferricore Ingot");
add(Registration.FerricoreRaw.get(), "Raw Ferricore");
add(Registration.BlazeGoldIngot.get(), "Blazegold Ingot");
add(Registration.RawFerricore.get(), "Raw Ferricore");
add(Registration.BlazegoldIngot.get(), "Blazegold Ingot");
add(Registration.RawBlazegold.get(), "Raw Blazegold");

//Misc
add("justdirethings.shiftmoreinfo", "Hold Shift for details");
Expand Down
Loading

0 comments on commit e35264a

Please sign in to comment.