sorceress/Asbestos
sorceress
/
Asbestos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1.18.2

This commit is contained in:
Agatha Lovelace 2022-04-04 19:03:03 +02:00
parent 499bdd39db
commit ce0783ca80
Signed by: sorceress
GPG Key ID: 11BBCFC65FC9F401
4 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gradle.properties
View File

@ -3,18 +3,18 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
minecraft_version=1.18.1 minecraft_version=1.18.2
yarn_mappings=1.18.1+build.5 yarn_mappings=1.18.2+build.2
loader_version=0.12.12 loader_version=0.13.3
# Mod Properties # Mod Properties
mod_version = 1.2 mod_version = 1.2.1
maven_group = dev.agatharose maven_group = dev.agatharose
archives_base_name = asbestos archives_base_name = asbestos
# Dependencies # Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api # 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 fabric_version=0.48.0+1.18.2
modmenu_version=3.0.1 modmenu_version=3.1.0
cca_version=4.0.1 cca_version=4.0.1
cloth_version=6.1.48 cloth_version=6.2.57

24
src/main/java/dev/agatharose/asbestos/AsbestosRegistry.java
View File

@ -1,5 +1,7 @@
package dev.agatharose.asbestos; package dev.agatharose.asbestos;
import java.util.Arrays;
import dev.agatharose.asbestos.block.AsbestosRoofBlock; import dev.agatharose.asbestos.block.AsbestosRoofBlock;
import dev.agatharose.asbestos.block.CarcinogenicBlock; import dev.agatharose.asbestos.block.CarcinogenicBlock;
import dev.agatharose.asbestos.item.PpeArmorMaterial; import dev.agatharose.asbestos.item.PpeArmorMaterial;
@ -24,17 +26,18 @@ import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.BuiltinRegistries;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import net.minecraft.util.registry.RegistryEntry;
import net.minecraft.util.registry.RegistryKey; import net.minecraft.util.registry.RegistryKey;
import net.minecraft.world.gen.GenerationStep; import net.minecraft.world.gen.GenerationStep;
import net.minecraft.world.gen.YOffset; 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.ConfiguredFeature;
import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.OreConfiguredFeatures; import net.minecraft.world.gen.feature.OreConfiguredFeatures;
import net.minecraft.world.gen.feature.OreFeatureConfig; import net.minecraft.world.gen.feature.OreFeatureConfig;
import net.minecraft.world.gen.feature.PlacedFeature; 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 { public class AsbestosRegistry {
// block/item definitions // block/item definitions
@ -77,15 +80,16 @@ public class AsbestosRegistry {
new Item.Settings().group(ItemGroup.COMBAT)); new Item.Settings().group(ItemGroup.COMBAT));
// serpentinite worldgen // serpentinite worldgen
private static ConfiguredFeature<?, ?> SERPENTINITE_OVERWORLD = new ConfiguredFeature<OreFeatureConfig, Feature<OreFeatureConfig>>(
private static ConfiguredFeature<?, ?> SERPENTINITE_OVERWORLD = Feature.ORE Feature.ORE, new OreFeatureConfig(OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
.configure(new OreFeatureConfig(OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
SERPENTINITE_BLOCK.getDefaultState(), 5)); SERPENTINITE_BLOCK.getDefaultState(), 5));
public static PlacedFeature SERPENTINITE_PLACED_FEATURE = SERPENTINITE_OVERWORLD.withPlacement( public static PlacedFeature SERPENTINITE_PLACED_FEATURE = new PlacedFeature(
CountPlacementModifier.of(20), RegistryEntry.of(SERPENTINITE_OVERWORLD),
SquarePlacementModifier.of(), Arrays.asList(
HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(0))); CountPlacementModifier.of(20),
SquarePlacementModifier.of(),
HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(0))));
public static void register() { public static void register() {
// asbestos fibers item // asbestos fibers item

15
src/main/java/dev/agatharose/asbestos/item/ScraperItem.java
View File

@ -1,21 +1,16 @@
package dev.agatharose.asbestos.item; 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.block.Block;
import net.minecraft.item.MiningToolItem; import net.minecraft.item.MiningToolItem;
import net.minecraft.item.ToolMaterial; 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 { public class ScraperItem extends MiningToolItem {
private static TagKey<Block> affectedBlocks = TagKey.of(Registry.BLOCK_KEY, new Identifier("asbestos", "scrapable"));
private static Set<Block> affectedBlocks = new HashSet<Block>(
Arrays.asList(ASBESTOS_BLOCK, POPCORN_CEILING_BLOCK, ASBESTOS_TILE_BLOCK));
public ScraperItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) { public ScraperItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) {
super(attackDamage, attackSpeed, material, Tag.of(affectedBlocks), settings); super(attackDamage, attackSpeed, material, affectedBlocks, settings);
} }
} }

8
src/main/resources/data/asbestos/tags/blocks/scrapable.json Normal file
View File

@ -0,0 +1,8 @@
{
"replace": false,
"values": [
"asbestos:asbestos_block",
"asbestos:popcorn_ceiling_block",
"asbestos:asbestos_tile_block"
]
}