i cant remember

CHANGELOG

@@ -1,18 +1,16 @@
 # Changes:
-## 1.18.2-0.1.0-unstable
-- changed dependencies for update to 1.18.2
-- 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.19-1.0.0-stable
+- updating is despicable
 
-## 1.18.2-1.0.0-stable
-- for all i care this shit looks stable to me
+## 1.19-1.0.1-unstable
+- added not tools
+- added not armour
+- added stupid/dumb damage source
+- added stupid status effect
+- added stupid tools
 
-## 1.18.2-1.1.0-stable
-- ported gamer bow to 1.18.2
-
-## 1.18.2-1.1.1-unstable
-- fixed weem stacking to 85 (maybe)
-- nerfed high effect
+## 1.19-1.0.2-unstable
+- added stupidium armour
+- added textures for stupidium stuff
+- fixed weem haybale
+- fixed fucked audio blocks

README.md

@@ -26,4 +26,7 @@ If you find an issue or bug in the mod or just have a general suggestion you can
 
 ### AAAAAAAAAAAAAAAa
 
-[aaaaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA](https://github.com/RyanTLG/GamerItems/blob/1-18-1/unstable/AAAAAAAAAAAAAAAa)
+[aaaaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA](https://github.com/RyanTLG/GamerItems/blob/1-18-1/unstable/AAAAAAAAAAAAAAAa)
+
+## NOTICE
+due to my lack of an attention span, i will no longer be updating or maintaining 1.18 versions, this is a final decision. I will also not support any versions up from 1.19 (pre chat reporting and account banning). Anyone willing to update 1.18 branches or add branches for older/newer minecraft versions are welcome to ask me [here](https://discord.gg/nsYbUnjBFJ)

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.11-SNAPSHOT'
+	id 'fabric-loom' version '0.12-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -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 {
@@ -70,7 +72,7 @@ publishing {
 	repositories {
     		maven {
       			name = "GitHubPackages"
-      			url = "https://maven.pkg.github.com/RyanTLG/gameritems"
+      			url = "https://maven.pkg.github.com/BigGaemer/gameritems"
       			credentials {
         		username = System.getenv("UNAME")
         		password = System.getenv("TOKEN")

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx6G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.18.2
-	yarn_mappings=1.18.2+build.3
-	loader_version=0.13.2
+	minecraft_version=1.19.2
+	yarn_mappings=1.19.2+build.28
+	loader_version=0.14.12
 
 # Mod Properties
-	mod_version = 1.18.2-1.1.1-unstable
-	maven_group = ryantlg.GamerItems.mod
+	mod_version = 1.19.2-1.1.0-stable
+	maven_group = gamer.GamerItems.mod
 	archives_base_name = GamerItems
 
 # Dependencies
-	fabric_version=0.51.1+1.18.2
+	fabric_version=0.72.0+1.19.2

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.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/net/arcmods/ryantlg/armourMaterials/stupidiumArmorMaterial.java

@@ -0,0 +1,61 @@
+package net.arcmods.ryantlg.armourMaterials;
+
+import net.arcmods.ryantlg.items.metalItems.oriumMetals;
+import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.item.ArmorMaterial;
+import net.minecraft.recipe.Ingredient;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.sound.SoundEvents;
+
+public class stupidiumArmorMaterial implements ArmorMaterial {
+    //														{boots, leggings, chestplate, helmet}
+	private static final int[] BASE_DURABILITY = new int[] {43, 60, 75, 49};
+	private static final int[] PROTECTION_VALUES = new int[] {4, 7, 9, 4}; 
+ 
+	// In which A is helmet, B chestplate, C leggings and D boots. 
+	// For reference, Leather uses {1, 2, 3, 1}, and Diamond/Netherite {3, 6, 8, 3}
+	// {A, C, B, D}
+
+    @Override
+	public int getDurability(EquipmentSlot slot) {
+		return BASE_DURABILITY[slot.getEntitySlotId()] * 10;
+	}
+ 
+	@Override
+	public int getProtectionAmount(EquipmentSlot slot) {
+		return PROTECTION_VALUES[slot.getEntitySlotId()];
+	}
+ 
+	@Override
+	public int getEnchantability() {
+		return 22;
+	}
+ 
+	@Override
+	public SoundEvent getEquipSound() {
+		return SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND;
+	}
+ 
+	@Override
+	public Ingredient getRepairIngredient() {
+		return Ingredient.ofItems(oriumMetals.ORIUM);
+	}
+ 
+	@Override
+	public String getName() {
+		// Must be all lowercase
+		return "stupidium";
+	}
+ 
+	@Override
+	public float getToughness() {
+		return 2.0F;
+	}
+ 
+	@Override
+	public float getKnockbackResistance() {
+		return 0.0F;
+	}
+
+    
+}

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

@@ -17,18 +17,18 @@ 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;
-    }
+    // @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,21 @@ 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;
+    // @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,18 @@ 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;
-    }
+    // @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( new TranslatableText("all.gameritems.jeremium.tooltiptwo").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
+        tooltip.add(Text.translatable("block.gameritems.jeremium.tooltip").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_HAYBALE = 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_haybale"), WEEM_HAYBALE);
+        Registry.register(Registry.ITEM, new Identifier("gameritems", "weem_haybale"), new BlockItem(WEEM_HAYBALE, new FabricItemSettings().group(gameritems.CHING)));
+        FlammableBlockRegistry.getDefaultInstance().add(WEEM_HAYBALE, 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_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.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 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(6.5f, 8.0f).requiresTool().luminance(5));
+    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_BLOCK         = new Block(FabricBlockSettings.of(Material.METAL).strength(4.0f).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 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(5.5f, 7f).requiresTool());
+    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_BLOCK = new oriumBlock(FabricBlockSettings.of(Material.METAL).strength(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 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(5.0f, 4.0F).requiresTool());
+    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/metalBlocks/stupidiumBlocks.java

@@ -0,0 +1,32 @@
+package net.arcmods.ryantlg.blocks.metalBlocks;
+
+import net.arcmods.ryantlg.gameritems;
+import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.minecraft.block.Block;
+import net.minecraft.block.Material;
+import net.minecraft.item.BlockItem;
+import net.minecraft.sound.BlockSoundGroup;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+public class stupidiumBlocks {
+
+    public static final Block STUPIDIUM_BLOCK = new Block(FabricBlockSettings.of(Material.METAL).strength(6.9f, 8.3f).requiresTool());
+    public static final Block STUPIDIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(6.5f, 6.0f).requiresTool());
+    public static final Block DEEPSLATE_STUPIDIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(7.2f, 7.2f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE));
+
+    public static void register() {
+        Registry.register(Registry.BLOCK, new Identifier("gameritems", "stupidium_ore"), STUPIDIUM_ORE);
+        Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_ore"), new BlockItem(STUPIDIUM_ORE, new FabricItemSettings().group(gameritems.CHING).fireproof().maxCount(56)));
+
+        Registry.register(Registry.BLOCK, new Identifier("gameritems", "deepslate_stupidium_ore"), DEEPSLATE_STUPIDIUM_ORE);
+        Registry.register(Registry.ITEM, new Identifier("gameritems", "deepslate_stupidium_ore"), new BlockItem(DEEPSLATE_STUPIDIUM_ORE, new FabricItemSettings().group(gameritems.CHING).fireproof().maxCount(56)));
+
+        Registry.register(Registry.BLOCK, new Identifier("gameritems", "stupidium_block"), STUPIDIUM_BLOCK);
+        Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_block"), new BlockItem(STUPIDIUM_BLOCK, new FabricItemSettings().group(gameritems.CHING).fireproof().maxCount(56)));
+
+        gameritems.LOGGER.info("stupidiumBlocks loaded");
+    }
+    
+}

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.RED));
     }
 
     @Override

src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notAxeItem.java

@@ -0,0 +1,10 @@
+package net.arcmods.ryantlg.customToolItemClasses.not;
+
+import net.minecraft.item.AxeItem;
+import net.minecraft.item.ToolMaterial;
+
+public class notAxeItem extends AxeItem {
+    public notAxeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
+        super(material, attackDamage, attackSpeed, settings);
+    }
+}

src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notHoeItem.java

@@ -0,0 +1,11 @@
+package net.arcmods.ryantlg.customToolItemClasses.not;
+
+import net.minecraft.item.HoeItem;
+
+import net.minecraft.item.ToolMaterial;
+
+public class notHoeItem extends HoeItem {
+    public notHoeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
+        super(material, attackDamage, attackSpeed, settings);
+    }
+}

