Update deps and bump min Neo version to 21.0.46-beta

Author: pupnewfster

build.gradle

@@ -398,7 +398,7 @@ dependencies {
     //TODO: Re-enable when it updates
     //localRuntime(jeiTweaker)
 
-    compileOnly("dev.gigaherz.jsonthings:JsonThings-${previous_minecraft_version}:${json_things_version}")
+    compileOnly("dev.gigaherz.jsonthings:JsonThings-${minecraft_version}:${json_things_version}")
 
     //Mods we have dependencies on but don't bother loading into the dev environment
     //compileOnly("curse.maven:projecte-api-226410:${projecte_api_id}")

gradle.properties

@@ -9,19 +9,19 @@ minecraft_version=1.21
 previous_minecraft_version=1.20.4
 previous_minor_minecraft_version=1.20.6
 loader_version_range=[4,)
-forge_version=21.0.42-beta
+forge_version=21.0.47-beta
 mod_version=10.6.3
 #This determines the minimum version of forge required to use Mekanism
 # Only bump it whenever we need access to a feature in forge that is not available in earlier versions
-forge_version_range=[21.0.40-beta,)
+forge_version_range=[21.0.46-beta,)
 minecraft_version_range=[1.21]
 #This specifies what type of release it will be uploaded to CurseForge and Modrinth as
 # options are: alpha, beta, release
 release_type=alpha
 
 #JUnit/Testing dependencies
 junit_version=5.10.2
-jqwik_version=1.8.5
+jqwik_version=1.9.0
 
 #NeoGradle Settings
 neogradle.subsystems.parchment.minecraftVersion=1.21
@@ -37,13 +37,14 @@ yamlops_version=1.2.0
 
 #Mod dependencies
 cc_tweaked_version=1.111.0
-crafttweaker_version=20.0.14
+crafttweaker_version=20.0.15
 ctm_version=1.2.0+1
 curios_version=9.0.4+1.21
 emi_version=1.1.8
 jade_api_id=5427895
-jade_id=5482520
-jei_version=19.0.0.11
+jade_id=5493270
+jei_version=19.0.0.14
+json_things_version=0.12.0
 top_version=1.21_neo-12.0.0-1
 wthit_version=12.2.2
 
@@ -54,15 +55,14 @@ wthit_version=12.2.2
 
 
 #Mod dependencies for recipes (only used by our data generators)
-ae2_version=19.0.7-alpha
-biomesoplenty_version=21.0.0.8
+ae2_version=19.0.8-alpha
+biomesoplenty_version=21.0.0.11
 glitchcore_version=2.0.0.2
 terrablender_version=4.0.0.1
 
 #Outdated mod dependencies
 flux_networks_id=5234697
 jeitweaker_version=8.0.5
-json_things_version=0.10.0
 oc2_id=3896581
 projecte_api_id=4860862
 recipe_stages_version=8.0.0.2

src/datagen/main/java/mekanism/common/loot/table/BaseBlockLootTables.java

@@ -31,12 +31,10 @@
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.component.DataComponentType;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
 import net.minecraft.data.loot.BlockLootSubProvider;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.flag.FeatureFlags;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.enchantment.Enchantments;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.block.Block;
@@ -101,17 +99,15 @@ protected boolean skipBlock(Block block) {
     }
 
     protected LootTable.Builder createOreDrop(Block block, ItemLike item) {
-        HolderLookup.RegistryLookup<Enchantment> registrylookup = this.registries.lookupOrThrow(Registries.ENCHANTMENT);
         return createSilkTouchDispatchTable(block, applyExplosionDecay(block, LootItem.lootTableItem(item.asItem())
-              .apply(ApplyBonusCount.addOreBonusCount(registrylookup.getOrThrow(Enchantments.FORTUNE)))
+              .apply(ApplyBonusCount.addOreBonusCount(this.registries.holderOrThrow(Enchantments.FORTUNE)))
         ));
     }
 
     protected LootTable.Builder droppingWithFortuneOrRandomly(Block block, ItemLike item, UniformGenerator range) {
-        HolderLookup.RegistryLookup<Enchantment> registrylookup = this.registries.lookupOrThrow(Registries.ENCHANTMENT);
         return createSilkTouchDispatchTable(block, applyExplosionDecay(block, LootItem.lootTableItem(item.asItem())
               .apply(SetItemCountFunction.setCount(range))
-              .apply(ApplyBonusCount.addOreBonusCount(registrylookup.getOrThrow(Enchantments.FORTUNE)))
+              .apply(ApplyBonusCount.addOreBonusCount(this.registries.holderOrThrow(Enchantments.FORTUNE)))
         ));
     }
 

src/main/java/mekanism/common/content/gear/ModuleContainer.java

@@ -26,7 +26,6 @@
 import mekanism.common.registries.MekanismDataComponents;
 import net.minecraft.core.Holder.Reference;
 import net.minecraft.core.HolderLookup;
-import net.minecraft.core.registries.Registries;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.codec.ByteBufCodecs;
@@ -224,7 +223,7 @@ private <MODULE extends ICustomModule<MODULE>> ItemEnchantments.Mutable disableO
     private <MODULE extends ICustomModule<MODULE>> ItemEnchantments.Mutable updateEnchantment(HolderLookup.Provider provider, Module<MODULE> module,
           @Nullable ItemEnchantments.Mutable adjustedEnchantments) {
         if (module.getCustomInstance() instanceof EnchantmentAwareModule<?> enchantmentBased) {
-            Optional<Reference<Enchantment>> enchantment = provider.lookupOrThrow(Registries.ENCHANTMENT).get(enchantmentBased.enchantment());
+            Optional<Reference<Enchantment>> enchantment = provider.holder(enchantmentBased.enchantment());
             int level = getEnchantmentLevel(module);
             if (enchantment.isPresent() && enchantments.getLevel(enchantment.get()) != level) {
                 adjustedEnchantments = new ItemEnchantments.Mutable(enchantments);
@@ -325,7 +324,7 @@ public <MODULE extends ICustomModule<MODULE>> void removeModule(HolderLookup.Pro
                 copiedModules.remove(type);
                 //Remove any corresponding enchantment
                 if (module.getCustomInstance() instanceof EnchantmentAwareModule<?> enchantmentBased) {
-                    Optional<Reference<Enchantment>> enchantment = provider.lookupOrThrow(Registries.ENCHANTMENT).get(enchantmentBased.enchantment());
+                    Optional<Reference<Enchantment>> enchantment = provider.holder(enchantmentBased.enchantment());
                     if (enchantment.isPresent() && enchantments.getLevel(enchantment.get()) != 0) {
                         adjustedEnchantments = new ItemEnchantments.Mutable(enchantments);
                         adjustedEnchantments.set(enchantment.get(), 0);

src/main/java/mekanism/common/registries/MekanismDamageTypes.java

@@ -80,7 +80,7 @@ public DamageSource source(RegistryAccess registryAccess, Vec3 position) {
         }
 
         private Holder<DamageType> holder(RegistryAccess registryAccess) {
-            return registryAccess.registryOrThrow(Registries.DAMAGE_TYPE).getHolderOrThrow(key());
+            return registryAccess.holderOrThrow(key());
         }
     }
 }

src/main/java/mekanism/common/tile/machine/TileEntityDigitalMiner.java

@@ -21,8 +21,8 @@
 import mekanism.api.Action;
 import mekanism.api.AutomationType;
 import mekanism.api.IContentsListener;
-import mekanism.api.SerializationConstants;
 import mekanism.api.RelativeSide;
+import mekanism.api.SerializationConstants;
 import mekanism.api.Upgrade;
 import mekanism.api.inventory.IInventorySlot;
 import mekanism.api.math.FloatingLong;
@@ -84,7 +84,6 @@
 import net.minecraft.core.Vec3i;
 import net.minecraft.core.component.DataComponentMap;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.chat.Component;
@@ -1275,7 +1274,7 @@ private List<ItemStack> getDrops(ServerLevel level, BlockState state, BlockPos p
         }
         ItemStack stack = ItemAtomicDisassembler.fullyChargedStack();
         if (getSilkTouch()) {
-            stack.enchant(level.registryAccess().registryOrThrow(Registries.ENCHANTMENT).getHolderOrThrow(Enchantments.SILK_TOUCH), 1);
+            stack.enchant(level.holderOrThrow(Enchantments.SILK_TOUCH), 1);
         }
         MekFakePlayer dummy = MekFakePlayer.setupFakePlayer(level, this.worldPosition.getX(), this.worldPosition.getY(), this.worldPosition.getZ());
         dummy.setEmulatingUUID(getOwnerUUID());//pretend to be the owner