diff --git a/gradle.properties b/gradle.properties index ad96b57..699bd67 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,18 +3,18 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.18.1 - yarn_mappings=1.18.1+build.5 - loader_version=0.12.12 + minecraft_version=1.18.2 + yarn_mappings=1.18.2+build.2 + loader_version=0.13.3 # Mod Properties - mod_version = 1.2 + mod_version = 1.2.1 maven_group = dev.agatharose archives_base_name = asbestos # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_version=0.44.0+1.18 - modmenu_version=3.0.1 + fabric_version=0.48.0+1.18.2 + modmenu_version=3.1.0 cca_version=4.0.1 - cloth_version=6.1.48 \ No newline at end of file + cloth_version=6.2.57 \ No newline at end of file diff --git a/src/main/java/dev/agatharose/asbestos/AsbestosRegistry.java b/src/main/java/dev/agatharose/asbestos/AsbestosRegistry.java index 656eba4..35e684e 100644 --- a/src/main/java/dev/agatharose/asbestos/AsbestosRegistry.java +++ b/src/main/java/dev/agatharose/asbestos/AsbestosRegistry.java @@ -1,5 +1,7 @@ package dev.agatharose.asbestos; +import java.util.Arrays; + import dev.agatharose.asbestos.block.AsbestosRoofBlock; import dev.agatharose.asbestos.block.CarcinogenicBlock; import dev.agatharose.asbestos.item.PpeArmorMaterial; @@ -24,17 +26,18 @@ import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.Identifier; import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.Registry; +import net.minecraft.util.registry.RegistryEntry; import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.gen.GenerationStep; import net.minecraft.world.gen.YOffset; -import net.minecraft.world.gen.decorator.CountPlacementModifier; -import net.minecraft.world.gen.decorator.HeightRangePlacementModifier; -import net.minecraft.world.gen.decorator.SquarePlacementModifier; import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.OreConfiguredFeatures; import net.minecraft.world.gen.feature.OreFeatureConfig; import net.minecraft.world.gen.feature.PlacedFeature; +import net.minecraft.world.gen.placementmodifier.CountPlacementModifier; +import net.minecraft.world.gen.placementmodifier.HeightRangePlacementModifier; +import net.minecraft.world.gen.placementmodifier.SquarePlacementModifier; public class AsbestosRegistry { // block/item definitions @@ -77,15 +80,16 @@ public class AsbestosRegistry { new Item.Settings().group(ItemGroup.COMBAT)); // serpentinite worldgen - - private static ConfiguredFeature SERPENTINITE_OVERWORLD = Feature.ORE - .configure(new OreFeatureConfig(OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES, + private static ConfiguredFeature SERPENTINITE_OVERWORLD = new ConfiguredFeature>( + Feature.ORE, new OreFeatureConfig(OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES, SERPENTINITE_BLOCK.getDefaultState(), 5)); - public static PlacedFeature SERPENTINITE_PLACED_FEATURE = SERPENTINITE_OVERWORLD.withPlacement( - CountPlacementModifier.of(20), - SquarePlacementModifier.of(), - HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(0))); + public static PlacedFeature SERPENTINITE_PLACED_FEATURE = new PlacedFeature( + RegistryEntry.of(SERPENTINITE_OVERWORLD), + Arrays.asList( + CountPlacementModifier.of(20), + SquarePlacementModifier.of(), + HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(0)))); public static void register() { // asbestos fibers item diff --git a/src/main/java/dev/agatharose/asbestos/item/ScraperItem.java b/src/main/java/dev/agatharose/asbestos/item/ScraperItem.java index a6983ed..436962a 100644 --- a/src/main/java/dev/agatharose/asbestos/item/ScraperItem.java +++ b/src/main/java/dev/agatharose/asbestos/item/ScraperItem.java @@ -1,21 +1,16 @@ package dev.agatharose.asbestos.item; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - -import static dev.agatharose.asbestos.AsbestosRegistry.*; import net.minecraft.block.Block; import net.minecraft.item.MiningToolItem; import net.minecraft.item.ToolMaterial; -import net.minecraft.tag.Tag; +import net.minecraft.tag.TagKey; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; public class ScraperItem extends MiningToolItem { - - private static Set affectedBlocks = new HashSet( - Arrays.asList(ASBESTOS_BLOCK, POPCORN_CEILING_BLOCK, ASBESTOS_TILE_BLOCK)); + private static TagKey affectedBlocks = TagKey.of(Registry.BLOCK_KEY, new Identifier("asbestos", "scrapable")); public ScraperItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) { - super(attackDamage, attackSpeed, material, Tag.of(affectedBlocks), settings); + super(attackDamage, attackSpeed, material, affectedBlocks, settings); } } \ No newline at end of file diff --git a/src/main/resources/data/asbestos/tags/blocks/scrapable.json b/src/main/resources/data/asbestos/tags/blocks/scrapable.json new file mode 100644 index 0000000..94940af --- /dev/null +++ b/src/main/resources/data/asbestos/tags/blocks/scrapable.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "asbestos:asbestos_block", + "asbestos:popcorn_ceiling_block", + "asbestos:asbestos_tile_block" + ] +} \ No newline at end of file