diff --git a/CHANGELOG b/CHANGELOG index b467007..70f44bf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,4 +15,8 @@ ## 1.18.2-1.1.1-unstable - fixed weem stacking to 85 (maybe) -- nerfed high effect \ No newline at end of file +- nerfed high effect + +## 1.18.2-1.1.2-unstable (incomplete) +- added healing back to high effect with lower amplifier +- changed block strength of all (non joke) blocks \ No newline at end of file diff --git a/src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java b/src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java index 112af47..34ed2e4 100644 --- a/src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java +++ b/src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java @@ -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); diff --git a/src/main/java/net/arcmods/ryantlg/blocks/omniumBlocks.java b/src/main/java/net/arcmods/ryantlg/blocks/omniumBlocks.java index edcca57..3e4f1f7 100755 --- a/src/main/java/net/arcmods/ryantlg/blocks/omniumBlocks.java +++ b/src/main/java/net/arcmods/ryantlg/blocks/omniumBlocks.java @@ -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() { diff --git a/src/main/java/net/arcmods/ryantlg/blocks/oriumBlocks.java b/src/main/java/net/arcmods/ryantlg/blocks/oriumBlocks.java index aa2ea5f..e814435 100644 --- a/src/main/java/net/arcmods/ryantlg/blocks/oriumBlocks.java +++ b/src/main/java/net/arcmods/ryantlg/blocks/oriumBlocks.java @@ -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() { diff --git a/src/main/java/net/arcmods/ryantlg/lootTables/grassVanillaWeem.java b/src/main/java/net/arcmods/ryantlg/lootTables/grassVanillaWeem.java index c6ab689..3a609df 100755 --- a/src/main/java/net/arcmods/ryantlg/lootTables/grassVanillaWeem.java +++ b/src/main/java/net/arcmods/ryantlg/lootTables/grassVanillaWeem.java @@ -22,7 +22,7 @@ public class grassVanillaWeem { .rolls(ConstantLootNumberProvider.create(1)) .with(ItemEntry.builder(weemItems.WEEM_SEEDS)) .withFunction(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0f)).build()) - .conditionally(RandomChanceLootCondition.builder(0.04f)); + .conditionally(RandomChanceLootCondition.builder(0.0123132f)); supplier.withPool(weemSeed.build()); } diff --git a/src/main/java/net/arcmods/ryantlg/statusEffects/effectClasses/highStatusEffect.java b/src/main/java/net/arcmods/ryantlg/statusEffects/effectClasses/highStatusEffect.java index 301e9d4..1e86905 100644 --- a/src/main/java/net/arcmods/ryantlg/statusEffects/effectClasses/highStatusEffect.java +++ b/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); } }