advancements

CHANGELOG

@@ -1,28 +1,28 @@
 # Changes:
-## 1.18.2-0.1.0-unstable
+## 1.18.1-1.0.1-unstable
-- changed dependencies for update to 1.18.2
+- first test and register to Strong bow (name not decided yet)
-- still have "errors" in code, not sure how to fix
+- praying to god i did nothing wrong
-- ore gen works perfectly (checked) even with errors
-- created CHANGELOG file for version branch
-- have crippling depression
-- man, updating is a bitch
 
-## 1.18.2-1.0.0-stable
+## 1.18.1-1.0.2-unstable
-- for all i care this shit looks stable to me
+- added model predicate provider
+- changed bow maxDamage to 458 from 19 (found ot it wasnt attack damage)
+- registered model predicate provider in client initializer
+- figuring out new stuff is painful
 
-## 1.18.2-1.1.0-stable
+## 1.18.1-1.1.0-stable
-- ported gamer bow to 1.18.2
+- renamed strong bow to Gamer Bow
+- added textures for Gamer Bow
+- added crafting recipe for Gamer Bow
+- fully implemented Gamer Bow
 
-## 1.18.2-1.1.1-unstable
+## 1.18.1-1.1.1-unstable
 - fixed weem stacking to 85 (maybe)
 - nerfed high effect
 
-## 1.18.2-1.1.2-unstable
+## 1.18.1-1.1.2-unstable
 - added healing back to high effect with lower amplifier
 - changed block strength of all (non joke) blocks
 
-## 1.18.2-1.1.3-unstable (incomplete)
+## 1.18.1-1.1.3-unstable (incomplete)
 - added evade enchantment
-- added more advancements
+- added more advancements
-- added weem hay bale
-- rearranged block files

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.11-SNAPSHOT'
+	id 'fabric-loom' version '0.10-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -16,6 +16,7 @@ repositories {
 	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
 	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
 	// for more information about repositories.
+	allprojects { repositories { maven { url 'https://jitpack.io' } } }
 }
 
 dependencies {

gradle.properties

@@ -1,16 +1,16 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx6G
+org.gradle.jvmargs=-Xmx4G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.18.2
+	minecraft_version=1.18.1
-	yarn_mappings=1.18.2+build.3
+	yarn_mappings=1.18.1+build.1
-	loader_version=0.13.2
+	loader_version=0.12.12
 
 # Mod Properties
-	mod_version = 1.18.2-1.1.2-unstable
+	mod_version = 1.18.1-1.1.2-unstable
 	maven_group = ryantlg.GamerItems.mod
 	archives_base_name = GamerItems
 
 # Dependencies
-	fabric_version=0.51.1+1.18.2
+	fabric_version=0.46.0+1.18

src/main/java/net/arcmods/ryantlg/BlockTags.java

@@ -1,10 +1,10 @@
 package net.arcmods.ryantlg;
 
+import net.fabricmc.fabric.api.tag.TagFactory;
 import net.minecraft.block.Block;
-import net.minecraft.tag.TagKey;
+import net.minecraft.tag.Tag;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
  
 public class BlockTags {
-  public static final TagKey<Block> ORES = TagKey.of(Registry.BLOCK_KEY, new Identifier("gameritems", "ores"));
+  public static final Tag<Block> ORES = TagFactory.BLOCK.create(new Identifier("gameritems", "ores"));
 }

src/main/java/net/arcmods/ryantlg/blocks/CropBlocks.java

@@ -0,0 +1,21 @@
+package net.arcmods.ryantlg.blocks;
+
+import net.arcmods.ryantlg.gameritems;
+import net.arcmods.ryantlg.blockClasses.WeemCropBlock;
+import net.minecraft.block.AbstractBlock;
+import net.minecraft.block.CropBlock;
+import net.minecraft.block.Material;
+import net.minecraft.sound.BlockSoundGroup;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+public class CropBlocks {
+    public static final CropBlock WEEM_CROP_BLOCK = new WeemCropBlock(AbstractBlock.Settings.of(Material.PLANT).nonOpaque().noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP));
+
+    public static void register() {
+
+        Registry.register(Registry.BLOCK, new Identifier("gameritems","weem_crop_block"), WEEM_CROP_BLOCK);
+
+        gameritems.LOGGER.info("CropBlocks loaded");
+    }
+}

src/main/java/net/arcmods/ryantlg/blocks/FunnyBlocks.java

