Skip to content

Commit

Permalink
Add new Biome, fixed issue with thors hammer and added new golem in n…
Browse files Browse the repository at this point in the history
…eoforge (#153)
  • Loading branch information
RealYusufIsmail authored Dec 18, 2023
1 parent 0eddf31 commit 915fd3f
Show file tree
Hide file tree
Showing 88 changed files with 7,053 additions and 222 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ plugins {
kotlin("plugin.allopen") version "1.9.21"
id("com.diffplug.spotless") version "6.22.0"
id("org.jetbrains.dokka") version "1.9.10"
id("net.darkhax.curseforgegradle") version "1.1.16"
id("net.darkhax.curseforgegradle") version "1.1.17"
jacoco // code coverage reports
}

Expand Down
6 changes: 6 additions & 0 deletions neoforge/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

All notable changes to this project will be documented in this file.

# [1.20.2-2.0.0.beta10] - 2023-12-07

### Fixed alot of issues with Thor's hammer. It should now work as intended with no issues.
### Added a new biome called Enderite Biome. This is a work in progress and will be updated in the future. It is found in the ChronoRealm dimension.


# [1.20.2-2.0.0.beta9] - 2023-11-26

### Ore gen has now been tested and fixed. All ores should now generate properly.
Expand Down
2 changes: 1 addition & 1 deletion neoforge/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
kotlin("jvm")
id("net.neoforged.gradle.userdev") version "7.0.26"
id("net.neoforged.gradle.userdev") version "7.0.57"
}

project.version = properties["modVersion"] as String
Expand Down
8 changes: 4 additions & 4 deletions neoforge/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
kotlin.code.style=official
org.gradle.jvmargs=-Xmx3G
org.gradle.jvmargs=-Xmx4G
org.gradle.daemon=false

modVersion = 1.20.2-2.0.0.beta9
modVersion = 1.20.2-2.0.0.beta10
mcVersion = 1.20.2
projectId = 480779
modId = temporalsmith

