From 423f72ab215aa7c4725cb23c6ba88f9502bfa461 Mon Sep 17 00:00:00 2001 From: glowredman Date: Tue, 7 Jun 2022 22:52:12 +0200 Subject: [PATCH] name "Nether Star Chisel" only "Bedrockium Chisel" if in GTNH --- build.gradle | 16 +++++++++------- src/main/java/team/chisel/Chisel.java | 4 ++++ src/main/java/team/chisel/Features.java | 1 - .../java/team/chisel/item/chisel/ItemChisel.java | 10 +++++----- src/main/resources/assets/chisel/lang/de_DE.lang | 2 ++ src/main/resources/assets/chisel/lang/en_GB.lang | 2 ++ src/main/resources/assets/chisel/lang/en_PT.lang | 2 ++ src/main/resources/assets/chisel/lang/en_US.lang | 3 ++- src/main/resources/assets/chisel/lang/fr_FR.lang | 2 ++ src/main/resources/assets/chisel/lang/ko_KR.lang | 2 ++ src/main/resources/assets/chisel/lang/ru_RU.lang | 3 ++- src/main/resources/assets/chisel/lang/zh_CN.lang | 3 ++- 12 files changed, 34 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 656f439f..c09bee22 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1644894948 +//version: 1652851397 /* DO NOT CHANGE THIS FILE! @@ -44,13 +44,14 @@ plugins { id 'eclipse' id 'scala' id 'maven-publish' - id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false - id 'org.jetbrains.kotlin.kapt' version '1.5.30' apply false + id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false + id 'org.jetbrains.kotlin.kapt' version '1.5.30' apply false + id 'com.google.devtools.ksp' version '1.5.30-1.0.0' apply false id 'org.ajoberstar.grgit' version '4.1.1' id 'com.github.johnrengelman.shadow' version '4.0.4' - id 'com.palantir.git-version' version '0.13.0' apply false + id 'com.palantir.git-version' version '0.13.0' apply false id 'de.undercouch.download' version '5.0.1' - id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false + id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false } if (project.file('.git/HEAD').isFile()) { @@ -103,6 +104,7 @@ checkPropertyExists("usesShadowedDependencies") checkPropertyExists("developmentEnvironmentUserName") boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false +boolean usesMixinDebug = project.findProperty('usesMixinDebug') ?: project.usesMixins.toBoolean() String javaSourceDir = "src/main/java/" String scalaSourceDir = "src/main/scala/" @@ -217,7 +219,7 @@ if (usesMixins.toBoolean()) { arguments += [ "--tweakClass org.spongepowered.asm.launch.MixinTweaker" ] - if (!project.hasProperty(usesMixinDebug) || usesMixinDebug.toBoolean()) { + if (usesMixinDebug.toBoolean()) { jvmArguments += [ "-Dmixin.debug.countInjections=true", "-Dmixin.debug.verbose=true", @@ -567,7 +569,7 @@ publishing { artifact source: shadowJar, classifier: "" } if(!noPublishedSources) { - artifact source: sourcesJar, classifier: "src" + artifact source: sourcesJar, classifier: "sources" } artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev" if (apiPackage) { diff --git a/src/main/java/team/chisel/Chisel.java b/src/main/java/team/chisel/Chisel.java index c2f453b1..ac1c273f 100644 --- a/src/main/java/team/chisel/Chisel.java +++ b/src/main/java/team/chisel/Chisel.java @@ -63,6 +63,7 @@ public class Chisel { public static final BlockCarvable.SoundType soundHolystoneFootstep = new BlockCarvable.SoundType("holystone", 1.0f, 1.0f); public static final BlockCarvable.SoundType soundMetalFootstep = new BlockCarvable.SoundType("metal", 1.0f, 1.0f); public static boolean multipartLoaded = false; + public static boolean gtnhLoaded = false; public static int renderEldritchId; public static int renderAutoChiselId; public static int renderGlowId; @@ -138,6 +139,9 @@ public class Chisel { if (Loader.isModLoaded("ForgeMultipart")) { new FMPCompat().init(); } + if (Loader.isModLoaded("dreamcraft")) { + gtnhLoaded = true; + } proxy.preInit(); } diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index 82f6a4ba..f5d2bc86 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -2,7 +2,6 @@ package team.chisel; import java.util.List; -import net.minecraft.block.BlockFire; import team.chisel.block.*; import team.chisel.carving.Carving; import team.chisel.client.render.SubmapManagerAntiblock; diff --git a/src/main/java/team/chisel/item/chisel/ItemChisel.java b/src/main/java/team/chisel/item/chisel/ItemChisel.java index f4417ea9..99798d35 100644 --- a/src/main/java/team/chisel/item/chisel/ItemChisel.java +++ b/src/main/java/team/chisel/item/chisel/ItemChisel.java @@ -51,6 +51,11 @@ public class ItemChisel extends Item implements IChiselItem { this.type = type; setMaxStackSize(1); setTextureName(Chisel.MOD_ID + ":chisel_" + type.name().toLowerCase(Locale.ENGLISH)); + if(type == ChiselType.NETHERSTAR && Chisel.gtnhLoaded) { + setUnlocalizedName(Chisel.MOD_ID + ".chisel_" + type.name().toLowerCase() + ".gtnh"); + } else { + setUnlocalizedName(Chisel.MOD_ID + ".chisel_" + type.name().toLowerCase()); + } MinecraftForge.EVENT_BUS.register(this); } @@ -81,11 +86,6 @@ public class ItemChisel extends Item implements IChiselItem { return false; } - @Override - public String getUnlocalizedName(ItemStack stack) { - return "item." + Chisel.MOD_ID + ".chisel_" + type.name().toLowerCase(); - } - @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean held) { diff --git a/src/main/resources/assets/chisel/lang/de_DE.lang b/src/main/resources/assets/chisel/lang/de_DE.lang index f00c0a23..13912b50 100644 --- a/src/main/resources/assets/chisel/lang/de_DE.lang +++ b/src/main/resources/assets/chisel/lang/de_DE.lang @@ -15,6 +15,8 @@ item.chisel.chisel.desc.modes=Verfügt über mehrere Modi zum Meißeln. item.chisel.chisel_diamond.name=Diamantmeißel item.chisel.chisel_obsidian.name=Obsidianmeißel +item.chisel.chisel_netherstar.name=Nethersternmeißel +item.chisel.chisel_netherstar.gtnh.name=Bedrockiummeißel item.ballMoss.name=Moosball item.ballMoss.desc=Rechtsklick, um ihn zu werfen. Verwandelt Bruchstein in bemoosten Bruchstein. diff --git a/src/main/resources/assets/chisel/lang/en_GB.lang b/src/main/resources/assets/chisel/lang/en_GB.lang index a427d0e4..27928d3e 100644 --- a/src/main/resources/assets/chisel/lang/en_GB.lang +++ b/src/main/resources/assets/chisel/lang/en_GB.lang @@ -15,6 +15,8 @@ item.chisel.chisel.desc.modes=Has multiple modes for chiseling. item.chisel.chisel_diamond.name=Diamond Chisel item.chisel.chisel_obsidian.name=Obsidian Chisel +item.chisel.chisel_netherstar.name=Nether Star Chisel +item.chisel.chisel_netherstar.gtnh.name=Bedrockium Chisel item.ballMoss.name=Ball O' Moss item.ballMoss.desc=Right-Click to throw. This will turn Cobblestone to Moss Stone on impact. diff --git a/src/main/resources/assets/chisel/lang/en_PT.lang b/src/main/resources/assets/chisel/lang/en_PT.lang index 61e572a3..05ab3204 100644 --- a/src/main/resources/assets/chisel/lang/en_PT.lang +++ b/src/main/resources/assets/chisel/lang/en_PT.lang @@ -15,6 +15,8 @@ item.chisel.chisel.desc.modes=Has multiple modes for chiseling. item.chisel.chisel_diamond.name=Diamond Chisel item.chisel.chisel_obsidian.name=Obsidian Chisel +item.chisel.chisel_netherstar.name=Nether Star Chisel +item.chisel.chisel_netherstar.gtnh.name=Bedrockium Chisel # Item localizations item.ballMoss.name=Ball O' Moss diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 93346869..e9ad5980 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -16,7 +16,8 @@ item.chisel.chisel.desc.modes=Has multiple modes for chiseling. item.chisel.chisel_diamond.name=Diamond Chisel item.chisel.chisel_obsidian.name=Obsidian Chisel -item.chisel.chisel_netherstar.name=Bedrockium Chisel +item.chisel.chisel_netherstar.name=Nether Star Chisel +item.chisel.chisel_netherstar.gtnh.name=Bedrockium Chisel item.ballMoss.name=Ball O' Moss item.ballMoss.desc=Right-Click to throw. This will turn Cobblestone to Moss Stone on impact. diff --git a/src/main/resources/assets/chisel/lang/fr_FR.lang b/src/main/resources/assets/chisel/lang/fr_FR.lang index 9cdcbd7c..18dde4cc 100644 --- a/src/main/resources/assets/chisel/lang/fr_FR.lang +++ b/src/main/resources/assets/chisel/lang/fr_FR.lang @@ -15,6 +15,8 @@ item.chisel.chisel.desc.modes=Has multiple modes for chiseling. item.chisel.chisel_diamond.name=Diamond Chisel item.chisel.chisel_obsidian.name=Obsidian Chisel +item.chisel.chisel_netherstar.name=Nether Star Chisel +item.chisel.chisel_netherstar.gtnh.name=Bedrockium Chisel # Item localizations item.ballMoss.name=Balle à mousse diff --git a/src/main/resources/assets/chisel/lang/ko_KR.lang b/src/main/resources/assets/chisel/lang/ko_KR.lang index f8f404b8..fad9d9e8 100644 --- a/src/main/resources/assets/chisel/lang/ko_KR.lang +++ b/src/main/resources/assets/chisel/lang/ko_KR.lang @@ -15,6 +15,8 @@ item.chisel.chisel.desc.modes=변환 범위를 선택 할 수 있습니다. item.chisel.chisel_diamond.name=다이아몬드 끌 item.chisel.chisel_obsidian.name=흑요석 끌 +item.chisel.chisel_netherstar.name=Nether Star Chisel +item.chisel.chisel_netherstar.gtnh.name=Bedrockium Chisel item.ballMoss.name=이끼 공 item.ballMoss.desc=우클릭으로 던지기. 돌과 조약돌에 이끼가 낍니다. diff --git a/src/main/resources/assets/chisel/lang/ru_RU.lang b/src/main/resources/assets/chisel/lang/ru_RU.lang index 9ae8f284..57fc970a 100644 --- a/src/main/resources/assets/chisel/lang/ru_RU.lang +++ b/src/main/resources/assets/chisel/lang/ru_RU.lang @@ -16,7 +16,8 @@ item.chisel.chisel.desc.modes=Обладает разными режимами item.chisel.chisel_diamond.name=Алмазная стамеска item.chisel.chisel_obsidian.name=Обсидиановая стамеска -item.chisel.chisel_netherstar.name=Бедрокиевая стамеска +item.chisel.chisel_netherstar.name=Стамеска из адских звёзд +item.chisel.chisel_netherstar.gtnh.name=Бедрокиевая стамеска item.ballMoss.name=Шарик мха item.ballMoss.desc=ПКМ, чтобы кинуть. Превратить булыжник в замшелый булыжник при столкновении. diff --git a/src/main/resources/assets/chisel/lang/zh_CN.lang b/src/main/resources/assets/chisel/lang/zh_CN.lang index f86ceda4..11b7835b 100644 --- a/src/main/resources/assets/chisel/lang/zh_CN.lang +++ b/src/main/resources/assets/chisel/lang/zh_CN.lang @@ -16,7 +16,8 @@ item.chisel.chisel.desc.modes=拥有多种雕刻模式. item.chisel.chisel_diamond.name=钻石凿子 item.chisel.chisel_obsidian.name=黑曜石凿子 -item.chisel.chisel_netherstar.name=基岩凿子 +item.chisel.chisel_netherstar.name=Nether Star Chisel +item.chisel.chisel_netherstar.gtnh.name=基岩凿子 item.ballMoss.name=苔藓球 item.ballMoss.desc=右键丢出.若碰到圆石则使其变成苔石.