@@ -1,4 +1,4 @@
-package net.arcmods.ryantlg.blocks.otherBlocks;
+package net.arcmods.ryantlg.blocks;
 
 import net.arcmods.ryantlg.gameritems;
 import net.arcmods.ryantlg.blockClasses.Damon;

src/main/java/net/arcmods/ryantlg/blocks/cropBlocks/weemCrop.java

@@ -1,31 +0,0 @@
-package net.arcmods.ryantlg.blocks.cropBlocks;
-
-import net.arcmods.ryantlg.gameritems;
-import net.arcmods.ryantlg.blockClasses.WeemCropBlock;
-import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
-import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
-import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
-import net.minecraft.block.AbstractBlock;
-import net.minecraft.block.Block;
-import net.minecraft.block.CropBlock;
-import net.minecraft.block.Material;
-import net.minecraft.block.PillarBlock;
-import net.minecraft.item.BlockItem;
-import net.minecraft.sound.BlockSoundGroup;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
-
-public class weemCrop {
-    public static final CropBlock WEEM_CROP_BLOCK = new WeemCropBlock(AbstractBlock.Settings.of(Material.PLANT).nonOpaque().noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP));
-    public static final Block WEEM_HAY_BLOCK = new PillarBlock(FabricBlockSettings.of(Material.SOLID_ORGANIC).nonOpaque().strength(1, 1).sounds(BlockSoundGroup.GRASS));
-
-    public static void register() {
-
-        Registry.register(Registry.BLOCK, new Identifier("gameritems","weem_crop_block"), WEEM_CROP_BLOCK);
-        Registry.register(Registry.BLOCK, new Identifier("gameritems", "weem_hay_block"), WEEM_HAY_BLOCK);
-        Registry.register(Registry.ITEM, new Identifier("gameritems", "weem_hay_block"), new BlockItem(WEEM_HAY_BLOCK, new FabricItemSettings().group(gameritems.CHING)));
-        FlammableBlockRegistry.getDefaultInstance().add(WEEM_HAY_BLOCK, 60, 20);
-
-        gameritems.LOGGER.info("CropBlocks loaded");
-    }
-}

src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java

@@ -1,4 +1,4 @@
-package net.arcmods.ryantlg.blocks.metalBlocks;
+package net.arcmods.ryantlg.blocks;
 
 import net.arcmods.ryantlg.gameritems;
 import net.arcmods.ryantlg.blockClasses.jeremiumBlock;

src/main/java/net/arcmods/ryantlg/blocks/omniumBlocks.java

@@ -1,4 +1,4 @@
-package net.arcmods.ryantlg.blocks.metalBlocks;
+package net.arcmods.ryantlg.blocks;
 
 import net.arcmods.ryantlg.gameritems;
 import net.fabricmc.fabric.api.item.v1.FabricItemSettings;

src/main/java/net/arcmods/ryantlg/blocks/oriumBlocks.java

@@ -1,4 +1,4 @@
-package net.arcmods.ryantlg.blocks.metalBlocks;
+package net.arcmods.ryantlg.blocks;
 
 import net.arcmods.ryantlg.gameritems;
 import net.arcmods.ryantlg.blockClasses.oriumBlock;

src/main/java/net/arcmods/ryantlg/gameritems.java

@@ -1,10 +1,10 @@
 package net.arcmods.ryantlg;
 
-import net.arcmods.ryantlg.blocks.cropBlocks.weemCrop;
+import net.arcmods.ryantlg.blocks.CropBlocks;
-import net.arcmods.ryantlg.blocks.metalBlocks.jeremiumBlocks;
+import net.arcmods.ryantlg.blocks.FunnyBlocks;
-import net.arcmods.ryantlg.blocks.metalBlocks.omniumBlocks;
+import net.arcmods.ryantlg.blocks.jeremiumBlocks;
-import net.arcmods.ryantlg.blocks.metalBlocks.oriumBlocks;
+import net.arcmods.ryantlg.blocks.omniumBlocks;
-import net.arcmods.ryantlg.blocks.otherBlocks.FunnyBlocks;
+import net.arcmods.ryantlg.blocks.oriumBlocks;
 import net.arcmods.ryantlg.enchantments.evadeEnchantment;
 import net.arcmods.ryantlg.items.armour.jeremiumArmour;
 import net.arcmods.ryantlg.items.armour.notArmour;