src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notPickaxeItem.java

@@ -0,0 +1,10 @@
+package net.arcmods.ryantlg.customToolItemClasses.not;
+
+import net.minecraft.item.PickaxeItem;
+import net.minecraft.item.ToolMaterial;
+
+public class notPickaxeItem extends PickaxeItem {
+    public notPickaxeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
+        super(material, attackDamage, attackSpeed, settings);
+    }
+}

src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notShovelItem.java

@@ -0,0 +1,12 @@
+package net.arcmods.ryantlg.customToolItemClasses.not;
+
+import net.minecraft.item.ShovelItem;
+import net.minecraft.item.ToolMaterial;
+
+public class notShovelItem extends ShovelItem{
+
+    public notShovelItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) {
+        super(material, attackDamage, attackSpeed, settings);
+    }
+    
+}

src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notSwordItem.java

@@ -0,0 +1,12 @@
+package net.arcmods.ryantlg.customToolItemClasses.not;
+
+import net.minecraft.item.SwordItem;
+import net.minecraft.item.ToolMaterial;
+
+public class notSwordItem extends SwordItem{
+
+    public notSwordItem(ToolMaterial toolMaterial, int attackDamage, float attackSpeed, Settings settings) {
+        super(toolMaterial, attackDamage, attackSpeed, settings);
+    }
+    
+}

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/customToolItemClasses/stupidium/StupidiumAxeItem.java

@@ -0,0 +1,12 @@
+package net.arcmods.ryantlg.customToolItemClasses.stupidium;
+
+import net.minecraft.item.AxeItem;
+import net.minecraft.item.ToolMaterial;
+
+public class StupidiumAxeItem extends AxeItem {
+
+    public StupidiumAxeItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) {
+        super(material, attackDamage, attackSpeed, settings);
+    }
+    
+}

src/main/java/net/arcmods/ryantlg/customToolItemClasses/stupidium/StupidiumBowItem.java

@@ -0,0 +1,20 @@
+package net.arcmods.ryantlg.customToolItemClasses.stupidium;
+
+import net.minecraft.item.BowItem;
+import net.arcmods.ryantlg.statusEffects.GamerEffects;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.item.ItemStack;
+
+public class StupidiumBowItem extends BowItem{
+
+    public StupidiumBowItem(Settings settings) {
+        super(settings);
+    }
+    
+    @Override
+    public boolean postHit(ItemStack stack, LivingEntity attackee, LivingEntity attacker) {
+        attackee.addStatusEffect(new StatusEffectInstance(GamerEffects.STUPID, 20*5, 0), attacker);
+        return super.postHit(stack, attackee, attacker);
+    }
+}

