Merge remote-tracking branch 'Kratte/1.20.1' into 1.20.1

Author: Hexeption

build.gradle

@@ -6,7 +6,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 group: 'org.spongepowered', name: 'mixingradle', version: '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: 'org.spongepowered.mixin'
 apply plugin: "com.matthewprenger.cursegradle"
 apply plugin: 'maven-publish'
 
-version = "1.19.2-3.0"
+version = "1.20.1-1.0"
 def env = System.getenv()
 if (env.GITHUB_RUN_NUMBER) {
     version = version + "+" + "${env.GITHUB_RUN_NUMBER}"
@@ -31,7 +31,7 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 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.2'
+    mappings channel: 'official', version: '1.20.1'
 
     runs {
         client {
@@ -107,13 +107,13 @@ repositories {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.19.2-43.1.32'
+    minecraft 'net.minecraftforge:forge:1.20.1-47.0.3'
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
-    compileOnly "com.refinedmods:refinedstorage:1.11.0"
-    runtimeOnly fg.deobf("com.refinedmods:refinedstorage:1.11.0") {
+    compileOnly "com.refinedmods:refinedstorage:1.12.3"
+    runtimeOnly fg.deobf("com.refinedmods:refinedstorage:1.12.3") {
         transitive false
     }
-    runtimeOnly fg.deobf("mezz.jei:jei-1.19.2-forge:11.3.0.262")
+    runtimeOnly fg.deobf("mezz.jei:jei-1.20.1-forge:15.0.0.12")
 }
 
 
@@ -139,13 +139,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 {
@@ -162,8 +162,7 @@ curseforge {
         id = '446870'
         changelog = 'A changelog can be found at https://github.com/Hexeption/RSInfinityBooster'
         releaseType = 'release'
-        addGameVersion '1.19'
-        addGameVersion '1.19.2'
+        addGameVersion '1.20.1'
 
         mainArtifact(jar) {
             displayName = "RSInfinityBooster v$version"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/uk/co/hexeption/rsinfinitybooster/RSInfinityBooster.java

@@ -1,10 +1,29 @@
 package uk.co.hexeption.rsinfinitybooster;
 
+//import appeng.api.ids.RSCreativeTabIds;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.registries.RegistryObject;
+import java.lang.reflect.Field;
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
+import net.minecraftforge.registries.RegisterEvent;
+import net.minecraft.world.item.CreativeModeTab;
+
+
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.config.ModConfig;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import uk.co.hexeption.rsinfinitybooster.setup.ModItems;
 import uk.co.hexeption.rsinfinitybooster.config.ServerConfig;
 import uk.co.hexeption.rsinfinitybooster.setup.Registration;
 
@@ -20,10 +39,45 @@ public class RSInfinityBooster {
 
 
 
+
 	public RSInfinityBooster() {
 
 		ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, SERVER_CONFIG.getSpec());
 
 		Registration.register();
+
+        IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
+		eventBus.addListener((RegisterEvent event) -> {
+            LOGGER.info("Creating Creative Mode Tab");
+            if(event.getRegistryKey() == Registries.CREATIVE_MODE_TAB){
+                registerTab(event.getVanillaRegistry());
+            }
+        });
+
+
+    }
+
+
+		public static void registerTab(Registry<CreativeModeTab> registry) {
+        	var tab = CreativeModeTab.builder()
+                .icon(() -> new ItemStack(ModItems.INFINITY_CARD.get()))
+                .displayItems((itemDisplayParameters, output) -> {
+
+                    for (Field field : ModItems.class.getFields()) {
+                                if (field.getType() != RegistryObject.class) continue;
+
+                        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);
+		
 	}
 }

src/main/java/uk/co/hexeption/rsinfinitybooster/datagen/DataGenerators.java

@@ -1,6 +1,7 @@
 package uk.co.hexeption.rsinfinitybooster.datagen;
 
 import net.minecraft.data.DataGenerator;
+import net.minecraft.data.DataProvider;
 import net.minecraftforge.data.event.GatherDataEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
@@ -22,6 +23,6 @@ private DataGenerators() {
     public static void onGatherData(GatherDataEvent event) {
         DataGenerator generator = event.getGenerator();
 
-        generator.addProvider(true, new RecipeGenerator(generator));
+        generator.addProvider(true, (DataProvider.Factory<RecipeGenerator>) p_176532_ -> new RecipeGenerator(generator.getPackOutput()));
     }
 }

src/main/java/uk/co/hexeption/rsinfinitybooster/datagen/RecipeGenerator.java

@@ -6,7 +6,8 @@
 import com.refinedmods.refinedstorage.item.UpgradeItem;
 import uk.co.hexeption.rsinfinitybooster.RSInfinityBooster;
 import uk.co.hexeption.rsinfinitybooster.setup.ModItems;
-
+import net.minecraft.data.PackOutput;
+import net.minecraft.data.recipes.RecipeCategory;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.recipes.FinishedRecipe;
 import net.minecraft.data.recipes.RecipeProvider;
@@ -22,27 +23,21 @@
  */
 public class RecipeGenerator extends RecipeProvider {
 
-	public RecipeGenerator(DataGenerator generatorIn) {
-		super(generatorIn);
-	}
-
-
-	@Override
-	public String getName() {
-		return "Hex - Recipes";
-	}
+	public RecipeGenerator(PackOutput packOutput) {
+        super(packOutput);
+    }
 
 	@Override
-	protected void buildCraftingRecipes(Consumer<FinishedRecipe> p_176532_) {
-		ShapedRecipeBuilder.shaped(ModItems.INFINITY_CARD.get())
+	protected void buildRecipes(Consumer<FinishedRecipe> p_176532_) {
+		ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.INFINITY_CARD.get())
 				.pattern("ERE").pattern("RSR").pattern("NNN")
 				.define('E', Items.ENDER_EYE)
 				.define('R', RSItems.UPGRADE_ITEMS.get(UpgradeItem.Type.RANGE).get())
 				.define('S', Items.NETHER_STAR)
 				.define('N', Items.NETHERITE_INGOT)
 				.unlockedBy("has_item", has(Items.NETHERITE_INGOT))
 				.save(p_176532_, new ResourceLocation(RSInfinityBooster.ID, "infinity_card"));
-		ShapedRecipeBuilder.shaped(ModItems.DIMENSION_CARD.get())
+		ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.DIMENSION_CARD.get())
 				.pattern("RNR").pattern("NEN").pattern("RNR")
 				.define('R', ModItems.INFINITY_CARD.get())
 				.define('E', Items.ENDER_EYE)

src/main/java/uk/co/hexeption/rsinfinitybooster/item/DimensionCard.java

@@ -12,7 +12,7 @@
  */
 public class DimensionCard extends Item {
 	public DimensionCard() {
-		super((new Properties()).tab(RS.CREATIVE_MODE_TAB));
+		super(new Item.Properties().durability(0));
 	}
 
 	@Override

src/main/resources/META-INF/mods.toml

@@ -1,5 +1,5 @@
 modLoader = "javafml" #mandatory
-loaderVersion = "[43,)" #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 GENERAL PUBLIC LICENSE"
 [[mods]] #mandatory
 modId = "rsinfinitybooster" #mandatory
@@ -11,18 +11,18 @@ description = '''
 [[dependencies.rsinfinitybooster]] #optional
 modId = "forge" #mandatory
 mandatory = true #mandatory
-versionRange = "[43,)" #mandatory
+versionRange = "[47,)" #mandatory
 ordering = "NONE"
 side = "BOTH"
 [[dependencies.rsinfinitybooster]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.19.2,)"
+versionRange = "[1.20.1,)"
 ordering = "NONE"
 side = "BOTH"
 [[dependencies.rsinfinitybooster]]
 modId = "refinedstorage"
-versionRange = "[1.11.0,)"
+versionRange = "[1.12.3,)"
 mandatory = true
 ordering = "BEFORE"
 side = "BOTH"

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

@@ -1,4 +1,5 @@
 {
+  "item_group.rsinfinitybooster.tab": "RS Infinity Booster",
   "item.rsinfinitybooster.infinity_card": "Infinity Range Booster",
   "item.rsinfinitybooster.dimension_card": "Dimension Card"
 }

src/main/resources/assets/rsinfinitybooster/lang/es_es.json

@@ -1,4 +1,5 @@
 {
+  "item_group.rsinfinitybooster.tab": "RS potenciador infinito",
   "item.rsinfinitybooster.infinity_card": "Mejora de Rango Infinito",
   "item.rsinfinitybooster.dimension_card": "Tarjeta Dimensional"
 }

src/main/resources/assets/rsinfinitybooster/lang/pt_br.json

@@ -1,4 +1,5 @@
 {
+    "item_group.rsinfinitybooster.tab": "RS Reforço Infinito",
     "item.rsinfinitybooster.infinity_card": "Intensificador de Alcance Infinito",
     "item.rsinfinitybooster.dimension_card": "Cartão de Dimensão"
   }