Merge branch '1.20' into patch-1

Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java

@@ -200,7 +200,7 @@ public class CarriedObjectRender
 
 				CarryOnData carry = CarryOnDataManager.getCarryData(player);
 
-				if (perspective == 0 && player == mc.player && !(Services.PLATFORM.isModLoaded("firstperson") || Services.PLATFORM.isModLoaded("firstpersonmod")))
+				if (perspective == 0 && player == mc.player && !(Services.PLATFORM.isModLoaded("firstperson") || Services.PLATFORM.isModLoaded("firstpersonmod") || Services.PLATFORM.isModLoaded("realcamera")))
 					continue;
 
 				light = manager.getPackedLightCoords(player, partialticks);

Common/src/main/java/tschipp/carryon/common/carry/PlacementHandler.java

@@ -158,8 +158,15 @@ public class PlacementHandler
 		Level level = player.level();
 
 		BlockPlaceContext context = new BlockPlaceContext(player, InteractionHand.MAIN_HAND, ItemStack.EMPTY, BlockHitResult.miss(player.position(), facing, pos));
-		if (!level.getBlockState(pos).canBeReplaced(context))
+		if (!level.getBlockState(pos).canBeReplaced(context)) {
 			pos = pos.relative(facing);
+ 			context = new BlockPlaceContext(player, InteractionHand.MAIN_HAND, ItemStack.EMPTY, BlockHitResult.miss(player.position(), facing, pos));
+		}
+
+		if (!level.getBlockState(pos).canBeReplaced(context)) {
+			level.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.LAVA_POP, SoundSource.PLAYERS, 0.5F, 0.5F);
+			return false;
+		}
 
 		Vec3 placementPos = Vec3.atBottomCenterOf(pos);
 