src/main/java/net/arcmods/ryantlg/customToolItemClasses/stupidium/StupidiumHoeItem.java

@@ -0,0 +1,12 @@
+package net.arcmods.ryantlg.customToolItemClasses.stupidium;
+
+import net.minecraft.item.HoeItem;
+import net.minecraft.item.ToolMaterial;
+
+public class StupidiumHoeItem extends HoeItem{
+
+    public StupidiumHoeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
+        super(material, attackDamage, attackSpeed, settings);
+    }
+    
+}

src/main/java/net/arcmods/ryantlg/customToolItemClasses/stupidium/StupidiumPickaxeItem.java

@@ -0,0 +1,12 @@
+package net.arcmods.ryantlg.customToolItemClasses.stupidium;
+
+import net.minecraft.item.PickaxeItem;
+import net.minecraft.item.ToolMaterial;
+
+public class StupidiumPickaxeItem extends PickaxeItem{
+
+    public StupidiumPickaxeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
+        super(material, attackDamage, attackSpeed, settings);
+    }
+    
+}

src/main/java/net/arcmods/ryantlg/customToolItemClasses/stupidium/StupidiumShovelItem.java

@@ -0,0 +1,12 @@
+package net.arcmods.ryantlg.customToolItemClasses.stupidium;
+
+import net.minecraft.item.ShovelItem;
+import net.minecraft.item.ToolMaterial;
+
+public class StupidiumShovelItem extends ShovelItem{
+
+    public StupidiumShovelItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) {
+        super(material, attackDamage, attackSpeed, settings);
+    }
+    
+}

src/main/java/net/arcmods/ryantlg/customToolItemClasses/stupidium/StupidiumSwordItem.java

@@ -0,0 +1,31 @@
+package net.arcmods.ryantlg.customToolItemClasses.stupidium;
+
+import java.util.List;
+
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.arcmods.ryantlg.statusEffects.GamerEffects;
+import net.minecraft.client.item.TooltipContext;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.SwordItem;
+import net.minecraft.item.ToolMaterial;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import net.minecraft.world.World;
+
+public class StupidiumSwordItem extends SwordItem {
+    public StupidiumSwordItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
+        super(material, attackDamage, attackSpeed, settings);
+    }
+    @Override
+    public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
+        tooltip.add(Text.translatable("item.gameritems.stupidium_sword.tooltip").formatted(Formatting.RED));
+    }
+
+    @Override
+    public boolean postHit(ItemStack stack, LivingEntity attackee, LivingEntity attacker) {
+        attackee.addStatusEffect(new StatusEffectInstance(GamerEffects.STUPID, 20*6, 0), attacker);
+        return super.postHit(stack, attackee, attacker);
+    }
+    
+}

src/main/java/net/arcmods/ryantlg/damageSources/stupidDamageSource.java

@@ -0,0 +1,14 @@
+package net.arcmods.ryantlg.damageSources;
+
+import net.minecraft.entity.damage.DamageSource;
+
+public class stupidDamageSource extends DamageSource {
+
+    protected stupidDamageSource() {
+        super("dumb");
+    }
+
+    public static final DamageSource STUPID = (new stupidDamageSource().setBypassesArmor());
+    
+}
+

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,25 +1,32 @@
 package net.arcmods.ryantlg;
 
-import net.arcmods.ryantlg.blocks.CropBlocks;
-import net.arcmods.ryantlg.blocks.FunnyBlocks;
-import net.arcmods.ryantlg.blocks.jeremiumBlocks;
-import net.arcmods.ryantlg.blocks.omniumBlocks;
-import net.arcmods.ryantlg.blocks.oriumBlocks;
+import net.arcmods.ryantlg.blocks.cropBlocks.weemCrop;
+import net.arcmods.ryantlg.blocks.metalBlocks.jeremiumBlocks;
+import net.arcmods.ryantlg.blocks.metalBlocks.omniumBlocks;
+import net.arcmods.ryantlg.blocks.metalBlocks.oriumBlocks;
+import net.arcmods.ryantlg.blocks.metalBlocks.stupidiumBlocks;
+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;
 import net.arcmods.ryantlg.items.armour.oriumArmour;
+import net.arcmods.ryantlg.items.armour.stupidiumArmour;
 import net.arcmods.ryantlg.items.bows.gamerBow;
+// import net.arcmods.ryantlg.items.bows.stupidBow;
 import net.arcmods.ryantlg.items.itemsByCrop.weemItems;
 import net.arcmods.ryantlg.items.metalItems.jeremiumMetals;
 import net.arcmods.ryantlg.items.metalItems.omniumMetals;
 import net.arcmods.ryantlg.items.metalItems.oriumMetals;
+import net.arcmods.ryantlg.items.metalItems.stupidiumMetals;
 import net.arcmods.ryantlg.items.miscItems.FunnyItems;
 import net.arcmods.ryantlg.items.miscItems.OtherItems;
 import net.arcmods.ryantlg.items.miscItems.fabricOfReality;
 import net.arcmods.ryantlg.items.tools.jeremiumTools;
+import net.arcmods.ryantlg.items.tools.notTools;
 import net.arcmods.ryantlg.items.tools.omniumTools;
 import net.arcmods.ryantlg.items.tools.oriumTools;
+import net.arcmods.ryantlg.items.tools.stupidiumTools;
 import net.arcmods.ryantlg.lootTables.grassVanillaWeem;
 import net.arcmods.ryantlg.statusEffects.GamerEffects;
 import net.arcmods.ryantlg.worldGeneration.DeepslateOmniumOreGen;
