bones

CHANGELOG

@@ -1,14 +1,6 @@
 # Changes:
-## 1.18.2-0.1.0-unstable
+## 1.19-1.0.0-stable
-- changed dependencies for update to 1.18.2
+- updating is despicable
-- still have "errors" in code, not sure how to fix
-- 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.19-1.1.0-stable
-- for all i care this shit looks stable to me
+- fixed an issue where the game crashes when right clicking on weem, Matt Damon, Elon Musk
-
-## 1.18.2-1.1.0-stable
-- ported gamer bow to 1.18.2

build.gradle

@@ -26,6 +26,8 @@ dependencies {
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
+
 }
 
 processResources {

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx6G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.18.2
+	minecraft_version=1.19
-	yarn_mappings=1.18.2+build.3
+	yarn_mappings=1.19+build.4
-	loader_version=0.13.2
+	loader_version=0.14.8
 
 # Mod Properties
-	mod_version = 1.18.2-1.1.0-stable
+	mod_version = 1.19-1.1.0-stable
 	maven_group = ryantlg.GamerItems.mod
 	archives_base_name = GamerItems
 
 # Dependencies
-	fabric_version=0.51.1+1.18.2
+	fabric_version=0.57.0+1.19

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/net/arcmods/ryantlg/blockClasses/Damon.java

@@ -17,18 +17,4 @@ public class Damon extends Block{
         super(settings);
     }
 
-    @Override
-    public ActionResult onUse(BlockState blockState, World world, BlockPos blockPos, PlayerEntity placedBy, Hand hand, BlockHitResult blockHitResult) {
-        if (!world.isClient) {
-            world.playSound(
-                    null, // Player - if non-null, will play sound for every nearby player *except* the specified player
-                    blockPos, // The position of where the sound will come from
-                    sounds.MATT_SOUND_EVENT, // The sound that will play
-                    SoundCategory.BLOCKS, // This determines which of the volume sliders affect this sound
-                    1f, //Volume multiplier, 1 is normal, 0.5 is half volume, etc
-                    1f // Pitch multiplier, 1 is normal, 0.5 is half pitch, etc
-            );
-        }
-        return ActionResult.FAIL;
-    }
 }

src/main/java/net/arcmods/ryantlg/blockClasses/WeemCropBlock.java

@@ -40,21 +40,6 @@ public class WeemCropBlock extends CropBlock {
         return AGE_TO_SHAPE[(Integer)state.get(this.getAgeProperty())];
     }
 
-    @Override
-    public ActionResult onUse(BlockState blockState, World world, BlockPos blockPos, PlayerEntity placedBy, Hand hand, BlockHitResult blockHitResult) {
-        if (!world.isClient) {
-            world.playSound(
-                    null, // Player - if non-null, will play sound for every nearby player *except* the specified player
-                    blockPos, // The position of where the sound will come from
-                    sounds.SNIFF_SOUND_EVENT, // The sound that will play
-                    SoundCategory.BLOCKS, // This determines which of the volume sliders affect this sound
-                    1f, //Volume multiplier, 1 is normal, 0.5 is half volume, etc
-                    1f // Pitch multiplier, 1 is normal, 0.5 is half pitch, etc
-            );
-        }
-        return ActionResult.FAIL;
-        
-    }
 }
 
  

src/main/java/net/arcmods/ryantlg/blockClasses/elon.java

@@ -17,18 +17,4 @@ public class elon extends Block{
         super(settings);
     }
 
-    @Override
-    public ActionResult onUse(BlockState blockState, World world, BlockPos blockPos, PlayerEntity placedBy, Hand hand, BlockHitResult blockHitResult) {
-        if (!world.isClient) {
-            world.playSound(
-                    null, // Player - if non-null, will play sound for every nearby player *except* the specified player
-                    blockPos, // The position of where the sound will come from
-                    sounds.ELON_SOUND_EVENT, // The sound that will play
-                    SoundCategory.BLOCKS, // This determines which of the volume sliders affect this sound
-                    1f, //Volume multiplier, 1 is normal, 0.5 is half volume, etc
-                    1f // Pitch multiplier, 1 is normal, 0.5 is half pitch, etc
-            );
-        }
-        return ActionResult.FAIL;
-    }
 }

