Housekeeping

src/main/generated/assets/acesbs/blockstates/deepslate_entropy_ore.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "acesbs:block/deepslate_entropy_ore"
+    }
+  }
+}

src/main/generated/assets/acesbs/models/block/deepslate_entropy_ore.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "acesbs:block/deepslate_entropy_ore"
+  }
+}

src/main/generated/assets/acesbs/models/item/deepslate_entropy_ore.json

@@ -0,0 +1,3 @@
+{
+  "parent": "acesbs:block/deepslate_entropy_ore"
+}

src/main/generated/data/acesbs/advancement/recipes/misc/stable_entropy_from_blasting_deepslate_entropy_ore.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_deepslate_entropy_ore": {
+      "conditions": {
+        "items": [
+          {
+            "items": "acesbs:deepslate_entropy_ore"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "acesbs:stable_entropy_from_blasting_deepslate_entropy_ore"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_deepslate_entropy_ore"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "acesbs:stable_entropy_from_blasting_deepslate_entropy_ore"
+    ]
+  }
+}

src/main/generated/data/acesbs/enchantment/lightning_strike.json

@@ -4,11 +4,13 @@
     "translate": "enchantment.acesbs.lightning_strike"
   },
   "effects": {
-    "minecraft:projectile_spawned": [
+    "minecraft:post_attack": [
       {
+        "affected": "victim",
         "effect": {
           "type": "acesbs:lighting_strike"
-        }
+        },
+        "enchanted": "attacker"
       }
     ]
   },

src/main/generated/data/acesbs/loot_table/blocks/deepslate_entropy_ore.json