@@ -27,6 +34,7 @@ import net.arcmods.ryantlg.worldGeneration.DeepslateOriumOreGen;
 import net.arcmods.ryantlg.worldGeneration.JeremiumOreGen;
 import net.arcmods.ryantlg.worldGeneration.OmniumOreGen;
 import net.arcmods.ryantlg.worldGeneration.OriumOreGen;
+import net.arcmods.ryantlg.worldGeneration.StupidiumOreGen;
 import net.fabricmc.api.ModInitializer;
 
 import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
@@ -67,6 +75,7 @@ public class gameritems implements ModInitializer {
 		omniumTools.register();
 		omniumBlocks.register();
 		OmniumOreGen.register();
+		StupidiumOreGen.register();
 		DeepslateOmniumOreGen.register();
 
 		weemItems.register();
@@ -85,7 +94,7 @@ public class gameritems implements ModInitializer {
 		OriumOreGen.register();
 		DeepslateOriumOreGen.register();
 
-		CropBlocks.register();
+		weemCrop.register();
 
 		fabricOfReality.register();
 
@@ -97,8 +106,17 @@ public class gameritems implements ModInitializer {
 		jeremiumTools.register();
 		JeremiumOreGen.register();
 
+		stupidiumMetals.register();
+		stupidiumBlocks.register();
+		stupidiumArmour.register();
+		stupidiumTools.register();
+
 		notArmour.register();
+		notTools.register();
 		gamerBow.register();
+		// stupidBow.register(); // incomplete: lazy
+
+		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/StupidiumItem.java

@@ -0,0 +1,26 @@
+package net.arcmods.ryantlg.itemClasses;
+
+import java.util.List;
+
+import net.minecraft.client.item.TooltipContext;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.text.Text;
+
+import net.minecraft.util.Formatting;
+import net.minecraft.world.World;
+
+public class StupidiumItem extends Item {
+
+    public StupidiumItem(Settings settings) {
+        super(settings);
+    }
+
+    @Override
+    public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
+
+        tooltip.add(Text.translatable("item.gameritems.stupidium.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/dipstickItem.java

@@ -0,0 +1,24 @@
+package net.arcmods.ryantlg.itemClasses;
+
+import java.util.List;
+
+import net.minecraft.client.item.TooltipContext;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import net.minecraft.world.World;
+
+public class dipstickItem extends Item{
+    
+    public dipstickItem(Settings settings) {
+        super(settings);
+    }
+    @Override
+    public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
+
+        tooltip.add(Text.translatable("item.gameritems.dipstick.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/armour/stupidiumArmour.java

@@ -0,0 +1,29 @@
+package net.arcmods.ryantlg.items.armour;
+
+import net.arcmods.ryantlg.armourMaterials.stupidiumArmorMaterial;
+import net.minecraft.util.registry.Registry;
+import net.arcmods.ryantlg.gameritems;
+import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.item.ArmorItem;
+import net.minecraft.item.ArmorMaterial;
+import net.minecraft.item.Item;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.Rarity;
+
+public class stupidiumArmour {
+    public static final ArmorMaterial STUPIDIUM_ARMOR_MATERIAL = new stupidiumArmorMaterial();
+    public static final Item STUPIDIUM_HELMET = new ArmorItem(STUPIDIUM_ARMOR_MATERIAL, EquipmentSlot.HEAD, new Item.Settings().group(gameritems.THING).rarity(Rarity.RARE));
+    public static final Item STUPIDIUM_CHESTPLATE = new ArmorItem(STUPIDIUM_ARMOR_MATERIAL, EquipmentSlot.CHEST, new Item.Settings().group(gameritems.THING).rarity(Rarity.RARE));
+    public static final Item STUPIDIUM_LEGGINGS = new ArmorItem(STUPIDIUM_ARMOR_MATERIAL, EquipmentSlot.LEGS, new Item.Settings().group(gameritems.THING).rarity(Rarity.RARE));
+    public static final Item STUPIDIUM_BOOTS = new ArmorItem(STUPIDIUM_ARMOR_MATERIAL, EquipmentSlot.FEET, new Item.Settings().group(gameritems.THING).rarity(Rarity.RARE));
+
+    public static void register() {
+
+        Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_helmet"), STUPIDIUM_HELMET);
+        Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_chestplate"), STUPIDIUM_CHESTPLATE);
+        Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_leggings"), STUPIDIUM_LEGGINGS);
+        Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_boots"), STUPIDIUM_BOOTS);
+
+        gameritems.LOGGER.info("stupidiumArmour loaded");
+    }
+}

src/main/java/net/arcmods/ryantlg/items/bows/stupidBow.java

@@ -0,0 +1,19 @@
+package net.arcmods.ryantlg.items.bows;
+
+import net.arcmods.ryantlg.gameritems;
+import net.arcmods.ryantlg.customToolItemClasses.stupidium.StupidiumBowItem;
+import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
+import net.minecraft.item.Item;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+public class stupidBow {
+    
+    public static final Item STUPID_BOW = new StupidiumBowItem(new FabricItemSettings().group(gameritems.CHING).maxCount(1).fireproof().maxDamage(458));
+
+    public static void register(){
+        Registry.register(Registry.ITEM, new Identifier("gameritems", "stupid_bow"), STUPID_BOW);
+    }
+
+
+}

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
 //================================================================================================================
@@ -34,7 +34,7 @@ public class weemItems {
         .statusEffect(new StatusEffectInstance(StatusEffects.LEVITATION, 20*7), 1f)
         .statusEffect(new StatusEffectInstance(GamerEffects.HIGH, 20*8), 1f)
         .build()
-        ).maxCount(64));
+        ));
 
     public static final Item WEEM_APPLE = new WeemItem(new FabricItemSettings().group(gameritems.CHING)
     .food(
@@ -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/items/metalItems/stupidiumMetals.java

@@ -0,0 +1,21 @@
+package net.arcmods.ryantlg.items.metalItems;
+
+import net.arcmods.ryantlg.gameritems;
+import net.arcmods.ryantlg.itemClasses.StupidiumItem;
+import net.minecraft.item.Item;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.Rarity;
+import net.minecraft.util.registry.Registry;
+
+public class stupidiumMetals {
+
+    public static final Item STUPIDIUM = new StupidiumItem(new Item.Settings().group(gameritems.CHING).maxCount(64).rarity(Rarity.UNCOMMON));
+	public static final Item RAW_STUPIDIUM = new StupidiumItem(new Item.Settings().group(gameritems.CHING).maxCount(64).rarity(Rarity.UNCOMMON));
+    
+    public static void register() {
+        Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_ingot"), STUPIDIUM);
+		Registry.register(Registry.ITEM, new Identifier("gameritems", "raw_stupidium"), RAW_STUPIDIUM);
+
+        gameritems.LOGGER.info("stupidiumMetals loaded");
+    }
+}

src/main/java/net/arcmods/ryantlg/items/miscItems/OtherItems.java

@@ -1,6 +1,7 @@
 package net.arcmods.ryantlg.items.miscItems;
 
 import net.arcmods.ryantlg.gameritems;
+import net.arcmods.ryantlg.itemClasses.dipstickItem;
 import net.minecraft.item.Item;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Rarity;
@@ -9,10 +10,12 @@ import net.minecraft.util.registry.Registry;
 public class OtherItems {
     
 	public static final Item NETHERITE_STICK = new Item(new Item.Settings().group(gameritems.CHING).maxCount(64).fireproof().rarity(Rarity.EPIC));
+    public static final Item DIPSTICK = new dipstickItem(new Item.Settings().group(gameritems.CHING));
 
     public static void register() {
 
 		Registry.register(Registry.ITEM, new Identifier("gameritems", "netherite_stick"), NETHERITE_STICK);
+        Registry.register(Registry.ITEM, new Identifier("gameritems", "dipstick"), DIPSTICK);
         
         gameritems.LOGGER.info("OtherItems loaded");
     }

src/main/java/net/arcmods/ryantlg/items/tools/notTools.java

@@ -0,0 +1,34 @@
+package net.arcmods.ryantlg.items.tools;
+
+import net.arcmods.ryantlg.gameritems;
+import net.arcmods.ryantlg.customToolItemClasses.not.notAxeItem;
+import net.arcmods.ryantlg.customToolItemClasses.not.notHoeItem;
+import net.arcmods.ryantlg.customToolItemClasses.not.notPickaxeItem;
+import net.arcmods.ryantlg.customToolItemClasses.not.notShovelItem;
+import net.arcmods.ryantlg.customToolItemClasses.not.notSwordItem;
+import net.arcmods.ryantlg.toolMaterials.notToolMaterial;
+import net.minecraft.item.Item;
+import net.minecraft.item.ToolItem;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.Rarity;
+import net.minecraft.util.registry.Registry;
+
+public class notTools {
+    
+    public static ToolItem NOT_SWORD = new notSwordItem(notToolMaterial.INSTANCE, 6, -0.1F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC));
+	public static ToolItem NOT_PICKAXE = new notPickaxeItem(notToolMaterial.INSTANCE, -48, -0.1F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC));
+	public static ToolItem NOT_SHOVEL = new notShovelItem(notToolMaterial.INSTANCE, -40, -0.1F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC));
+	public static ToolItem NOT_AXE = new notAxeItem(notToolMaterial.INSTANCE, 10, -0.1F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC));
+	public static ToolItem NOT_HOE = new notHoeItem(notToolMaterial.INSTANCE, -49, -0.1F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC));
+
+    public static void register() {
+
+        Registry.register(Registry.ITEM, new Identifier("gameritems", "not_sword"), NOT_SWORD);
+		Registry.register(Registry.ITEM, new Identifier("gameritems", "not_pickaxe"), NOT_PICKAXE);
+		Registry.register(Registry.ITEM, new Identifier("gameritems", "not_shovel"), NOT_SHOVEL);
+		Registry.register(Registry.ITEM, new Identifier("gameritems", "not_axe"), NOT_AXE);
+		Registry.register(Registry.ITEM, new Identifier("gameritems", "not_hoe"), NOT_HOE);
+
+		gameritems.LOGGER.info("notTools loaded");
+    }
+}

src/main/java/net/arcmods/ryantlg/items/tools/stupidiumTools.java

@@ -0,0 +1,34 @@
+package net.arcmods.ryantlg.items.tools;
+
+import net.arcmods.ryantlg.gameritems;
+import net.arcmods.ryantlg.customToolItemClasses.stupidium.StupidiumAxeItem;
+import net.arcmods.ryantlg.customToolItemClasses.stupidium.StupidiumHoeItem;
+import net.arcmods.ryantlg.customToolItemClasses.stupidium.StupidiumPickaxeItem;
+import net.arcmods.ryantlg.customToolItemClasses.stupidium.StupidiumShovelItem;
+import net.arcmods.ryantlg.customToolItemClasses.stupidium.StupidiumSwordItem;
+import net.arcmods.ryantlg.toolMaterials.stupidiumToolMaterial;
+import net.minecraft.item.Item;
+import net.minecraft.item.ToolItem;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.Rarity;
+import net.minecraft.util.registry.Registry;
+
+public class stupidiumTools {
+    
+    public static ToolItem STUPID_SWORD = new StupidiumSwordItem(stupidiumToolMaterial.INSTANCE, 6, -2.0F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.RARE));
+	public static ToolItem STUPID_PICKAXE = new StupidiumPickaxeItem(stupidiumToolMaterial.INSTANCE, -3, -2.8F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.RARE));
+	public static ToolItem STUPID_SHOVEL = new StupidiumShovelItem(stupidiumToolMaterial.INSTANCE, -2.5F, -3.0F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.RARE));
+	public static ToolItem STUPID_AXE = new StupidiumAxeItem(stupidiumToolMaterial.INSTANCE, 7, -2.2F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.RARE));
+	public static ToolItem STUPID_HOE = new StupidiumHoeItem(stupidiumToolMaterial.INSTANCE, -9, -3.2F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.RARE));
+
+    public static void register() {
+
+        Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_sword"), STUPID_SWORD);
+		Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_pickaxe"), STUPID_PICKAXE);
+		Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_shovel"), STUPID_SHOVEL);
+		Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_axe"), STUPID_AXE);
+		Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_hoe"), STUPID_HOE);
+
+		gameritems.LOGGER.info("stupidiumTools loaded");
+    }
+}

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.v1.event.LootTableLoadingCallback;
+import net.fabricmc.fabric.api.loot.v2.LootTableEvents;
+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)) {
-                FabricLootPoolBuilder weemSeed = FabricLootPoolBuilder.builder()
-                .rolls(ConstantLootNumberProvider.create(1))
+            if (source.isBuiltin() && GRASS_LOOT_TABLE_ID.equals(id)) {
+                LootPool.Builder poolBuilder = LootPool.builder()
                 .with(ItemEntry.builder(weemItems.WEEM_SEEDS))
-                .withFunction(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0f)).build())
-                .conditionally(RandomChanceLootCondition.builder(0.04f));
-                supplier.withPool(weemSeed.build());
-
+                .conditionally(RandomChanceLootCondition.builder(0.0123132f));;
+ 
+                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/statusEffects/GamerEffects.java