src/main/java/net/arcmods/ryantlg/blockClasses/jeremiumBlock.java

@@ -6,7 +6,7 @@ import net.minecraft.block.Block;
 import net.minecraft.client.item.TooltipContext;
 import net.minecraft.item.ItemStack;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
+
 import net.minecraft.util.Formatting;
 import net.minecraft.world.BlockView;
 
@@ -17,8 +17,8 @@ public class jeremiumBlock extends Block{
     }
     @Override
     public void appendTooltip(ItemStack itemStack, BlockView world, List<Text> tooltip, TooltipContext tooltipContext) {
-        tooltip.add( new TranslatableText("block.gameritems.jeremium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
+        tooltip.add(Text.translatable("block.gameritems.jeremium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
-        tooltip.add( new TranslatableText("all.gameritems.jeremium.tooltiptwo").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
+        tooltip.add(Text.translatable("all.gameritems.jeremium.tooltiptwo").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
     }
 
 }

src/main/java/net/arcmods/ryantlg/blockClasses/oriumBlock.java

@@ -6,7 +6,7 @@ import net.minecraft.block.Block;
 import net.minecraft.client.item.TooltipContext;
 import net.minecraft.item.ItemStack;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
+
 import net.minecraft.util.Formatting;
 import net.minecraft.world.BlockView;
 
@@ -17,6 +17,6 @@ public class oriumBlock extends Block{
     }
     @Override
     public void appendTooltip(ItemStack itemStack, BlockView world, List<Text> tooltip, TooltipContext tooltipContext) {
-        tooltip.add( new TranslatableText("block.gameritems.orium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
+        tooltip.add(Text.translatable("block.gameritems.orium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
     }
 }

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

@@ -1,21 +0,0 @@
-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/cropBlocks/weemCrop.java

@@ -0,0 +1,31 @@
+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/metalBlocks/jeremiumBlocks.java

@@ -1,4 +1,4 @@
-package net.arcmods.ryantlg.blocks;
+package net.arcmods.ryantlg.blocks.metalBlocks;
 
 import net.arcmods.ryantlg.gameritems;
 import net.arcmods.ryantlg.blockClasses.jeremiumBlock;
@@ -13,9 +13,9 @@ import net.minecraft.util.registry.Registry;
 
 public class jeremiumBlocks {
 
-    public static final Block JEREMIUM_BLOCK = new jeremiumBlock(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool().luminance(16));
+    public static final Block JEREMIUM_BLOCK = new jeremiumBlock(FabricBlockSettings.of(Material.METAL).strength(5.5f, 4.8f).requiresTool().luminance(16));
-    public static final Block JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().luminance(5));
+    public static final Block JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(6.5f, 8.0f).requiresTool().luminance(5));
-    public static final Block DEEPSLATE_JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().luminance(5).sounds(BlockSoundGroup.DEEPSLATE));
+    public static final Block DEEPSLATE_JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f, 4.2f).requiresTool().luminance(5).sounds(BlockSoundGroup.DEEPSLATE));
 
     public static void register() {
         Registry.register(Registry.BLOCK, new Identifier("gameritems", "jeremium_ore"), JEREMIUM_ORE);

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

@@ -1,4 +1,4 @@
-package net.arcmods.ryantlg.blocks;
+package net.arcmods.ryantlg.blocks.metalBlocks;
 
 import net.arcmods.ryantlg.gameritems;
 import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
@@ -11,9 +11,9 @@ import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
 public class omniumBlocks {
-    public static final Block OMNIUM_ORE           = new Block(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool());
+    public static final Block OMNIUM_ORE           = new Block(FabricBlockSettings.of(Material.STONE).strength(3.5f, 4.0f).requiresTool());
-	public static final Block OMNIUM_BLOCK         = new Block(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool());
+	public static final Block OMNIUM_BLOCK         = new Block(FabricBlockSettings.of(Material.METAL).strength(5.5f, 7f).requiresTool());
-    public static final Block DEEPSLATE_OMNIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE));
+    public static final Block DEEPSLATE_OMNIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(4.5f, 3.5f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE));
 
     public static void register() {
 

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

@@ -1,4 +1,4 @@
-package net.arcmods.ryantlg.blocks;
+package net.arcmods.ryantlg.blocks.metalBlocks;
 
 import net.arcmods.ryantlg.gameritems;
 import net.arcmods.ryantlg.blockClasses.oriumBlock;
@@ -13,9 +13,9 @@ import net.minecraft.util.Rarity;
 import net.minecraft.util.registry.Registry;
 
 public class oriumBlocks {
-    public static final Block ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool());
+    public static final Block ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(3.2f, 3.0f).requiresTool());
-	public static final Block ORIUM_BLOCK = new oriumBlock(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool());
+	public static final Block ORIUM_BLOCK = new oriumBlock(FabricBlockSettings.of(Material.METAL).strength(5.0f, 4.0F).requiresTool());
-    public static final Block DEEPSLATE_ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE));
+    public static final Block DEEPSLATE_ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(4.3f, 3.5f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE));
 
     public static void register() {
 

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

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

src/main/java/net/arcmods/ryantlg/customToolItemClasses/jeremium/JeremiumSwordItem.java

@@ -11,7 +11,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.item.SwordItem;
 import net.minecraft.item.ToolMaterial;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Formatting;
 import net.minecraft.world.World;
 
@@ -21,7 +20,7 @@ public class JeremiumSwordItem extends SwordItem {
     }
     @Override
     public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
-    tooltip.add( new TranslatableText("item.gameritems.jeremium_sword.tooltip").formatted(Formatting.DARK_PURPLE, Formatting.ITALIC) );
+        tooltip.add(Text.translatable("item.gameritems.jeremium_sword.tooltip").formatted(Formatting.DARK_PURPLE, Formatting.ITALIC) );
     }
 
     @Override