@@ -228,7 +235,7 @@ public class PlacementHandler
 
 			if (ListHandler.isStackingPermitted(topEntity)) {
 				double sizeEntity = topEntity.getBbHeight() * topEntity.getBbWidth();
-				if (Constants.COMMON_CONFIG.settings.entitySizeMattersStacking && sizeHeldEntity <= sizeEntity || !Constants.COMMON_CONFIG.settings.entitySizeMattersStacking) {
+				if (!Constants.COMMON_CONFIG.settings.entitySizeMattersStacking || sizeHeldEntity <= sizeEntity) {
 					if (topEntity instanceof Horse horse)
 						horse.setTamed(true);
 

Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java

@@ -242,6 +242,7 @@ public class CarryConfig
 			)
 			public String[] forbiddenTiles = {
 					"#forge:immovable", "#forge:relocation_not_supported", "#neoforge:immovable", "#neoforge:relocation_not_supported", "minecraft:end_portal", "minecraft:piston_head",
+					"#c:relocation_not_supported",
 					"minecraft:end_gateway", "minecraft:tall_grass", "minecraft:large_fern", "minecraft:peony",
 					"minecraft:rose_bush", "minecraft:lilac", "minecraft:sunflower", "minecraft:*_bed",
 					"minecraft:*_door", "minecraft:big_dripleaf_stem", "minecraft:waterlily", "minecraft:cake",
@@ -268,9 +269,9 @@ public class CarryConfig
 					"mekanismgenerators:wind_generator", "cookingforblockheads:cabinet", "cookingforblockheads:corner", "cookingforblockheads:counter",
 					"cookingforblockheads:oven", "cookingforblockheads:toaster", "cookingforblockheads:milk_jar", "cookingforblockheads:cow_jar",
 					"cookingforblockheads:fruit_basket", "cookingforblockheads:cooking_table", "cookingforblockheads:fridge", "cookingforblockheads:sink",
-					"chipped:*",
+					"chipped:*", "irons_spellbooks:*", "create*:*", "simple_pipes:*", "libmultipart:*", "quark:tiny_potato", "ait:*",
-					"powah:*", "advancementtrophies:trophy", "mekanismgenerators:heat_generator", "mna:filler_block", "create_enchantment_industry:*", "graveyard:*", "immersivepetroleum:*", "tardis:interior_door",
+					"vampirism:*", "extrastorage:*", "relics:researching_table", "sophisticatedstorage:*chest",
-					"cuffed:*"
+					"powah:*", "advancementtrophies:trophy", "mekanismgenerators:heat_generator", "mna:filler_block", "create_enchantment_industry:*", "graveyard:*", "immersivepetroleum:*", "tardis:interior_door", "cuffed:*"
 			};
 
 			@Property(
@@ -278,6 +279,7 @@ public class CarryConfig
 					description = "Entities that cannot be picked up"
 			)
 			public String[] forbiddenEntities = {
+					"#c:capturing_not_supported", "#c:teleporting_not_supported",
 					"minecraft:end_crystal", "minecraft:ender_dragon", "minecraft:ghast",
 					"minecraft:shulker", "minecraft:leash_knot", "minecraft:armor_stand",
 					"minecraft:item_frame", "minecraft:painting", "minecraft:shulker_bullet",

Common/src/main/resources/assets/carryon/lang/ko_kr.json

@@ -1,15 +1,15 @@
 {
     "carryon.category.settings": "설정",
     "carryon.category.blacklist": "블랙리스트",
-    "carryon.category.modeloverrides": "모델 오버라이딩 (고급)",
+    "carryon.category.modeloverrides": "모델 재정의 (고급)",
-    "carryon.category.custompickupconditions": "커스텀 들기 컨디션 (고급)",
+    "carryon.category.custompickupconditions": "맞춤형 들기 조건 (고급)",
     "carryon.category.whitelist": "화이트리스트",
 
-    "carryon.general.modeloverrides.modeloverrides": "모델 오버라이딩",
+    "carryon.general.modeloverrides.modeloverrides": "모델 재정의",
-    "carryon.general.blacklist.forbiddenentities": "플레이어가 들 수 없는 엔티티",
+    "carryon.general.blacklist.forbiddenentities": "플레이어가 들 수 없는 개체",
     "carryon.general.blacklist.forbiddentiles": "플레이어가 들 수 없는 블록",
-    "carryon.category.custompickupconditions.custompickupconditionsblocks": "커스텀 블록 들기 컨디션",
+    "carryon.category.custompickupconditions.custompickupconditionsblocks": "맞춤형 블록 들기 조건",
-    "carryon.category.custompickupconditions.custompickupconditionsentities": "커스텀 엔티티 들기 컨디션",
+    "carryon.category.custompickupconditions.custompickupconditionsentities": "맞춤형 개체 들기 조건",
 
     "key.carry.desc": "들고 나르기",
     "key.carry.category": "Carry On"

Forge/build.gradle

@@ -102,8 +102,8 @@ repositories {
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
     compileOnly project(":Common")
-    compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixinextras_version}"))
+    implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixinextras_version}"))
-    runtimeOnly(annotationProcessor("io.github.llamalad7:mixinextras-forge:${mixinextras_version}"))
+    implementation(annotationProcessor("io.github.llamalad7:mixinextras-forge:${mixinextras_version}"))
     jarJar(group: 'io.github.llamalad7', name: 'mixinextras-forge', version: "[${mixinextras_version},)")
 
     //implementation fg.deobf("net.darkhax.gamestages:GameStages-Forge-1.19.2:11.0.2")

Jenkinsfile

@@ -3,7 +3,7 @@
 pipeline {
     agent any
     tools {
-        jdk "jdk-17.0.1"
+        jdk "jdk-21"
     }
     stages {
         stage('Clean') {

NeoForge/build.gradle

@@ -64,6 +64,9 @@ runs {
 
 sourceSets.main.resources.srcDir 'src/generated/resources'
 
+tasks.named("test").configure {
+    enabled = false
+}
 
 dependencies {
     implementation "net.neoforged:neoforge:${neoforge_version}"

settings.gradle

@@ -46,4 +46,5 @@ plugins {
 }
 
 rootProject.name = 'CarryOn'
-include("Common", "Fabric", "Forge", "NeoForge")
+include("Common", "Fabric", "NeoForge")
+//include("Common", "Fabric", "Forge", "NeoForge")