@@ -2,7 +2,8 @@ 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.stupidStatusEffect;
+//import net.arcmods.ryantlg.statusEffects.effectClasses.jeremydStatusEffect;
 import net.minecraft.entity.effect.StatusEffect;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
@@ -10,11 +11,13 @@ import net.minecraft.util.registry.Registry;
 public class GamerEffects {
 
     public static final StatusEffect HIGH = new highStatusEffect();
+    public static final StatusEffect STUPID = new stupidStatusEffect();
 
     //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", "stupid"), STUPID);
 
         //Registry.register(Registry.STATUS_EFFECT, new Identifier("gameritems", "jeremyd"), JEREMYD);
 

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

@@ -25,6 +25,7 @@ public class highStatusEffect extends StatusEffect{
       ((PlayerEntity) entity).getFallSounds();
       ((PlayerEntity) entity).disableShield(true);
       ((PlayerEntity) entity).dismountVehicle();
+      ((PlayerEntity) entity).heal(0 << amplifier);
     }
   }
     

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

@@ -0,0 +1,28 @@
+package net.arcmods.ryantlg.statusEffects.effectClasses;
+
+import net.arcmods.ryantlg.damageSources.stupidDamageSource;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffect;
+import net.minecraft.entity.effect.StatusEffectCategory;
+
+public class stupidStatusEffect extends StatusEffect {
+    public stupidStatusEffect() {
+        super(
+          StatusEffectCategory.HARMFUL, 
+          0x6b3f7f
+          ); 
+      }
+     
+      @Override
+      public boolean canApplyUpdateEffect(int duration, int amplifier) {
+        return true;
+      }
+     
+      @Override
+      public void applyUpdateEffect(LivingEntity entity, int amplifier) {
+        
+            entity.damage(stupidDamageSource.STUPID, 1);
+        
+      }
+    
+}

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