@@ -86,7 +86,7 @@ public class gameritems implements ModInitializer {
 		OriumOreGen.register();
 		DeepslateOriumOreGen.register();
 
-		weemCrop.register();
+		CropBlocks.register();
 
 		fabricOfReality.register();
 

src/main/java/net/arcmods/ryantlg/gameritemsClient.java

@@ -1,6 +1,6 @@
 package net.arcmods.ryantlg;
 
-import net.arcmods.ryantlg.blocks.cropBlocks.weemCrop;
+import net.arcmods.ryantlg.blocks.CropBlocks;
 import net.arcmods.ryantlg.utils.bowModelPredicateProvider;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
@@ -13,7 +13,7 @@ public class gameritemsClient implements ClientModInitializer{
 
     @Override
     public void onInitializeClient() {
-        BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), weemCrop.WEEM_CROP_BLOCK);
+        BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), CropBlocks.WEEM_CROP_BLOCK);
 
         bowModelPredicateProvider.registerBowModels();
 

src/main/java/net/arcmods/ryantlg/items/itemsByCrop/weemItems.java

@@ -1,7 +1,7 @@
 package net.arcmods.ryantlg.items.itemsByCrop;
 
 import net.arcmods.ryantlg.gameritems;
-import net.arcmods.ryantlg.blocks.cropBlocks.weemCrop;
+import net.arcmods.ryantlg.blocks.CropBlocks;
 import net.arcmods.ryantlg.itemClasses.BreemItem;
 import net.arcmods.ryantlg.itemClasses.WeemItem;
 import net.arcmods.ryantlg.statusEffects.GamerEffects;
@@ -56,13 +56,14 @@ public class weemItems {
 
 //seeds
 //================================================================================================================
-    public static final Item WEEM_SEEDS = new AliasedBlockItem(weemCrop.WEEM_CROP_BLOCK, new Item.Settings().group(gameritems.CHING));
+    public static final Item WEEM_SEEDS = new AliasedBlockItem(CropBlocks.WEEM_CROP_BLOCK, new Item.Settings().group(gameritems.CHING));
 
 
     public static void register() {
 
         Registry.register(Registry.ITEM, new Identifier("gameritems", "breem"), BREEM);
         Registry.register(Registry.ITEM, new Identifier("gameritems", "weem_apple"), WEEM_APPLE);
+
         Registry.register(Registry.ITEM, new Identifier("gameritems","weem_seeds"), WEEM_SEEDS);
         Registry.register(Registry.ITEM, new Identifier("gameritems", "weem"), WEEM);
 

src/main/java/net/arcmods/ryantlg/lootTables/grassVanillaWeem.java

@@ -22,7 +22,7 @@ public class grassVanillaWeem {
                 .rolls(ConstantLootNumberProvider.create(1))
                 .with(ItemEntry.builder(weemItems.WEEM_SEEDS))
                 .withFunction(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0f)).build())
-                .conditionally(RandomChanceLootCondition.builder(0.0123132f));
+                .conditionally(RandomChanceLootCondition.builder(0.04f));
                 supplier.withPool(weemSeed.build());
 
             }

src/main/java/net/arcmods/ryantlg/todo.txt

@@ -5,6 +5,4 @@ advancements
 argentine
 geranine
 soulium
-floute
+floute
-
-port to 1.18.1 when busyn't

src/main/java/net/arcmods/ryantlg/utils/bowModelPredicateProvider.java

@@ -1,7 +1,7 @@
 package net.arcmods.ryantlg.utils;
 
 import net.arcmods.ryantlg.items.bows.gamerBow;
-import net.minecraft.client.item.ModelPredicateProviderRegistry;
+import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
 import net.minecraft.item.Item;
 import net.minecraft.util.Identifier;
 
