Merge branch 'main' into 1.18

bclib.gradle

@@ -7,8 +7,8 @@ buildscript {
         gradlePluginPortal()
     }
 }
-sourceCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_16
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version

src/main/java/ru/bclib/world/features/BCLFeature.java

@@ -7,6 +7,7 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.levelgen.GenerationStep.Decoration;
 import net.minecraft.world.level.levelgen.VerticalAnchor;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
+import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.feature.configurations.CountConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
@@ -18,15 +19,15 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTes
 public class BCLFeature {
 	private ConfiguredFeature<?, ?> featureConfigured;
 	private Decoration featureStep;
-	private net.minecraft.world.level.levelgen.feature.Feature<?> feature;
+	private Feature<?> feature;
 	
-	public BCLFeature(net.minecraft.world.level.levelgen.feature.Feature<?> feature, ConfiguredFeature<?, ?> configuredFeature, Decoration featureStep) {
+	public BCLFeature(Feature<?> feature, ConfiguredFeature<?, ?> configuredFeature, Decoration featureStep) {
 		this.featureConfigured = configuredFeature;
 		this.featureStep = featureStep;
 		this.feature = feature;
 	}
 	
-	public BCLFeature(ResourceLocation id, net.minecraft.world.level.levelgen.feature.Feature<NoneFeatureConfiguration> feature, Decoration featureStep, ConfiguredFeature<?, ?> configuredFeature) {
+	public BCLFeature(ResourceLocation id, Feature<NoneFeatureConfiguration> feature, Decoration featureStep, ConfiguredFeature<?, ?> configuredFeature) {
 		this.featureConfigured = Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, id, configuredFeature);
 		this.feature = Registry.register(Registry.FEATURE, id, feature);
 		this.featureStep = featureStep;
@@ -34,9 +35,9 @@ public class BCLFeature {
 	
 	/**
 	 * Get raw feature.
-	 * @return {@link net.minecraft.world.level.levelgen.feature.Feature}.
+	 * @return {@link Feature}.
 	 */
-	public net.minecraft.world.level.levelgen.feature.Feature<?> getFeature() {
+	public Feature<?> getFeature() {
 		return feature;
 	}
 	
@@ -59,11 +60,11 @@ public class BCLFeature {
 	/**
 	 * Will create a basic plant feature.
 	 * @param id {@link ResourceLocation} feature ID.
-	 * @param feature {@link net.minecraft.world.level.levelgen.feature.Feature} with {@link NoneFeatureConfiguration} config.
+	 * @param feature {@link Feature} with {@link NoneFeatureConfiguration} config.
 	 * @param density iterations per chunk.
 	 * @return new BCLFeature instance.
 	 */
-	public static BCLFeature makeVegetationFeature(ResourceLocation id, net.minecraft.world.level.levelgen.feature.Feature<NoneFeatureConfiguration> feature, int density) {
+	public static BCLFeature makeVegetationFeature(ResourceLocation id, Feature<NoneFeatureConfiguration> feature, int density) {
 		ConfiguredFeature<?, ?> configured = feature
 			.configured(FeatureConfiguration.NONE)
 			.decorated(BCLDecorators.HEIGHTMAP_SQUARE)
@@ -88,7 +89,7 @@ public class BCLFeature {
 			blockOre.defaultBlockState(),
 			veinSize
 		);
-		ConfiguredFeature<?, ?> oreFeature = net.minecraft.world.level.levelgen.feature.Feature.ORE
+		ConfiguredFeature<?, ?> oreFeature = Feature.ORE
 			.configured(featureConfig)
 			.rangeUniform(
 				VerticalAnchor.absolute(minY),
@@ -107,10 +108,10 @@ public class BCLFeature {
 	 * Will create feature which will be generated once in each chunk.
 	 * @param id {@link ResourceLocation} feature ID.
 	 * @param step {@link Decoration} feature step.
-	 * @param feature {@link net.minecraft.world.level.levelgen.feature.Feature} with {@link NoneFeatureConfiguration} config.
+	 * @param feature {@link Feature} with {@link NoneFeatureConfiguration} config.
 	 * @return new BCLFeature instance.
 	 */
-	public static BCLFeature makeChunkFeature(ResourceLocation id, Decoration step, net.minecraft.world.level.levelgen.feature.Feature<NoneFeatureConfiguration> feature) {
+	public static BCLFeature makeChunkFeature(ResourceLocation id, Decoration step, Feature<NoneFeatureConfiguration> feature) {
 		ConfiguredFeature<?, ?> configured = feature
 			.configured(FeatureConfiguration.NONE)
 			.decorated(FeatureDecorator.COUNT.configured(new CountConfiguration(1)));
@@ -121,11 +122,11 @@ public class BCLFeature {
 	 * Will create feature with chanced decoration, chance for feature to generate per chunk is 1 / chance.
 	 * @param id {@link ResourceLocation} feature ID.
 	 * @param step {@link Decoration} feature step.
-	 * @param feature {@link net.minecraft.world.level.levelgen.feature.Feature} with {@link NoneFeatureConfiguration} config.
+	 * @param feature {@link Feature} with {@link NoneFeatureConfiguration} config.
 	 * @param chance chance for feature to be generated in.
 	 * @return new BCLFeature instance.
 	 */
-	public static BCLFeature makeChancedFeature(ResourceLocation id, Decoration step, net.minecraft.world.level.levelgen.feature.Feature<NoneFeatureConfiguration> feature, int chance) {
+	public static BCLFeature makeChancedFeature(ResourceLocation id, Decoration step, Feature<NoneFeatureConfiguration> feature, int chance) {
 		ConfiguredFeature<?, ?> configured = feature
 			.configured(FeatureConfiguration.NONE)
 			.decorated(FeatureDecorator.CHANCE.configured(new ChanceDecoratorConfiguration(chance)));
@@ -136,11 +137,11 @@ public class BCLFeature {
 	 * Will create feature with specified generation iterations per chunk.
 	 * @param id {@link ResourceLocation} feature ID.
 	 * @param step {@link Decoration} feature step.
-	 * @param feature {@link net.minecraft.world.level.levelgen.feature.Feature} with {@link NoneFeatureConfiguration} config.
+	 * @param feature {@link Feature} with {@link NoneFeatureConfiguration} config.
 	 * @param count iterations steps.
 	 * @return new BCLFeature instance.
 	 */
-	public static BCLFeature makeCountFeature(ResourceLocation id, Decoration step, net.minecraft.world.level.levelgen.feature.Feature<NoneFeatureConfiguration> feature, int count) {
+	public static BCLFeature makeCountFeature(ResourceLocation id, Decoration step, Feature<NoneFeatureConfiguration> feature, int count) {
 		ConfiguredFeature<?, ?> configured = feature
 			.configured(FeatureConfiguration.NONE)
 			.decorated(FeatureDecorator.COUNT.configured(new CountConfiguration(count)));
@@ -151,10 +152,10 @@ public class BCLFeature {
 	 * Makes simple configured feature with {@link NoneFeatureConfiguration} set to NONE.
 	 * @param id {@link ResourceLocation} feature ID.
 	 * @param step {@link Decoration} feature step.
-	 * @param feature {@link net.minecraft.world.level.levelgen.feature.Feature} with {@link NoneFeatureConfiguration} config.
+	 * @param feature {@link Feature} with {@link NoneFeatureConfiguration} config.
 	 * @return new BCLFeature instance.
 	 */
-	public static BCLFeature makeFeatureConfigured(ResourceLocation id, Decoration step, net.minecraft.world.level.levelgen.feature.Feature<NoneFeatureConfiguration> feature) {
+	public static BCLFeature makeFeatureConfigured(ResourceLocation id, Decoration step, Feature<NoneFeatureConfiguration> feature) {
 		ConfiguredFeature<?, ?> configured = feature.configured(FeatureConfiguration.NONE);
 		return new BCLFeature(id, feature, step, configured);
 	}
@@ -165,27 +166,27 @@ public class BCLFeature {
 	}
 	
 	@Deprecated(forRemoval = true)
-	public static BCLFeature makeRawGenFeature(ResourceLocation id, net.minecraft.world.level.levelgen.feature.Feature<NoneFeatureConfiguration> feature, int chance) {
+	public static BCLFeature makeRawGenFeature(ResourceLocation id, Feature<NoneFeatureConfiguration> feature, int chance) {
 		return makeChancedFeature(id, Decoration.RAW_GENERATION, feature, chance);
 	}
 	
 	@Deprecated(forRemoval = true)
-	public static BCLFeature makeChunkFeature(ResourceLocation id, net.minecraft.world.level.levelgen.feature.Feature<NoneFeatureConfiguration> feature) {
+	public static BCLFeature makeChunkFeature(ResourceLocation id, Feature<NoneFeatureConfiguration> feature) {
 		return makeChunkFeature(id, Decoration.LOCAL_MODIFICATIONS, feature);
 	}
 	
 	@Deprecated(forRemoval = true)
-	public static BCLFeature makeChansedFeature(ResourceLocation id, net.minecraft.world.level.levelgen.feature.Feature<NoneFeatureConfiguration> feature, int chance) {
+	public static BCLFeature makeChansedFeature(ResourceLocation id, Feature<NoneFeatureConfiguration> feature, int chance) {
 		return makeChancedFeature(id, Decoration.SURFACE_STRUCTURES, feature, chance);
 	}
 	
 	@Deprecated(forRemoval = true)
-	public static BCLFeature makeCountRawFeature(ResourceLocation id, net.minecraft.world.level.levelgen.feature.Feature<NoneFeatureConfiguration> feature, int chance) {
+	public static BCLFeature makeCountRawFeature(ResourceLocation id, Feature<NoneFeatureConfiguration> feature, int chance) {
 		return makeCountFeature(id, Decoration.RAW_GENERATION, feature, chance);
 	}
 	
 	@Deprecated(forRemoval = true)
-	public static BCLFeature makeFeatureConfigured(ResourceLocation id, net.minecraft.world.level.levelgen.feature.Feature<NoneFeatureConfiguration> feature) {
+	public static BCLFeature makeFeatureConfigured(ResourceLocation id, Feature<NoneFeatureConfiguration> feature) {
 		return makeFeatureConfigured(id, Decoration.RAW_GENERATION, feature);
 	}
 }

src/main/resources/assets/bclib/lang/ko_kr.json

@@ -0,0 +1,50 @@
+{
+	"message.bclib.anvil_damage": "§c위험",
+	"bclib.datafixer.backupWarning.title": "가디언에서 호환되지 않는 월드를 감지",
+	"bclib.datafixer.backupWarning.message": "가디언에서 감지한 바에 따르면 설치된 모드들의 내부가 이 월드가 마지막으로 게임한 이후로 바뀌었습니다.\n\n우리는 당신을 위해 자동으로 월드를 바꿀 수 있습니다. 변경 내용을 적용하지 않고 계속하면 월드 로드가 올바르게 수행되지 않을 수 있습니다. 계속하기 전에 백업을 만들어야 합니다.",
+	"bclib.datafixer.backupWarning.backup": "수정 사항을 적용하기 전에 백업 생성",
+	"bclib.datafixer.backupWarning.nofixes": "수정 없이 계속",
+	"bclib.datafixer.backupWarning.fix": "수정 사항 적용",
+	"title.bclib.bclibmissmatch": "버전 불일치",
+	"message.bclib.bclibmissmatch": "서버와 클라이언트의 BCLib 버전이 일치하지 않습니다. 이것은 게임을 할 때 문제를 일으킬 것입니다.\n\n서버에서 BCLib-Version을 자동으로 다운로드하시겠습니까? \n\nBCLib은 새 버전을 설치하기 전에 이전 버전을 모드 폴더의 하위 디렉터리로 이동합니다.",
+	"title.bclib.syncfiles": "데이터 불일치",
+	"message.bclib.syncfiles": "서버의 일부 내용이 클라이언트의 버전과 일치하지 않습니다.\n선택한 내용을 서버의 데이터로 바꾸시겠습니까?",
+	"message.bclib.syncfiles.mods": "모드 동기화",
+	"message.bclib.syncfiles.configs": "구성 동기화",
+	"message.bclib.syncfiles.folders": "폴더 및 파일 동기화",
+	"message.bclib.syncfiles.delete": "필요 없는 삭제",
+	"title.bclib.confirmrestart": "재시작 필요",
+	"message.bclib.confirmrestart": "요청한 콘텐츠가 동기화되었습니다. 지금 마인크래프트를 다시 시작해야 합니다.",
+	"title.link.bclib.discord": "디스코드",
+    "title.bclib.modmenu.main": "BCLib 환경설정",
+	"title.bclib.progress": "진행",
+	"title.bclib.filesync.progress": "파일 전송",
+	"message.bclib.filesync.progress": "파일 내용을 서버와 동기화하는 중",
+	"message.bclib.filesync.progress.stage.empty": "",
+	
+	"title.config.bclib.client.auto_sync.enabled": "자동 동기화 사용",
+	"title.config.bclib.client.auto_sync.acceptConfigs": "들어오는 구성 파일 수락",
+	"title.config.bclib.client.auto_sync.acceptFiles": "수신 파일 수락",
+	"title.config.bclib.client.auto_sync.acceptMods": "수신 모드 수락",
+	"title.config.bclib.client.auto_sync.displayModInfo": "서버사이드 모드가 클라이언트와 다를 때 경고 표시",
+	"title.config.bclib.client.auto_sync.debugHashes": "로그에 자동 동기화 디버그 해시 인쇄",
+
+	"title.bclib.syncfiles.modInfo": "모드 정보",
+	"title.bclib.syncfiles.modlist": "모드 목록",
+	"message.bclib.syncfiles.modlist": "설치된 모드의 상태는 다음과 같습니다.\n\n로컬에 없거나 서버에 다른 버전이 있는 모든 모드는 동기화됩니다.",
+	"title.bclib.modmissmatch": "모드 버전 충돌",
+	"message.bclib.modmissmatch": "이 클라이언트의 일부 모드는 서버의 모드 버전과 일치하지 않습니다.\n\n모드가 일치하지 않으면 이상한 게임 동작이나 충돌이 발생할 수 있습니다. 서버와 같은 모드를 사용하는 것으로 해주세요.",
+
+	"message.bclib.datafixer.progress.waitbackup": "백업이 완료될 때까지 기다리는 중입니다. 시간이 걸릴 수 있습니다!",
+	"message.bclib.datafixer.progress.reading": "데이터 읽기",
+	"message.bclib.datafixer.progress.players": "플레이어 수정",
+	"message.bclib.datafixer.progress.level": "level.dat에 패치 적용",
+	"message.bclib.datafixer.progress.worlddata": "사용자 지정 월드-데이터 패치 적용",
+	"message.bclib.datafixer.progress.regions": "모든 영역 복구",
+	"message.bclib.datafixer.progress.saving": "패치 상태 저장 중",
+	"title.bclib.datafixer.progress": "월드 수정",
+	"message.bclib.datafixer.progress": "사용자 환경에 모든 패치를 적용하고 있습니다.",
+	"title.bclib.datafixer.error": "월드를 수정하는 중 오류 발생",
+	"message.bclib.datafixer.error": "월드를 수리하는 동안 오류가 발생했습니다. 즉, 이 수준은 일치하지 않는 상태이므로 재생하지 않아야 합니다. 백업을 복구하고 아래 오류를 수정한 후 다시 시도하십시오.",
+	"title.bclib.datafixer.error.continue": "계속 진행 및 수정됨"
+}

src/main/resources/bclib.mixins.client.json

@@ -4,17 +4,18 @@
 	"package": "ru.bclib.mixin.client",
 	"compatibilityLevel": "JAVA_16",
 	"client": [
-		"SimpleReloadableResourceManagerMixin",
+		"AnvilScreenMixin",
-		"EnchantingTableBlockMixin",
 		"BackgroundRendererMixin",
 		"ClientRecipeBookMixin",
-		"ModelManagerMixin",
+		"EnchantingTableBlockMixin",
-		"TextureAtlasMixin",
+		"GameMixin",
-		"AnvilScreenMixin",
-		"ModelBakeryMixin",
 		"MinecraftMixin",
 		"GameMixin",
 		"StructureFeaturesMixin"
+		"ModelBakeryMixin",
+		"ModelManagerMixin",
+		"SimpleReloadableResourceManagerMixin",
+		"TextureAtlasMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1

src/main/resources/bclib.mixins.common.json

@@ -4,18 +4,18 @@
 	"package": "ru.bclib.mixin.common",
 	"compatibilityLevel": "JAVA_16",
 	"mixins": [
-		"SimpleReloadableResourceManagerMixin",
+		"AnvilBlockMixin",
-		"shears.DiggingEnchantmentMixin",
+		"AnvilMenuMixin",
-		"shears.TripWireBlockMixin",
+		"BiomeMixin",
+		"BoneMealItemMixin",
 		"ChunkBiomeContainerMixin",
-		"shears.BeehiveBlockMixin",
-		"shears.PumpkinBlockMixin",
-		"shears.MushroomCowMixin",
-		"shears.SnowGolemMixin",
 		"ComposterBlockAccessor",
 		"PotionBrewingAccessor",
 		"RecipeManagerAccessor",
+		"CraftingMenuMixin",
 		"EnchantmentMenuMixin",
+		"LayerLightSectionStorageMixin",
+		"MainMixin",
 		"MinecraftServerMixin",
 		"PistonBaseBlockMixin",
 		"WorldGenRegionMixin",
@@ -26,12 +26,20 @@
 		"BoneMealItemMixin",
 		"shears.SheepMixin",
 		"PortalShapeMixin",
+		"PotionBrewingAccessor",
+		"RecipeManagerAccessor",
+		"RecipeManagerMixin",
 		"ServerLevelMixin",
-		"AnvilBlockMixin",
+		"SimpleReloadableResourceManagerMixin",
-		"AnvilMenuMixin",
 		"TagLoaderMixin",
-		"BiomeMixin",
+		"WorldGenRegionMixin",
-		"MainMixin"
+		"shears.BeehiveBlockMixin",
+		"shears.DiggingEnchantmentMixin",
+		"shears.MushroomCowMixin",
+		"shears.PumpkinBlockMixin",
+		"shears.SheepMixin",
+		"shears.SnowGolemMixin",
+		"shears.TripWireBlockMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1