src/main/java/net/arcmods/ryantlg/customToolItemClasses/omnium/OmniumSwordItem.java

@@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.item.SwordItem;
 import net.minecraft.item.ToolMaterial;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Formatting;
 import net.minecraft.world.World;
 
@@ -17,6 +16,6 @@ public class OmniumSwordItem extends SwordItem {
     }
     @Override
     public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
-    tooltip.add( new TranslatableText("item.gameritems.omnium_sword.tooltip").formatted(Formatting.DARK_PURPLE, Formatting.ITALIC) );
+        tooltip.add(Text.translatable("item.gameritems.omnium_sword.tooltip").formatted(Formatting.RED) );
     }
 }

src/main/java/net/arcmods/ryantlg/enchantments/evadeEnchantment.java

@@ -0,0 +1,53 @@
+package net.arcmods.ryantlg.enchantments;
+
+import net.arcmods.ryantlg.gameritems;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentTarget;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+public class evadeEnchantment extends Enchantment {
+
+    public evadeEnchantment() {
+        super(Enchantment.Rarity.UNCOMMON, EnchantmentTarget.ARMOR_CHEST, new EquipmentSlot[] {EquipmentSlot.HEAD, EquipmentSlot.CHEST, EquipmentSlot.FEET, EquipmentSlot.LEGS});
+    }
+
+    @Override
+    public int getMinPower(int level) {
+        return 30;
+    }
+    @Override
+    public int getMaxLevel() {
+        return 4;
+    }
+    // public void onTargetDamaged(LivingEntity user, Entity target, int level) {
+    //     if(target instanceof LivingEntity) {
+    //         ((LivingEntity) user).addStatusEffect(new StatusEffectInstance(StatusEffects.SPEED, 20 * 5, level - 1));
+    //     }
+ 
+    //     super.onTargetDamaged(user, target, level);
+    // }
+    @Override
+    public void onUserDamaged(LivingEntity user, Entity attacker, int level) {
+        if (attacker instanceof LivingEntity) {
+            ((LivingEntity) user).addStatusEffect(new StatusEffectInstance(StatusEffects.SPEED, 20 * 7, level));
+            ((LivingEntity) attacker).addStatusEffect(new StatusEffectInstance(StatusEffects.SLOWNESS, 20 * 5, level));
+        }
+        super.onUserDamaged(user, attacker, level);
+    }
+
+    public static void register() {
+        Registry.register(
+            Registry.ENCHANTMENT,
+            new Identifier("gameritems", "evade"),
+            new evadeEnchantment()
+        );
+        gameritems.LOGGER.info("evadeEnchantment loaded");
+    }
+    
+}

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

