diff --git a/.gradle/8.8/checksums/checksums.lock b/.gradle/8.8/checksums/checksums.lock index 2da2bf26d..0994e37ed 100644 Binary files a/.gradle/8.8/checksums/checksums.lock and b/.gradle/8.8/checksums/checksums.lock differ diff --git a/.gradle/8.8/checksums/md5-checksums.bin b/.gradle/8.8/checksums/md5-checksums.bin index 9f88805c9..df7e32c10 100644 Binary files a/.gradle/8.8/checksums/md5-checksums.bin and b/.gradle/8.8/checksums/md5-checksums.bin differ diff --git a/.gradle/8.8/checksums/sha1-checksums.bin b/.gradle/8.8/checksums/sha1-checksums.bin index 6a7fb5e26..789c3e874 100644 Binary files a/.gradle/8.8/checksums/sha1-checksums.bin and b/.gradle/8.8/checksums/sha1-checksums.bin differ diff --git a/.gradle/8.8/executionHistory/executionHistory.bin b/.gradle/8.8/executionHistory/executionHistory.bin index 16c1c662f..84d840600 100644 Binary files a/.gradle/8.8/executionHistory/executionHistory.bin and b/.gradle/8.8/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.8/executionHistory/executionHistory.lock b/.gradle/8.8/executionHistory/executionHistory.lock index 0226a1740..bbf8a572a 100644 Binary files a/.gradle/8.8/executionHistory/executionHistory.lock and b/.gradle/8.8/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.8/fileHashes/fileHashes.bin b/.gradle/8.8/fileHashes/fileHashes.bin index 2b5e3ea79..45d82942e 100644 Binary files a/.gradle/8.8/fileHashes/fileHashes.bin and b/.gradle/8.8/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.8/fileHashes/fileHashes.lock b/.gradle/8.8/fileHashes/fileHashes.lock index 6de667579..55b24f237 100644 Binary files a/.gradle/8.8/fileHashes/fileHashes.lock and b/.gradle/8.8/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.8/fileHashes/resourceHashesCache.bin b/.gradle/8.8/fileHashes/resourceHashesCache.bin index 85ee37ef4..2b7b60ebf 100644 Binary files a/.gradle/8.8/fileHashes/resourceHashesCache.bin and b/.gradle/8.8/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 74c11120a..1f433dd34 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 293c68bd5..62353d633 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/build/classes/java/main/net/mcreator/customoregen/init/CustomOreGenModBlocks.class b/build/classes/java/main/net/mcreator/customoregen/init/CustomOreGenModBlocks.class index 6bd7eb10d..71ec68d97 100644 Binary files a/build/classes/java/main/net/mcreator/customoregen/init/CustomOreGenModBlocks.class and b/build/classes/java/main/net/mcreator/customoregen/init/CustomOreGenModBlocks.class differ diff --git a/build/classes/java/main/net/mcreator/customoregen/init/CustomOreGenModItems.class b/build/classes/java/main/net/mcreator/customoregen/init/CustomOreGenModItems.class index 7b7d0a590..cf8341007 100644 Binary files a/build/classes/java/main/net/mcreator/customoregen/init/CustomOreGenModItems.class and b/build/classes/java/main/net/mcreator/customoregen/init/CustomOreGenModItems.class differ diff --git a/build/classes/java/main/net/mcreator/customoregen/init/CustomOreGenModTabs.class b/build/classes/java/main/net/mcreator/customoregen/init/CustomOreGenModTabs.class index 34958f125..d498d0fe9 100644 Binary files a/build/classes/java/main/net/mcreator/customoregen/init/CustomOreGenModTabs.class and b/build/classes/java/main/net/mcreator/customoregen/init/CustomOreGenModTabs.class differ diff --git a/build/libs/modid-1.0.jar b/build/libs/modid-1.0.jar index 56127274f..592894ac6 100644 Binary files a/build/libs/modid-1.0.jar and b/build/libs/modid-1.0.jar differ diff --git a/build/reobfJar/log.txt b/build/reobfJar/log.txt index 31d00dafc..292e67888 100644 --- a/build/reobfJar/log.txt +++ b/build/reobfJar/log.txt @@ -134,43 +134,47 @@ Adding Libraries to Inheritance Reading Input: C:\Users\felden.r\MCreatorWorkspaces\custom_ore_gen\build\libs\modid-1.0.jar Adding input to inheritance map Processing entries -Conflicting propagated mapping for net/mcreator/customoregen/block/ConcentrateddiamondoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ -Conflicting propagated mapping for net/mcreator/customoregen/block/DeepslatepuregoldenoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/DeepslateimpureironoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/DeepslateironoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ Conflicting propagated mapping for net/mcreator/customoregen/block/DeepslateimpuregoldoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/AshcoaloreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/CopperhighoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/DeepslatelapisoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ Conflicting propagated mapping for net/mcreator/customoregen/block/ConcentratedcoaloreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ Conflicting propagated mapping for net/mcreator/customoregen/block/DeepslatesharddiamondoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ -Conflicting propagated mapping for net/mcreator/customoregen/block/DeepslatelapisoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ -Conflicting propagated mapping for net/mcreator/customoregen/block/AshcoaloreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/ConcentrateddiamondoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ Conflicting propagated mapping for net/mcreator/customoregen/block/DeepslateredstoneoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ Conflicting propagated mapping for net/mcreator/customoregen/block/CopperloweroreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/DeepslatepuregoldenoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/ImpureironoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ Conflicting propagated mapping for net/mcreator/customoregen/block/ImpuregoldoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ -Conflicting propagated mapping for net/mcreator/customoregen/block/CopperhighoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ -Conflicting propagated mapping for net/mcreator/customoregen/block/HighemeraldoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ -Conflicting propagated mapping for net/mcreator/customoregen/block/RedstoneoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ -Conflicting propagated mapping for net/mcreator/customoregen/block/PuregoldenoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ Conflicting propagated mapping for net/mcreator/customoregen/block/LoweremeraldoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ -Conflicting propagated mapping for net/mcreator/customoregen/block/LapisoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ Conflicting propagated mapping for net/mcreator/customoregen/block/SharddiamondblockoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/HighemeraldoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/PuregoldenoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/RedstoneoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/LapisoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/IronoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondaxeItem$1/getUses()I from net/minecraft/world/item/Tier/getUses()I: getUses -> m_6609_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondaxeItem$1/getSpeed()F from net/minecraft/world/item/Tier/getSpeed()F: getSpeed -> m_6624_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondaxeItem$1/getRepairIngredient()Lnet/minecraft/world/item/crafting/Ingredient; from net/minecraft/world/item/Tier/getRepairIngredient()Lnet/minecraft/world/item/crafting/Ingredient;: getRepairIngredient -> m_6282_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondaxeItem$1/getEnchantmentValue()I from net/minecraft/world/item/Tier/getEnchantmentValue()I: getEnchantmentValue -> m_6601_ -Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondaxeItem$1/getLevel()I from net/minecraft/world/item/Tier/getLevel()I: getLevel -> m_6604_ -Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondaxeItem$1/getAttackDamageBonus()F from net/minecraft/world/item/Tier/getAttackDamageBonus()F: getAttackDamageBonus -> m_6631_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondpickaxeItem$1/getUses()I from net/minecraft/world/item/Tier/getUses()I: getUses -> m_6609_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondpickaxeItem$1/getSpeed()F from net/minecraft/world/item/Tier/getSpeed()F: getSpeed -> m_6624_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondpickaxeItem$1/getRepairIngredient()Lnet/minecraft/world/item/crafting/Ingredient; from net/minecraft/world/item/Tier/getRepairIngredient()Lnet/minecraft/world/item/crafting/Ingredient;: getRepairIngredient -> m_6282_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondpickaxeItem$1/getEnchantmentValue()I from net/minecraft/world/item/Tier/getEnchantmentValue()I: getEnchantmentValue -> m_6601_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondpickaxeItem$1/getLevel()I from net/minecraft/world/item/Tier/getLevel()I: getLevel -> m_6604_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondpickaxeItem$1/getAttackDamageBonus()F from net/minecraft/world/item/Tier/getAttackDamageBonus()F: getAttackDamageBonus -> m_6631_ +Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondaxeItem$1/getLevel()I from net/minecraft/world/item/Tier/getLevel()I: getLevel -> m_6604_ +Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondaxeItem$1/getAttackDamageBonus()F from net/minecraft/world/item/Tier/getAttackDamageBonus()F: getAttackDamageBonus -> m_6631_ Conflicting propagated mapping for net/mcreator/customoregen/item/DiamondshardItem/appendHoverText(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Ljava/util/List;Lnet/minecraft/world/item/TooltipFlag;)V from net/minecraft/world/item/Item/appendHoverText(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Ljava/util/List;Lnet/minecraft/world/item/TooltipFlag;)V: appendHoverText -> m_7373_ +Conflicting propagated mapping for net/minecraftforge/event/BuildCreativeModeTabContentsEvent/accept(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/CreativeModeTab$TabVisibility;)V from net/minecraft/world/item/CreativeModeTab$Output/accept(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/CreativeModeTab$TabVisibility;)V: accept -> m_246267_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondshovelItem$1/getUses()I from net/minecraft/world/item/Tier/getUses()I: getUses -> m_6609_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondshovelItem$1/getSpeed()F from net/minecraft/world/item/Tier/getSpeed()F: getSpeed -> m_6624_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondshovelItem$1/getRepairIngredient()Lnet/minecraft/world/item/crafting/Ingredient; from net/minecraft/world/item/Tier/getRepairIngredient()Lnet/minecraft/world/item/crafting/Ingredient;: getRepairIngredient -> m_6282_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondshovelItem$1/getEnchantmentValue()I from net/minecraft/world/item/Tier/getEnchantmentValue()I: getEnchantmentValue -> m_6601_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondshovelItem$1/getLevel()I from net/minecraft/world/item/Tier/getLevel()I: getLevel -> m_6604_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondshovelItem$1/getAttackDamageBonus()F from net/minecraft/world/item/Tier/getAttackDamageBonus()F: getAttackDamageBonus -> m_6631_ -Conflicting propagated mapping for net/minecraftforge/event/BuildCreativeModeTabContentsEvent/accept(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/CreativeModeTab$TabVisibility;)V from net/minecraft/world/item/CreativeModeTab$Output/accept(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/CreativeModeTab$TabVisibility;)V: accept -> m_246267_ Adding extras Sorting Writing Output: C:\Users\felden.r\MCreatorWorkspaces\custom_ore_gen\build\reobfJar\output.jar @@ -187,12 +191,16 @@ Writing Output: C:\Users\felden.r\MCreatorWorkspaces\custom_ore_gen\build\reobfJ assets/custom_ore_gen/blockstates/copperhighore.json assets/custom_ore_gen/blockstates/copperlowerore.json assets/custom_ore_gen/blockstates/deepslateimpuregoldore.json + assets/custom_ore_gen/blockstates/deepslateimpureironore.json + assets/custom_ore_gen/blockstates/deepslateironore.json assets/custom_ore_gen/blockstates/deepslatelapisore.json assets/custom_ore_gen/blockstates/deepslatepuregoldenore.json assets/custom_ore_gen/blockstates/deepslateredstoneore.json assets/custom_ore_gen/blockstates/deepslatesharddiamondore.json assets/custom_ore_gen/blockstates/highemeraldore.json assets/custom_ore_gen/blockstates/impuregoldore.json + assets/custom_ore_gen/blockstates/impureironore.json + assets/custom_ore_gen/blockstates/ironore.json assets/custom_ore_gen/blockstates/lapisore.json assets/custom_ore_gen/blockstates/loweremeraldore.json assets/custom_ore_gen/blockstates/puregoldenore.json @@ -208,12 +216,16 @@ Writing Output: C:\Users\felden.r\MCreatorWorkspaces\custom_ore_gen\build\reobfJ assets/custom_ore_gen/models/block/copperhighore.json assets/custom_ore_gen/models/block/copperlowerore.json assets/custom_ore_gen/models/block/deepslateimpuregoldore.json + assets/custom_ore_gen/models/block/deepslateimpureironore.json + assets/custom_ore_gen/models/block/deepslateironore.json assets/custom_ore_gen/models/block/deepslatelapisore.json assets/custom_ore_gen/models/block/deepslatepuregoldenore.json assets/custom_ore_gen/models/block/deepslateredstoneore.json assets/custom_ore_gen/models/block/deepslatesharddiamondore.json assets/custom_ore_gen/models/block/highemeraldore.json assets/custom_ore_gen/models/block/impuregoldore.json + assets/custom_ore_gen/models/block/impureironore.json + assets/custom_ore_gen/models/block/ironore.json assets/custom_ore_gen/models/block/lapisore.json assets/custom_ore_gen/models/block/loweremeraldore.json assets/custom_ore_gen/models/block/puregoldenore.json @@ -227,6 +239,8 @@ Writing Output: C:\Users\felden.r\MCreatorWorkspaces\custom_ore_gen\build\reobfJ assets/custom_ore_gen/models/item/copperhighore.json assets/custom_ore_gen/models/item/copperlowerore.json assets/custom_ore_gen/models/item/deepslateimpuregoldore.json + assets/custom_ore_gen/models/item/deepslateimpureironore.json + assets/custom_ore_gen/models/item/deepslateironore.json assets/custom_ore_gen/models/item/deepslatelapisore.json assets/custom_ore_gen/models/item/deepslatepuregoldenore.json assets/custom_ore_gen/models/item/deepslateredstoneore.json @@ -234,6 +248,8 @@ Writing Output: C:\Users\felden.r\MCreatorWorkspaces\custom_ore_gen\build\reobfJ assets/custom_ore_gen/models/item/diamondshard.json assets/custom_ore_gen/models/item/highemeraldore.json assets/custom_ore_gen/models/item/impuregoldore.json + assets/custom_ore_gen/models/item/impureironore.json + assets/custom_ore_gen/models/item/ironore.json assets/custom_ore_gen/models/item/lapisore.json assets/custom_ore_gen/models/item/loweremeraldore.json assets/custom_ore_gen/models/item/puregoldenore.json @@ -242,6 +258,7 @@ Writing Output: C:\Users\felden.r\MCreatorWorkspaces\custom_ore_gen\build\reobfJ assets/custom_ore_gen/models/item/sharddiamondblockore.json assets/custom_ore_gen/models/item/sharddiamondpickaxe.json assets/custom_ore_gen/models/item/sharddiamondshovel.json + assets/custom_ore_gen/models/item/shardironore.json assets/custom_ore_gen/textures/ assets/custom_ore_gen/textures/block/ assets/custom_ore_gen/textures/block/ash_coal.png @@ -249,9 +266,12 @@ Writing Output: C:\Users\felden.r\MCreatorWorkspaces\custom_ore_gen\build\reobfJ assets/custom_ore_gen/textures/block/concentrated_coal.png assets/custom_ore_gen/textures/block/deepslate_impure_copper_ore.png assets/custom_ore_gen/textures/block/deepslate_impure_gold_ore.png + assets/custom_ore_gen/textures/block/deepslate_impure_iron_ore.png assets/custom_ore_gen/textures/block/deepslate_pure_gold_ore.png assets/custom_ore_gen/textures/block/impure_copper_ore.png assets/custom_ore_gen/textures/block/impure_gold_ore.png + assets/custom_ore_gen/textures/block/impure_iron_ore.png + assets/custom_ore_gen/textures/block/iron_shard.png assets/custom_ore_gen/textures/block/pure_golden_ore.png assets/custom_ore_gen/textures/block/shard_diamond_deepslate_ore.png assets/custom_ore_gen/textures/block/shard_diamond_ore.png @@ -260,6 +280,7 @@ Writing Output: C:\Users\felden.r\MCreatorWorkspaces\custom_ore_gen\build\reobfJ assets/custom_ore_gen/textures/item/ assets/custom_ore_gen/textures/item/ash_coal.png assets/custom_ore_gen/textures/item/diamond_shard.png + assets/custom_ore_gen/textures/item/iron_shard.png assets/custom_ore_gen/textures/item/shard_diamond_axe.png assets/custom_ore_gen/textures/item/shard_diamond_pickaxe.png assets/custom_ore_gen/textures/item/shard_diamond_shovel.png @@ -273,11 +294,17 @@ Writing Output: C:\Users\felden.r\MCreatorWorkspaces\custom_ore_gen\build\reobfJ data/custom_ore_gen/forge/biome_modifier/ashcoalore_biome_modifier.json data/custom_ore_gen/forge/biome_modifier/concentratedcoalore_biome_modifier.json data/custom_ore_gen/forge/biome_modifier/concentrateddiamondore_biome_modifier.json + data/custom_ore_gen/forge/biome_modifier/copperhighore_biome_modifier.json + data/custom_ore_gen/forge/biome_modifier/copperlowerore_biome_modifier.json data/custom_ore_gen/forge/biome_modifier/deepslateimpuregoldore_biome_modifier.json + data/custom_ore_gen/forge/biome_modifier/deepslateimpureironore_biome_modifier.json + data/custom_ore_gen/forge/biome_modifier/deepslateironore_biome_modifier.json data/custom_ore_gen/forge/biome_modifier/deepslatelapisore_biome_modifier.json data/custom_ore_gen/forge/biome_modifier/deepslatepuregoldenore_biome_modifier.json data/custom_ore_gen/forge/biome_modifier/diamondore_biome_modifier.json data/custom_ore_gen/forge/biome_modifier/impuregoldore_biome_modifier.json + data/custom_ore_gen/forge/biome_modifier/impureironore_biome_modifier.json + data/custom_ore_gen/forge/biome_modifier/ironore_biome_modifier.json data/custom_ore_gen/forge/biome_modifier/loweremeraldore_biome_modifier.json data/custom_ore_gen/forge/biome_modifier/puregoldenore_biome_modifier.json data/custom_ore_gen/forge/biome_modifier/sharddiamondblockore_biome_modifier.json @@ -289,12 +316,16 @@ Writing Output: C:\Users\felden.r\MCreatorWorkspaces\custom_ore_gen\build\reobfJ data/custom_ore_gen/loot_tables/blocks/copperhighore.json data/custom_ore_gen/loot_tables/blocks/copperlowerore.json data/custom_ore_gen/loot_tables/blocks/deepslateimpuregoldore.json + data/custom_ore_gen/loot_tables/blocks/deepslateimpureironore.json + data/custom_ore_gen/loot_tables/blocks/deepslateironore.json data/custom_ore_gen/loot_tables/blocks/deepslatelapisore.json data/custom_ore_gen/loot_tables/blocks/deepslatepuregoldenore.json data/custom_ore_gen/loot_tables/blocks/deepslateredstoneore.json data/custom_ore_gen/loot_tables/blocks/deepslatesharddiamondore.json data/custom_ore_gen/loot_tables/blocks/highemeraldore.json data/custom_ore_gen/loot_tables/blocks/impuregoldore.json + data/custom_ore_gen/loot_tables/blocks/impureironore.json + data/custom_ore_gen/loot_tables/blocks/ironore.json data/custom_ore_gen/loot_tables/blocks/lapisore.json data/custom_ore_gen/loot_tables/blocks/loweremeraldore.json data/custom_ore_gen/loot_tables/blocks/puregoldenore.json @@ -303,6 +334,7 @@ Writing Output: C:\Users\felden.r\MCreatorWorkspaces\custom_ore_gen\build\reobfJ data/custom_ore_gen/recipes/ data/custom_ore_gen/recipes/ashtocoal.json data/custom_ore_gen/recipes/diamondshardtodiamond.json + data/custom_ore_gen/recipes/ironshardtorawiron.json data/custom_ore_gen/tags/ data/custom_ore_gen/tags/worldgen/ data/custom_ore_gen/tags/worldgen/biome/ @@ -315,11 +347,17 @@ Writing Output: C:\Users\felden.r\MCreatorWorkspaces\custom_ore_gen\build\reobfJ data/custom_ore_gen/worldgen/configured_feature/ashcoalore.json data/custom_ore_gen/worldgen/configured_feature/concentratedcoalore.json data/custom_ore_gen/worldgen/configured_feature/concentrateddiamondore.json + data/custom_ore_gen/worldgen/configured_feature/copperhighore.json + data/custom_ore_gen/worldgen/configured_feature/copperlowerore.json data/custom_ore_gen/worldgen/configured_feature/deepslateimpuregoldore.json + data/custom_ore_gen/worldgen/configured_feature/deepslateimpureironore.json + data/custom_ore_gen/worldgen/configured_feature/deepslateironore.json data/custom_ore_gen/worldgen/configured_feature/deepslatelapisore.json data/custom_ore_gen/worldgen/configured_feature/deepslatepuregoldenore.json data/custom_ore_gen/worldgen/configured_feature/diamondore.json data/custom_ore_gen/worldgen/configured_feature/impuregoldore.json + data/custom_ore_gen/worldgen/configured_feature/impureironore.json + data/custom_ore_gen/worldgen/configured_feature/ironore.json data/custom_ore_gen/worldgen/configured_feature/loweremeraldore.json data/custom_ore_gen/worldgen/configured_feature/puregoldenore.json data/custom_ore_gen/worldgen/configured_feature/sharddiamondblockore.json @@ -327,11 +365,17 @@ Writing Output: C:\Users\felden.r\MCreatorWorkspaces\custom_ore_gen\build\reobfJ data/custom_ore_gen/worldgen/placed_feature/ashcoalore.json data/custom_ore_gen/worldgen/placed_feature/concentratedcoalore.json data/custom_ore_gen/worldgen/placed_feature/concentrateddiamondore.json + data/custom_ore_gen/worldgen/placed_feature/copperhighore.json + data/custom_ore_gen/worldgen/placed_feature/copperlowerore.json data/custom_ore_gen/worldgen/placed_feature/deepslateimpuregoldore.json + data/custom_ore_gen/worldgen/placed_feature/deepslateimpureironore.json + data/custom_ore_gen/worldgen/placed_feature/deepslateironore.json data/custom_ore_gen/worldgen/placed_feature/deepslatelapisore.json data/custom_ore_gen/worldgen/placed_feature/deepslatepuregoldenore.json data/custom_ore_gen/worldgen/placed_feature/diamondore.json data/custom_ore_gen/worldgen/placed_feature/impuregoldore.json + data/custom_ore_gen/worldgen/placed_feature/impureironore.json + data/custom_ore_gen/worldgen/placed_feature/ironore.json data/custom_ore_gen/worldgen/placed_feature/loweremeraldore.json data/custom_ore_gen/worldgen/placed_feature/puregoldenore.json data/custom_ore_gen/worldgen/placed_feature/sharddiamondblockore.json @@ -359,12 +403,16 @@ Writing Output: C:\Users\felden.r\MCreatorWorkspaces\custom_ore_gen\build\reobfJ net/mcreator/customoregen/block/CopperhighoreBlock.class net/mcreator/customoregen/block/CopperloweroreBlock.class net/mcreator/customoregen/block/DeepslateimpuregoldoreBlock.class + net/mcreator/customoregen/block/DeepslateimpureironoreBlock.class + net/mcreator/customoregen/block/DeepslateironoreBlock.class net/mcreator/customoregen/block/DeepslatelapisoreBlock.class net/mcreator/customoregen/block/DeepslatepuregoldenoreBlock.class net/mcreator/customoregen/block/DeepslateredstoneoreBlock.class net/mcreator/customoregen/block/DeepslatesharddiamondoreBlock.class net/mcreator/customoregen/block/HighemeraldoreBlock.class net/mcreator/customoregen/block/ImpuregoldoreBlock.class + net/mcreator/customoregen/block/ImpureironoreBlock.class + net/mcreator/customoregen/block/IronoreBlock.class net/mcreator/customoregen/block/LapisoreBlock.class net/mcreator/customoregen/block/LoweremeraldoreBlock.class net/mcreator/customoregen/block/PuregoldenoreBlock.class @@ -384,4 +432,5 @@ Writing Output: C:\Users\felden.r\MCreatorWorkspaces\custom_ore_gen\build\reobfJ net/mcreator/customoregen/item/SharddiamondpickaxeItem.class net/mcreator/customoregen/item/SharddiamondshovelItem$1.class net/mcreator/customoregen/item/SharddiamondshovelItem.class + net/mcreator/customoregen/item/ShardironoreItem.class pack.mcmeta diff --git a/build/reobfJar/output.jar b/build/reobfJar/output.jar index 56127274f..592894ac6 100644 Binary files a/build/reobfJar/output.jar and b/build/reobfJar/output.jar differ diff --git a/build/resources/main/assets/custom_ore_gen/lang/en_us.json b/build/resources/main/assets/custom_ore_gen/lang/en_us.json index f75828f8b..6b1d55cf1 100644 --- a/build/resources/main/assets/custom_ore_gen/lang/en_us.json +++ b/build/resources/main/assets/custom_ore_gen/lang/en_us.json @@ -1,22 +1,27 @@ { "block.custom_ore_gen.lapisore": "Lapis ore", "block.custom_ore_gen.sharddiamondblockore": "Sharddiamondblockore", - "block.custom_ore_gen.ashcoalore": "Ash coal ore", "block.custom_ore_gen.concentratedcoalore": "Concentrated coal ore", + "block.custom_ore_gen.ironore": "Iron ore", + "item.custom_ore_gen.diamondshard.description_0": "Sert a crée un diamant", + "block.custom_ore_gen.copperhighore": "Copperhighore", + "block.custom_ore_gen.copperlowerore": "deepslate copper ore", + "block.custom_ore_gen.deepslateredstoneore": "Deepslate redstone ore", + "block.custom_ore_gen.deepslateironore": "Deepslate iron ore", + "item.custom_ore_gen.sharddiamondaxe": "Shard diamond axe", + "block.custom_ore_gen.deepslateimpuregoldore": "deepslate Impure gold ore", + "block.custom_ore_gen.ashcoalore": "Ash coal ore", + "block.custom_ore_gen.impureironore": "Impure iron ore", "item.custom_ore_gen.ashcoal": "Ash", "block.custom_ore_gen.impuregoldore": "Impure gold ore", "block.custom_ore_gen.redstoneore": "Redstone ore", "block.custom_ore_gen.deepslatelapisore": "Deepslate lapis ore", "item.custom_ore_gen.sharddiamondpickaxe": "Shard diamond pickaxe", - "item.custom_ore_gen.diamondshard.description_0": "Sert a crée un diamant", - "block.custom_ore_gen.copperhighore": "Copperhighore", - "block.custom_ore_gen.copperlowerore": "deepslate copper ore", + "block.custom_ore_gen.deepslateimpureironore": "Deepslate impure iron ore", "block.custom_ore_gen.loweremeraldore": "Loweremeraldore", - "block.custom_ore_gen.deepslateredstoneore": "Deepslate redstone ore", - "item.custom_ore_gen.sharddiamondaxe": "Shard diamond axe", "block.custom_ore_gen.deepslatesharddiamondore": "Deepslatesharddiamondore", "block.custom_ore_gen.concentrateddiamondore": "Concentrated diamond ore", - "block.custom_ore_gen.deepslateimpuregoldore": "deepslate Impure gold ore", + "item.custom_ore_gen.shardironore": "Shard iron ore", "item.custom_ore_gen.diamondshard": "Diamondshard", "block.custom_ore_gen.deepslatepuregoldenore": "Deepslate pure golden ore", "block.custom_ore_gen.puregoldenore": "Pure golden ore", diff --git a/build/resources/main/data/custom_ore_gen/loot_tables/blocks/copperhighore.json b/build/resources/main/data/custom_ore_gen/loot_tables/blocks/copperhighore.json index 0dcbdc5ca..4fac0215f 100644 --- a/build/resources/main/data/custom_ore_gen/loot_tables/blocks/copperhighore.json +++ b/build/resources/main/data/custom_ore_gen/loot_tables/blocks/copperhighore.json @@ -1,85 +1,20 @@ { "type": "minecraft:block", + "random_sequence": "custom_ore_gen:blocks/copperhighore", "pools": [ { - "rolls": { - "min": 1, - "max": 2 - }, - "entries": [ + "rolls": 1.0, + "conditions": [ { - "type": "minecraft:item", - "name": "minecraft:raw_copper", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 2, - "max": 5 - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ] + "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1, + ], "entries": [ { "type": "minecraft:item", - "name": "minecraft:copper_ore", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - } - ] + "name": "custom_ore_gen:copperhighore" } ] } - ], - "random_sequence": "custom_ore_gen:blocks/copperhighore" + ] } \ No newline at end of file diff --git a/build/resources/main/data/custom_ore_gen/worldgen/configured_feature/impuregoldore.json b/build/resources/main/data/custom_ore_gen/worldgen/configured_feature/impuregoldore.json index bf8ca91dc..6a04fb2ac 100644 --- a/build/resources/main/data/custom_ore_gen/worldgen/configured_feature/impuregoldore.json +++ b/build/resources/main/data/custom_ore_gen/worldgen/configured_feature/impuregoldore.json @@ -1,7 +1,7 @@ { "type": "minecraft:ore", "config": { - "size": 16, + "size": 9, "discard_chance_on_air_exposure": 0, "targets": [ { diff --git a/build/resources/main/data/custom_ore_gen/worldgen/placed_feature/impuregoldore.json b/build/resources/main/data/custom_ore_gen/worldgen/placed_feature/impuregoldore.json index a94b733b6..5746fbb9e 100644 --- a/build/resources/main/data/custom_ore_gen/worldgen/placed_feature/impuregoldore.json +++ b/build/resources/main/data/custom_ore_gen/worldgen/placed_feature/impuregoldore.json @@ -16,7 +16,7 @@ "absolute": 0 }, "max_inclusive": { - "absolute": 32 + "absolute": 24 } } }, diff --git a/build/resources/main/data/minecraft/tags/blocks/mineable/pickaxe.json b/build/resources/main/data/minecraft/tags/blocks/mineable/pickaxe.json index 72ea42084..20cd1e5b3 100644 --- a/build/resources/main/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/build/resources/main/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -1,6 +1,10 @@ { "replace": false, "values": [ + "custom_ore_gen:deepslateironore", + "custom_ore_gen:ironore", + "custom_ore_gen:deepslateimpureironore", + "custom_ore_gen:impureironore", "custom_ore_gen:loweremeraldore", "custom_ore_gen:deepslateredstoneore", "custom_ore_gen:redstoneore", diff --git a/build/resources/main/data/minecraft/tags/blocks/needs_stone_tool.json b/build/resources/main/data/minecraft/tags/blocks/needs_stone_tool.json index a34183f4e..b80a3282f 100644 --- a/build/resources/main/data/minecraft/tags/blocks/needs_stone_tool.json +++ b/build/resources/main/data/minecraft/tags/blocks/needs_stone_tool.json @@ -1,6 +1,10 @@ { "replace": false, "values": [ + "custom_ore_gen:deepslateironore", + "custom_ore_gen:ironore", + "custom_ore_gen:deepslateimpureironore", + "custom_ore_gen:impureironore", "custom_ore_gen:deepslatelapisore", "custom_ore_gen:lapisore" ] diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/Dospawninginnightcode$DospawninginnightcodeForgeBusEvents.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/Dospawninginnightcode$DospawninginnightcodeForgeBusEvents.class.uniqueId0 deleted file mode 100644 index 6af6c7c56..000000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/Dospawninginnightcode$DospawninginnightcodeForgeBusEvents.class.uniqueId0 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/Dospawninginnightcode.class.uniqueId1 b/build/tmp/compileJava/compileTransaction/stash-dir/Dospawninginnightcode.class.uniqueId1 deleted file mode 100644 index 09c9d84f6..000000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/Dospawninginnightcode.class.uniqueId1 and /dev/null differ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index 00cc9043e..84fb2453c 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/custom_ore_gen.mcreator b/custom_ore_gen.mcreator index 1cc059f1f..434bfa141 100644 --- a/custom_ore_gen.mcreator +++ b/custom_ore_gen.mcreator @@ -284,8 +284,11 @@ "registry_name": "deepslatesharddiamondore", "metadata": { "files": [ + "src/main/resources/data/custom_ore_gen/worldgen/placed_feature/deepslatesharddiamondore.json", "src/main/resources/assets/custom_ore_gen/models/item/deepslatesharddiamondore.json", "src/main/resources/assets/custom_ore_gen/blockstates/deepslatesharddiamondore.json", + "src/main/resources/data/custom_ore_gen/worldgen/configured_feature/deepslatesharddiamondore.json", + "src/main/resources/data/custom_ore_gen/forge/biome_modifier/deepslatesharddiamondore_biome_modifier.json", "src/main/resources/assets/custom_ore_gen/models/block/deepslatesharddiamondore.json", "src/main/java/net/mcreator/customoregen/block/DeepslatesharddiamondoreBlock.java" ] @@ -359,9 +362,12 @@ "metadata": { "files": [ "src/main/resources/assets/custom_ore_gen/models/item/lapisore.json", + "src/main/resources/data/custom_ore_gen/worldgen/configured_feature/lapisore.json", "src/main/java/net/mcreator/customoregen/block/LapisoreBlock.java", + "src/main/resources/data/custom_ore_gen/worldgen/placed_feature/lapisore.json", "src/main/resources/assets/custom_ore_gen/models/block/lapisore.json", - "src/main/resources/assets/custom_ore_gen/blockstates/lapisore.json" + "src/main/resources/assets/custom_ore_gen/blockstates/lapisore.json", + "src/main/resources/data/custom_ore_gen/forge/biome_modifier/lapisore_biome_modifier.json" ] }, "path": "~/lapis_ore" @@ -408,8 +414,11 @@ "files": [ "src/main/resources/assets/custom_ore_gen/blockstates/redstoneore.json", "src/main/resources/assets/custom_ore_gen/models/item/redstoneore.json", + "src/main/resources/data/custom_ore_gen/worldgen/placed_feature/redstoneore.json", "src/main/java/net/mcreator/customoregen/block/RedstoneoreBlock.java", - "src/main/resources/assets/custom_ore_gen/models/block/redstoneore.json" + "src/main/resources/data/custom_ore_gen/worldgen/configured_feature/redstoneore.json", + "src/main/resources/assets/custom_ore_gen/models/block/redstoneore.json", + "src/main/resources/data/custom_ore_gen/forge/biome_modifier/redstoneore_biome_modifier.json" ] }, "path": "~/redstone_ore" @@ -435,10 +444,13 @@ "registry_name": "deepslateredstoneore", "metadata": { "files": [ + "src/main/resources/data/custom_ore_gen/worldgen/configured_feature/deepslateredstoneore.json", + "src/main/resources/data/custom_ore_gen/worldgen/placed_feature/deepslateredstoneore.json", "src/main/resources/assets/custom_ore_gen/blockstates/deepslateredstoneore.json", "src/main/java/net/mcreator/customoregen/block/DeepslateredstoneoreBlock.java", "src/main/resources/assets/custom_ore_gen/models/item/deepslateredstoneore.json", - "src/main/resources/assets/custom_ore_gen/models/block/deepslateredstoneore.json" + "src/main/resources/assets/custom_ore_gen/models/block/deepslateredstoneore.json", + "src/main/resources/data/custom_ore_gen/forge/biome_modifier/deepslateredstoneore_biome_modifier.json" ] }, "path": "~/redstone_ore" @@ -464,9 +476,12 @@ "registry_name": "copperhighore", "metadata": { "files": [ + "src/main/resources/data/custom_ore_gen/worldgen/placed_feature/copperhighore.json", + "src/main/resources/data/custom_ore_gen/forge/biome_modifier/copperhighore_biome_modifier.json", "src/main/resources/assets/custom_ore_gen/models/block/copperhighore.json", "src/main/resources/data/custom_ore_gen/loot_tables/blocks/copperhighore.json", "src/main/resources/assets/custom_ore_gen/blockstates/copperhighore.json", + "src/main/resources/data/custom_ore_gen/worldgen/configured_feature/copperhighore.json", "src/main/resources/assets/custom_ore_gen/models/item/copperhighore.json", "src/main/java/net/mcreator/customoregen/block/CopperhighoreBlock.java" ] @@ -482,6 +497,9 @@ "metadata": { "files": [ "src/main/resources/assets/custom_ore_gen/models/block/copperlowerore.json", + "src/main/resources/data/custom_ore_gen/forge/biome_modifier/copperlowerore_biome_modifier.json", + "src/main/resources/data/custom_ore_gen/worldgen/placed_feature/copperlowerore.json", + "src/main/resources/data/custom_ore_gen/worldgen/configured_feature/copperlowerore.json", "src/main/java/net/mcreator/customoregen/block/CopperloweroreBlock.java", "src/main/resources/assets/custom_ore_gen/models/item/copperlowerore.json", "src/main/resources/assets/custom_ore_gen/blockstates/copperlowerore.json" @@ -565,9 +583,12 @@ "registry_name": "highemeraldore", "metadata": { "files": [ + "src/main/resources/data/custom_ore_gen/forge/biome_modifier/highemeraldore_biome_modifier.json", + "src/main/resources/data/custom_ore_gen/worldgen/placed_feature/highemeraldore.json", "src/main/resources/assets/custom_ore_gen/blockstates/highemeraldore.json", "src/main/resources/assets/custom_ore_gen/models/block/highemeraldore.json", "src/main/java/net/mcreator/customoregen/block/HighemeraldoreBlock.java", + "src/main/resources/data/custom_ore_gen/worldgen/configured_feature/highemeraldore.json", "src/main/resources/assets/custom_ore_gen/models/item/highemeraldore.json" ] }, diff --git a/elements/Concentrateddiamondore.mod.json b/elements/Concentrateddiamondore.mod.json index 3a1a615b7..bdc0fead6 100644 --- a/elements/Concentrateddiamondore.mod.json +++ b/elements/Concentrateddiamondore.mod.json @@ -132,6 +132,6 @@ "frequencyPerChunks": 1, "frequencyOnChunk": 9, "minGenerateHeight": -70, - "maxGenerateHeight": 64 + "maxGenerateHeight": 0 } } \ No newline at end of file diff --git a/elements/Copperhighore.mod.json b/elements/Copperhighore.mod.json index 508e26a7f..3793da193 100644 --- a/elements/Copperhighore.mod.json +++ b/elements/Copperhighore.mod.json @@ -117,16 +117,13 @@ "isFluidTank": false, "fluidCapacity": 8000, "fluidRestrictions": [], - "generateFeature": false, + "generateFeature": true, "restrictionBiomes": [ { "value": "#mod:hot_biomes" } ], "blocksToReplace": [ - { - "value": "TAG:stone_ore_replaceables" - }, { "value": "Blocks.STONE" } diff --git a/elements/Copperlowerore.mod.json b/elements/Copperlowerore.mod.json index 53a72a2ee..6fd758f81 100644 --- a/elements/Copperlowerore.mod.json +++ b/elements/Copperlowerore.mod.json @@ -117,11 +117,15 @@ "isFluidTank": false, "fluidCapacity": 8000, "fluidRestrictions": [], - "generateFeature": false, - "restrictionBiomes": [], + "generateFeature": true, + "restrictionBiomes": [ + { + "value": "#mod:hot_biomes" + } + ], "blocksToReplace": [ { - "value": "TAG:stone_ore_replaceables" + "value": "Blocks.STONE" } ], "generationShape": "UNIFORM", diff --git a/elements/Deepslateredstoneore.mod.json b/elements/Deepslateredstoneore.mod.json index 36d30633b..59d00db47 100644 --- a/elements/Deepslateredstoneore.mod.json +++ b/elements/Deepslateredstoneore.mod.json @@ -117,16 +117,13 @@ "isFluidTank": false, "fluidCapacity": 8000, "fluidRestrictions": [], - "generateFeature": false, + "generateFeature": true, "restrictionBiomes": [ { "value": "#mod:hot_biomes" } ], "blocksToReplace": [ - { - "value": "TAG:stone_ore_replaceables" - }, { "value": "Blocks.STONE" } diff --git a/elements/Deepslatesharddiamondore.mod.json b/elements/Deepslatesharddiamondore.mod.json index 367f96cfb..343f646c0 100644 --- a/elements/Deepslatesharddiamondore.mod.json +++ b/elements/Deepslatesharddiamondore.mod.json @@ -117,7 +117,7 @@ "isFluidTank": false, "fluidCapacity": 8000, "fluidRestrictions": [], - "generateFeature": false, + "generateFeature": true, "restrictionBiomes": [], "blocksToReplace": [ { diff --git a/elements/Highemeraldore.mod.json b/elements/Highemeraldore.mod.json index 1d0636474..53beafc86 100644 --- a/elements/Highemeraldore.mod.json +++ b/elements/Highemeraldore.mod.json @@ -117,7 +117,7 @@ "isFluidTank": false, "fluidCapacity": 8000, "fluidRestrictions": [], - "generateFeature": false, + "generateFeature": true, "restrictionBiomes": [ { "value": "#mod:rare_biomes" @@ -129,7 +129,7 @@ } ], "generationShape": "UNIFORM", - "frequencyPerChunks": 10, + "frequencyPerChunks": 5, "frequencyOnChunk": 8, "minGenerateHeight": 0, "maxGenerateHeight": 64 diff --git a/elements/Impuregoldore.mod.json b/elements/Impuregoldore.mod.json index 87aeacd60..80578653d 100644 --- a/elements/Impuregoldore.mod.json +++ b/elements/Impuregoldore.mod.json @@ -124,7 +124,7 @@ "value": "Blocks.STONE" } ], - "generationShape": "TRIANGLE", + "generationShape": "UNIFORM", "frequencyPerChunks": 10, "frequencyOnChunk": 9, "minGenerateHeight": 0, diff --git a/elements/Lapisore.mod.json b/elements/Lapisore.mod.json index 41ae3ac01..811324b03 100644 --- a/elements/Lapisore.mod.json +++ b/elements/Lapisore.mod.json @@ -117,7 +117,7 @@ "isFluidTank": false, "fluidCapacity": 8000, "fluidRestrictions": [], - "generateFeature": false, + "generateFeature": true, "restrictionBiomes": [ { "value": "#mod:cold_biomes" @@ -125,7 +125,7 @@ ], "blocksToReplace": [ { - "value": "TAG:stone_ore_replaceables" + "value": "Blocks.STONE" } ], "generationShape": "TRIANGLE", diff --git a/elements/Loweremeraldore.mod.json b/elements/Loweremeraldore.mod.json index 7ec86d2ab..1eb30cf51 100644 --- a/elements/Loweremeraldore.mod.json +++ b/elements/Loweremeraldore.mod.json @@ -128,9 +128,9 @@ "value": "Blocks.STONE" } ], - "generationShape": "UNIFORM", - "frequencyPerChunks": 10, - "frequencyOnChunk": 16, + "generationShape": "TRIANGLE", + "frequencyPerChunks": 8, + "frequencyOnChunk": 11, "minGenerateHeight": -64, "maxGenerateHeight": 0 } diff --git a/elements/Redstoneore.mod.json b/elements/Redstoneore.mod.json index 4cf4e1a9d..0cfbe742b 100644 --- a/elements/Redstoneore.mod.json +++ b/elements/Redstoneore.mod.json @@ -117,16 +117,13 @@ "isFluidTank": false, "fluidCapacity": 8000, "fluidRestrictions": [], - "generateFeature": false, + "generateFeature": true, "restrictionBiomes": [ { "value": "#mod:hot_biomes" } ], "blocksToReplace": [ - { - "value": "TAG:stone_ore_replaceables" - }, { "value": "Blocks.STONE" } diff --git a/elements/Sharddiamondblockore.mod.json b/elements/Sharddiamondblockore.mod.json index e910defe4..9ed4f3a6b 100644 --- a/elements/Sharddiamondblockore.mod.json +++ b/elements/Sharddiamondblockore.mod.json @@ -128,7 +128,7 @@ "value": "Blocks.STONE" } ], - "generationShape": "TRIANGLE", + "generationShape": "UNIFORM", "frequencyPerChunks": 1, "frequencyOnChunk": 8, "minGenerateHeight": 0, diff --git a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/copperhighore.json b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/copperhighore.json index 0dcbdc5ca..4fac0215f 100644 --- a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/copperhighore.json +++ b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/copperhighore.json @@ -1,85 +1,20 @@ { "type": "minecraft:block", + "random_sequence": "custom_ore_gen:blocks/copperhighore", "pools": [ { - "rolls": { - "min": 1, - "max": 2 - }, - "entries": [ + "rolls": 1.0, + "conditions": [ { - "type": "minecraft:item", - "name": "minecraft:raw_copper", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 2, - "max": 5 - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ] + "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1, + ], "entries": [ { "type": "minecraft:item", - "name": "minecraft:copper_ore", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - } - ] + "name": "custom_ore_gen:copperhighore" } ] } - ], - "random_sequence": "custom_ore_gen:blocks/copperhighore" + ] } \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/worldgen/configured_feature/loweremeraldore.json b/src/main/resources/data/custom_ore_gen/worldgen/configured_feature/loweremeraldore.json index 8e949d245..340e8bac6 100644 --- a/src/main/resources/data/custom_ore_gen/worldgen/configured_feature/loweremeraldore.json +++ b/src/main/resources/data/custom_ore_gen/worldgen/configured_feature/loweremeraldore.json @@ -1,7 +1,7 @@ { "type": "minecraft:ore", "config": { - "size": 16, + "size": 11, "discard_chance_on_air_exposure": 0, "targets": [ { diff --git a/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/concentrateddiamondore.json b/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/concentrateddiamondore.json index c87a8cbb8..6f9879276 100644 --- a/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/concentrateddiamondore.json +++ b/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/concentrateddiamondore.json @@ -16,7 +16,7 @@ "absolute": -70 }, "max_inclusive": { - "absolute": 64 + "absolute": 0 } } }, diff --git a/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/impuregoldore.json b/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/impuregoldore.json index 5746fbb9e..4bb789a79 100644 --- a/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/impuregoldore.json +++ b/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/impuregoldore.json @@ -11,7 +11,7 @@ { "type": "minecraft:height_range", "height": { - "type": "minecraft:trapezoid", + "type": "minecraft:uniform", "min_inclusive": { "absolute": 0 }, diff --git a/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/loweremeraldore.json b/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/loweremeraldore.json index c11753342..6d4712c83 100644 --- a/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/loweremeraldore.json +++ b/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/loweremeraldore.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 10 + "count": 8 }, { "type": "minecraft:in_square" @@ -11,7 +11,7 @@ { "type": "minecraft:height_range", "height": { - "type": "minecraft:uniform", + "type": "minecraft:trapezoid", "min_inclusive": { "absolute": -64 }, diff --git a/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/sharddiamondblockore.json b/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/sharddiamondblockore.json index 0b98765a4..1654f5eb9 100644 --- a/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/sharddiamondblockore.json +++ b/src/main/resources/data/custom_ore_gen/worldgen/placed_feature/sharddiamondblockore.json @@ -11,7 +11,7 @@ { "type": "minecraft:height_range", "height": { - "type": "minecraft:trapezoid", + "type": "minecraft:uniform", "min_inclusive": { "absolute": 0 },