Updated to 1.20.1

Hexeption · Hexeption · commit 9788977b345e · 2023-06-16T18:52:19.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.+', changing: true
         classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
         classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.4.0"
         classpath group: 'gradle.plugin.com.modrinth.minotaur', name: 'Minotaur', version: '1.1.0'
@@ -18,7 +18,7 @@ apply plugin: "com.matthewprenger.cursegradle"
 apply plugin: 'maven-publish'
 
 group = 'uk.co.hexeption'
-version = '1.19.3-1.3.0'
+version = '1.20.1-1.0.0'
 def env = System.getenv()
 if (env.GITHUB_RUN_NUMBER) {
     version = version + "+" + "${env.GITHUB_RUN_NUMBER}"
@@ -31,7 +31,7 @@ java {
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 
 minecraft {
-    mappings channel: 'official', version: '1.19.3'
+    mappings channel: 'official', version: '1.20.1'
 
     runs {
         client {
@@ -105,11 +105,11 @@ repositories {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.19.3-44.1.8'
+    minecraft 'net.minecraftforge:forge:1.20.1-47.0.3'
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
-    runtimeOnly fg.deobf("mezz.jei:jei-1.19.3-forge:12.1.1.13")
-    compileOnly fg.deobf("appeng:appliedenergistics2-forge:13.0.9-beta")
-    runtimeOnly fg.deobf("appeng:appliedenergistics2-forge:13.0.9-beta")
+    runtimeOnly fg.deobf("mezz.jei:jei-1.20.1-forge:15.0.0.12")
+    compileOnly fg.deobf("appeng:appliedenergistics2-forge:15.0.2-alpha")
+    runtimeOnly fg.deobf("appeng:appliedenergistics2-forge:15.0.2-alpha")
 }
 
 jar {
@@ -134,13 +134,13 @@ mixin {
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     from sourceSets.main.allSource
 }
 
 task deobfJar(type: Jar) {
     from sourceSets.main.output
-    classifier 'deobf'
+    archiveClassifier = 'deobf'
 }
 
 artifacts {
@@ -206,7 +206,7 @@ task publishModrinth (type: TaskModrinthUpload){
     changelog = 'A changelog can be found at https://github.com/Hexeption/AEInfinityBooster'
     versionNumber = "$version"
     uploadFile = jar
-    addGameVersion("1.19.3")
+    addGameVersion("1.20.2")
     addLoader('forge')
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists
diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,5 +1,5 @@
-// 1.19.3	2023-01-31T17:18:12.3473739	Recipes
-e973e18b72bd2ccfbb6778412f00f9bcccf0924d data/aeinfinitybooster/advancements/recipes/misc/dimension_card.json
-02b2f6447afd45a8cd40ab47af9422df90599714 data/aeinfinitybooster/advancements/recipes/misc/infinity_card.json
-27c7a523b96cd6b17473d2201aa8263623a0e239 data/aeinfinitybooster/recipes/dimension_card.json
-608d99b1d35fb629b78a831e8a7128a33decf736 data/aeinfinitybooster/recipes/infinity_card.json
+// 1.20.1	2023-06-16T18:51:56.0360851	Recipes
+9bfdb21a9795499875c6e5e43df9e0b13108fbe8 data/aeinfinitybooster/advancements/recipes/misc/dimension_card.json
+531cd172d9f61fe1797b436345da0cefcc138449 data/aeinfinitybooster/advancements/recipes/misc/infinity_card.json
+40d3b32f9526a4ef96068d5482d5162be34236c2 data/aeinfinitybooster/recipes/dimension_card.json
+53848559d7093ba5e6d1a9a8e8ee865d28562039 data/aeinfinitybooster/recipes/infinity_card.json
diff --git a/src/generated/resources/data/aeinfinitybooster/advancements/recipes/misc/dimension_card.json b/src/generated/resources/data/aeinfinitybooster/advancements/recipes/misc/dimension_card.json
@@ -30,5 +30,6 @@
     "recipes": [
       "aeinfinitybooster:dimension_card"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/src/generated/resources/data/aeinfinitybooster/advancements/recipes/misc/infinity_card.json b/src/generated/resources/data/aeinfinitybooster/advancements/recipes/misc/infinity_card.json
@@ -30,5 +30,6 @@
     "recipes": [
       "aeinfinitybooster:infinity_card"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/src/generated/resources/data/aeinfinitybooster/recipes/dimension_card.json b/src/generated/resources/data/aeinfinitybooster/recipes/dimension_card.json
@@ -19,5 +19,6 @@
   ],
   "result": {
     "item": "aeinfinitybooster:dimension_card"
-  }
+  },
+  "show_notification": true
 }
diff --git a/src/generated/resources/data/aeinfinitybooster/recipes/infinity_card.json b/src/generated/resources/data/aeinfinitybooster/recipes/infinity_card.json
@@ -22,5 +22,6 @@
   ],
   "result": {
     "item": "aeinfinitybooster:infinity_card"
-  }
+  },
+  "show_notification": true
 }
diff --git a/src/main/java/uk/co/hexeption/aeinfinitybooster/AEInfinityBooster.java b/src/main/java/uk/co/hexeption/aeinfinitybooster/AEInfinityBooster.java
@@ -1,17 +1,17 @@
 package uk.co.hexeption.aeinfinitybooster;
 
+import appeng.api.ids.AECreativeTabIds;
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.CreativeModeTabEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.registries.RegisterEvent;
 import net.minecraftforge.registries.RegistryObject;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -28,37 +28,41 @@ public class AEInfinityBooster {
 
     public static final String ID = "aeinfinitybooster";
 
-    public static CreativeModeTab CREATIVE_MODE_TAB;
-
     public AEInfinityBooster() {
 
         Registration.register();
 
+
         IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
-        eventBus.addListener(this::createCreativeModeTab);
+        eventBus.addListener((RegisterEvent event) -> {
+            LOGGER.info("Creating Creative Mode Tab");
+            if(event.getRegistryKey() == Registries.CREATIVE_MODE_TAB){
+                registerTab(event.getVanillaRegistry());
+            }
+        });
 
     }
 
-    @SubscribeEvent
-    public void createCreativeModeTab(CreativeModeTabEvent.Register event) {
-        LOGGER.info("Creating Creative Mode Tab");
-        CREATIVE_MODE_TAB = event.registerCreativeModeTab(new ResourceLocation(ID, "aeinfinitybooster"), builder -> builder
-                .title(Component.translatable("item_group." + ID + ".tab"))
+    public static void registerTab(Registry<CreativeModeTab> registry) {
+        var tab = CreativeModeTab.builder()
                 .icon(() -> new ItemStack(ModItems.INFINITY_CARD.get()))
-                .displayItems((enabledFlags, populator, hasPermissions) -> {
+                .displayItems((itemDisplayParameters, output) -> {
 
-                    for (Field field : ModItems.class.getFields()) {
-                        if (field.getType() != RegistryObject.class) continue;
+                            for (Field field : ModItems.class.getFields()) {
+                                if (field.getType() != RegistryObject.class) continue;
 
-                        try {
-                            RegistryObject<Item> item = (RegistryObject<Item>) field.get(null);
-                            populator.accept(new ItemStack(item.get()));
-                        } catch (IllegalAccessException e) {
-                        }
-                    }
+                                try {
+                                    RegistryObject<Item> item = (RegistryObject<Item>) field.get(null);
+                                    output.accept(new ItemStack(item.get()));
+                                } catch (IllegalAccessException e) {
+                                }
+                            }
 
-                })
-        );
+                        }
+                )
+                .title(Component.translatable("item_group." + ID + ".tab"))
+                .build();
+        Registry.register(registry, new ResourceLocation(ID, "aeinfinitybooster"), tab);
     }
 
 }
diff --git a/src/main/java/uk/co/hexeption/aeinfinitybooster/mixins/MixinWirelessBlockEntity.java b/src/main/java/uk/co/hexeption/aeinfinitybooster/mixins/MixinWirelessBlockEntity.java
@@ -1,8 +1,7 @@
 package uk.co.hexeption.aeinfinitybooster.mixins;
 
 import appeng.api.inventories.InternalInventory;
-import appeng.blockentity.networking.WirelessBlockEntity;
-import appeng.core.definitions.AEItems;
+import appeng.blockentity.networking.WirelessAccessPointBlockEntity;
 import appeng.util.inv.AppEngInternalInventory;
 import appeng.util.inv.filter.IAEItemFilter;
 import net.minecraft.core.BlockPos;
@@ -15,15 +14,14 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import uk.co.hexeption.aeinfinitybooster.setup.ModItems;
 
 /**
  * MixinWirelessBlockEntity
  *
  * @author Hexeption admin@hexeption.co.uk
  * @since 22/12/2021 - 09:06 am
  */
-@Mixin(value = WirelessBlockEntity.class, remap = false)
+@Mixin(value = WirelessAccessPointBlockEntity.class, remap = false)
 public class MixinWirelessBlockEntity {
 
     @Shadow @Final private AppEngInternalInventory inv;
diff --git a/src/main/java/uk/co/hexeption/aeinfinitybooster/mixins/MixinWirelessMenu.java b/src/main/java/uk/co/hexeption/aeinfinitybooster/mixins/MixinWirelessMenu.java
@@ -1,6 +1,6 @@
 package uk.co.hexeption.aeinfinitybooster.mixins;
 
-import appeng.menu.implementations.WirelessMenu;
+import appeng.menu.implementations.WirelessAccessPointMenu;
 import appeng.menu.slot.RestrictedInputSlot;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -16,7 +16,7 @@
  * @author Hexeption admin@hexeption.co.uk
  * @since 22/12/2021 - 10:35 am
  */
-@Mixin(value = WirelessMenu.class)
+@Mixin(value = WirelessAccessPointMenu.class)
 public abstract class MixinWirelessMenu {
 
     @Shadow
diff --git a/src/main/java/uk/co/hexeption/aeinfinitybooster/mixins/MixinWirelessTerminalMenuHost.java b/src/main/java/uk/co/hexeption/aeinfinitybooster/mixins/MixinWirelessTerminalMenuHost.java
@@ -2,7 +2,7 @@
 
 import appeng.api.implementations.blockentities.IWirelessAccessPoint;
 import appeng.api.implementations.menuobjects.ItemMenuHost;
-import appeng.blockentity.networking.WirelessBlockEntity;
+import appeng.blockentity.networking.WirelessAccessPointBlockEntity;
 import appeng.helpers.WirelessTerminalMenuHost;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
@@ -32,14 +32,14 @@ public MixinWirelessTerminalMenuHost(Player player, int slot, ItemStack itemStac
     @Inject(method = "testWap", at = @At("HEAD"), cancellable = true)
     private void testWap(IWirelessAccessPoint wirelessAccessPoint, CallbackInfoReturnable<Boolean> cir) {
 
-        wirelessAccessPoint.getGrid().getMachines(WirelessBlockEntity.class).forEach(wirelessBlockEntity -> {
+        wirelessAccessPoint.getGrid().getMachines(WirelessAccessPointBlockEntity.class).forEach(wirelessBlockEntity -> {
 
             if (wirelessBlockEntity.getInternalInventory().getStackInSlot(0).is(ModItems.DIMENSION_CARD.get())) {
                 currentDistanceFromGrid = 32;
                 cir.setReturnValue(true);
             }
 
-            if (!this.getPlayer().level.dimension().location().toString().equals(wirelessAccessPoint.getLocation().getLevel().dimension().location().toString())) {
+            if (!this.getPlayer().level().dimension().location().toString().equals(wirelessAccessPoint.getLocation().getLevel().dimension().location().toString())) {
                 return;
             }
 
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml" #mandatory
-loaderVersion = "[44,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
+loaderVersion = "[47,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
 license = "GNU Lesser General Public License"
 [[mods]] #mandatory
 modId = "aeinfinitybooster" #mandatory
@@ -11,18 +11,18 @@ description = '''
 [[dependencies.aeinfinitybooster]] #optional
 modId = "forge" #mandatory
 mandatory = true #mandatory
-versionRange = "[44,)" #mandatory
+versionRange = "[47,)" #mandatory
 ordering = "NONE"
 side = "BOTH"
 [[dependencies.aeinfinitybooster]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.19.3,)"
+versionRange = "[1.20.1,)"
 ordering = "NONE"
 side = "BOTH"
 [[dependencies.aeinfinitybooster]]
 modId = "ae2"
-versionRange = "[13.0.9-beta,)"
+versionRange = "[15.0.2-alpha,)"
 mandatory = true
 ordering = "AFTER"
 side = "BOTH"

Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,6 @@`
`30`	`30`	`"recipes": [`
`31`	`31`	`"aeinfinitybooster:dimension_card"`
`32`	`32`	`]`
`33`		`- }`
	`33`	`+ },`
	`34`	`+ "sends_telemetry_event": false`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,6 @@`
`19`	`19`	`],`
`20`	`20`	`"result": {`
`21`	`21`	`"item": "aeinfinitybooster:dimension_card"`
`22`		`- }`
	`22`	`+ },`
	`23`	`+ "show_notification": true`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,6 @@`
`22`	`22`	`],`
`23`	`23`	`"result": {`
`24`	`24`	`"item": "aeinfinitybooster:infinity_card"`
`25`		`- }`
	`25`	`+ },`
	`26`	`+ "show_notification": true`
`26`	`27`	`}`