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

+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) {