@@ -12,7 +12,7 @@ public class bowModelPredicateProvider {
     }
 
     private static void registerBow(Item bow) {
-        ModelPredicateProviderRegistry.register(bow, new Identifier("pull"),
+        FabricModelPredicateProviderRegistry.register(bow, new Identifier("pull"),
                 (stack, world, entity, seed) -> {
                     if (entity == null) {
                         return 0.0f;
@@ -23,7 +23,7 @@ public class bowModelPredicateProvider {
                     return (float)(stack.getMaxUseTime() - entity.getItemUseTimeLeft()) / 20.0f;
                 });
 
-        ModelPredicateProviderRegistry.register(bow, new Identifier("pulling"),
+        FabricModelPredicateProviderRegistry.register(bow, new Identifier("pulling"),
                 (stack, world, entity, seed) -> entity != null && entity.isUsingItem()
                         && entity.getActiveItem() == stack ? 1.0f : 0.0f);
     }

src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOmniumOreGen.java

@@ -1,51 +1,35 @@
 package net.arcmods.ryantlg.worldGeneration;
 
-import java.util.Arrays;
-
 import net.arcmods.ryantlg.gameritems;
-import net.arcmods.ryantlg.blocks.metalBlocks.omniumBlocks;
+import net.arcmods.ryantlg.blocks.omniumBlocks;
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
 import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
 import net.minecraft.util.registry.RegistryKey;
 import net.minecraft.world.gen.YOffset;
 import net.minecraft.world.gen.GenerationStep;
+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;
 import net.minecraft.util.registry.BuiltinRegistries;
 import net.minecraft.util.registry.Registry;
-import net.minecraft.util.registry.RegistryEntry;
 import net.minecraft.util.Identifier;
 
 public class DeepslateOmniumOreGen {
 
-    /*private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
+    private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
           OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
           omniumBlocks.DEEPSLATE_OMNIUM_ORE.getDefaultState(),
-          4)); // vein size*/
+          4)); // vein size
-	private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = new ConfiguredFeature(
-		Feature.ORE, new OreFeatureConfig(
-			OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
-			omniumBlocks.DEEPSLATE_OMNIUM_ORE.getDefaultState(),
-			4)); // vein size
  
-  	/*public static PlacedFeature ORE_PLACED_FEATURE = ORE_CONFIGURED_FEATURE.withPlacement(
+  	public static PlacedFeature ORE_PLACED_FEATURE = ORE_CONFIGURED_FEATURE.withPlacement(
       	CountPlacementModifier.of(2), // number of veins per chunk
       	SquarePlacementModifier.of(), // spreading horizontally
-      	HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(19))); // height*/
+      	HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(19))); // height
-
-	public static PlacedFeature ORE_PLACED_FEATURE = new PlacedFeature(
-		RegistryEntry.of(ORE_CONFIGURED_FEATURE),
-		Arrays.asList(
-			CountPlacementModifier.of(2), // number of veins per chunk
-			SquarePlacementModifier.of(), // spreading horizontally
-			HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(19))
-		)); // height
  
     
 
@@ -53,11 +37,11 @@ public class DeepslateOmniumOreGen {
 		
         Registry.register(BuiltinRegistries.CONFIGURED_FEATURE,
         new Identifier("gameritems", "deepslate_omnium_ore"), ORE_CONFIGURED_FEATURE);
-    Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gameritems", "deepslate_omnium_ore"),
+    	Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gameritems", "deepslate_omnium_ore"),
-        ORE_PLACED_FEATURE);
+        	ORE_PLACED_FEATURE);
-    BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES,
+    	BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES,
-        RegistryKey.of(Registry.PLACED_FEATURE_KEY,
+        	RegistryKey.of(Registry.PLACED_FEATURE_KEY,
-            new Identifier("gameritems", "deepslate_omnium_ore")));
+            	new Identifier("gameritems", "deepslate_omnium_ore")));
 		
 		gameritems.LOGGER.info("DeepslateOmniumOreGen loaded");
     }

src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOriumOreGen.java

@@ -1,52 +1,36 @@
 package net.arcmods.ryantlg.worldGeneration;
 
-import java.util.Arrays;
-
 import net.arcmods.ryantlg.gameritems;
-import net.arcmods.ryantlg.blocks.metalBlocks.oriumBlocks;
+import net.arcmods.ryantlg.blocks.oriumBlocks;
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
 import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
 import net.minecraft.util.registry.RegistryKey;
 import net.minecraft.world.gen.YOffset;
 import net.minecraft.world.gen.GenerationStep;
+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;
 import net.minecraft.util.registry.BuiltinRegistries;
 import net.minecraft.util.registry.Registry;