@@ -1,10 +1,11 @@
 package net.arcmods.ryantlg;
 
-import net.arcmods.ryantlg.blocks.CropBlocks;
+import net.arcmods.ryantlg.blocks.cropBlocks.weemCrop;
-import net.arcmods.ryantlg.blocks.FunnyBlocks;
+import net.arcmods.ryantlg.blocks.metalBlocks.jeremiumBlocks;
-import net.arcmods.ryantlg.blocks.jeremiumBlocks;
+import net.arcmods.ryantlg.blocks.metalBlocks.omniumBlocks;
-import net.arcmods.ryantlg.blocks.omniumBlocks;
+import net.arcmods.ryantlg.blocks.metalBlocks.oriumBlocks;
-import net.arcmods.ryantlg.blocks.oriumBlocks;
+import net.arcmods.ryantlg.blocks.otherBlocks.FunnyBlocks;
+import net.arcmods.ryantlg.enchantments.evadeEnchantment;
 import net.arcmods.ryantlg.items.armour.jeremiumArmour;
 import net.arcmods.ryantlg.items.armour.notArmour;
 import net.arcmods.ryantlg.items.armour.omniumArmour;
@@ -85,7 +86,7 @@ public class gameritems implements ModInitializer {
 		OriumOreGen.register();
 		DeepslateOriumOreGen.register();
 
-		CropBlocks.register();
+		weemCrop.register();
 
 		fabricOfReality.register();
 
@@ -100,6 +101,8 @@ public class gameritems implements ModInitializer {
 		notArmour.register();
 		gamerBow.register();
 
+		evadeEnchantment.register();
+
 	}
 	//fight me
 	

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

@@ -1,6 +1,6 @@
 package net.arcmods.ryantlg;
 
-import net.arcmods.ryantlg.blocks.CropBlocks;
+import net.arcmods.ryantlg.blocks.cropBlocks.weemCrop;
 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(), CropBlocks.WEEM_CROP_BLOCK);
+        BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), weemCrop.WEEM_CROP_BLOCK);
 
         bowModelPredicateProvider.registerBowModels();
 

src/main/java/net/arcmods/ryantlg/itemClasses/BreemItem.java

@@ -6,7 +6,6 @@ import net.minecraft.client.item.TooltipContext;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Formatting;
 import net.minecraft.world.World;
 
