name "Nether Star Chisel" only "Bedrockium Chisel" if in GTNH

This commit is contained in:
glowredman committed 2022-06-07 22:52:12 +02:00
1 parent 3c0729591f
commit 423f72ab21
12 files changed
+34 -16

No files matched your search

+9 -7
View File
@@ -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) {
+4
View File
@@ -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();
}
-1
View File
@@ -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;
@@ -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) {
@@ -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.
@@ -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.
@@ -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
@@ -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.
@@ -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
@@ -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=우클릭으로 던지기. 돌과 조약돌에 이끼가 낍니다.
@@ -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=ПКМ, чтобы кинуть. Превратить булыжник в замшелый булыжник при столкновении.
@@ -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=右键丢出.若碰到圆石则使其变成苔石.