diff --git a/elements/OreMinerMineButtonPressed.mod.json b/elements/OreMinerMineButtonPressed.mod.json
index 8bb20e3..da62142 100644
--- a/elements/OreMinerMineButtonPressed.mod.json
+++ b/elements/OreMinerMineButtonPressed.mod.json
@@ -2,6 +2,6 @@
"_fv": 73,
"_type": "procedure",
"definition": {
- "procedurexml": "oreMinerRollno_ext_triggerAND0Items.DIAMOND_PICKAXE0block.amethyst_block.breakblock10.750.85150local:oreMinerRollRANDOMLTlocal:oreMinerRoll0.4ADD113Items.COAL#0106LTlocal:oreMinerRoll0.6ADD224Items.RAW_COPPER208LTlocal:oreMinerRoll0.7ADD31Items.RAW_IRON308LTlocal:oreMinerRoll0.78ADD41Items.RAW_GOLD4010LTlocal:oreMinerRoll0.81ADD512Items.DIAMOND5014LTlocal:oreMinerRoll0.84ADD612Items.EMERALD6014LTlocal:oreMinerRoll0.985ADD736Items.REDSTONE709ADD81Items.NETHERITE_SCRAP8020"
+ "procedurexml": "oreMinerRollno_ext_triggerAND0Items.DIAMOND_PICKAXE0block.amethyst_block.breakblock10.750.85150local:oreMinerRollRANDOMLTlocal:oreMinerRoll0.4ADD1MULTIPLY13ADDFORTUNE01Items.COAL#01106LTlocal:oreMinerRoll0.6ADD2MULTIPLY24ADDFORTUNE01Items.COPPER_INGOT208LTlocal:oreMinerRoll0.7ADD3MULTIPLY1ADDFORTUNE01Items.IRON_INGOT308LTlocal:oreMinerRoll0.78ADD4MULTIPLY1ADDFORTUNE01Items.GOLD_INGOT4010LTlocal:oreMinerRoll0.81ADD5MULTIPLY12ADDFORTUNE01Items.DIAMOND53014LTlocal:oreMinerRoll0.84ADD6MULTIPLY12ADDFORTUNE01Items.EMERALD63014LTlocal:oreMinerRoll0.985ADD7MULTIPLY36ADDFORTUNE01Items.REDSTONE7509ADD8MULTIPLY1ADDFORTUNE01Items.NETHERITE_SCRAP8020"
}
}
\ No newline at end of file
diff --git a/elements/OreMinerRecipe.mod.json b/elements/OreMinerRecipe.mod.json
index cd0499e..ad4a995 100644
--- a/elements/OreMinerRecipe.mod.json
+++ b/elements/OreMinerRecipe.mod.json
@@ -15,10 +15,10 @@
"value": "Items.COAL#0"
},
{
- "value": "Items.RAW_COPPER"
+ "value": "Items.COPPER_INGOT"
},
{
- "value": "Items.RAW_IRON"
+ "value": "Items.IRON_INGOT"
},
{
"value": "Items.NETHERITE_SCRAP"
@@ -27,7 +27,7 @@
"value": "CUSTOM:QuadraCondensedNetherrack"
},
{
- "value": "Items.RAW_GOLD"
+ "value": "Items.GOLD_INGOT"
},
{
"value": "Items.REDSTONE"
diff --git a/nims_random_bullshit.mcreator b/nims_random_bullshit.mcreator
index 55a3678..8721a79 100644
--- a/nims_random_bullshit.mcreator
+++ b/nims_random_bullshit.mcreator
@@ -3425,7 +3425,7 @@
"workspaceSettings": {
"modid": "nims_random_bullshit",
"modName": "Nim\u0027s Random Bullshit",
- "version": "1.6.0",
+ "version": "1.6.1",
"description": "Random shit added by Nim. Created with MCreator.",
"author": "nimsolated, MCreator",
"websiteURL": "https://mcreator.net",
diff --git a/src/main/java/net/mcreator/nimsrandombullshit/procedures/OreMinerMineButtonPressedProcedure.java b/src/main/java/net/mcreator/nimsrandombullshit/procedures/OreMinerMineButtonPressedProcedure.java
index 463c1a3..44d6c6f 100644
--- a/src/main/java/net/mcreator/nimsrandombullshit/procedures/OreMinerMineButtonPressedProcedure.java
+++ b/src/main/java/net/mcreator/nimsrandombullshit/procedures/OreMinerMineButtonPressedProcedure.java
@@ -4,6 +4,7 @@ import net.minecraftforge.registries.ForgeRegistries;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.Level;
+import net.minecraft.world.item.enchantment.Enchantments;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.inventory.Slot;
@@ -54,16 +55,20 @@ public class OreMinerMineButtonPressedProcedure {
}
return 0;
}
- }.getAmount(1) + Mth.nextInt(RandomSource.create(), 1, 3)));
+ }.getAmount(1) + Mth.nextInt(RandomSource.create(), 1, 3)
+ * ((entity instanceof Player _plrSlotItem && _plrSlotItem.containerMenu instanceof Supplier _splr && _splr.get() instanceof Map _slt ? ((Slot) _slt.get(0)).getItem() : ItemStack.EMPTY)
+ .getEnchantmentLevel(Enchantments.BLOCK_FORTUNE) + 1)));
((Slot) _slots.get(1)).set(_setstack);
_player.containerMenu.broadcastChanges();
}
+ if (entity instanceof Player _player)
+ _player.giveExperiencePoints(1);
if (entity instanceof Player _player)
_player.getCooldowns()
.addCooldown((entity instanceof Player _plrSlotItem && _plrSlotItem.containerMenu instanceof Supplier _splr && _splr.get() instanceof Map _slt ? ((Slot) _slt.get(0)).getItem() : ItemStack.EMPTY).getItem(), 6);
} else if (oreMinerRoll < 0.6) {
if (entity instanceof Player _player && _player.containerMenu instanceof Supplier _current && _current.get() instanceof Map _slots) {
- ItemStack _setstack = new ItemStack(Items.RAW_COPPER).copy();
+ ItemStack _setstack = new ItemStack(Items.COPPER_INGOT).copy();
_setstack.setCount((int) (new Object() {
public int getAmount(int sltid) {
if (entity instanceof Player _player && _player.containerMenu instanceof Supplier _current && _current.get() instanceof Map _slots) {
@@ -73,7 +78,9 @@ public class OreMinerMineButtonPressedProcedure {
}
return 0;
}
- }.getAmount(2) + Mth.nextInt(RandomSource.create(), 2, 4)));
+ }.getAmount(2) + Mth.nextInt(RandomSource.create(), 2, 4)
+ * ((entity instanceof Player _plrSlotItem && _plrSlotItem.containerMenu instanceof Supplier _splr && _splr.get() instanceof Map _slt ? ((Slot) _slt.get(0)).getItem() : ItemStack.EMPTY)
+ .getEnchantmentLevel(Enchantments.BLOCK_FORTUNE) + 1)));
((Slot) _slots.get(2)).set(_setstack);
_player.containerMenu.broadcastChanges();
}
@@ -82,7 +89,7 @@ public class OreMinerMineButtonPressedProcedure {
.addCooldown((entity instanceof Player _plrSlotItem && _plrSlotItem.containerMenu instanceof Supplier _splr && _splr.get() instanceof Map _slt ? ((Slot) _slt.get(0)).getItem() : ItemStack.EMPTY).getItem(), 8);
} else if (oreMinerRoll < 0.7) {
if (entity instanceof Player _player && _player.containerMenu instanceof Supplier _current && _current.get() instanceof Map _slots) {
- ItemStack _setstack = new ItemStack(Items.RAW_IRON).copy();
+ ItemStack _setstack = new ItemStack(Items.IRON_INGOT).copy();
_setstack.setCount((int) (new Object() {
public int getAmount(int sltid) {
if (entity instanceof Player _player && _player.containerMenu instanceof Supplier _current && _current.get() instanceof Map _slots) {
@@ -92,7 +99,8 @@ public class OreMinerMineButtonPressedProcedure {
}
return 0;
}
- }.getAmount(3) + 1));
+ }.getAmount(3) + 1 * ((entity instanceof Player _plrSlotItem && _plrSlotItem.containerMenu instanceof Supplier _splr && _splr.get() instanceof Map _slt ? ((Slot) _slt.get(0)).getItem() : ItemStack.EMPTY)
+ .getEnchantmentLevel(Enchantments.BLOCK_FORTUNE) + 1)));
((Slot) _slots.get(3)).set(_setstack);
_player.containerMenu.broadcastChanges();
}
@@ -101,7 +109,7 @@ public class OreMinerMineButtonPressedProcedure {
.addCooldown((entity instanceof Player _plrSlotItem && _plrSlotItem.containerMenu instanceof Supplier _splr && _splr.get() instanceof Map _slt ? ((Slot) _slt.get(0)).getItem() : ItemStack.EMPTY).getItem(), 8);
} else if (oreMinerRoll < 0.78) {
if (entity instanceof Player _player && _player.containerMenu instanceof Supplier _current && _current.get() instanceof Map _slots) {
- ItemStack _setstack = new ItemStack(Items.RAW_GOLD).copy();
+ ItemStack _setstack = new ItemStack(Items.GOLD_INGOT).copy();
_setstack.setCount((int) (new Object() {
public int getAmount(int sltid) {
if (entity instanceof Player _player && _player.containerMenu instanceof Supplier _current && _current.get() instanceof Map _slots) {
@@ -111,7 +119,8 @@ public class OreMinerMineButtonPressedProcedure {
}
return 0;
}
- }.getAmount(4) + 1));
+ }.getAmount(4) + 1 * ((entity instanceof Player _plrSlotItem && _plrSlotItem.containerMenu instanceof Supplier _splr && _splr.get() instanceof Map _slt ? ((Slot) _slt.get(0)).getItem() : ItemStack.EMPTY)
+ .getEnchantmentLevel(Enchantments.BLOCK_FORTUNE) + 1)));
((Slot) _slots.get(4)).set(_setstack);
_player.containerMenu.broadcastChanges();
}
@@ -130,10 +139,14 @@ public class OreMinerMineButtonPressedProcedure {
}
return 0;
}
- }.getAmount(5) + Mth.nextInt(RandomSource.create(), 1, 2)));
+ }.getAmount(5) + Mth.nextInt(RandomSource.create(), 1, 2)
+ * ((entity instanceof Player _plrSlotItem && _plrSlotItem.containerMenu instanceof Supplier _splr && _splr.get() instanceof Map _slt ? ((Slot) _slt.get(0)).getItem() : ItemStack.EMPTY)
+ .getEnchantmentLevel(Enchantments.BLOCK_FORTUNE) + 1)));
((Slot) _slots.get(5)).set(_setstack);
_player.containerMenu.broadcastChanges();
}
+ if (entity instanceof Player _player)
+ _player.giveExperiencePoints(3);
if (entity instanceof Player _player)
_player.getCooldowns()
.addCooldown((entity instanceof Player _plrSlotItem && _plrSlotItem.containerMenu instanceof Supplier _splr && _splr.get() instanceof Map _slt ? ((Slot) _slt.get(0)).getItem() : ItemStack.EMPTY).getItem(), 14);
@@ -149,10 +162,14 @@ public class OreMinerMineButtonPressedProcedure {
}
return 0;
}
- }.getAmount(6) + Mth.nextInt(RandomSource.create(), 1, 2)));
+ }.getAmount(6) + Mth.nextInt(RandomSource.create(), 1, 2)
+ * ((entity instanceof Player _plrSlotItem && _plrSlotItem.containerMenu instanceof Supplier _splr && _splr.get() instanceof Map _slt ? ((Slot) _slt.get(0)).getItem() : ItemStack.EMPTY)
+ .getEnchantmentLevel(Enchantments.BLOCK_FORTUNE) + 1)));
((Slot) _slots.get(6)).set(_setstack);
_player.containerMenu.broadcastChanges();
}
+ if (entity instanceof Player _player)
+ _player.giveExperiencePoints(3);
if (entity instanceof Player _player)
_player.getCooldowns()
.addCooldown((entity instanceof Player _plrSlotItem && _plrSlotItem.containerMenu instanceof Supplier _splr && _splr.get() instanceof Map _slt ? ((Slot) _slt.get(0)).getItem() : ItemStack.EMPTY).getItem(), 14);
@@ -168,10 +185,14 @@ public class OreMinerMineButtonPressedProcedure {
}
return 0;
}
- }.getAmount(7) + Mth.nextInt(RandomSource.create(), 3, 6)));
+ }.getAmount(7) + Mth.nextInt(RandomSource.create(), 3, 6)
+ * ((entity instanceof Player _plrSlotItem && _plrSlotItem.containerMenu instanceof Supplier _splr && _splr.get() instanceof Map _slt ? ((Slot) _slt.get(0)).getItem() : ItemStack.EMPTY)
+ .getEnchantmentLevel(Enchantments.BLOCK_FORTUNE) + 1)));
((Slot) _slots.get(7)).set(_setstack);
_player.containerMenu.broadcastChanges();
}
+ if (entity instanceof Player _player)
+ _player.giveExperiencePoints(5);
if (entity instanceof Player _player)
_player.getCooldowns()
.addCooldown((entity instanceof Player _plrSlotItem && _plrSlotItem.containerMenu instanceof Supplier _splr && _splr.get() instanceof Map _slt ? ((Slot) _slt.get(0)).getItem() : ItemStack.EMPTY).getItem(), 9);
@@ -187,7 +208,8 @@ public class OreMinerMineButtonPressedProcedure {
}
return 0;
}
- }.getAmount(8) + 1));
+ }.getAmount(8) + 1 * ((entity instanceof Player _plrSlotItem && _plrSlotItem.containerMenu instanceof Supplier _splr && _splr.get() instanceof Map _slt ? ((Slot) _slt.get(0)).getItem() : ItemStack.EMPTY)
+ .getEnchantmentLevel(Enchantments.BLOCK_FORTUNE) + 1)));
((Slot) _slots.get(8)).set(_setstack);
_player.containerMenu.broadcastChanges();
}
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index cf5d307..b940996 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -4,7 +4,7 @@ license="Academic Free License v3.0"
[[mods]]
modId="nims_random_bullshit"
-version="1.6.0"
+version="1.6.1"
displayName="Nim's Random Bullshit"
displayURL="https://mcreator.net"
credits="Created using mod maker MCreator - https://mcreator.net/about"
diff --git a/src/main/resources/data/nims_random_bullshit/recipes/ore_miner_recipe.json b/src/main/resources/data/nims_random_bullshit/recipes/ore_miner_recipe.json
index d8a60ec..a9aba19 100644
--- a/src/main/resources/data/nims_random_bullshit/recipes/ore_miner_recipe.json
+++ b/src/main/resources/data/nims_random_bullshit/recipes/ore_miner_recipe.json
@@ -6,10 +6,10 @@
"item": "minecraft:coal"
},
{
- "item": "minecraft:raw_copper"
+ "item": "minecraft:copper_ingot"
},
{
- "item": "minecraft:raw_iron"
+ "item": "minecraft:iron_ingot"
},
{
"item": "minecraft:netherite_scrap"
@@ -18,7 +18,7 @@
"item": "nims_random_bullshit:quadra_condensed_netherrack"
},
{
- "item": "minecraft:raw_gold"
+ "item": "minecraft:gold_ingot"
},
{
"item": "minecraft:redstone"