Merge pull request #156 from Rakambda/feature/1.19.3

Minecraft 1.19.3

.github/CODEOWNERS

@@ -1 +1 @@
-*       @RakSrinaNa
+*       @Rakambda

.github/FUNDING.yml

@@ -1 +1 @@
-github: [RakSrinaNa]
+github: [Rakambda]

.github/ISSUE_TEMPLATE/0_fabric_bug_report.yml

@@ -2,7 +2,7 @@ name: Fabric bug report
 description: Create a report to help us improve the Fabric version
 labels: ["modloader: Fabric", "type: 🐛 bug"]
 assignees:
-  - RakSrinaNa
+  - Rakambda
 body:
   - type: textarea
     id: describing

.github/ISSUE_TEMPLATE/1_forge-bug-report.yml

@@ -2,7 +2,7 @@ name: Forge bug report
 description: Create a report to help us improve the Forge version
 labels: ["modloader: Forge", "type: 🐛 bug"]
 assignees:
-  - RakSrinaNa
+  - Rakambda
 body:
   - type: textarea
     id: describing

.github/ISSUE_TEMPLATE/2_feature_request.yml

@@ -2,7 +2,7 @@ name: Feature request
 description: Suggest an idea for this project
 labels: ["type: 🧱 enhancement"]
 assignees:
-  - RakSrinaNa
+  - Rakambda
 body:
   - type: textarea
     id: describing

.github/ISSUE_TEMPLATE/config.yml

@@ -7,5 +7,5 @@ contact_links:
     url: https://modrinth.com/mod/editsign/versions
     about: Find the downloadable JARs of the mod on Modrinth.
   - name: Discussions
-    url: https://github.com/RakSrinaNa/EditSign/discussions
+    url: https://github.com/Rakambda/EditSign/discussions
     about: Got a more generic thing to say that isn't an issue or feature request / need support? Start a discussion here

.github/dependabot.yml

@@ -5,10 +5,10 @@ updates:
     schedule:
       interval: "daily"
     reviewers:
-      - RakSrinaNa
+      - Rakambda
   - package-ecosystem: github-actions
     directory: "/"
     schedule:
       interval: "daily"
     reviewers:
-      - RakSrinaNa
+      - Rakambda

.github/renovate.json