-import net.minecraft.util.registry.RegistryEntry;
 import net.minecraft.util.Identifier;
 
 public class DeepslateOriumOreGen {
 
-    // private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
+    private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
-    //       OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
+          OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
-    //       oriumBlocks.DEEPSLATE_ORIUM_ORE.getDefaultState(),
+          oriumBlocks.DEEPSLATE_ORIUM_ORE.getDefaultState(),
-    //       5)); // vein size
+          5)); // vein size
-
+ 
-	private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = new ConfiguredFeature(
+  	public static PlacedFeature ORE_PLACED_FEATURE = ORE_CONFIGURED_FEATURE.withPlacement(
-		Feature.ORE, new OreFeatureConfig(
+      	CountPlacementModifier.of(5), // number of veins per chunk
-			OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
+      	SquarePlacementModifier.of(), // spreading horizontally
-			oriumBlocks.DEEPSLATE_ORIUM_ORE.getDefaultState(),
+      	HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(35))); // height
-			5)); // vein size
  
-  	// public static PlacedFeature ORE_PLACED_FEATURE = ORE_CONFIGURED_FEATURE.withPlacement(
-    //   	CountPlacementModifier.of(5), // number of veins per chunk
-    //   	SquarePlacementModifier.of(), // spreading horizontally
-    //   	HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(35))); // height
-	
-	public static PlacedFeature ORE_PLACED_FEATURE = new PlacedFeature(
-		RegistryEntry.of(ORE_CONFIGURED_FEATURE),
-		Arrays.asList(
-			CountPlacementModifier.of(5), // number of veins per chunk
-			SquarePlacementModifier.of(), // spreading horizontally
-			HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(35))
-		)); // height
     
 
     public static void register() {

src/main/java/net/arcmods/ryantlg/worldGeneration/JeremiumOreGen.java

@@ -1,55 +1,41 @@
 package net.arcmods.ryantlg.worldGeneration;
 
-import java.util.Arrays;
-
 import net.arcmods.ryantlg.gameritems;
-import net.arcmods.ryantlg.blocks.metalBlocks.jeremiumBlocks;
+import net.arcmods.ryantlg.blocks.jeremiumBlocks;
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
 import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
 import net.minecraft.util.registry.RegistryKey;
 import net.minecraft.world.gen.YOffset;
 import net.minecraft.world.gen.GenerationStep;
+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;
 import net.minecraft.util.registry.BuiltinRegistries;
 import net.minecraft.util.registry.Registry;
-import net.minecraft.util.registry.RegistryEntry;
 import net.minecraft.util.Identifier;
 
 public class JeremiumOreGen {
 
-    // private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
+    private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
-    //       OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
+          OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
-    //       jeremiumBlocks.DEEPSLATE_JEREMIUM_ORE.getDefaultState(),
+          jeremiumBlocks.DEEPSLATE_JEREMIUM_ORE.getDefaultState(),
-    //       3)); // vein size
+          3)); // vein size
-
-	private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = new ConfiguredFeature(
-		Feature.ORE, new OreFeatureConfig(
-			OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
-			jeremiumBlocks.DEEPSLATE_JEREMIUM_ORE.getDefaultState(),
-			3)); // vein size
  
-  	// public static PlacedFeature ORE_PLACED_FEATURE = ORE_CONFIGURED_FEATURE.withPlacement(
+  	public static PlacedFeature ORE_PLACED_FEATURE = ORE_CONFIGURED_FEATURE.withPlacement(
-    //   	CountPlacementModifier.of(1), // number of veins per chunk
+      	CountPlacementModifier.of(1), // number of veins per chunk
-    //   	SquarePlacementModifier.of(), // spreading horizontally
+      	SquarePlacementModifier.of(), // spreading horizontally
-    //   	HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(-4))); // height
+      	HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(-4))); // height
-	
+ 
-	public static PlacedFeature ORE_PLACED_FEATURE = new PlacedFeature(
+    
-		RegistryEntry.of(ORE_CONFIGURED_FEATURE),
-		Arrays.asList(
-			CountPlacementModifier.of(1), // number of veins per chunk
-			SquarePlacementModifier.of(), // spreading horizontally
-			HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(-4))
-		)); // height
 
     public static void register() {
 		
+
         Registry.register(BuiltinRegistries.CONFIGURED_FEATURE,
         new Identifier("gameritems", "deepslate_jeremium_ore"), ORE_CONFIGURED_FEATURE);
     	Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gameritems", "deepslate_jeremium_ore"),

src/main/java/net/arcmods/ryantlg/worldGeneration/OmniumOreGen.java

@@ -1,60 +1,44 @@
 package net.arcmods.ryantlg.worldGeneration;
 
-import java.util.Arrays;
-
 import net.arcmods.ryantlg.gameritems;
-import net.arcmods.ryantlg.blocks.metalBlocks.omniumBlocks;
+import net.arcmods.ryantlg.blocks.omniumBlocks;
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
 import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
 import net.minecraft.util.registry.RegistryKey;
 import net.minecraft.world.gen.YOffset;
 import net.minecraft.world.gen.GenerationStep;
+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;
 import net.minecraft.util.registry.BuiltinRegistries;
 import net.minecraft.util.registry.Registry;
-import net.minecraft.util.registry.RegistryEntry;
 import net.minecraft.util.Identifier;
 
 public class OmniumOreGen {
 
-    // private static ConfiguredFeature<?, ?> OMNIUM_ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
+    private static ConfiguredFeature<?, ?> OMNIUM_ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
-    //       OreConfiguredFeatures.STONE_ORE_REPLACEABLES,
+          OreConfiguredFeatures.STONE_ORE_REPLACEABLES,
-    //       omniumBlocks.OMNIUM_ORE.getDefaultState(),
+          omniumBlocks.OMNIUM_ORE.getDefaultState(),
-    //       4)); // vein size
+          4)); // vein size
-
-	private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = new ConfiguredFeature(
-		Feature.ORE, new OreFeatureConfig(
-			OreConfiguredFeatures.STONE_ORE_REPLACEABLES,
-			omniumBlocks.OMNIUM_ORE.getDefaultState(),
-			4)); // vein size
  