@@ -4,4 +4,5 @@ crafting recipes
 advancements
 argentine
 geranine
-soulium
+soulium
+floute

src/main/java/net/arcmods/ryantlg/toolMaterials/notToolMaterial.java

@@ -0,0 +1,36 @@
+package net.arcmods.ryantlg.toolMaterials;
+
+import net.arcmods.ryantlg.items.miscItems.fabricOfReality;
+import net.minecraft.item.ToolMaterial;
+import net.minecraft.recipe.Ingredient;
+
+public class notToolMaterial implements ToolMaterial {
+
+    public static final notToolMaterial INSTANCE = new notToolMaterial();
+
+    @Override
+    public int getDurability() {
+        return 50000;
+    }
+    @Override
+    public float getMiningSpeedMultiplier() {
+        return 50.0F;
+    }
+    @Override
+    public float getAttackDamage() {
+        return 50.0F;
+    }
+    @Override
+    public int getMiningLevel() {
+        return 4;
+    }
+    @Override
+    public int getEnchantability() {
+        return 50;
+    }
+    @Override
+    public Ingredient getRepairIngredient() {
+        return Ingredient.ofItems(fabricOfReality.FABRIC_OF_REALITY);
+    }
+
+}

src/main/java/net/arcmods/ryantlg/toolMaterials/stupidiumToolMaterial.java

