upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 17:47:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/KAMKEEL/CustomNPC-Plus into dev

Browse Source
This commit is contained in:
Kam committed 2025-08-27 15:47:18 -04:00
2 parents 7615a60932 4245fc9820
commit 0ddf2d1d13
14 files changed
+35 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/blocks/BlockSign.java
+1 -2
View File
@@ -11,7 +11,6 @@ import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.MathHelper;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import noppes.npcs.blocks.tiles.TileBanner;
import noppes.npcs.blocks.tiles.TileSign;
import noppes.npcs.blocks.tiles.TileVariant;
@@ -37,7 +36,7 @@ public class BlockSign extends BlockRotated {
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
TileBanner tile = (TileBanner) world.getTileEntity(x, y, z);
TileSign tile = (TileSign) world.getTileEntity(x, y, z);
return tile.canEdit();
}
src/main/java/noppes/npcs/client/ClientProxy.java
+1 -2
View File
@@ -287,10 +287,9 @@ public class ClientProxy extends CommonProxy {
}
Minecraft mc = Minecraft.getMinecraft();
NPCButton = new KeyBinding("NPC Inventory", Keyboard.KEY_N, "key.categories.customnpc");
NPCButton = new KeyBinding("key.npcInventory", Keyboard.KEY_N, "key.categories.customnpc");
ClientRegistry.registerKeyBinding(NPCButton);
mc.gameSettings.loadOptions();
new PresetController(CustomNpcs.Dir);