-  	// public static PlacedFeature OMNIUM_ORE_PLACED_FEATURE = OMNIUM_ORE_CONFIGURED_FEATURE.withPlacement(
+  	public static PlacedFeature OMNIUM_ORE_PLACED_FEATURE = OMNIUM_ORE_CONFIGURED_FEATURE.withPlacement(
-    //   	CountPlacementModifier.of(2), // number of veins per chunk
+      	CountPlacementModifier.of(2), // number of veins per chunk
-    //   	SquarePlacementModifier.of(), // spreading horizontally
+      	SquarePlacementModifier.of(), // spreading horizontally
-    //   	HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(19))); // height
+      	HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(19))); // height
  
-	public static PlacedFeature ORE_PLACED_FEATURE = new PlacedFeature(
-		RegistryEntry.of(ORE_CONFIGURED_FEATURE),
-		Arrays.asList(
-			CountPlacementModifier.of(2), // number of veins per chunk
-			SquarePlacementModifier.of(), // spreading horizontally
-			HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(19))
-		)); // height
     
 
     public static void register() {
 
         Registry.register(BuiltinRegistries.CONFIGURED_FEATURE,
-        new Identifier("gameritems", "omnium_ore"), ORE_CONFIGURED_FEATURE);
+        new Identifier("gameritems", "omnium_ore"), OMNIUM_ORE_CONFIGURED_FEATURE);
     	Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gameritems", "omnium_ore"),
-        	ORE_PLACED_FEATURE);
+        	OMNIUM_ORE_PLACED_FEATURE);
     	BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES,
         	RegistryKey.of(Registry.PLACED_FEATURE_KEY,
             	new Identifier("gameritems", "omnium_ore")));

src/main/java/net/arcmods/ryantlg/worldGeneration/OriumOreGen.java

@@ -1,59 +1,44 @@
 package net.arcmods.ryantlg.worldGeneration;
 
-import java.util.Arrays;
-
 import net.arcmods.ryantlg.gameritems;
-import net.arcmods.ryantlg.blocks.metalBlocks.oriumBlocks;
+import net.arcmods.ryantlg.blocks.oriumBlocks;
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
 import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
 import net.minecraft.util.registry.RegistryKey;
 import net.minecraft.world.gen.YOffset;
 import net.minecraft.world.gen.GenerationStep;
+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;
 import net.minecraft.util.registry.BuiltinRegistries;
 import net.minecraft.util.registry.Registry;
-import net.minecraft.util.registry.RegistryEntry;
 import net.minecraft.util.Identifier;
 
 public class OriumOreGen {
 
-    // private static ConfiguredFeature<?, ?> ORIUM_ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
+    private static ConfiguredFeature<?, ?> ORIUM_ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
-    //       OreConfiguredFeatures.STONE_ORE_REPLACEABLES,
+          OreConfiguredFeatures.STONE_ORE_REPLACEABLES,
-    //       oriumBlocks.ORIUM_ORE.getDefaultState(),
+          oriumBlocks.ORIUM_ORE.getDefaultState(),
-    //       5)); // vein size
+          5)); // vein size
-
-	private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = new ConfiguredFeature(
-		Feature.ORE, new OreFeatureConfig(
-			OreConfiguredFeatures.STONE_ORE_REPLACEABLES,
-			oriumBlocks.ORIUM_ORE.getDefaultState(),
-			5)); // vein size
  