@@ -19,6 +18,8 @@ public class BreemItem extends Item {
     @Override
     public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
 
-    tooltip.add( new TranslatableText("item.gameritems.breem.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
+        tooltip.add(Text.translatable("item.gameritems.breem.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
-}
+
+        //tooltip.add( new TranslatableText("item.gameritems.breem.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
+    }
 }

src/main/java/net/arcmods/ryantlg/itemClasses/FabricReality.java

@@ -7,7 +7,7 @@ import net.minecraft.client.item.TooltipContext;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
+
 import net.minecraft.util.Formatting;
 import net.minecraft.world.World;
 
@@ -19,7 +19,7 @@ public class FabricReality extends Item{
     @Override
     public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
 
-    tooltip.add( new TranslatableText("item.gameritems.fabric_of_reality.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
+        tooltip.add(Text.translatable("item.gameritems.fabric_of_reality.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
 
     }
 }

src/main/java/net/arcmods/ryantlg/itemClasses/WeemItem.java

@@ -6,7 +6,7 @@ import net.minecraft.client.item.TooltipContext;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
+
 import net.minecraft.util.Formatting;
 import net.minecraft.world.World;
 
@@ -19,6 +19,6 @@ public class WeemItem extends Item {
     @Override
     public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
 
-    tooltip.add( new TranslatableText("item.gameritems.weem.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
+        tooltip.add(Text.translatable("item.gameritems.weem.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
 }
 }

src/main/java/net/arcmods/ryantlg/itemClasses/jeremiumItem.java

@@ -6,7 +6,7 @@ import net.minecraft.client.item.TooltipContext;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
+
 import net.minecraft.util.Formatting;
 import net.minecraft.world.World;
 
@@ -19,7 +19,7 @@ public class jeremiumItem extends Item{
     @Override
     public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
 
-    tooltip.add( new TranslatableText("all.gameritems.jeremium.tooltiptwo").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
+        tooltip.add(Text.translatable("all.gameritems.jeremium.tooltiptwo").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
 
     }
     

src/main/java/net/arcmods/ryantlg/itemClasses/oriumItem.java

@@ -6,7 +6,7 @@ import net.minecraft.client.item.TooltipContext;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
+
 import net.minecraft.util.Formatting;
 import net.minecraft.world.World;
 
@@ -19,7 +19,7 @@ public class oriumItem extends Item{
     @Override
     public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
 
-    tooltip.add( new TranslatableText("item.gameritems.orium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
+        tooltip.add(Text.translatable("item.gameritems.orium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
 
     }
 }

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;
+import net.arcmods.ryantlg.blocks.cropBlocks.weemCrop;
 import net.arcmods.ryantlg.itemClasses.BreemItem;
 import net.arcmods.ryantlg.itemClasses.WeemItem;
 import net.arcmods.ryantlg.statusEffects.GamerEffects;
@@ -18,7 +18,7 @@ public class weemItems {
 
 //main items
 //================================================================================================================
-    public static final Item WEEM = new Item(new Item.Settings().group(gameritems.CHING).maxCount(128));
+    public static final Item WEEM = new Item(new Item.Settings().group(gameritems.CHING).maxCount(64));
 
 //  foods
 //================================================================================================================
@@ -56,14 +56,13 @@ public class weemItems {
 
 //seeds
 //================================================================================================================
-    public static final Item WEEM_SEEDS = new AliasedBlockItem(CropBlocks.WEEM_CROP_BLOCK, new Item.Settings().group(gameritems.CHING));
+    public static final Item WEEM_SEEDS = new AliasedBlockItem(weemCrop.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

@@ -2,31 +2,39 @@ package net.arcmods.ryantlg.lootTables;
 
 import net.arcmods.ryantlg.gameritems;
 import net.arcmods.ryantlg.items.itemsByCrop.weemItems;
-import net.fabricmc.fabric.api.loot.v1.FabricLootPoolBuilder;
+import net.fabricmc.fabric.api.loot.v2.LootTableEvents;
-import net.fabricmc.fabric.api.loot.v1.event.LootTableLoadingCallback;
+import net.minecraft.block.Blocks;
+import net.minecraft.loot.LootPool;
 import net.minecraft.loot.condition.RandomChanceLootCondition;
 import net.minecraft.loot.entry.ItemEntry;
-import net.minecraft.loot.function.SetCountLootFunction;
-import net.minecraft.loot.provider.number.ConstantLootNumberProvider;
 import net.minecraft.util.Identifier;
 
 public class grassVanillaWeem {
     
-    private static final Identifier GRASS_LOOT_TABLE_ID = new Identifier("minecraft", "blocks/grass");
+    private static final Identifier GRASS_LOOT_TABLE_ID = Blocks.GRASS.getLootTableId();
 
     private static void modifyLootTables() {
-        LootTableLoadingCallback.EVENT.register(((resourceManager, manager, id, supplier, setter) -> {
+        LootTableEvents.MODIFY.register(((resourceManager, manager, id, tableBuilder, source) -> {
 
-            if (GRASS_LOOT_TABLE_ID.equals(id)) {
+            if (source.isBuiltin() && GRASS_LOOT_TABLE_ID.equals(id)) {
-                FabricLootPoolBuilder weemSeed = FabricLootPoolBuilder.builder()
+                LootPool.Builder poolBuilder = LootPool.builder()
-                .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());
  
+                tableBuilder.pool(poolBuilder);
             }
 
+
+            // if (GRASS_LOOT_TABLE_ID.equals(id)) {
+            //     FabricLootPoolBuilder weemSeed = FabricLootPoolBuilder.builder()
+            //     .rolls(ConstantLootNumberProvider.create(1))
+            //     .with(ItemEntry.builder(weemItems.WEEM_SEEDS))
+            //     .withFunction(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0f)).build())
+            //     .conditionally(RandomChanceLootCondition.builder(0.0123132f));
+            //     supplier.withPool(weemSeed.build());
+
+            // }
+
         }));
     }
 

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

@@ -6,19 +6,21 @@ import net.minecraft.util.registry.Registry;
 
 public class sounds {
 
-    public static final Identifier SNIFF = new Identifier("gameritems:sniff");
+    // THIS IS BROKEN DO NOT TOUCH
-    public static SoundEvent SNIFF_SOUND_EVENT = new SoundEvent(SNIFF);
-    public static final Identifier MATT = new Identifier("gameritems:matt");
-    public static SoundEvent MATT_SOUND_EVENT = new SoundEvent(MATT);
-    public static final Identifier ELON = new Identifier("gameritems:elon");
-    public static SoundEvent ELON_SOUND_EVENT = new SoundEvent(ELON);
 
-    public static void register() {
+    // public static final Identifier SNIFF = new Identifier("gameritems:sniff");
-        gameritems.LOGGER.info("Sounds Loaded");
+    // public static SoundEvent SNIFF_SOUND_EVENT = new SoundEvent(SNIFF);
+    // public static final Identifier MATT = new Identifier("gameritems:matt");
+    // public static SoundEvent MATT_SOUND_EVENT = new SoundEvent(MATT);
+    // public static final Identifier ELON = new Identifier("gameritems:elon");
+    // public static SoundEvent ELON_SOUND_EVENT = new SoundEvent(ELON);
 
-        Registry.register(Registry.SOUND_EVENT, sounds.SNIFF, SNIFF_SOUND_EVENT); 
+    // public static void register() {
-        Registry.register(Registry.SOUND_EVENT, sounds.MATT, MATT_SOUND_EVENT); 
+    //     gameritems.LOGGER.info("Sounds Loaded");
-        Registry.register(Registry.SOUND_EVENT, sounds.ELON, ELON_SOUND_EVENT); 
+
-    }
+    //     Registry.register(Registry.SOUND_EVENT, sounds.SNIFF, SNIFF_SOUND_EVENT); 
+    //     Registry.register(Registry.SOUND_EVENT, sounds.MATT, MATT_SOUND_EVENT); 
+    //     Registry.register(Registry.SOUND_EVENT, sounds.ELON, ELON_SOUND_EVENT); 
+    // }
 
 }

src/main/java/net/arcmods/ryantlg/statusEffects/GamerEffects.java

@@ -2,7 +2,7 @@ package net.arcmods.ryantlg.statusEffects;
 
 import net.arcmods.ryantlg.gameritems;
 import net.arcmods.ryantlg.statusEffects.effectClasses.highStatusEffect;
-import net.arcmods.ryantlg.statusEffects.effectClasses.jeremydStatusEffect;
+//import net.arcmods.ryantlg.statusEffects.effectClasses.jeremydStatusEffect;
 import net.minecraft.entity.effect.StatusEffect;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
@@ -11,12 +11,12 @@ public class GamerEffects {
 
     public static final StatusEffect HIGH = new highStatusEffect();
 
-    public static final StatusEffect JEREMYD = new jeremydStatusEffect();
+    //public static final StatusEffect JEREMYD = new jeremydStatusEffect();
 
     public static void register() {
         Registry.register(Registry.STATUS_EFFECT, new Identifier("gameritems", "high"), HIGH);
 
-        Registry.register(Registry.STATUS_EFFECT, new Identifier("gameritems", "jeremyd"), JEREMYD);
+        //Registry.register(Registry.STATUS_EFFECT, new Identifier("gameritems", "jeremyd"), JEREMYD);
 
         gameritems.LOGGER.info("statusEffects Loaded");
     }

src/main/java/net/arcmods/ryantlg/statusEffects/effectClasses/highStatusEffect.java

@@ -1,7 +1,7 @@
 package net.arcmods.ryantlg.statusEffects.effectClasses;
 
 import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.damage.DamageSource;
+//import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.effect.StatusEffect;
 import net.minecraft.entity.effect.StatusEffectCategory;
 import net.minecraft.entity.player.PlayerEntity;
@@ -22,13 +22,10 @@ public class highStatusEffect extends StatusEffect{
   @Override
   public void applyUpdateEffect(LivingEntity entity, int amplifier) {
     if (entity instanceof PlayerEntity) {
-      ((PlayerEntity) entity).addExperience(0 << amplifier);
       ((PlayerEntity) entity).getFallSounds();
       ((PlayerEntity) entity).disableShield(true);
       ((PlayerEntity) entity).dismountVehicle();
-      ((PlayerEntity) entity).damage(DamageSource.FALL, (float) 0.01);
+      ((PlayerEntity) entity).heal(0 << amplifier);
-      ((PlayerEntity) entity).heal(3 << amplifier);
-      ((PlayerEntity) entity).getFallSounds();
     }
   }
     

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

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

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

@@ -3,7 +3,7 @@ package net.arcmods.ryantlg.worldGeneration;
 import java.util.Arrays;
 
 import net.arcmods.ryantlg.gameritems;
-import net.arcmods.ryantlg.blocks.omniumBlocks;
+import net.arcmods.ryantlg.blocks.metalBlocks.omniumBlocks;
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
 import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
 import net.minecraft.util.registry.RegistryKey;

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

@@ -3,7 +3,7 @@ package net.arcmods.ryantlg.worldGeneration;
 import java.util.Arrays;
 
 import net.arcmods.ryantlg.gameritems;
-import net.arcmods.ryantlg.blocks.oriumBlocks;
+import net.arcmods.ryantlg.blocks.metalBlocks.oriumBlocks;
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
 import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
 import net.minecraft.util.registry.RegistryKey;

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

@@ -3,7 +3,7 @@ package net.arcmods.ryantlg.worldGeneration;
 import java.util.Arrays;
 
 import net.arcmods.ryantlg.gameritems;
-import net.arcmods.ryantlg.blocks.jeremiumBlocks;
+import net.arcmods.ryantlg.blocks.metalBlocks.jeremiumBlocks;
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
 import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
 import net.minecraft.util.registry.RegistryKey;

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

@@ -3,7 +3,7 @@ package net.arcmods.ryantlg.worldGeneration;
 import java.util.Arrays;
 
 import net.arcmods.ryantlg.gameritems;
-import net.arcmods.ryantlg.blocks.omniumBlocks;
+import net.arcmods.ryantlg.blocks.metalBlocks.omniumBlocks;
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
 import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
 import net.minecraft.util.registry.RegistryKey;

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

@@ -3,7 +3,7 @@ package net.arcmods.ryantlg.worldGeneration;
 import java.util.Arrays;
 
 import net.arcmods.ryantlg.gameritems;
-import net.arcmods.ryantlg.blocks.oriumBlocks;
+import net.arcmods.ryantlg.blocks.metalBlocks.oriumBlocks;
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
 import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
 import net.minecraft.util.registry.RegistryKey;

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

@@ -0,0 +1,16 @@
+{
+    "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

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

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

@@ -0,0 +1,7 @@
+{
+    "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

@@ -0,0 +1,7 @@
+{
+    "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

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

src/main/resources/data/gameritems/advancements/jeremium_armour.json

@@ -0,0 +1,43 @@
+{
+    "display": {
+      "icon": {
+        "item": "gameritems:jeremium_helmet"
+      },
+      "title": "coSvered in red",
+      "description": "Get a full set of Jeremium armour",
+      "frame": "task",
+      "show_toast": true,
+      "announce_to_chat": true
+    },
+    "parent": "gameritems:raw_jeremium",
+    "criteria": {
+      "requirement": {
+        "trigger": "minecraft:inventory_changed",
+        "conditions": {
+          "items": [
+            {
+              "items": [
+                "gameritems:jeremium_helmet"
+              ]
+            },
+            {
+              "items": [
+                "gameritems:jeremium_chestplate"
+              ]
+            },
+            {
+              "items": [
+                "gameritems:jeremium_leggings"
+              ]
+            },
+            {
+              "items": [
+                "gameritems:jeremium_boots"
+              ]
+            }
+          ]
+        }
+      }
+    }
+  }
+  

src/main/resources/data/gameritems/advancements/omnium_armour.json

@@ -0,0 +1,43 @@
+{
+    "display": {
+      "icon": {
+        "item": "gameritems:omnium_helmet"
+      },
+      "title": "covereD in greEn",
+      "description": "Get a full set of Omnium armour",
+      "frame": "task",
+      "show_toast": true,
+      "announce_to_chat": true
+    },
+    "parent": "gameritems:raw_omnium",
+    "criteria": {
+      "requirement": {
+        "trigger": "minecraft:inventory_changed",
+        "conditions": {
+          "items": [
+            {
+              "items": [
+                "gameritems:omnium_helmet"
+              ]
+            },
+            {
+              "items": [
+                "gameritems:omnium_chestplate"
+              ]
+            },
+            {
+              "items": [
+                "gameritems:omnium_leggings"
+              ]
+            },
+            {
+              "items": [
+                "gameritems:omnium_boots"
+              ]
+            }
+          ]
+        }
+      }
+    }
+  }
+  

src/main/resources/data/gameritems/advancements/orium_armour.json

@@ -0,0 +1,42 @@
+{
+  "display": {
+    "icon": {
+      "item": "gameritems:orium_helmet"
+    },
+    "title": "covered iN blUe",
+    "description": "Get a full set of Orium armour",
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true
+  },
+  "parent": "gameritems:raw_orium",
+  "criteria": {
+    "requirement": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "gameritems:orium_helmet"
+            ]
+          },
+          {
+            "items": [
+              "gameritems:orium_chestplate"
+            ]
+          },
+          {
+            "items": [
+              "gameritems:orium_leggings"
+            ]
+          },
+          {
+            "items": [
+              "gameritems:orium_boots"
+            ]
+          }
+        ]
+      }
+    }
+  }
+}

src/main/resources/data/gameritems/advancements/raw_jeremium.json

@@ -0,0 +1,27 @@
+{
+  "display": {
+    "icon": {
+      "item": "gameritems:raw_jeremium"
+    },
+    "title": "reD?",
+    "description": "Get a piece of raw Jeremium",
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true
+  },
+  "parent": "gameritems:omnium_armour",
+  "criteria": {
+    "requirement": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "gameritems:raw_jeremium"
+            ]
+          }
+        ]
+      }
+    }
+  }
+}

src/main/resources/data/gameritems/advancements/raw_omnium.json

@@ -1,27 +1,27 @@
 {
-    "display": {
+  "display": {
-      "icon": {
+    "icon": {
-        "item": "gameritems:raw_omnium"
+      "item": "gameritems:raw_omnium"
-      },
-      "title": "greEN?",
-      "description": "Get a piece of raw Omnium",
-      "frame": "task",
-      "show_toast": true,
-      "announce_to_chat": true
     },
-    "parent": "gameritems:gameritems",
+    "title": "greEN?",
-    "criteria": {
+    "description": "Get a piece of raw Omnium",
-      "requirement": {
+    "frame": "task",
-        "trigger": "minecraft:inventory_changed",
+    "show_toast": true,
-        "conditions": {
+    "announce_to_chat": true
-          "items": [
+  },
-            {
+  "parent": "gameritems:orium_armour",
-              "items": [
+  "criteria": {
-                "gameritems:raw_omnium"
+    "requirement": {
-              ]
+      "trigger": "minecraft:inventory_changed",
-            }
+      "conditions": {
-          ]
+        "items": [
-        }
+          {
+            "items": [
+              "gameritems:raw_omnium"
+            ]
+          }
+        ]
       }
     }
   }
+}

src/main/resources/data/gameritems/advancements/raw_orium.json

@@ -0,0 +1,27 @@
+{
+  "display": {
+    "icon": {
+      "item": "gameritems:raw_orium"
+    },
+    "title": "blueS?",
+    "description": "Get a piece of raw Orium",
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true
+  },
+  "parent": "gameritems:gameritems",
+  "criteria": {
+    "requirement": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "gameritems:raw_orium"
+            ]
+          }
+        ]
+      }
+    }
+  }
+}

src/main/resources/fabric.mod.json

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