stuffs

CHANGELOG

@@ -20,4 +20,9 @@
 ## 1.18.2-1.1.2-unstable
 - added healing back to high effect with lower amplifier
 - changed block strength of all (non joke) blocks
-- 1.1.2 complete
+
+## 1.18.2-1.1.3-unstable (incomplete)
+- added evade enchantment
+- added more advancements
+- added weem hay bale
+- rearranged block files

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;

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;

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;

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/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.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.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/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;
@@ -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/todo.txt

@@ -4,4 +4,7 @@ crafting recipes
 advancements
 argentine
 geranine
-soulium
+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": {
-      "icon": {
-        "item": "gameritems:raw_omnium"
-      },
-      "title": "greEN?",
-      "description": "Get a piece of raw Omnium",
-      "frame": "task",
-      "show_toast": true,
-      "announce_to_chat": true
+  "display": {
+    "icon": {
+      "item": "gameritems:raw_omnium"
     },
-    "parent": "gameritems:gameritems",
-    "criteria": {
-      "requirement": {
-        "trigger": "minecraft:inventory_changed",
-        "conditions": {
-          "items": [
-            {
-              "items": [
-                "gameritems:raw_omnium"
-              ]
-            }
-          ]
-        }
+    "title": "greEN?",
+    "description": "Get a piece of raw Omnium",
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true
+  },
+  "parent": "gameritems:orium_armour",
+  "criteria": {
+    "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"
+            ]
+          }
+        ]
+      }
+    }
+  }
+}