-  	// public static PlacedFeature ORIUM_ORE_PLACED_FEATURE = ORIUM_ORE_CONFIGURED_FEATURE.withPlacement(
+  	public static PlacedFeature ORIUM_ORE_PLACED_FEATURE = ORIUM_ORE_CONFIGURED_FEATURE.withPlacement(
-    //   	CountPlacementModifier.of(5), // number of veins per chunk
+      	CountPlacementModifier.of(5), // number of veins per chunk
-    //   	SquarePlacementModifier.of(), // spreading horizontally
+      	SquarePlacementModifier.of(), // spreading horizontally
-    //   	HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(35))); // height
+      	HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(35))); // height
-	
+ 
-    public static PlacedFeature ORE_PLACED_FEATURE = new PlacedFeature(
+    
-		RegistryEntry.of(ORE_CONFIGURED_FEATURE),
-		Arrays.asList(
-			CountPlacementModifier.of(5), // number of veins per chunk
-			SquarePlacementModifier.of(), // spreading horizontally
-			HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(35))
-		)); // height
 
     public static void register() {
 
         Registry.register(BuiltinRegistries.CONFIGURED_FEATURE,
-        new Identifier("gameritems", "orium_ore"), ORE_CONFIGURED_FEATURE);
+        new Identifier("gameritems", "orium_ore"), ORIUM_ORE_CONFIGURED_FEATURE);
     	Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gameritems", "orium_ore"),
-        	ORE_PLACED_FEATURE);
+        	ORIUM_ORE_PLACED_FEATURE);
     	BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES,
         	RegistryKey.of(Registry.PLACED_FEATURE_KEY,
             	new Identifier("gameritems", "orium_ore")));

src/main/resources/assets/gameritems/blockstates/weem_hay_block.json

@@ -1,16 +0,0 @@
-{
-    "variants": {
-      "axis=y": {
-        "model": "gameritems:block/weem_hay_block"
-      },
-      "axis=z": {
-        "model": "gameritems:block/weem_hay_block",
-        "x": 90
-      },
-      "axis=x": {
-        "model": "gameritems:block/weem_hay_block",
-        "x": 90,
-        "y": 90
-      }
-    }
-  }

src/main/resources/assets/gameritems/lang/en_us.json

@@ -70,7 +70,6 @@
     "block.gameritems.deepslate_omnium_ore": "Deepslate Omnium Ore",
     "block.gameritems.deepslate_orium_ore": "Deepslate Orium Ore",
     "item.gameritems.gamer_bow": "Gamer Bow",
-    "enchantment.gameritems.evade": "Evade",
+    "enchantment.gameritems.evade": "Evade"
-    "block.gameritems.weem_hay_block": "Weem Hay Bale"
 
 } 

src/main/resources/assets/gameritems/models/block/weem_hay_block.json

@@ -1,7 +0,0 @@
-{
-    "parent": "minecraft:block/cube_column",
-    "textures": {
-      "end": "gameritems:block/weem_block_top",
-      "side": "gameritems:block/weem_block_side"
-    }
-  }

src/main/resources/assets/gameritems/models/block/weem_hay_block_horizontal.json

@@ -1,7 +0,0 @@
-{
-    "parent": "minecraft:block/cube_column_horizontal",
-    "textures": {
-      "end": "gameritems:block/weem_block_top",
-      "side": "gameritems:block/weem_block_side"
-    }
-  }

src/main/resources/assets/gameritems/models/item/weem_hay_block.json

@@ -1,3 +0,0 @@
-{
-    "parent": "gameritems:block/weem_hay_block"
-}

src/main/resources/fabric.mod.json

@@ -31,12 +31,12 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.13.2",
+    "fabricloader": ">=0.12.12",
     "fabric": "*",
-    "minecraft": "1.18.2",
+    "minecraft": "1.18.1",
     "java": ">=17"
   },
   "suggests": {
-    "darkevolution": "1.18.2-x"
+    "darkevolution": "1.18.1-x"
   }
 }