@@ -0,0 +1,36 @@
+package net.arcmods.ryantlg.toolMaterials;
+
+import net.arcmods.ryantlg.items.metalItems.stupidiumMetals;
+import net.minecraft.item.ToolMaterial;
+import net.minecraft.recipe.Ingredient;
+
+public class stupidiumToolMaterial implements ToolMaterial {
+
+    public static final stupidiumToolMaterial INSTANCE = new stupidiumToolMaterial();
+
+    @Override
+    public int getDurability() {
+        return 1530;
+    }
+    @Override
+    public float getMiningSpeedMultiplier() {
+        return 10.0F;
+    }
+    @Override
+    public float getAttackDamage() {
+        return 10.0F;
+    }
+    @Override
+    public int getMiningLevel() {
+        return 4;
+    }
+    @Override
+    public int getEnchantability() {
+        return 27;
+    }
+    @Override
+    public Ingredient getRepairIngredient() {
+        return Ingredient.ofItems(stupidiumMetals.STUPIDIUM);
+    }
+
+}

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/java/net/arcmods/ryantlg/worldGeneration/StupidiumOreGen.java

@@ -0,0 +1,64 @@
+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.metalBlocks.stupidiumBlocks;
+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.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 StupidiumOreGen {
+
+    // private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
+    //       OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
+    //       jeremiumBlocks.DEEPSLATE_JEREMIUM_ORE.getDefaultState(),
+    //       3)); // vein size
+
+	private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = new ConfiguredFeature(
+		Feature.ORE, new OreFeatureConfig(
+			OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
+			stupidiumBlocks.DEEPSLATE_STUPIDIUM_ORE.getDefaultState(),
+			2)); // vein size
+ 
+  	// public static PlacedFeature ORE_PLACED_FEATURE = ORE_CONFIGURED_FEATURE.withPlacement(
+    //   	CountPlacementModifier.of(1), // number of veins per chunk
+    //   	SquarePlacementModifier.of(), // spreading horizontally
+    //   	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(-20))
+		)); // height
+
+    public static void register() {
+		
+        Registry.register(BuiltinRegistries.CONFIGURED_FEATURE,
+        new Identifier("gameritems", "deepslate_stupidium_ore"), ORE_CONFIGURED_FEATURE);
+    	Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gameritems", "deepslate_stupidium_ore"),
+        	ORE_PLACED_FEATURE);
+    	BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES,
+        	RegistryKey.of(Registry.PLACED_FEATURE_KEY,
+            	new Identifier("gameritems", "deepslate_stupidium_ore")));
+
+		gameritems.LOGGER.info("StupidiumOreGen loaded");
+    }
+}

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

@@ -0,0 +1,5 @@
+{
+    "variants": {
+      "": { "model": "gameritems:block/deepslate_stupidium_ore" }
+    }
+  }

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

@@ -0,0 +1,5 @@
+{
+    "variants": {
+      "": { "model": "gameritems:block/stupidium_block" }
+    }
+  }

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

@@ -0,0 +1,5 @@
+{
+    "variants": {
+      "": { "model": "gameritems:block/stupidium_ore" }
+    }
+  }

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

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

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

