Merge branch 'refs/heads/1.20' into 1.20.5

# Conflicts:
#	gradle.properties

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
         if: ${{ runner.os != 'Windows' }}
         run: chmod +x ./gradlew
       - name: build
-        run: ./gradlew build
+        run: ./gradlew downloadTranslations build
       - name: capture build artifacts
         if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from LTS java on one OS
         uses: actions/upload-artifact@v2

.github/workflows/release.yml

@@ -30,7 +30,7 @@ jobs:
         run: chmod +x gradlew
 
       - name: Build and publish with Gradle
-        run: ./gradlew build publish
+        run: ./gradlew downloadTranslations build publish
         env:
           MAVEN_URL: ${{ secrets.MAVEN_URL }}
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}

build.gradle

@@ -1,3 +1,15 @@
+buildscript {
+	dependencies {
+		classpath "de.guntram.mcmod:crowdin-translate:1.4+1.19.3"
+	}
+	repositories {
+		maven {
+			name = 'CrowdinTranslate source'
+			url = "https://minecraft.guntram.de/maven/"
+		}
+	}
+}
+
 plugins {
 	id 'fabric-loom' version '1.6.+'
 	id 'maven-publish'
@@ -12,6 +24,13 @@ archivesBaseName = project.archives_base_name
 version = project.mod_version + '+' + project.minecraft_version
 group = project.maven_group
 
+apply plugin: 'de.guntram.mcmod.crowdin-translate'
+crowdintranslate.crowdinProjectName = 'patbox-mods'
+crowdintranslate.jsonSourceName = 'armor_stand_editor'
+crowdintranslate.minecraftProjectName = '../data/armor_stand_editor'
+crowdintranslate.verbose = false
+
+
 repositories {
 	// Add repositories to retrieve artifacts from in here.
 	// You should only use this when depending on other mods because

gradle.properties

@@ -1,15 +1,15 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
 
-minecraft_version=1.20.5-rc3
-yarn_mappings=1.20.5-rc3+build.1
+minecraft_version=1.20.6
+yarn_mappings=1.20.6+build.1
 loader_version=0.15.10
 
 #Fabric api
 fabric_version=0.97.3+1.20.5
 
 # Mod Properties
-mod_version = 2.4.0
+mod_version = 2.4.1
 maven_group = eu.pb4
 archives_base_name = armor-stand-editor
 

src/main/java/eu/pb4/armorstandeditor/legacy/LegacyEditorGuis.java

@@ -386,7 +386,15 @@ public void onClose() {
     public static void openItemFrameEditor(ServerPlayerEntity player, ItemFrameEntity entity) {
         ItemFrameEntityAccessor ifa = (ItemFrameEntityAccessor) entity;
 
-        SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_9X1, player, false);
+        SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_9X1, player, false) {
+            @Override
+            public void onTick() {
+                if (entity.isRemoved() || entity.getPos().squaredDistanceTo(player.getPos()) > 24 * 24) {
+                    this.close();
+                }
+                super.onTick();
+            }
+        };;
 
         ItemFrameInventory inventory = new ItemFrameInventory(entity);
 

src/main/java/eu/pb4/armorstandeditor/util/ItemFrameInventory.java

@@ -18,7 +18,7 @@ public ItemFrameInventory(ItemFrameEntity entity) {
 
     @Override
     public int size() {
-        return 6;
+        return 1;
     }
 
     @Override
@@ -32,11 +32,17 @@ public List<ItemStack> getItems() {
 
     @Override
     public ItemStack getStack(int slot) {
+        if (this.entity.isRemoved()) {
+            return ItemStack.EMPTY;
+        }
         return entity.getHeldItemStack();
     }
 
     @Override
     public ItemStack removeStack(int slot, int amount) {
+        if (this.entity.isRemoved()) {
+            return ItemStack.EMPTY;
+        }
         ItemStack result = Inventories.splitStack(this.getItems(), slot, amount);
         if (!result.isEmpty()) {
             markDirty();
@@ -46,11 +52,17 @@ public ItemStack removeStack(int slot, int amount) {
 
     @Override
     public ItemStack removeStack(int slot) {
+        if (this.entity.isRemoved()) {
+            return ItemStack.EMPTY;
+        }
         return Inventories.removeStack(this.getItems(), slot);
     }
 
     @Override
     public void setStack(int slot, ItemStack stack) {
+        if (this.entity.isRemoved()) {
+            return;
+        }
         this.entity.setHeldItemStack(stack);
     }
 
@@ -66,6 +78,9 @@ public boolean canPlayerUse(PlayerEntity player) {
 
     @Override
     public void clear() {
+        if (this.entity.isRemoved()) {
+            return;
+        }
         this.entity.setHeldItemStack(ItemStack.EMPTY);
     }
 }