Merge branch 'dev' into 1.20.6

# Conflicts:
#	gradle.properties
#	src/main/java/com/cstav/genshinstrument/block/partial/AbstractInstrumentBlock.java
#	src/main/java/com/cstav/genshinstrument/client/gui/screen/options/instrument/partial/AbstractInstrumentOptionsScreen.java
#	src/main/resources/fabric.mod.json

build.gradle

@@ -3,11 +3,11 @@ plugins {
 	id 'maven-publish'
 }
 
-version = project.mod_version
+version = "fabric-${archive_version_range}-${project.mod_version}"
 group = project.maven_group
 
 base {
-	archivesName = project.archives_base_name+"-fabric-"+project.minecraft_version
+	archivesName = project.archives_base_name
 }
 
 repositories {
@@ -51,10 +51,10 @@ dependencies {
 }
 
 processResources {
-	inputs.property "version", project.version
+	inputs.property "version", mod_version
 
 	filesMatching("fabric.mod.json") {
-		expand "version": project.version
+		expand "version": mod_version
 	}
 }
 
@@ -82,6 +82,7 @@ jar {
 publishing {
 	publications {
 		mavenJava(MavenPublication) {
+			artifactId = mod_id
 			from components.java
 		}
 	}

gradle.properties

@@ -7,10 +7,13 @@ org.gradle.parallel=true
 minecraft_version=1.20.6
 loader_version=0.16.5
 
-# Mod Properties
-mod_version=4.0.1
-maven_group=com.cstav.genshinstrument
 archives_base_name=genshinstrument
+archive_version_range=1.20.6
+
+# Mod Properties
+mod_version=4.0.2
+maven_group=com.cstav
+mod_id=genshinstrument
 
 # Dependencies
 fabric_version=0.100.8+1.20.6

src/main/java/com/cstav/genshinstrument/block/partial/AbstractInstrumentBlock.java

@@ -59,9 +59,10 @@ public AbstractInstrumentBlock(Properties pProperties) {
     @Override
     public void onRemove(BlockState pState, Level pLevel, BlockPos pPos, BlockState pNewState, boolean pMovedByPiston) {
         final BlockEntity be = pLevel.getBlockEntity(pPos);
-        if (!(be instanceof InstrumentBlockEntity))
+        if (!(be instanceof InstrumentBlockEntity)) {
+            super.onRemove(pState, pLevel, pPos, pNewState, pMovedByPiston);
             return;
-
+        }
 
         final InstrumentBlockEntity ibe = (InstrumentBlockEntity)be;
 
@@ -71,6 +72,8 @@ public void onRemove(BlockState pState, Level pLevel, BlockPos pPos, BlockState
                 GIPacketHandler.sendToClient(new NotifyInstrumentOpenPacket(user), (ServerPlayer)player);
             });
         }
+
+        super.onRemove(pState, pLevel, pPos, pNewState, pMovedByPiston);
     }
 
 

src/main/java/com/cstav/genshinstrument/client/gui/screen/options/instrument/partial/AbstractInstrumentOptionsScreen.java

@@ -72,7 +72,6 @@ public void render(GuiGraphics gui, int pMouseX, int pMouseY, float pPartialTick
         });
 
         super.render(gui, pMouseX, pMouseY, pPartialTick);
-
         gui.drawCenteredString(font, title, width/2, 15, Color.WHITE.getRGB());
     }
 

src/main/resources/fabric.mod.json

@@ -1,11 +1,11 @@
 {
 	"schemaVersion": 1,
 	"id": "genshinstrument",
-	"version": "4.0.1",
+	"version": "${version}",
 	"name": "Genshin Instruments",
 	"description": "A mod that brings Genshin Impact's instruments to Minecraft!\nThis is my first ever published mod, and I am quite proud of it :')\nHope you enjoy it as much as I do!!",
 	"authors": [
-		"Stav (IGN StavWasPlayZ)"
+		"StavWasPlayZ"
 	],
 	"contact": {
 		"homepage": "https://www.curseforge.com/minecraft/mc-mods/genshin-instruments",