neoForgeVersion = 20.2.62-beta
kotlinForForgeVersion = 4.7.0
neoForgeVersion = 20.2.86
kotlinForForgeVersion = 4.8.0
logbackVersion = 1.4.11
junitVersion = 5.10.0
coreVersion = 1.20.2-1.1.2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.2 2023-11-16T22:20:28.51812 Item Models: temporalsmith
// 1.20.2 2023-11-30T18:05:33.987846 Item Models: temporalsmith
c944664c5c8be4439e0016b8e101ad0f02dedfd1 assets/temporalsmith/models/item/amethyst_axe.json
05cb548d8cfe3bf55c7d5a80c0fc92f3763b03f4 assets/temporalsmith/models/item/amethyst_boots.json
d193ac5d52e5d0e62ae7b48b226198bca3033789 assets/temporalsmith/models/item/amethyst_chestplate.json
Expand All @@ -21,6 +21,7 @@ a0c91459372e7e36718f1f9451e82b5841512c37 assets/temporalsmith/models/item/enderi
23e941a299be2f7dbbe8b73d11aa75f14174574b assets/temporalsmith/models/item/enderite_axe.json
feac6327f2e1d894c584f4a725d7a34ed41a9332 assets/temporalsmith/models/item/enderite_boots.json
78f08f24b9532dedf4131e90012af76060c6dc9b assets/temporalsmith/models/item/enderite_chestplate.json
f46318d09b38d1615c64d78a3c1e925740403352 assets/temporalsmith/models/item/enderite_golem_spawn_egg.json
b414e3492dc41e8b90ccefffffa5bdab49a9db10 assets/temporalsmith/models/item/enderite_helmet.json
060d65e693e1ebff7de42a9e857c96de403a0d0b assets/temporalsmith/models/item/enderite_hoe.json
7b2a62a69b85c454246cdd0861b99e3d9320e45a assets/temporalsmith/models/item/enderite_leggings.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
// 1.20.2 2023-11-25T22:58:36.998559 Registries
// 1.20.2 2023-12-16T18:27:18.314867 Registries
8811f7ebb0231c679e9da0ded45180c8d5784e4f data/temporalsmith/neoforge/biome_modifier/add_aqumarine_ore.json
970aeb29b13aa54f84e12f7b883e51d26d76c942 data/temporalsmith/neoforge/biome_modifier/add_enderite_ore.json
e01058f2c8e6e8613f1091c97da5a3ca2d5e02ec data/temporalsmith/neoforge/biome_modifier/add_graphite_ore.json
218a15536ac4219b6def8a8c5f03abacdff73ece data/temporalsmith/neoforge/biome_modifier/add_imperium_ore.json
dba70b28432105f6e973f655c23212620d93fd32 data/temporalsmith/neoforge/biome_modifier/add_rainbow_ore.json
0416c6da5c3d71c0d613f3b76db4513442ffe94d data/temporalsmith/neoforge/biome_modifier/add_ruby_ore.json
5475fc5a7c3c864d7388d28b1e12ca7ac58e248d data/temporalsmith/neoforge/biome_modifier/add_sapphire_ore.json
5f572106ee4e9c2edbcee6d1a4b4100259148c98 data/temporalsmith/worldgen/biome/enderite_biome.json
52e07796b3598ae2784352122ffaaf4500ac1385 data/temporalsmith/worldgen/configured_feature/aqumarine_ore.json
06d2f6fc59b416a218d7f1908e39c8e8cd38f0cd data/temporalsmith/worldgen/configured_feature/enderite_ore.json
5de076268702b0d4004d22c9da338c0ac05bbb5f data/temporalsmith/worldgen/configured_feature/enderite_sapling.json
200476c7e225de0670ae88f408d09f3539f4a637 data/temporalsmith/worldgen/configured_feature/graphite_ore.json
dd2b7cf358c461013e2803cd6ab61e8c5b98c2e2 data/temporalsmith/worldgen/configured_feature/imperium_ore.json
ec03cefdac2c52ddfb75ed2db1067658c1c92331 data/temporalsmith/worldgen/configured_feature/rainbow_ore.json
9fda389b2417a2d4ee09b1e64f19f9c9ed3949b5 data/temporalsmith/worldgen/configured_feature/ruby_ore.json
1d6d257f5f49ea828e625ab2d48e62cc2c6b6380 data/temporalsmith/worldgen/configured_feature/sapphire_ore.json
8c027f905df95c4c4d8c0c4af202e3ce8cd6d4b8 data/temporalsmith/worldgen/placed_feature/aqumarine_ore.json
50c913c5c0036bbfe1b6cd54372b2d6cbe78394b data/temporalsmith/worldgen/placed_feature/enderite_ore.json
8053ab9408b8fe1ebadd19ee16d4558e9a37a4a4 data/temporalsmith/worldgen/placed_feature/enderite_ore.json
a78cf0f31a322a9b807bb5c40f365a78a23d42f4 data/temporalsmith/worldgen/placed_feature/enderite_sapling.json
d8040693f1117e99d067fe359dda5f9b52b6651b data/temporalsmith/worldgen/placed_feature/graphite_ore.json
61ea0b364add74ee30c6d37cae5c9296b2e9340e data/temporalsmith/worldgen/placed_feature/imperium_ore.json
245865d02328ff3d787cb9696b8331c91c0f314a data/temporalsmith/worldgen/placed_feature/imperium_ore.json
234868a33a4c99ab3a7f9674ddd8bfec19d40d76 data/temporalsmith/worldgen/placed_feature/rainbow_ore.json
e3f76fdd3e1c696aa4410d181f02b752c420be11 data/temporalsmith/worldgen/placed_feature/ruby_ore.json
9420e0222283204b9b0178e144b9952319c15014 data/temporalsmith/worldgen/placed_feature/sapphire_ore.json
a1c0b5c46354c416e911e0867d9ae46c5c02e5ed data/temporalsmith/worldgen/placed_feature/sapphire_ore.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
// 1.20.2 2023-11-25T18:18:52.9352 Tags for minecraft:block mod id temporalsmith
// 1.20.2 2023-12-01T14:59:40.049478 Tags for minecraft:block mod id temporalsmith
82963b29c120fb55c17c40fe37b1c98c60346b84 data/forge/tags/blocks/deepslate_ores/aqumarine_ores.json
edd052247952263e801a8ba38de967b85c9c1dc4 data/forge/tags/blocks/deepslate_ores/graphite_ores.json
fc6b7da8497984df4efddd78ed393469f77e7495 data/forge/tags/blocks/deepslate_ores/imperium_ores.json
d0b34f000c868dd7777162e2a47905d3f0d9b05b data/forge/tags/blocks/deepslate_ores/rainbow_ores.json
20fdb86899bfe49b4d201bdafb9a1a3ec3442b69 data/forge/tags/blocks/deepslate_ores/ruby_ores.json
66cc8c08bbee5110fa4750035c00f7c6fb87dd99 data/forge/tags/blocks/deepslate_ores/sapphire_ores.json
97b75ae1bfd7e3dd7cbd13d11362898f058bcf1b data/forge/tags/blocks/needs_gold_tool.json
f749d0ed38706a0ee78399721870470e662aac09 data/forge/tags/blocks/needs_wood_tool.json
fbd5467f6bc42e9d5bafb76a19a2d58236759424 data/forge/tags/blocks/ores/aqumarine_ores.json
89a2cb81b32881c3c0b11d88725ea163ac31fc3e data/forge/tags/blocks/ores/enderite_ores.json
9704fda3f8331a1336cc7787ab7974566836368e data/forge/tags/blocks/ores/graphite_ores.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.2 2023-11-23T21:21:53.68928 Loot Tables
// 1.20.2 2023-12-01T14:59:40.050833 Loot Tables
94fa78c06977fb9934f334a8c6f098cb6b212022 data/temporalsmith/loot_tables/blocks/aqumarine_block.json
7b5557e48855ffd9b66b3b14e92969c0ad73aa21 data/temporalsmith/loot_tables/blocks/aqumarine_ore.json
7d29ccb81310873aa10bc8803c2a25c5764f87e2 data/temporalsmith/loot_tables/blocks/custom_armour_crafting_table.json
Expand All @@ -10,7 +10,10 @@ e39bb6d3761962dc2f86ab6dc30e1146aafc5f91 data/temporalsmith/loot_tables/blocks/d
49aff66e99619a46f1cbc2d9c1deb7cbea649394 data/temporalsmith/loot_tables/blocks/deepslate_ruby_ore.json
7b1f102aff92820ded204b74092f985baad858d7 data/temporalsmith/loot_tables/blocks/deepslate_sapphire_ore.json
9ebcb651a70b51dbe961d599bd3b52690980ece6 data/temporalsmith/loot_tables/blocks/enderite_block.json
3d34dd2c757af172bf6cbad35da66a800e3a4922 data/temporalsmith/loot_tables/blocks/enderite_log.json
065c085691f9eb6b9c24cb135a225876bf790b96 data/temporalsmith/loot_tables/blocks/enderite_ore.json
a9f85546ea78c661a5902759ef38c79856d3eb93 data/temporalsmith/loot_tables/blocks/enderite_planks.json
dbb25bcd6b269655f193c1284b2d5fa2d8687559 data/temporalsmith/loot_tables/blocks/enderite_sapling.json
d237d79d76e6c62dac2dbae7de4bb9a6b51bb6ff data/temporalsmith/loot_tables/blocks/graphite_block.json
13f85449dd24215c45dc35681ba3ca2ade1d4607 data/temporalsmith/loot_tables/blocks/graphite_ore.json
5692a941a36ca1fb7dcf356ff18e2bab63ebcc21 data/temporalsmith/loot_tables/blocks/imperium_ore.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.2 2023-11-16T22:20:28.535892 Armour and Tools Mod Blockstates
// 1.20.2 2023-12-01T15:04:11.608351 Armour and Tools Mod Blockstates
98e67552137937bcefb638188a41422100ce6084 assets/temporalsmith/blockstates/aqumarine_block.json
5d8b07c2d0681ab698b6b620b610abfb44a43a65 assets/temporalsmith/blockstates/aqumarine_ore.json
79aacdcade435214443a431ec249338aa5ecb28f assets/temporalsmith/blockstates/custom_armour_crafting_table.json
Expand All @@ -10,7 +10,10 @@ f92238f4dc73d3b71b981e3f577ae1f653f8dbb1 assets/temporalsmith/blockstates/deepsl
027cc3d7ef10c824a913d52219b926303986643b assets/temporalsmith/blockstates/deepslate_ruby_ore.json
4cd6dbc6a9dd8a334005d73a5de88dcd0998b078 assets/temporalsmith/blockstates/deepslate_sapphire_ore.json
fc9e2ead2b891dfc9c764f3e1cd015f527581666 assets/temporalsmith/blockstates/enderite_block.json
58caae063445ea7ec0df24f2e1d78446fdbd53e8 assets/temporalsmith/blockstates/enderite_log.json
bd202bd2a64929649368c43f8f585753a288ac68 assets/temporalsmith/blockstates/enderite_ore.json
96c56a6feca3b3ee5f9ccfde26785631f99c7134 assets/temporalsmith/blockstates/enderite_planks.json
2da441708f17099082e1a45db02eabbbad0380e0 assets/temporalsmith/blockstates/enderite_sapling.json
c9bb08138170eb217d0351322471e87fce2dc1e9 assets/temporalsmith/blockstates/graphite_block.json
944ca17e7c66fdc7250f35eb2ab72bbbe017b57e assets/temporalsmith/blockstates/graphite_ore.json
95429089b1b03e16b3d137ba0251c882c5bc047f assets/temporalsmith/blockstates/imperium_ore.json
Expand All @@ -32,7 +35,11 @@ aa53a53e902d7ddf4e591db381790bed74fef2bd assets/temporalsmith/models/block/deeps
4c31adebfd0cc7bffac04ba5efc737cbd8328770 assets/temporalsmith/models/block/deepslate_ruby_ore.json
b4f99014b1b845b3cc5a147d2b9528d0b718e377 assets/temporalsmith/models/block/deepslate_sapphire_ore.json
7c72c23cf269324ec017595a9188b17fbc6c8ef4 assets/temporalsmith/models/block/enderite_block.json
c84a9ac85aa17cbc2d45536161523b7a57d738d6 assets/temporalsmith/models/block/enderite_log.json
0191c668ebe1619d89f6333b2edba8e523aee918 assets/temporalsmith/models/block/enderite_log_horizontal.json
3ded90eb30eb769523b16a9c7367217c565b4b6e assets/temporalsmith/models/block/enderite_ore.json
5a321293b32559e31d52e08d4b0751f5df176b74 assets/temporalsmith/models/block/enderite_planks.json
b78e41c7ba9eb746fce6b2f2b87b9978005253ea assets/temporalsmith/models/block/enderite_sapling.json
c6543d609d8c8add9ef99149e0557dd849a1f753 assets/temporalsmith/models/block/graphite_block.json
34653633e1aa60b32ae0c88d88980e794c2de0a2 assets/temporalsmith/models/block/graphite_ore.json
a5831fad6d28ed694abfe8556283b55ab4401379 assets/temporalsmith/models/block/imperium_ore.json
Expand All @@ -55,7 +62,10 @@ de26134bdd75d8b18b465cedd644f26c282629bf assets/temporalsmith/models/item/aqumar
558ee076cacb2431cefa4c558852ab8b45b0c043 assets/temporalsmith/models/item/deepslate_ruby_ore.json
5bccc6c7841b919006f427b1f1d21861b7e5c282 assets/temporalsmith/models/item/deepslate_sapphire_ore.json
9ca9a55aea7f0d37cd963cb962d737e3f871e4bc assets/temporalsmith/models/item/enderite_block.json
4e018c7b81192ee68bf32ff30e09220ade62382c assets/temporalsmith/models/item/enderite_log.json
c96b06d76f3e04159f25b40a379db2030672dd69 assets/temporalsmith/models/item/enderite_ore.json
472c1aa06cc2a893ef1c13c1ddfbfb3d4d7d3efc assets/temporalsmith/models/item/enderite_planks.json
9d8612e14434195279654c7646208ab3d00eb20b assets/temporalsmith/models/item/enderite_sapling.json
a2d782ef056e1452315b4b65ebf84d75f4bc8ea4 assets/temporalsmith/models/item/graphite_block.json
2c56800900305e9caacb48549f096f0b547f0fc1 assets/temporalsmith/models/item/graphite_ore.json
b549b3cf2661b902cb6b3b616e3fa94afffb996a assets/temporalsmith/models/item/imperium_ore.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.2 2023-11-25T18:18:52.936448 Languages: en_us
85bf9089b39c43906813319aa2d32ee543fe60ae assets/temporalsmith/lang/en_us.json
// 1.20.2 2023-12-01T14:59:40.052602 Languages: en_us
4018c43514bf966ec241d7b191eb47382899bbb9 assets/temporalsmith/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "temporalsmith:block/enderite_log_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "temporalsmith:block/enderite_log"
},
"axis=z": {
"model": "temporalsmith:block/enderite_log_horizontal",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "temporalsmith:block/enderite_planks"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "temporalsmith:block/enderite_sapling"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,11 @@
"block.temporalsmith.deepslate_ruby_ore": "Deepslate Ruby Ore",
"block.temporalsmith.deepslate_sapphire_ore": "Deepslate Sapphire Ore",
"block.temporalsmith.enderite_block": "Enderite Block",
"block.temporalsmith.enderite_log": "Enderite Log",
"block.temporalsmith.enderite_ore": "Enderite Ore",
"block.temporalsmith.enderite_planks": "Enderite Planks",
"block.temporalsmith.enderite_portal_frame": "Enderite Portal Frame",
"block.temporalsmith.enderite_sapling": "Enderite Sapling",
"block.temporalsmith.graphite_block": "Graphite Block",
"block.temporalsmith.graphite_ore": "Graphite Ore",
"block.temporalsmith.imperium_ore": "Imperium Ore",
Expand Down Expand Up @@ -116,6 +119,7 @@
"item.temporalsmith.enderite_axe": "Enderite Axe",
"item.temporalsmith.enderite_boots": "Enderite Boots",
"item.temporalsmith.enderite_chestplate": "Enderite Chestplate",
"item.temporalsmith.enderite_golem_spawn_egg": "Enderite Golem Spawn Egg",
"item.temporalsmith.enderite_helmet": "Enderite Helmet",
"item.temporalsmith.enderite_hoe": "Enderite Hoe",
"item.temporalsmith.enderite_leggings": "Enderite Leggings",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column",
"textures": {
"end": "temporalsmith:block/enderite_log_top",
"side": "temporalsmith:block/enderite_log"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column_horizontal",
"textures": {
"end": "temporalsmith:block/enderite_log_top",
"side": "temporalsmith:block/enderite_log"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "temporalsmith:block/enderite_planks"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cross",
"textures": {
"cross": "temporalsmith:block/enderite_sapling"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "temporalsmith:item/enderite_golem_spawn_egg"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "temporalsmith:block/enderite_log"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "temporalsmith:block/enderite_planks"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "temporalsmith:block/enderite_sapling"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"values": [
"temporalsmith:enderite_log",
"temporalsmith:enderite_planks",
"temporalsmith:enderite_sapling"
]
}
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": "temporalsmith:enderite_log"
}
],
"rolls": 1.0
}
],
"random_sequence": "temporalsmith:blocks/enderite_log"
}
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": "temporalsmith:enderite_planks"
}
],
"rolls": 1.0
}
],
"random_sequence": "temporalsmith:blocks/enderite_planks"
}
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": "temporalsmith:enderite_sapling"
}
],
"rolls": 1.0
}
],
"random_sequence": "temporalsmith:blocks/enderite_sapling"
}
Loading

0 comments on commit 915fd3f

Please sign in to comment.