Skip to content

Commit

Permalink
Merge pull request #159 from Direwolf20-MC/experienceholder
Browse files Browse the repository at this point in the history
Experienceholder
  • Loading branch information
Direwolf20-MC authored Sep 13, 2024
2 parents d1b5430 + 87a6b7c commit 6808c39
Show file tree
Hide file tree
Showing 52 changed files with 2,281 additions and 21 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-09-10T19:56:11.5948361 JustDireThings Tags
// 1.21.1 2024-09-12T11:15:53.8960728 JustDireThings Tags
3f1af1854f73f0ca55ec9d76439efe025d53baaf data/c/tags/block/budding_blocks.json
f9398184c0216b0a1898a13ab326b459417ec790 data/c/tags/block/buds.json
691444261459e5b538067e8cd03db2fbe1b3371d data/c/tags/block/clusters.json
Expand All @@ -13,5 +13,5 @@ fd8f34ea7c3f46b4031a8323009cfaffab88474e data/justdirethings/tags/block/phase_de
b73bf681aa4023a1ac69623485bbec13846a282a data/justdirethings/tags/block/swapper_deny.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/justdirethings/tags/block/tick_speed_deny.json
704d4386b02b3ad86131bd6cf1e36461baa4169f data/minecraft/tags/block/bamboo_plantable_on.json
0562efff705455227cd6342808df3c8f082d9cbc data/minecraft/tags/block/mineable/pickaxe.json
206c5b35dd25f55c68f989b006c5c5acce7822af data/minecraft/tags/block/mineable/pickaxe.json
8882a0a52d428036a957d24fb046777a8795e588 data/minecraft/tags/block/mineable/shovel.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-09-07T12:06:42.2583603 Loot Tables
// 1.21.1 2024-09-12T11:15:53.9060812 Loot Tables
16a0ab61513717ab1cb8c1df9718722a643d9728 data/justdirethings/loot_table/blocks/blazegold_block.json
b2953e2dcd4960e7f275bb42e4ad626219213fe1 data/justdirethings/loot_table/blocks/blockbreakert1.json
bb65fdba3c1b14526a629aacb462661b5853008b data/justdirethings/loot_table/blocks/blockbreakert2.json
Expand All @@ -18,6 +18,7 @@ d6bade76be1cda5393e15c24c1fbe30e95f88d76 data/justdirethings/loot_table/blocks/d
33bae530c3d366588774b7fd2be61e8eae4d2f59 data/justdirethings/loot_table/blocks/eclipsealloy_block.json
86da68130cd736a04252f0ce688aaaa22a824f70 data/justdirethings/loot_table/blocks/eclipsegateblock.json
ae552784cf952a0f440297360735d3a06f2219ad data/justdirethings/loot_table/blocks/energytransmitter.json
bbec1ad75f93301b82c08e7ce57318522028e967 data/justdirethings/loot_table/blocks/experienceholder.json
1374ed53b2d6c1462b64a99f3ca1b290388d36c5 data/justdirethings/loot_table/blocks/ferricore_block.json
3716bc4ec75b66e189c71ea06c09dc08fd0132f5 data/justdirethings/loot_table/blocks/fluidcollectort1.json
6878247c1338944b23fd82861b5e098763334d6d data/justdirethings/loot_table/blocks/fluidcollectort2.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-09-07T12:06:42.2473509 Item Models: justdirethings
// 1.21.1 2024-09-13T13:42:08.1493472 Item Models: justdirethings
c197a1b2a5ae31fcfabfe6cab9ab95a9dc0e1af6 assets/justdirethings/models/item/blazegold_axe.json
dddf215922d40d92c2d8bce4229f2e2af8b3c7ba assets/justdirethings/models/item/blazegold_axe_active.json
6396fb6e503760080534bc26337236d4d09a4cb8 assets/justdirethings/models/item/blazegold_block.json
Expand Down Expand Up @@ -209,6 +209,7 @@ d3f356b071deedc9372ec13aa79b224a46327716 assets/justdirethings/models/item/eclip
2f3ef44480cc3c82ab7af95cfee7d174dcfd1d30 assets/justdirethings/models/item/eclipsealloy_sword_active.json
f60564d23035abd9c1d690f4622ea258afa92db1 assets/justdirethings/models/item/eclipsegate_wand.json
acf1922ba0cd70df4e7ccf30684508a47ac1a14b assets/justdirethings/models/item/energytransmitter.json
c6e8a590cc9e752378ffd172eadd9fcf6f6bb1ed assets/justdirethings/models/item/experienceholder.json
eb052d000da5f8d7999360f7bbfe773aa23ce70d assets/justdirethings/models/item/ferricore_axe.json
62a8f615d9bd8a95b2e7e21b8f6658454008fb54 assets/justdirethings/models/item/ferricore_axe_active.json
6c85011e764ec697b9be64a2f7fc12ddacf56f74 assets/justdirethings/models/item/ferricore_block.json
Expand Down Expand Up @@ -367,3 +368,4 @@ a3679c6341273d0028d1f6882e467e290189eb35 assets/justdirethings/models/item/upgra
0af186d271e80543d4bc2b38307337807c61af8d assets/justdirethings/models/item/upgrade_treefeller.json
24c722112f9d85c53ea12020657451e156b57e1c assets/justdirethings/models/item/upgrade_walkspeed.json
b713dac946a919bd3c78bdd84396c681905676bb assets/justdirethings/models/item/voidshift_wand.json
a7b09b6500bbaed0170e4ebbf38cac862e0b2f20 assets/justdirethings/models/item/xp_fluid_bucket.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21.1 2024-09-08T10:48:40.1210526 Languages: en_us for mod: justdirethings
d5878f400337646026ccd4b5a26fd0191197b510 assets/justdirethings/lang/en_us.json
// 1.21.1 2024-09-13T13:53:01.5331943 Languages: en_us for mod: justdirethings
50598341120df2f850d5821435699dff7b3dcdb3 assets/justdirethings/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-09-07T12:06:42.2598615 Recipes
// 1.21.1 2024-09-12T11:15:53.9075825 Recipes
39cd44c838de7f56aeac73aec8b3bfb64ad7fec2 data/justdirethings/advancement/recipes/building_blocks/blazegold_ingot_9x9.json
2f2a0f948f272df9713010dbcb75beb81c328b01 data/justdirethings/advancement/recipes/building_blocks/celestigem_9x9.json
94b1a5fa365caea5ec90b525346091c5babe3068 data/justdirethings/advancement/recipes/building_blocks/coal_t1_9x9.json
Expand Down Expand Up @@ -244,8 +244,10 @@ e8627cdd4f0fb2a6c839f4f9634298a090d5311e data/justdirethings/advancement/recipes
e7739ae5a223a405cd2d8a63f1fffe9aae24ee77 data/justdirethings/advancement/recipes/misc/eclipsealloy_sword-templateupgrade.json
6f8cbc17d75d54ec3630af834f37a475d9aeb23a data/justdirethings/advancement/recipes/misc/eclipsealloy_sword.json
c4027f6d2dfede7c4b83887d84307ecb3fd3d194 data/justdirethings/advancement/recipes/misc/eclipsegate_wand.json
99d92b1bc189067bd87bd462a3d9dcdc80b97214 data/justdirethings/advancement/recipes/misc/energytransmitter.json
6f7bbe549ead5d8d6e55a047489e60fd15ed6ed9 data/justdirethings/advancement/recipes/misc/energytransmitter.json
1c708ed2037839bce715e7bbb2b4735f10332ebf data/justdirethings/advancement/recipes/misc/energytransmitter_nbtclear.json
95ed0743947a37f994102e9fa297703842817dd9 data/justdirethings/advancement/recipes/misc/experienceholder.json
e4c5cc919880147cb39143d2756b4cd3987a1809 data/justdirethings/advancement/recipes/misc/experienceholder_nbtclear.json
7e588d8128a4c11f6f2dc30c548188f5d05e476b data/justdirethings/advancement/recipes/misc/ferricore_axe-leafbreaker.json
cb728c7c3e212df2c679818a0c43ead0f775862e data/justdirethings/advancement/recipes/misc/ferricore_axe-treefeller.json
53378d92dc5e2456f22bef4f2e68f88ab35ed25c data/justdirethings/advancement/recipes/misc/ferricore_axe.json
Expand Down Expand Up @@ -626,6 +628,8 @@ da733be1557a9be15498275f8c6178ed326ac6a9 data/justdirethings/recipe/eclipsealloy
2f2859d569c0b8c60550dfb94a5bda2cd7c44aab data/justdirethings/recipe/eclipsegate_wand.json
b05351e6bb42bb9d25dd71b1c866ed8faa5676b9 data/justdirethings/recipe/energytransmitter.json
96973172b8a0d257d8b381579a452986ba57d599 data/justdirethings/recipe/energytransmitter_nbtclear.json
27ac72b113eb35d4b4e95866a54e70a0844bfa13 data/justdirethings/recipe/experienceholder.json
d7a84f58bdf776d2037d2a688104493093707109 data/justdirethings/recipe/experienceholder_nbtclear.json
04206220684c529ae065b7eac581f3b8f88c18e9 data/justdirethings/recipe/ferricore_axe-leafbreaker.json
89fda77982a9d37bbdb23d336a8c93e94a540496 data/justdirethings/recipe/ferricore_axe-treefeller.json
86d392a3bb7b5daf9cf25a03c114aab9a04ba849 data/justdirethings/recipe/ferricore_axe.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-09-07T12:06:42.2548566 Block States: justdirethings
// 1.21.1 2024-09-13T13:42:08.1573543 Block States: justdirethings
e5976480ed9485e0bae43d4edde0c8aecaabe8a5 assets/justdirethings/blockstates/blazegold_block.json
6580258682ab076313135ecb0c16dc2595a1a0df assets/justdirethings/blockstates/blockbreakert1.json
0db1a53fd80ee5aed746843da439bd30b131ac55 assets/justdirethings/blockstates/blockbreakert2.json
Expand Down Expand Up @@ -52,6 +52,7 @@ f49a72ecbf07e06b65c649abe5868d3d4ef1f311 assets/justdirethings/blockstates/unref
08ba81f3e2ae52bf1c45b64295a773b42f47d7d5 assets/justdirethings/blockstates/unrefined_t3_fluid_block.json
ee8299d78cf13542216f38b90fa292fb0d634f81 assets/justdirethings/blockstates/unrefined_t4_fluid_block.json
db57ae5afcebace0cb6847909f30fe9458feef8a assets/justdirethings/blockstates/unstable_portal_fluid_block.json
b6f1951b73ff9f551bfc1407975e4451ad9abe62 assets/justdirethings/blockstates/xp_fluid_block.json
9bd3946cfa107459786529b2af21eb125a901fb7 assets/justdirethings/models/block/blazegold_block.json
9659e3f59756a5bb95fdd0504c1bf43fe30d2724 assets/justdirethings/models/block/blockbreakert1.json
bb4a6cb7aaa1b611b9e5d16b1b02f1ec51a6c645 assets/justdirethings/models/block/blockbreakert1_active.json
Expand Down Expand Up @@ -128,3 +129,4 @@ d8845a6da5ed66f910e014c97071f8ea754df1c8 assets/justdirethings/models/block/time
4cbb3c8e0147ca797cb922394a58a3950e00ffef assets/justdirethings/models/block/unrefined_t3_fluid_block.json
4cbb3c8e0147ca797cb922394a58a3950e00ffef assets/justdirethings/models/block/unrefined_t4_fluid_block.json
4cbb3c8e0147ca797cb922394a58a3950e00ffef assets/justdirethings/models/block/unstable_portal_fluid_block.json
4cbb3c8e0147ca797cb922394a58a3950e00ffef assets/justdirethings/models/block/xp_fluid_block.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "justdirethings:block/xp_fluid_block"
}
}
}
11 changes: 11 additions & 0 deletions src/generated/resources/assets/justdirethings/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"block.justdirethings.eclipsealloy_block": "Eclipse Alloy Block",
"block.justdirethings.eclipsegateblock": "Eclipse Gate",
"block.justdirethings.energytransmitter": "Energy Transmitter",
"block.justdirethings.experienceholder": "Experience Holder",
"block.justdirethings.ferricore_block": "Ferricore Block",
"block.justdirethings.fluidcollectort1": "Simple Fluid Collector",
"block.justdirethings.fluidcollectort2": "Advanced Fluid Collector",
Expand Down Expand Up @@ -67,6 +68,7 @@
"block.justdirethings.unrefined_t3_fluid_block": "Unrefined Voidflame Fuel",
"block.justdirethings.unrefined_t4_fluid_block": "Unrefined Eclipse Ember Fuel",
"block.justdirethings.unstable_portal_fluid_block": "Unstable Portal Fluid",
"block.justdirethings.xp_fluid_block": "XP Fluid",
"entity.justdirethings.decoy_entity": "Decoy Entity",
"entity.justdirethings.paradox_entity": "Paradox",
"entity.justdirethings.time_wand_entity": "Time Wand Entity",
Expand All @@ -80,6 +82,7 @@
"fluid_type.justdirethings.unrefined_t3_fluid_type": "Unrefined Voidflame Fuel",
"fluid_type.justdirethings.unrefined_t4_fluid_type": "Unrefined Eclipse Ember Fuel",
"fluid_type.justdirethings.unstable_portal_fluid_type": "Unstable Portal Fluid",
"fluid_type.justdirethings.xp_fluid_type": "XP Fluid",
"item.justdirethings.blazegold_axe": "Blazegold Axe",
"item.justdirethings.blazegold_boots": "Blazegold Boots",
"item.justdirethings.blazegold_chestplate": "Blazegold Chestplate",
Expand Down Expand Up @@ -207,6 +210,7 @@
"item.justdirethings.upgrade_treefeller": "Upgrade: Treefeller",
"item.justdirethings.upgrade_walkspeed": "Upgrade: Walk Speed",
"item.justdirethings.voidshift_wand": "Voidshift Wand",
"item.justdirethings.xp_fluid_bucket": "XP Fluid Bucket",
"itemGroup.DeferredHolder{ResourceKey[minecraft:creative_mode_tab / justdirethings:justdirethings]}": "Just Dire Things",
"justdirethings.ability": "Ability: %s - %s",
"justdirethings.ability.airburst": "Air Burst",
Expand Down Expand Up @@ -356,6 +360,7 @@
"justdirethings.screen.click-hold-for": "Hold Click For (ticks)",
"justdirethings.screen.click-left": "Left Click",
"justdirethings.screen.click-right": "Right Click",
"justdirethings.screen.collectexp": "Collect Experience",
"justdirethings.screen.comparecounts": "Compare Stack Sizes",
"justdirethings.screen.comparenbt": "Compare NBT",
"justdirethings.screen.copy_area": "Copy Area",
Expand Down Expand Up @@ -393,20 +398,24 @@
"justdirethings.screen.low": "Low",
"justdirethings.screen.no_fuel": "Fuel source empty",
"justdirethings.screen.notrequireequipped": "Activate from Inventory",
"justdirethings.screen.owneronly": "Owner Only",
"justdirethings.screen.paradoxall": "Revert Blocks and Entities",
"justdirethings.screen.paradoxblock": "Revert Blocks",
"justdirethings.screen.paradoxenergycost": "Energy Cost: %s FE",
"justdirethings.screen.paradoxentity": "Revert Entities",
"justdirethings.screen.paradoxfluidcost": "Fluid Cost: %s mb",
"justdirethings.screen.pickupdelay": "Pickup Delay (Ticks)",
"justdirethings.screen.pullfluids": "Pull Fluids",
"justdirethings.screen.pullitems": "Pull Items",
"justdirethings.screen.pulse": "Pulse",
"justdirethings.screen.pushfluids": "Push Fluids",
"justdirethings.screen.redstone-strong": "Strong Signal",
"justdirethings.screen.redstone-weak": "Weak Signal",
"justdirethings.screen.remove_favorite": "Remove Favorite",
"justdirethings.screen.renderarea": "Render Area",
"justdirethings.screen.renderparadox": "Render Paradox",
"justdirethings.screen.requireequipped": "Activate if Equipped",
"justdirethings.screen.retrieveexp": "Retrieve Level",
"justdirethings.screen.rightclicksettings": "Right Click for Settings",
"justdirethings.screen.save_close": "Save and Close",
"justdirethings.screen.senditems": "Push Items",
Expand All @@ -418,6 +427,7 @@
"justdirethings.screen.snapshotarea": "Snapshot Area",
"justdirethings.screen.sneak-click": "Sneak Click",
"justdirethings.screen.stay_open": "Stay Open",
"justdirethings.screen.storeexp": "Store Level",
"justdirethings.screen.swapitems": "Swap Items",
"justdirethings.screen.target-adult": "Target Adult",
"justdirethings.screen.target-air": "Target Air",
Expand All @@ -429,6 +439,7 @@
"justdirethings.screen.target-noblock": "Ignore Blocks",
"justdirethings.screen.target-passive": "Target Passive",
"justdirethings.screen.target-player": "Target Player",
"justdirethings.screen.targetexp": "Target Level",
"justdirethings.screen.tickspeed": "Speed (Ticks)",
"justdirethings.settingscopied": "Settings Copied",
"justdirethings.settingspasted": "Settings Pasted",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"textures": {
"particle": "justdirethings:block/fluid_source"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "justdirethings:block/experienceholder"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"parent": "neoforge:item/bucket",
"fluid": "justdirethings:xp_fluid_source",
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_ferricore_ingot": {
"has_blazegold_ingot": {
"conditions": {
"items": [
{
"items": "justdirethings:ferricore_ingot"
"items": "justdirethings:blazegold_ingot"
}
]
},
Expand All @@ -21,7 +21,7 @@
"requirements": [
[
"has_the_recipe",
"has_ferricore_ingot"
"has_blazegold_ingot"
]
],
"rewards": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_blazegold_ingot": {
"conditions": {
"items": [
{
"items": "justdirethings:blazegold_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "justdirethings:experienceholder"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_blazegold_ingot"
]
],
"rewards": {
"recipes": [
"justdirethings:experienceholder"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_experienceholder": {
"conditions": {
"items": [
{
"items": "justdirethings:experienceholder"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "justdirethings:experienceholder_nbtclear"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_experienceholder"
]
],
"rewards": {
"recipes": [
"justdirethings:experienceholder_nbtclear"
]
}
}
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": "justdirethings:experienceholder"
}
],
"rolls": 1.0
}
],
"random_sequence": "justdirethings:blocks/experienceholder"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"group": "justdirethings",
"key": {
"d": {
"item": "minecraft:emerald"
},
"e": {
"item": "minecraft:ender_pearl"
},
"f": {
"item": "justdirethings:blazegold_ingot"
},
"h": {
"item": "minecraft:book"
}
},
"pattern": [
" d ",
"heh",
"fff"
],
"result": {
"count": 1,
"id": "justdirethings:experienceholder"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"group": "justdirethings",
"ingredients": [
{
"item": "justdirethings:experienceholder"
}
],
"result": {
"count": 1,
"id": "justdirethings:experienceholder"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"justdirethings:time_crystal_cluster",
"justdirethings:time_crystal_block",
"justdirethings:paradoxmachine",
"justdirethings:inventory_holder"
"justdirethings:inventory_holder",
"justdirethings:experienceholder"
]
}
Loading

0 comments on commit 6808c39

Please sign in to comment.