@@ -1,6 +1,6 @@
 {
   "assignees": [
-    "RakSrinaNa"
+    "Rakambda"
   ],
   "extends": [
     "config:base"

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-For newer releases see the [releases section](https://github.com/RakSrinaNa/EditSign/releases).
+For newer releases see the [releases section](https://github.com/Rakambda/EditSign/releases).
 
 ## [1.17.1-2.2.3] - 2021-08-08
 ### Changed

build.gradle

@@ -1,3 +1,5 @@
+import java.util.regex.Pattern
+
 buildscript {
     repositories {
         mavenCentral()
@@ -53,7 +55,7 @@ allprojects {
 }
 
 def minecraftVersion = libs.versions.minecraftVersion.get()
-group = "fr.raksrinana"
+group = "fr.rakambda"
 archivesBaseName = "${project.modName}-${minecraftVersion}"
 
 def relType = "release"
@@ -98,46 +100,61 @@ task buildJar(type: Jar, group: "modding") {
     manifest {
         attributes([
                 "Specification-Title"     : project.modId,
-                "Specification-Vendor"    : "RakSrinaNa",
+                "Specification-Vendor"    : "Rakambda",
                 "Specification-Version"   : project.version,
                 "Implementation-Title"    : project.modName,
                 "Implementation-Version"  : "${project.version}",
-                "Implementation-Vendor"   : "RakSrinaNa",
+                "Implementation-Vendor"   : "Rakambda",
                 "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])
     }
 }
 assemble.finalizedBy("buildJar")
 
+static def extractMainVersion(String ver) {
+    def match = Pattern.compile("(\\d+\\.\\d+)(\\.\\d+)?").matcher(ver)
+    if (match.matches()) {
+        return match.group(1)
+    }
+    return null;
+}
+
 curseforge {
     apiKey = "${project.findProperty("curseforgeApiKey")}"
-    if (!isAlpha) {
-        project {
-            id = "${project.curseforge_project_id}"
-            changelogType = "markdown"
+    project {
+        id = "${project.curseforge_project_id}"
+        changelogType = "markdown"
+
+        if (isAlpha) {
+            def extracted = extractMainVersion(minecraftVersion)
+            if (extracted != null) {
+                addGameVersion(extracted + "-Snapshot")
+            }
+        } else {
             addGameVersion(minecraftVersion)
-            addGameVersion("Java 17")
+        }
+
+        addGameVersion("Java 17")
+        if (project.includeFabric.toBoolean()) {
+            addGameVersion("Fabric")
+        }
+        if (project.includeForge.toBoolean()) {
+            addGameVersion("Forge")
+        }
+        changelog = project.findProperty("changelog") ?: "No changelog provided"
+        releaseType = relType
+        mainArtifact(jar) {
+            displayName = "${minecraftVersion}-${project.version}"
+        }
+        relations {
             if (project.includeFabric.toBoolean()) {
-                addGameVersion("Fabric")
+                optionalDependency("fabric-api") //It's actually required
+                optionalDependency("modmenu")
+                optionalDependency("cloth-config")
             }
+
             if (project.includeForge.toBoolean()) {
-                addGameVersion("Forge")
-            }
-            changelog = project.findProperty("changelog") ?: "No changelog provided"
-            releaseType = relType
-            mainArtifact(jar) {
-                displayName = "${minecraftVersion}-${project.version}"
-            }
-            relations {
-                if (project.includeFabric.toBoolean()) {
-                    optionalDependency("fabric-api") //It's actually required
-                    optionalDependency("modmenu")
-                    optionalDependency("cloth-config")
-                }
-
-                if (project.includeForge.toBoolean()) {
-                    optionalDependency("cloth-config")
-                }
+                optionalDependency("cloth-config")
             }
         }
     }
@@ -147,9 +164,7 @@ curseforge {
         forgeGradleIntegration = false
     }
     afterEvaluate {
-        if(!isAlpha){
-            tasks["curseforge${project.curseforge_project_id}"].dependsOn("buildJar")
-        }
+        tasks["curseforge${project.curseforge_project_id}"].dependsOn("buildJar")
     }
 }
 

common/src/main/java/fr/raksrinana/editsign/common/EditSignCommon.java → common/src/main/java/fr/rakambda/editsign/common/EditSignCommon.java

@@ -1,10 +1,10 @@
-package fr.raksrinana.editsign.common;
+package fr.rakambda.editsign.common;
 
-import fr.raksrinana.editsign.common.config.Configuration;
-import fr.raksrinana.editsign.common.wrapper.IComponent;
-import fr.raksrinana.editsign.common.wrapper.IHand;
-import fr.raksrinana.editsign.common.wrapper.IItem;
-import fr.raksrinana.editsign.common.wrapper.IPlayer;
+import fr.rakambda.editsign.common.wrapper.IComponent;
+import fr.rakambda.editsign.common.wrapper.IHand;
+import fr.rakambda.editsign.common.wrapper.IItem;
+import fr.rakambda.editsign.common.wrapper.IPlayer;
+import fr.rakambda.editsign.common.config.Configuration;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;

common/src/main/java/fr/raksrinana/editsign/common/config/ConfigLoader.java → common/src/main/java/fr/rakambda/editsign/common/config/ConfigLoader.java

@@ -1,4 +1,4 @@
-package fr.raksrinana.editsign.common.config;
+package fr.rakambda.editsign.common.config;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;

common/src/main/java/fr/raksrinana/editsign/common/config/Configuration.java → common/src/main/java/fr/rakambda/editsign/common/config/Configuration.java

@@ -1,8 +1,8 @@
-package fr.raksrinana.editsign.common.config;
+package fr.rakambda.editsign.common.config;
 
 import com.google.gson.annotations.Expose;
-import fr.raksrinana.editsign.common.EditSignCommon;
-import fr.raksrinana.editsign.common.wrapper.IItem;
+import fr.rakambda.editsign.common.EditSignCommon;
+import fr.rakambda.editsign.common.wrapper.IItem;
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.Getter;

common/src/main/java/fr/raksrinana/editsign/common/config/cloth/ClothHookBase.java → common/src/main/java/fr/rakambda/editsign/common/config/cloth/ClothHookBase.java

@@ -1,7 +1,7 @@
-package fr.raksrinana.editsign.common.config.cloth;
+package fr.rakambda.editsign.common.config.cloth;
 
-import fr.raksrinana.editsign.common.EditSignCommon;
-import fr.raksrinana.editsign.common.wrapper.IComponent;
+import fr.rakambda.editsign.common.EditSignCommon;
+import fr.rakambda.editsign.common.wrapper.IComponent;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

common/src/main/java/fr/raksrinana/editsign/common/wrapper/IComponent.java → common/src/main/java/fr/rakambda/editsign/common/wrapper/IComponent.java

@@ -1,4 +1,4 @@
-package fr.raksrinana.editsign.common.wrapper;
+package fr.rakambda.editsign.common.wrapper;
 
 import org.jetbrains.annotations.NotNull;
 

common/src/main/java/fr/rakambda/editsign/common/wrapper/IHand.java

@@ -0,0 +1,4 @@
+package fr.rakambda.editsign.common.wrapper;
+
+public interface IHand extends IWrapper{
+}

common/src/main/java/fr/raksrinana/editsign/common/wrapper/IItem.java → common/src/main/java/fr/rakambda/editsign/common/wrapper/IItem.java

@@ -1,4 +1,4 @@
-package fr.raksrinana.editsign.common.wrapper;
+package fr.rakambda.editsign.common.wrapper;
 
 public interface IItem extends IWrapper{
 	boolean isAir();

common/src/main/java/fr/raksrinana/editsign/common/wrapper/IItemStack.java → common/src/main/java/fr/rakambda/editsign/common/wrapper/IItemStack.java

@@ -1,4 +1,4 @@
-package fr.raksrinana.editsign.common.wrapper;
+package fr.rakambda.editsign.common.wrapper;
 
 import org.jetbrains.annotations.NotNull;
 

common/src/main/java/fr/raksrinana/editsign/common/wrapper/IPlayer.java → common/src/main/java/fr/rakambda/editsign/common/wrapper/IPlayer.java

@@ -1,4 +1,4 @@
-package fr.raksrinana.editsign.common.wrapper;
+package fr.rakambda.editsign.common.wrapper;
 
 import org.jetbrains.annotations.NotNull;
 

common/src/main/java/fr/raksrinana/editsign/common/wrapper/IWrapper.java → common/src/main/java/fr/rakambda/editsign/common/wrapper/IWrapper.java

@@ -1,4 +1,4 @@
-package fr.raksrinana.editsign.common.wrapper;
+package fr.rakambda.editsign.common.wrapper;
 
 import org.jetbrains.annotations.NotNull;
 

fabric/src/client/java/fr/raksrinana/editsign/fabric/client/ModMenuImpl.java → fabric/src/client/java/fr/rakambda/editsign/fabric/client/ModMenuImpl.java

@@ -1,10 +1,10 @@
-package fr.raksrinana.editsign.fabric.client;
+package fr.rakambda.editsign.fabric.client;
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
-import fr.raksrinana.editsign.common.EditSignCommon;
-import fr.raksrinana.editsign.fabric.EditSign;
-import fr.raksrinana.editsign.fabric.client.cloth.ClothConfigHook;
+import fr.rakambda.editsign.common.EditSignCommon;
+import fr.rakambda.editsign.fabric.client.cloth.ClothConfigHook;
+import fr.rakambda.editsign.fabric.EditSign;
 import net.fabricmc.loader.api.FabricLoader;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -18,7 +18,7 @@ public ConfigScreenFactory<?> getModConfigScreenFactory(){
 		if(FabricLoader.getInstance().isModLoaded("cloth-config")){
 			return (screen) -> {
 				try{
-					return Class.forName("fr.raksrinana.editsign.fabric.client.cloth.ClothConfigHook")
+					return Class.forName("fr.rakambda.editsign.fabric.client.cloth.ClothConfigHook")
 							.asSubclass(ClothConfigHook.class)
 							.getConstructor(EditSignCommon.class)
 							.newInstance(EditSign.getMod())

fabric/src/client/java/fr/raksrinana/editsign/fabric/client/cloth/ClothConfigHook.java → fabric/src/client/java/fr/rakambda/editsign/fabric/client/cloth/ClothConfigHook.java

@@ -1,9 +1,9 @@
-package fr.raksrinana.editsign.fabric.client.cloth;
+package fr.rakambda.editsign.fabric.client.cloth;
 
-import fr.raksrinana.editsign.common.EditSignCommon;
-import fr.raksrinana.editsign.common.config.Configuration;
-import fr.raksrinana.editsign.common.config.cloth.ClothHookBase;
-import fr.raksrinana.editsign.common.wrapper.IComponent;
+import fr.rakambda.editsign.common.EditSignCommon;
+import fr.rakambda.editsign.common.config.Configuration;
+import fr.rakambda.editsign.common.config.cloth.ClothHookBase;
+import fr.rakambda.editsign.common.wrapper.IComponent;
 import me.shedaniel.clothconfig2.api.ConfigBuilder;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -42,7 +42,7 @@ public void fillConfigScreen(@NotNull ConfigBuilder builder, @NotNull Configurat
 		var requiredItemEntry = builder.entryBuilder()
 				.startStrField(translatable(getFieldName(null, "requiredItemId")), config.getRequiredItemId())
 				.setDefaultValue("")
-				.setTooltip(getTooltips(null, "requiredItemId", 2))
+				.setTooltip(getTooltips(null, "requiredItemId", 4))
 				.setSaveConsumer(config::setRequiredItemId)
 				.setErrorSupplier(map(getMinecraftItemIdCellError()))
 				.build();

fabric/src/main/java/fr/raksrinana/editsign/fabric/EditSign.java → fabric/src/main/java/fr/rakambda/editsign/fabric/EditSign.java

@@ -1,6 +1,6 @@
-package fr.raksrinana.editsign.fabric;
+package fr.rakambda.editsign.fabric;
 
-import fr.raksrinana.editsign.fabric.common.EditSignCommonsImpl;
+import fr.rakambda.editsign.fabric.common.EditSignCommonsImpl;
 import lombok.Getter;
 import net.fabricmc.api.ModInitializer;
 

fabric/src/main/java/fr/raksrinana/editsign/fabric/common/EditSignCommonsImpl.java → fabric/src/main/java/fr/rakambda/editsign/fabric/common/EditSignCommonsImpl.java

@@ -1,17 +1,20 @@
-package fr.raksrinana.editsign.fabric.common;
+package fr.rakambda.editsign.fabric.common;
 
-import fr.raksrinana.editsign.common.EditSignCommon;
-import fr.raksrinana.editsign.common.wrapper.IComponent;
-import fr.raksrinana.editsign.common.wrapper.IItem;
-import fr.raksrinana.editsign.fabric.common.wrapper.ComponentWrapper;
-import fr.raksrinana.editsign.fabric.common.wrapper.ItemWrapper;
+import fr.rakambda.editsign.common.EditSignCommon;
+import fr.rakambda.editsign.common.wrapper.IComponent;
+import fr.rakambda.editsign.common.wrapper.IItem;
+import fr.rakambda.editsign.fabric.common.wrapper.ComponentWrapper;
+import fr.rakambda.editsign.fabric.common.wrapper.ItemWrapper;
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.contents.TranslatableContents;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
 import org.jetbrains.annotations.NotNull;
+import java.util.Optional;
 import java.util.stream.Stream;
 import static java.util.stream.Stream.empty;
 
@@ -32,16 +35,21 @@ public Stream<IItem> getItem(@NotNull String name){
 			}
 			var identifier = new ResourceLocation(name);
 			if(isTag){
-				var tag = TagKey.create(Registry.ITEM_REGISTRY, identifier);
-				return getRegistryTagContent(Registry.ITEM, tag).map(ItemWrapper::new);
+				var tag = TagKey.create(Registries.ITEM, identifier);
+				return getRegistryTagContent(BuiltInRegistries.ITEM, tag).map(ItemWrapper::new);
 			}
-			return Stream.of(Registry.ITEM.get(identifier)).map(ItemWrapper::new);
+			return getRegistryElement(BuiltInRegistries.ITEM, identifier).stream().map(ItemWrapper::new);
 		}
 		catch(Exception e){
 			return empty();
 		}
 	}
 
+	@NotNull
+	private <T> Optional<T> getRegistryElement(Registry<T> registryKey, ResourceLocation identifier){
+		return registryKey.getOptional(identifier);
+	}
+
 	@NotNull
 	private <T> Stream<T> getRegistryTagContent(@NotNull Registry<T> registry, @NotNull TagKey<T> tag){
 		return registry.getTag(tag).stream()

fabric/src/main/java/fr/raksrinana/editsign/fabric/common/wrapper/ComponentWrapper.java → fabric/src/main/java/fr/rakambda/editsign/fabric/common/wrapper/ComponentWrapper.java

@@ -1,6 +1,6 @@
-package fr.raksrinana.editsign.fabric.common.wrapper;
+package fr.rakambda.editsign.fabric.common.wrapper;
 
-import fr.raksrinana.editsign.common.wrapper.IComponent;
+import fr.rakambda.editsign.common.wrapper.IComponent;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import net.minecraft.network.chat.Component;

fabric/src/main/java/fr/raksrinana/editsign/fabric/common/wrapper/HandWrapper.java → fabric/src/main/java/fr/rakambda/editsign/fabric/common/wrapper/HandWrapper.java

@@ -1,6 +1,6 @@
-package fr.raksrinana.editsign.fabric.common.wrapper;
+package fr.rakambda.editsign.fabric.common.wrapper;
 
-import fr.raksrinana.editsign.common.wrapper.IHand;
+import fr.rakambda.editsign.common.wrapper.IHand;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import net.minecraft.world.InteractionHand;