Skip to content

Commit

Permalink
| Changelog |
Browse files Browse the repository at this point in the history
Alpha-0.3

- Tweaked Aluminum, Lead, Tin, Uranium, Platinum and Sulfur Pickaxe Tags (thanks for the feedback)

- Added NEEDS_STONE_TOOL Block Tag

- Tweaked Raw Zinc, Raw Platinum, Raw Lead, Steel ingot, Cobalt ingot, Platinum ingot, Aluminum ingot, Brass ingot, Lumium ingot, Lead ingot, Tin ingot, Raw tin

- Added Obsidian Ore (can spawn all over the nether and close to lava lakes or under them)
  • Loading branch information
RadzRatz committed Dec 6, 2024
1 parent 09a2b38 commit 383d391
Show file tree
Hide file tree
Showing 43 changed files with 229 additions and 31 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ mod_name=Eternal Ores
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=All Rights Reserved
# The mod version. See https://semver.org/
mod_version=0.2
mod_version=0.3
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
# This should match the base package used for the mod sources.
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-11-28T18:35:11.1331851 Registries
// 1.21.1 2024-12-05T21:20:21.9072523 Registries
e1e39d8c0dd14b8ca81db0987f9fd567434888ef data/eternalores/neoforge/biome_modifier/add_aluminum_ore.json
196fc4f620aca98c1a1a8a19c590cf5c77a3a48a data/eternalores/neoforge/biome_modifier/add_amber_ore.json
38b0fa35569f3fa7c97799b04490355a30e02a48 data/eternalores/neoforge/biome_modifier/add_apatite_ore.json
Expand All @@ -7,6 +7,7 @@ e50f9991f5193a84b409caccecc2b1eebea61be2 data/eternalores/neoforge/biome_modifie
cdd04fdfc3bf0400cd941f497bdb2cff19dd2a60 data/eternalores/neoforge/biome_modifier/add_fluorite_ore.json
a138df9886ac47ca9627e7fd67541fbf3bd171dd data/eternalores/neoforge/biome_modifier/add_gallium_ore.json
87e70ba58041b8ee0487db89f3e8835cf02672b3 data/eternalores/neoforge/biome_modifier/add_lead_ore.json
1568e47573ed46ef7972e9742450ed358f4d5d16 data/eternalores/neoforge/biome_modifier/add_nether_obsidian_ore.json
594170d7631078f6b6be61f8e99043f832f6645b data/eternalores/neoforge/biome_modifier/add_nickel_ore.json
4ef62a122e49fd70ac6952eb28277de16ac84888 data/eternalores/neoforge/biome_modifier/add_niter_ore.json
1e6067e3bdd6abe6d90fa8e3f124c62c58fc020f data/eternalores/neoforge/biome_modifier/add_onyx_ore.json
Expand All @@ -29,6 +30,7 @@ c8400853afd014b14043db31f2191efd114f7c10 data/eternalores/worldgen/configured_fe
54926689d544ee45a5d874d9d34c5a7d0b871432 data/eternalores/worldgen/configured_feature/fluorite_ore.json
a188847ed4890270da10c0454813461e48c5e707 data/eternalores/worldgen/configured_feature/gallium_ore.json
bd67e085f72542c9488290969f5af1fed14a4d51 data/eternalores/worldgen/configured_feature/lead_ore.json
c8bf5b8878f2ab94d622a0903acd3bf04d98c754 data/eternalores/worldgen/configured_feature/nether_obsidian_ore.json
e4df228ef65a5b143980d0d25618e1283cea4997 data/eternalores/worldgen/configured_feature/nickel_ore.json
6c83befc72bffc377588dac7e2d85ed3a5a78284 data/eternalores/worldgen/configured_feature/niter_ore.json
9fa33a9bea82ab06416ed0bf8d17211ea328dd51 data/eternalores/worldgen/configured_feature/onyx_ore.json
Expand All @@ -53,6 +55,7 @@ d8212f8e9719680a34ea4f1b40d2016ae0d2f85a data/eternalores/worldgen/placed_featur
04a9a963fe6b85dbadb848e9db20a4a501b78d2c data/eternalores/worldgen/placed_feature/lead_ore_placed.json
b5496c82dbd3a8897d2a10327ac9267abed7c35f data/eternalores/worldgen/placed_feature/nickel_ore_placed.json
c537287f90c9f2c8216f715190504c53503737aa data/eternalores/worldgen/placed_feature/niter_ore_placed.json
8cbce4e22feb9981a6de9bd21d8d0470458e3edd data/eternalores/worldgen/placed_feature/obsidian_ore_placed.json
ba1e4a9a7e8499d3d3e3c124d194c5ac257d4d44 data/eternalores/worldgen/placed_feature/onyx_ore_placed.json
e4f515fb7040f77e9f01a42f0b4dbbaad93950e3 data/eternalores/worldgen/placed_feature/osmium_ore_placed.json
43cb38b50f6fe23334aa86a322e16e70d6ead1cb data/eternalores/worldgen/placed_feature/peridot_ore_placed.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-12-03T23:42:20.8489313 Block States: eternalores
// 1.21.1 2024-12-05T01:56:43.8724327 Block States: eternalores
b6b9c6647989b7f9e5a630a3b54ebeeb48d5e923 assets/eternalores/blockstates/aluminum_block.json
53b119ec7b481084821223847767537173db8789 assets/eternalores/blockstates/aluminum_ore_block.json
c0182d0bd8baae3e50001c8cb01182f701b062ab assets/eternalores/blockstates/amber_block.json
Expand Down Expand Up @@ -51,6 +51,7 @@ db68f7a2905271d480371a4422d4745758660835 assets/eternalores/blockstates/gallium_
a34375547285bd6813512a2114a62382edf2ddc9 assets/eternalores/blockstates/nickel_ore_block.json
4dc6c287b89979c6469a3ece8957081a53a077bf assets/eternalores/blockstates/niter_block.json
343adc6ef1d752524ca55dbeec1dfed86acb24c2 assets/eternalores/blockstates/niter_ore_block.json
9eea904e742015ddcda411833a19b8e92692b388 assets/eternalores/blockstates/obsidian_ore_block.json
200f46ec68194a3004c601926af7eebbfe4f7841 assets/eternalores/blockstates/onyx_block.json
ec41979c035658c46c8a9cc626aa1ce1f581940b assets/eternalores/blockstates/onyx_ore_block.json
fb2d14b983fb5e35d94a157c65659b48b637bb42 assets/eternalores/blockstates/osmium_block.json
Expand Down Expand Up @@ -145,6 +146,7 @@ d57e6ba5e68c2c0e9d29b1ebe76c3e01430954eb assets/eternalores/models/block/nickel_
7e31240bd26c02dc918343ea735b25a4d74ee5e1 assets/eternalores/models/block/nickel_ore_block.json
df0e3a22d807db492f06cab773720d05665ca52a assets/eternalores/models/block/niter_block.json
3994e32b1a62bf8ca52414b4107d64d2868c7d87 assets/eternalores/models/block/niter_ore_block.json
c7e65017face1c02a494a80f44c1c31572a2e7e6 assets/eternalores/models/block/obsidian_ore_block.json
cd31c9c3eccbd185ddd20c8d29977d2f34a09a98 assets/eternalores/models/block/onyx_block.json
12eda2a58e701c75eb87f7731c12529bec8926ae assets/eternalores/models/block/onyx_ore_block.json
8b1aedb6718a278dce6f880535dc9aad4d8a4648 assets/eternalores/models/block/osmium_block.json
Expand Down Expand Up @@ -239,6 +241,7 @@ a9f7a50161f31fb45ef0b6ce0953ee8c31dd0d46 assets/eternalores/models/item/nickel_b
d63baeeea10dc31e45bd1d208d832b349306acc0 assets/eternalores/models/item/nickel_ore_block.json
dd3bbd80e04fc7e69655ff3dc198d483e20493af assets/eternalores/models/item/niter_block.json
b58fd9a7d740bf18c3318d7642430f821232fd53 assets/eternalores/models/item/niter_ore_block.json
2600f0fa15f7e56ca71788620c58a7f68d8c5d21 assets/eternalores/models/item/obsidian_ore_block.json
d67aebba5f5485beca0f5b1479ab36bd7a31fd78 assets/eternalores/models/item/onyx_block.json
09ec670224e9fe6ac20fa2faf138096fc6a57d0a assets/eternalores/models/item/onyx_ore_block.json
f39f4f311e6b48364e72aaad44bae9cc783d444a assets/eternalores/models/item/osmium_block.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// 1.21.1 2024-12-03T23:42:20.8609334 Tags for minecraft:block mod id eternalores
395e57ec1ea9eb25294bc315812157006b865bba data/minecraft/tags/block/mineable/pickaxe.json
5e28a27c841a1ca5ab67fc4048a07de9568f1b40 data/minecraft/tags/block/needs_diamond_tool.json
eb69d555414aa1d4cf29d18569e4ca2b28cf8549 data/minecraft/tags/block/needs_iron_tool.json
// 1.21.1 2024-12-05T01:56:43.8824351 Tags for minecraft:block mod id eternalores
ced3233662f4ce0e6fb448bed11b449eb1591228 data/minecraft/tags/block/mineable/pickaxe.json
dda35b02a812d61136fd5028bfca73f3d01995c2 data/minecraft/tags/block/needs_diamond_tool.json
49bd4188e03286d367752d469cb6024a47ca4723 data/minecraft/tags/block/needs_iron_tool.json
37ecc7c3d0bad87b4d47d2bf363e8a46900ee7fa data/minecraft/tags/block/needs_stone_tool.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-12-03T23:42:20.8559322 Loot Tables
// 1.21.1 2024-12-05T01:56:43.8784334 Loot Tables
7c29615ef61bc39400d3ae8fac7e6ce7a52c3073 data/eternalores/loot_table/blocks/aluminum_block.json
5280c280d8a89ef453e6e13c1f54c6031d9d9eb4 data/eternalores/loot_table/blocks/aluminum_ore_block.json
351caea42c6ba11c95dedb2047634525696cb814 data/eternalores/loot_table/blocks/amber_block.json
Expand Down Expand Up @@ -51,6 +51,7 @@ a83399b3c189fdc61c4c2b69bc8f2c4dd28ba226 data/eternalores/loot_table/blocks/lead
e606622623208d2d4b5e3309a894a878bf82ffc3 data/eternalores/loot_table/blocks/nickel_ore_block.json
1bb2b03e8be5559a5655b2f9d2b12b208b61d862 data/eternalores/loot_table/blocks/niter_block.json
a7e74a203df78fc22fc649a3c40022f0fafdf716 data/eternalores/loot_table/blocks/niter_ore_block.json
7f060d7bde82a79de0ffa9bf09d7961eb4fcae6b data/eternalores/loot_table/blocks/obsidian_ore_block.json
fb28b29107ce14df16ae877a1c056222587c2210 data/eternalores/loot_table/blocks/onyx_block.json
e7f2bae4835fe1b87e68f0f4874db1aa2362d4aa data/eternalores/loot_table/blocks/onyx_ore_block.json
1d3cd92ceefb38315df2ed5dd564bf56074fd404 data/eternalores/loot_table/blocks/osmium_block.json
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "eternalores:block/obsidian_ore_block"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "eternalores:block/obsidian_ore_block"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "eternalores:block/obsidian_ore_block"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"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": "eternalores:obsidian_ore_block"
},
{
"type": "minecraft:item",
"functions": [
{
"add": false,
"count": {
"type": "minecraft:uniform",
"max": 2.0,
"min": 1.0
},
"function": "minecraft:set_count"
},
{
"enchantment": "minecraft:fortune",
"formula": "minecraft:ore_drops",
"function": "minecraft:apply_bonus"
}
],
"name": "eternalores:gem_obsidian_shard"
}
]
}
],
"rolls": 1.0
}
],
"random_sequence": "eternalores:blocks/obsidian_ore_block"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "neoforge:add_features",
"biomes": "#minecraft:is_nether",
"features": "eternalores:obsidian_ore_placed",
"step": "underground_ores"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "minecraft:ore",
"config": {
"discard_chance_on_air_exposure": 0.0,
"size": 12,
"targets": [
{
"state": {
"Name": "eternalores:obsidian_ore_block"
},
"target": {
"block": "minecraft:netherrack",
"predicate_type": "minecraft:block_match"
}
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"feature": "eternalores:nether_obsidian_ore",
"placement": [
{
"type": "minecraft:count",
"count": 12
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:height_range",
"height": {
"type": "minecraft:uniform",
"max_inclusive": {
"absolute": 128
},
"min_inclusive": {
"absolute": -64
}
}
},
{
"type": "minecraft:biome"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"eternalores:deepslate_gallium_ore_block",
"eternalores:peridot_ore_block",
"eternalores:deepslate_peridot_ore_block",
"eternalores:obsidian_ore_block",
"eternalores:aluminum_block",
"eternalores:bronze_block",
"eternalores:cobalt_block",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@
"values": [
"eternalores:cobalt_ore_block",
"eternalores:deepslate_cobalt_ore_block",
"eternalores:lead_ore_block",
"eternalores:deepslate_lead_ore_block",
"eternalores:platinum_ore_block",
"eternalores:deepslate_platinum_ore_block",
"eternalores:plutonium_ore_block",
"eternalores:deepslate_plutonium_ore_block",
"eternalores:uranium_ore_block",
"eternalores:deepslate_uranium_ore_block"
"eternalores:obsidian_ore_block"
]
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"values": [
"eternalores:aluminum_ore_block",
"eternalores:deepslate_aluminum_ore_block",
"eternalores:amber_ore_block",
"eternalores:deepslate_amber_ore_block",
"eternalores:apatite_ore_block",
Expand All @@ -10,6 +8,8 @@
"eternalores:deepslate_cinnabar_ore_block",
"eternalores:fluorite_ore_block",
"eternalores:deepslate_fluorite_ore_block",
"eternalores:lead_ore_block",
"eternalores:deepslate_lead_ore_block",
"eternalores:nickel_ore_block",
"eternalores:deepslate_nickel_ore_block",
"eternalores:niter_ore_block",
Expand All @@ -22,10 +22,6 @@
"eternalores:deepslate_ruby_ore_block",
"eternalores:sapphire_ore_block",
"eternalores:deepslate_sapphire_ore_block",
"eternalores:sulfur_ore_block",
"eternalores:deepslate_sulfur_ore_block",
"eternalores:tin_ore_block",
"eternalores:deepslate_tin_ore_block",
"eternalores:silver_ore_block",
"eternalores:deepslate_silver_ore_block",
"eternalores:zinc_ore_block",
Expand All @@ -34,6 +30,8 @@
"eternalores:deepslate_gallium_ore_block",
"eternalores:peridot_ore_block",
"eternalores:deepslate_peridot_ore_block",
"eternalores:uranium_ore_block",
"eternalores:deepslate_uranium_ore_block",
"eternalores:aluminum_block",
"eternalores:bronze_block",
"eternalores:cobalt_block",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"values": [
"eternalores:aluminum_ore_block",
"eternalores:deepslate_aluminum_ore_block",
"eternalores:tin_ore_block",
"eternalores:deepslate_tin_ore_block",
"eternalores:sulfur_ore_block",
"eternalores:deepslate_sulfur_ore_block"
]
}
2 changes: 2 additions & 0 deletions src/main/java/net/radzratz/eternalores/EternalOres.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public EternalOres(IEventBus modEventBus, ModContainer modContainer)
// Do not add this line if there are no @SubscribeEvent-annotated functions in this class, like onServerStarting() below.
NeoForge.EVENT_BUS.register(this);

System.out.println("Registering Blocks and Items");
Moditems.register(modEventBus);
ModBlocks.register(modEventBus);

Expand All @@ -58,6 +59,7 @@ public EternalOres(IEventBus modEventBus, ModContainer modContainer)
private void commonSetup(final FMLCommonSetupEvent event)
{
System.out.println("Common setup is running.");
System.out.println("Checking on ModCompat class");
ModCompatibility.checkOtherModsMekanism();
}

Expand Down
6 changes: 6 additions & 0 deletions src/main/java/net/radzratz/eternalores/block/ModBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,12 @@ public class ModBlocks {
.strength(3f)
.requiresCorrectToolForDrops()
.sound(SoundType.STONE)));
//Obsidian
public static final DeferredBlock<Block> OBSIDIAN_ORE_BLOCK = registerBlock("obsidian_ore_block",
() -> new Block(BlockBehaviour.Properties.of()
.strength(4f)
.requiresCorrectToolForDrops()
.sound(SoundType.STONE)));

//RAW ORE BLOCKS
public static final DeferredBlock<Block> RAW_ALUMINUM_BLOCK = registerBlock("raw_aluminum_block",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,9 @@ protected void generate() {
//PERIDOT TO GEM
add(ModBlocks.PERIDOT_ORE_BLOCK.get(), block -> createMultipleOreDrops(ModBlocks.PERIDOT_ORE_BLOCK.get(), Moditems.GEM_PERIDOT.get(), 1,3));
add(ModBlocks.DEEPSLATE_PERIDOT_ORE_BLOCK.get(), block -> createMultipleOreDrops(ModBlocks.DEEPSLATE_PERIDOT_ORE_BLOCK.get(), Moditems.GEM_PERIDOT.get(),1,3));

//OBSIDIAN ORE TO GEM
add(ModBlocks.OBSIDIAN_ORE_BLOCK.get(), block -> createMultipleOreDrops(ModBlocks.OBSIDIAN_ORE_BLOCK.get(), Moditems.GEM_OBSIDIAN_SHARD.get(),1,2));
}

protected LootTable.Builder createMultipleOreDrops(Block pBlock, Item item, float minDrops, float maxDrops) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ protected void registerStatesAndModels() {
//PERIDOT
blockWithItem(ModBlocks.PERIDOT_ORE_BLOCK);
blockWithItem(ModBlocks.DEEPSLATE_PERIDOT_ORE_BLOCK);
//
blockWithItem(ModBlocks.OBSIDIAN_ORE_BLOCK);
}

private void blockWithItem(DeferredBlock<?> deferredBlock) {
Expand Down
Loading

0 comments on commit 383d391

Please sign in to comment.