@@ -1,18 +1,21 @@
 {
+    // bullshit items
     "item.gameritems.chin": "your chin",
-    "itemGroup.gameritems.chins": "funny stuff",
     "item.gameritems.nuts": "nuts",
     "item.gameritems.deez": "deez",
     "item.gameritems.deez_nuts": "deez nuts",
     "item.gameritems.deez_nuts_on_your_chin": "deez nuts on your chin",
     "item.gameritems.drag": "drag",
     "item.gameritems.drag_deez_nuts_on_your_chin": "drag deez nuts on our chin",
+    "item.gameritems.your_mother": "your mother",
+    "block.gameritems.matt_damon": "matt damon",
+
+
+    // omnium
     "item.gameritems.omnium_ingot": "Omnium Ingot",
     "block.gameritems.omnium_ore": "Omnium Ore",
     "block.gameritems.omnium_block": "Omnium Block",
     "item.gameritems.raw_omnium": "Raw Omnium",
-    "item.gameritems.your_mother": "your mother",
-    "block.gameritems.matt_damon": "matt damon",
     "item.gameritems.omnium_sword": "Omnium Sword",
     "item.gameritems.omnium_pickaxe": "Omnium Pickaxe",
     "item.gameritems.omnium_helmet": "Omnium Helmet",
@@ -22,16 +25,29 @@
     "item.gameritems.omnium_shovel": "Omnium Shovel",
     "item.gameritems.omnium_axe": "Omnium Axe",
     "item.gameritems.omnium_hoe": "Omnium Hoe",
+    "block.gameritems.deepslate_omnium_ore": "Deepslate Omnium Ore",
     "item.gameritems.netherite_stick": "Netherite Stick",
+    "item.gameritems.omnium_sword.tooltip": "Surprisingly lightweight!",
+
+
+    // item groups
     "itemGroup.gameritems.things": "ueh, stuff",
     "itemGroup.gameritems.armour_and_tools": "Armour, Weapons, and Tools",
-    "item.gameritems.omnium_sword.tooltip": "Surprisingly lightweight!",
+    "itemGroup.gameritems.chins": "funny stuff",
+
+
+    // weem items
     "item.gameritems.weem": "Weem",
     "item.gameritems.weem_seeds": "Weem Seeds",
+    "item.gameritems.weem_apple": "Weem Apple",
+    "block.gameritems.weem_haybale": "Weem Hay Bale",
     "item.gameritems.breem": "Breem",
     "item.gameritems.breem.tooltip": "High as a kite!",
     "item.gameritems.weem.tooltip": "Higher than a kite!",
-    "item.gameritems.weem_apple": "Weem Apple",
+
+
+    // orium items
+    "block.gameritems.deepslate_orium_ore": "Deepslate Orium Ore",
     "item.gameritems.orium.tooltip": "hahaha ore-ium",
     "block.gameritems.orium.tooltip": "hahaha ore-ium",
     "item.gameritems.raw_orium": "Raw Orium",
@@ -47,9 +63,19 @@
     "item.gameritems.orium_hoe": "Orium Hoe",
     "item.gameritems.orium_sword": "Orium Sword",
     "item.gameritems.orium_pickaxe": "Orium Pickaxe",
+
+
+    // effects
+    "effect.gameritems.stupid": "Stupid",
+    "effect.gameritems.high": "High",
+
+
+    // fabric of reality
     "item.gameritems.fabric_of_reality.tooltip": "Warning: has a chance to get §o§l§4RIPPED§r.",
     "item.gameritems.fabric_of_reality": "Fabric of Reality",
-    "effect.gameritems.high": "High",
+
+
+    // jeremium items
     "item.gameritems.jeremium_ingot": "Jeremium Ingot",
     "item.gameritems.raw_jeremium": "Raw Jeremium",
     "block.gameritems.jeremium_ore": "Jeremium Ore",
@@ -67,8 +93,36 @@
     "item.gameritems.jeremium_pickaxe": "Jeremium Pickaxe",
     "item.gameritems.jeremium_sword.tooltip": "Kinda heavy",
     "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"
 
+
+    // ETC
+    "item.gameritems.gamer_bow": "Gamer Bow",
+
+
+    // enchantments
+    "enchantment.gameritems.evade": "Evade",
+
+
+    // death messages
+    "death.attack.dumb": "%1$s choked on air.",
+
+
+    // stupidium items
+    "item.gameritems.stupidium.tooltip": "No brain here.",
+    "item.gameritems.dipstick": "Dipstick",
+    "block.gameritems.stupidium_ore": "Stupidium Ore",
+    "block.gameritems.deepslate_stupidium_ore": "Deepslate Stupidium Ore",
+    "block.gameritems.stupidium_block": "Stupidium Block",
+    "item.gameritems.stupidium_shovel": "Stupidium Shovel",
+    "item.gameritems.stupidium_sword": "Stupidium Sword",
+    "item.gameritems.stupidium_axe": "Stupidium Axe",
+    "item.gameritems.stupidium_hoe": "Stupidium Hoe",
+    "item.gameritems.stupidium_pickaxe": "Stupidium Pickaxe",
+    "item.gameritems.stupidium_sword.tooltip": "Inflicts Stupid on the victim.",
+    "item.gameritems.stupidium_ingot": "Stupidium Ingot",
+    "item.gameritems.raw_stupidium": "Raw Stupidium",
+    "item.gameritems.stupidium_helmet": "Stupidium Helmet",
+    "item.gameritems.stupidium_chestplate": "Stupidium Chestplate",
+    "item.gameritems.stupidium_leggings": "Stupidium Leggings",
+    "item.gameritems.stupidium_boots": "Stupidium Boots"
 } 

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

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+      "all": "gameritems:block/deepslate_stupidium_ore"
+    }
+  }

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

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+      "all": "gameritems:block/stupidium_block"
+    }
+  }

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

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+      "all": "gameritems:block/stupidium_ore"
+    }
+  }

src/main/resources/assets/gameritems/models/block/weem_haybale.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_haybale_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/deepslate_stupidium_ore.json

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

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

@@ -0,0 +1,6 @@
+{
+    "parent": "item/handheld",
+    "textures": {
+      "layer0": "gameritems:item/dipstick"
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "parent": "item/handheld",
+    "textures": {
+      "layer0": "gameritems:item/not_axe"
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "parent": "item/handheld",
+    "textures": {
+      "layer0": "gameritems:item/not_hoe"
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "parent": "item/handheld",
+    "textures": {
+      "layer0": "gameritems:item/not_pickaxe"
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "parent": "item/handheld",
+    "textures": {
+      "layer0": "gameritems:item/not_shovel"
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "parent": "item/handheld",
+    "textures": {
+      "layer0": "gameritems:item/not_sword"
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+      "layer0": "gameritems:item/raw_stupidium"
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "parent": "item/handheld",
+    "textures": {
+      "layer0": "gameritems:item/stupidium_axe"
+    }
+}

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

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

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

@@ -0,0 +1,6 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "gameritems:item/stupidium_boots"
+	}
+}

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

@@ -0,0 +1,6 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "gameritems:item/stupidium_chestplate"
+	}
+}

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

@@ -0,0 +1,6 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "gameritems:item/stupidium_helmet"
+	}
+}

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

@@ -0,0 +1,6 @@
+{
+    "parent": "item/handheld",
+    "textures": {
+      "layer0": "gameritems:item/stupidium_hoe"
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+      "layer0": "gameritems:item/stupidium_ingot"
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "gameritems:item/stupidium_leggings"
+	}
+}

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

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

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

@@ -0,0 +1,6 @@
+{
+    "parent": "item/handheld",
+    "textures": {
+      "layer0": "gameritems:item/stupidium_pickaxe"
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "parent": "item/handheld",
+    "textures": {
+      "layer0": "gameritems:item/stupidium_shovel"
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "parent": "item/handheld",
+    "textures": {
+      "layer0": "gameritems:item/stupidium_sword"
+    }
+}

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

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