@@ -0,0 +1,189 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:match_tool",
+          "predicate": {
+            "predicates": {
+              "minecraft:enchantments": [
+                {
+                  "enchantments": "minecraft:silk_touch",
+                  "levels": {
+                    "min": 1
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "acesbs:entropy_ore"
+        }
+      ],
+      "functions": [
+        {
+          "function": "minecraft:explosion_decay"
+        }
+      ],
+      "rolls": 1.0
+    },
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:inverted",
+          "term": {
+            "condition": "minecraft:match_tool",
+            "predicate": {
+              "predicates": {
+                "minecraft:enchantments": [
+                  {
+                    "enchantments": "minecraft:silk_touch",
+                    "levels": {
+                      "min": 1
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        },
+        {
+          "condition": "minecraft:match_tool",
+          "predicate": {
+            "items": [
+              "acesbs:prisma_steel_pickaxe",
+              "acesbs:prisma_steel_hammer"
+            ]
+          }
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:air",
+          "weight": 360
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:coal",
+          "weight": 12
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:raw_copper",
+          "weight": 10
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:raw_iron",
+          "weight": 6
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:raw_gold",
+          "weight": 4
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:lapis_lazuli",
+          "weight": 3
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:redstone",
+          "weight": 2
+        },
+        {
+          "type": "minecraft:item",
+          "name": "acesbs:raw_entropy"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:diamond"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:emerald"
+        }
+      ],
+      "functions": [
+        {
+          "enchantment": "minecraft:fortune",
+          "formula": "minecraft:ore_drops",
+          "function": "minecraft:apply_bonus"
+        },
+        {
+          "function": "minecraft:explosion_decay"
+        }
+      ],
+      "rolls": {
+        "type": "minecraft:uniform",
+        "max": 3.0,
+        "min": 1.0
+      }
+    },
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:inverted",
+          "term": {
+            "condition": "minecraft:match_tool",
+            "predicate": {
+              "predicates": {
+                "minecraft:enchantments": [
+                  {
+                    "enchantments": "minecraft:silk_touch",
+                    "levels": {
+                      "min": 1
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        },
+        {
+          "condition": "minecraft:inverted",
+          "term": {
+            "condition": "minecraft:match_tool",
+            "predicate": {
+              "items": [
+                "acesbs:prisma_steel_pickaxe",
+                "acesbs:prisma_steel_hammer"
+              ]
+            }
+          }
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "acesbs:raw_entropy"
+        }
+      ],
+      "functions": [
+        {
+          "enchantment": "minecraft:fortune",
+          "formula": "minecraft:ore_drops",
+          "function": "minecraft:apply_bonus"
+        },
+        {
+          "function": "minecraft:explosion_decay"
+        }
+      ],
+      "rolls": {
+        "type": "minecraft:uniform",
+        "max": 3.0,
+        "min": 1.0
+      }
+    }
+  ]
+}

src/main/generated/data/acesbs/loot_table/blocks/entropy_ore.json

@@ -73,7 +73,7 @@
         {
           "type": "minecraft:item",
           "name": "minecraft:coal",
-          "weight": 14
+          "weight": 12
         },
         {
           "type": "minecraft:item",
@@ -83,12 +83,22 @@
         {
           "type": "minecraft:item",
           "name": "minecraft:raw_iron",
-          "weight": 8
+          "weight": 6
         },
         {
           "type": "minecraft:item",
           "name": "minecraft:raw_gold",
-          "weight": 6
+          "weight": 4
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:lapis_lazuli",
+          "weight": 3
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:redstone",
+          "weight": 2
         },
         {
           "type": "minecraft:item",
@@ -97,6 +107,10 @@
         {
           "type": "minecraft:item",
           "name": "minecraft:diamond"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:emerald"
         }
       ],
       "functions": [

src/main/generated/data/acesbs/recipe/stable_entropy_from_blasting_deepslate_entropy_ore.json

@@ -0,0 +1,13 @@
+{
+  "type": "minecraft:blasting",
+  "category": "misc",
+  "cookingtime": 2000,
+  "experience": 0.5,
+  "group": "stable_entropy",
+  "ingredient": {
+    "item": "acesbs:deepslate_entropy_ore"
+  },
+  "result": {
+    "id": "acesbs:stable_entropy"
+  }
+}

src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json

@@ -3,6 +3,7 @@
     "acesbs:entropy_block",
     "acesbs:stable_entropy_block",
     "acesbs:prisma_steel_block",
-    "acesbs:entropy_ore"
+    "acesbs:entropy_ore",
+    "acesbs:deepslate_entropy_ore"
   ]
 }

src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json

@@ -1,6 +1,7 @@
 {
   "values": [
     "acesbs:entropy_ore",
+    "acesbs:deepslate_entropy_ore",
     "acesbs:entropy_block",
     "acesbs:stable_entropy_block",
     "acesbs:prisma_steel_block"

src/main/generated/data/minecraft/tags/item/trimmable_armor.json

@@ -3,6 +3,7 @@
     "acesbs:prisma_steel_helmet",
     "acesbs:prisma_steel_chestplate",
     "acesbs:prisma_steel_leggings",
-    "acesbs:prisma_steel_boots"
+    "acesbs:prisma_steel_boots",
+    "acesbs:berserkers_pauldron"
   ]
 }

src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java

@@ -38,12 +38,20 @@ public class ModBlocks {
                     .requiresTool()
                     .sounds(BlockSoundGroup.AMETHYST_BLOCK)));
     public static final Block ENTROPY_ORE = registerBlock("entropy_ore",
-            new ExperienceDroppingBlock(UniformIntProvider.create(2, 5),
+            new ExperienceDroppingBlock(UniformIntProvider.create(3, 7),
                     AbstractBlock.Settings.create()
-                    .strength(3f)
+                            .strength(3.0F, 3.0F)
+                            .mapColor(MapColor.STONE_GRAY)
                             .requiresTool()
                             .sounds(BlockSoundGroup.STONE)));
 
+    public static final Block DEEPSLATE_ENTROPY_ORE = registerBlock("deepslate_entropy_ore",
+            new ExperienceDroppingBlock(UniformIntProvider.create(3, 7),
+                    AbstractBlock.Settings.create()
+                            .mapColor(MapColor.DEEPSLATE_GRAY)
+                            .strength(4.5F, 3.0F)
+                            .requiresTool()
+                            .sounds(BlockSoundGroup.DEEPSLATE)));
 
     public static final Block STABLE_ENTROPY_BLOCK = registerBlock("stable_entropy_block",
             new StableEntropyBlock(AbstractBlock.Settings.create()

src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java

@@ -20,9 +20,11 @@ public class ModBlockTagProvider extends FabricTagProvider.BlockTagProvider {
                 .add(ModBlocks.ENTROPY_BLOCK)
                 .add(ModBlocks.STABLE_ENTROPY_BLOCK)
                 .add(ModBlocks.PRISMA_STEEL_BLOCK)
-                .add(ModBlocks.ENTROPY_ORE);
+                .add(ModBlocks.ENTROPY_ORE)
+                .add(ModBlocks.DEEPSLATE_ENTROPY_ORE);
         getOrCreateTagBuilder(BlockTags.NEEDS_DIAMOND_TOOL)
                 .add(ModBlocks.ENTROPY_ORE)
+                .add(ModBlocks.DEEPSLATE_ENTROPY_ORE)
                 .add(ModBlocks.ENTROPY_BLOCK)
                 .add(ModBlocks.STABLE_ENTROPY_BLOCK)
                 .add(ModBlocks.PRISMA_STEEL_BLOCK);

src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java

@@ -70,6 +70,7 @@ public class ModLootTableProvider extends FabricBlockLootTableProvider {
         addDrop(ModBlocks.LEMONWOOD_TRAPDOOR);
 
         addDrop(ModBlocks.ENTROPY_ORE, prismaSteelOreDrops(ModBlocks.ENTROPY_ORE, ModItems.RAW_ENTROPY, 1, 3));
+        addDrop(ModBlocks.DEEPSLATE_ENTROPY_ORE, prismaSteelOreDrops(ModBlocks.ENTROPY_ORE, ModItems.RAW_ENTROPY, 1, 3));
 
         BlockStatePropertyLootCondition.Builder builder2 = BlockStatePropertyLootCondition.builder(ModBlocks.TOBACCO_CROP)
                 .properties(StatePredicate.Builder.create().exactMatch(TobaccoCrop.AGE, TobaccoCrop.MAX_AGE));
@@ -122,12 +123,15 @@ public class ModLootTableProvider extends FabricBlockLootTableProvider {
                 .conditionally(InvertedLootCondition.builder(silkTouchCondition))
                 .conditionally(specialToolCondition(ModItems.PRISMA_STEEL_PICKAXE, ModItems.PRISMA_STEEL_HAMMER))
                 .with(ItemEntry.builder(Items.AIR).weight(360))
-                .with(ItemEntry.builder(Items.COAL).weight(14))
+                .with(ItemEntry.builder(Items.COAL).weight(12))
                 .with(ItemEntry.builder(Items.RAW_COPPER).weight(10))
-                .with(ItemEntry.builder(Items.RAW_IRON).weight(8))
+                .with(ItemEntry.builder(Items.RAW_IRON).weight(6))
-                .with(ItemEntry.builder(Items.RAW_GOLD).weight(6))
+                .with(ItemEntry.builder(Items.RAW_GOLD).weight(4))
+                .with(ItemEntry.builder(Items.LAPIS_LAZULI).weight(3))
+                .with(ItemEntry.builder(Items.REDSTONE).weight(2))
                 .with(ItemEntry.builder(ModItems.RAW_ENTROPY).weight(1))
                 .with(ItemEntry.builder(Items.DIAMOND).weight(1))
+                .with(ItemEntry.builder(Items.EMERALD).weight(1))
                 .apply(ApplyBonusLootFunction.oreDrops(impl.getOrThrow(Enchantments.FORTUNE)))
                 .apply(ExplosionDecayLootFunction.builder());
 

src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java

@@ -19,6 +19,7 @@ public class ModModelProvider extends FabricModelProvider {
     @Override
     public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) {
         blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.ENTROPY_ORE);
+        blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.DEEPSLATE_ENTROPY_ORE);
 //        blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.ENTROPY_BLOCK);
 //        Has a complex texture, use the default blockbench method.
         blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.STABLE_ENTROPY_BLOCK);

src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java

@@ -28,7 +28,7 @@ public class ModRecipeProvider extends FabricRecipeProvider {
     @Override
     public void generate(RecipeExporter recipeExporter) {
 
-        List<ItemConvertible> ENTROPY_SMELTABLES = List.of(ModItems.RAW_ENTROPY, ModBlocks.ENTROPY_ORE);
+        List<ItemConvertible> ENTROPY_SMELTABLES = List.of(ModItems.RAW_ENTROPY, ModBlocks.ENTROPY_ORE, ModBlocks.DEEPSLATE_ENTROPY_ORE);
 
         offerBlasting(recipeExporter, ENTROPY_SMELTABLES, RecipeCategory.MISC, ModItems.STABLE_ENTROPY, 0.5f, 2000, "stable_entropy");
 

src/main/java/com/acethewildfire/acesbs/enchantment/ModEnchantments.java

@@ -33,8 +33,10 @@ public class ModEnchantments {
             Enchantment.leveledCost(25, 9),
             2,
             AttributeModifierSlot.MAINHAND
-        )).addEffect(
+        ))
-                EnchantmentEffectComponentTypes.PROJECTILE_SPAWNED,
+            .addEffect(
+                EnchantmentEffectComponentTypes.POST_ATTACK,
+                EnchantmentEffectTarget.ATTACKER, EnchantmentEffectTarget.VICTIM,
                 new LightningStrikeEnchantmentEffect()));
     }
 

src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java

@@ -38,6 +38,7 @@ public class ModItemGroups {
                     .displayName(Text.translatable("itemgroup.acesbs.blocks"))
                     .entries((displayContext, entries) -> {
                         entries.add(ModBlocks.ENTROPY_ORE);
+                        entries.add(ModBlocks.DEEPSLATE_ENTROPY_ORE);
                         entries.add(ModBlocks.ENTROPY_BLOCK);
                         entries.add(ModBlocks.STABLE_ENTROPY_BLOCK);
                         entries.add(ModBlocks.PRISMA_STEEL_BLOCK);

src/main/java/com/acethewildfire/acesbs/util/UpdateRecipies.java

@@ -26,6 +26,8 @@ import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.RegistryWrapper;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 public class UpdateRecipies {
@@ -39,7 +41,44 @@ public class UpdateRecipies {
     public static void updateVanilla(){
         AcesBS.LOGGER.info("Updating vanilla Ore Drops for Prisma Steel");
 
+        RegistryKey<LootTable> coalOreLootId = Blocks.COAL_ORE.getLootTableKey();
+        RegistryKey<LootTable> copperOreLootId = Blocks.COPPER_ORE.getLootTableKey();
         RegistryKey<LootTable> ironOreLootId = Blocks.IRON_ORE.getLootTableKey();
+        RegistryKey<LootTable> goldOreLootId = Blocks.GOLD_ORE.getLootTableKey();
+        RegistryKey<LootTable> lapisOreLootId = Blocks.LAPIS_ORE.getLootTableKey();
+        RegistryKey<LootTable> redstoneOreLootId = Blocks.REDSTONE_ORE.getLootTableKey();
+        RegistryKey<LootTable> diamondOreLootId = Blocks.DIAMOND_ORE.getLootTableKey();
+        RegistryKey<LootTable> emeraldOreLootId = Blocks.EMERALD_ORE.getLootTableKey();
+
+        RegistryKey<LootTable> coalDeepslateOreLootId = Blocks.DEEPSLATE_COAL_ORE.getLootTableKey();
+        RegistryKey<LootTable> copperDeepslateOreLootId = Blocks.DEEPSLATE_COPPER_ORE.getLootTableKey();
+        RegistryKey<LootTable> ironDeepslateOreLootId = Blocks.DEEPSLATE_IRON_ORE.getLootTableKey();
+        RegistryKey<LootTable> goldDeepslateOreLootId = Blocks.DEEPSLATE_GOLD_ORE.getLootTableKey();
+        RegistryKey<LootTable> lapisDeepslateOreLootId = Blocks.DEEPSLATE_LAPIS_ORE.getLootTableKey();
+        RegistryKey<LootTable> redstoneDeepslateOreLootId = Blocks.DEEPSLATE_REDSTONE_ORE.getLootTableKey();
+        RegistryKey<LootTable> diamondDeepslateOreLootId = Blocks.DEEPSLATE_DIAMOND_ORE.getLootTableKey();
+        RegistryKey<LootTable> emeraldDeepslateOreLootId = Blocks.DEEPSLATE_EMERALD_ORE.getLootTableKey();
+
+        List<RegistryKey<LootTable>> ores = new ArrayList<>();
+
+        ores.add(coalOreLootId);
+        ores.add(copperOreLootId);
+        ores.add(ironOreLootId);
+        ores.add(goldOreLootId);
+        ores.add(lapisOreLootId);
+        ores.add(redstoneOreLootId);
+        ores.add(diamondOreLootId);
+        ores.add(emeraldOreLootId);
+
+        ores.add(coalDeepslateOreLootId);
+        ores.add(copperDeepslateOreLootId);
+        ores.add(ironDeepslateOreLootId);
+        ores.add(goldDeepslateOreLootId);
+        ores.add(lapisDeepslateOreLootId);
+        ores.add(redstoneDeepslateOreLootId);
+        ores.add(diamondDeepslateOreLootId);
+        ores.add(emeraldDeepslateOreLootId);
+
 
 
 
@@ -53,19 +92,21 @@ public class UpdateRecipies {
                 )
             );
 
-            // Target only iron ore
+            if (source.isBuiltin() && ores.contains(key)) {
-            if (source.isBuiltin() && ironOreLootId.equals(key)) {
                 LootPool.Builder extraPool = LootPool.builder()
                         .rolls(UniformLootNumberProvider.create(1, 2))
                         .conditionally(InvertedLootCondition.builder(silkTouchCondition))
                         .conditionally(specialToolCondition(ModItems.PRISMA_STEEL_PICKAXE, ModItems.PRISMA_STEEL_HAMMER))
-                        .with(ItemEntry.builder(Items.AIR).weight(360))
+                        .with(ItemEntry.builder(Items.AIR).weight(460))
-                        .with(ItemEntry.builder(Items.COAL).weight(14))
+                        .with(ItemEntry.builder(Items.COAL).weight(12))
                         .with(ItemEntry.builder(Items.RAW_COPPER).weight(10))
-                        .with(ItemEntry.builder(Items.RAW_IRON).weight(8))
+                        .with(ItemEntry.builder(Items.RAW_IRON).weight(6))
-                        .with(ItemEntry.builder(Items.RAW_GOLD).weight(6))
+                        .with(ItemEntry.builder(Items.RAW_GOLD).weight(4))
+                        .with(ItemEntry.builder(Items.LAPIS_LAZULI).weight(3))
+                        .with(ItemEntry.builder(Items.REDSTONE).weight(2))
                         .with(ItemEntry.builder(ModItems.RAW_ENTROPY).weight(1))
                         .with(ItemEntry.builder(Items.DIAMOND).weight(1))
+                        .with(ItemEntry.builder(Items.EMERALD).weight(1))
                         .apply(ApplyBonusLootFunction.oreDrops(impl.getOrThrow(Enchantments.FORTUNE)))
                         .apply(ExplosionDecayLootFunction.builder());
 

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

@@ -1,5 +1,5 @@
 {
-  "item.acesbs.oracle_lemon.effect.blindness": "Oracle of Lemon",
+  "item.acesbs.oracle_lemon.effect.lemon": "Oracle of Lemon",
   "item.acesbs.raw_entropy": "Raw Entropy",
   "item.acesbs.stable_entropy": "Stabilized Entropy",
   "item.acesbs.infernal_ashes": "Infernal Ashes",
@@ -62,6 +62,7 @@
   "block.acesbs.entropy_block": "Block of Raw Entropy",
   "block.acesbs.prisma_steel_block": "Block of Prisma Steel",
   "block.acesbs.entropy_ore": "Entropic Ore",
+  "block.acesbs.deepslate_entropy_ore": "Deepslate Entropic Ore",
   "block.acesbs.stable_entropy_block": "Block of Stabilized Entropy",
 
   "block.acesbs.lizard_planks": "Lizard Planks",