Skip to content

Commit 66d99f7

Browse files
arucilarucil
authoredAug 6, 2017
Merge pull request #1 from Flithor/MC-1.12
update to 1.12 port of minecraft
·
1.0-1.12.21.0-1.12
2 parents dd987b6 + 1bfc2df commit 66d99f7

File tree

6 files changed

+51
-40
lines changed

6 files changed

+51
-40
lines changed
 

‎src/main/java/xpbox/BlockXPBox.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@
88
import net.minecraft.entity.player.EntityPlayerMP;
99
import net.minecraft.init.Blocks;
1010
import net.minecraft.init.Items;
11+
import net.minecraft.item.Item;
1112
import net.minecraft.item.ItemStack;
1213
import net.minecraft.util.EnumFacing;
1314
import net.minecraft.util.EnumHand;
15+
import net.minecraft.util.ResourceLocation;
1416
import net.minecraft.util.math.BlockPos;
1517
import net.minecraft.world.World;
18+
import net.minecraftforge.fml.common.registry.ForgeRegistries;
1619
import net.minecraftforge.fml.common.registry.GameRegistry;
1720

1821
import javax.annotation.Nullable;
@@ -31,7 +34,7 @@ public BlockXPBox() {
3134
}
3235

3336
public static void registerRecipe() {
34-
GameRegistry.addShapedRecipe(new ItemStack(blockXPBox),
37+
GameRegistry.addShapedRecipe(new ResourceLocation(NAME), null, new ItemStack(blockXPBox),
3538
"OGO",
3639
"ICI",
3740
"ERE",
@@ -42,14 +45,14 @@ public static void registerRecipe() {
4245
'C', Blocks.CHEST,
4346
'G', Blocks.GLASS_PANE);
4447
}
45-
4648
@Override
47-
public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, @Nullable ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
49+
public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
4850
if (!worldIn.isRemote) {
4951
sendXPMessage(playerIn);
5052
}
5153
return true;
5254
}
55+
5356

5457
private static void sendXPMessage(EntityPlayer player) {
5558
PacketHandler.wrapper.sendTo(

‎src/main/java/xpbox/GuiXPBox.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) {
163163

164164
updateScreen();
165165

166-
fontRendererObj.drawString(I18n.translateToLocal("gui.title"), x + 8, y + 4, 0x404040);
166+
fontRenderer.drawString(I18n.translateToLocal("gui.title"), x + 8, y + 4, 0x404040);
167167

168168
super.drawScreen(mouseX, mouseY, partialTicks);
169169
}

‎src/main/java/xpbox/MessageOp.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static class Handler implements IMessageHandler<MessageOp, IMessage> {
3737
@Override
3838
public IMessage onMessage(MessageOp message, MessageContext ctx) {
3939
FMLCommonHandler.instance().getWorldThread(ctx.netHandler).addScheduledTask(
40-
() -> BlockXPBox.updateXP(ctx.getServerHandler().playerEntity,
40+
() -> BlockXPBox.updateXP(ctx.getServerHandler().player,
4141
message.op, message.xp));
4242
return null;
4343
}

‎src/main/java/xpbox/XPBox.java

+20-12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
package xpbox;
22

33
import net.minecraft.block.Block;
4+
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
5+
import net.minecraft.entity.Entity;
46
import net.minecraft.entity.player.EntityPlayer;
57
import net.minecraft.init.Blocks;
68
import net.minecraft.init.Items;
9+
import net.minecraft.item.Item;
710
import net.minecraft.item.ItemBlock;
811
import net.minecraft.item.ItemStack;
912
import net.minecraft.util.ResourceLocation;
13+
import net.minecraftforge.client.model.ModelLoader;
1014
import net.minecraftforge.common.MinecraftForge;
1115
import net.minecraftforge.common.capabilities.*;
1216
import net.minecraftforge.event.AttachCapabilitiesEvent;
@@ -16,14 +20,15 @@
1620
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
1721
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
1822
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
23+
import net.minecraftforge.fml.common.registry.ForgeRegistries;
1924
import net.minecraftforge.fml.common.registry.GameRegistry;
2025

2126
@Mod(modid = XPBox.MODID, name = XPBox.NAME, version = XPBox.VERSION,
22-
acceptedMinecraftVersions = "[1.10.2]")
27+
acceptedMinecraftVersions = "[1.12]")
2328
public class XPBox {
2429
public static final String MODID = "xpbox";
2530
public static final String NAME = "XPBox";
26-
public static final String VERSION = "1.0";
31+
public static final String VERSION = "1.0.1.12";
2732

2833
public static Block blockXPBox;
2934

@@ -36,19 +41,21 @@ public class XPBox {
3641

3742
@Mod.EventHandler
3843
public void preInit(FMLPreInitializationEvent e) {
39-
// register block
40-
GameRegistry.register(blockXPBox = new BlockXPBox());
41-
ItemBlock item = new ItemBlock(blockXPBox);
42-
GameRegistry.register(item, blockXPBox.getRegistryName());
43-
44-
proxy.registerItemRenderer(item);
44+
45+
//register blockxpbox
46+
ForgeRegistries.BLOCKS.register(blockXPBox=new BlockXPBox().setUnlocalizedName("xpbox"));
47+
48+
//register itemxpbox
49+
ForgeRegistries.ITEMS.register(new ItemBlock(blockXPBox).setRegistryName(blockXPBox.getRegistryName()));
50+
51+
proxy.registerItemRenderer(Item.getItemFromBlock(blockXPBox));
4552

4653
// init network
4754
PacketHandler.init();
4855
}
4956

5057
@Mod.EventHandler
51-
public void init(FMLInitializationEvent e) {
58+
public void init(FMLInitializationEvent e) {
5259
// register recipe
5360
BlockXPBox.registerRecipe();
5461

@@ -59,12 +66,13 @@ public void init(FMLInitializationEvent e) {
5966

6067
// register event handler
6168
MinecraftForge.EVENT_BUS.register(this);
69+
6270
}
6371

6472
@SubscribeEvent
65-
public void attachCapability(AttachCapabilitiesEvent.Entity e) {
66-
if (e.getEntity() instanceof EntityPlayer
67-
&& !e.getEntity().hasCapability(XP_CAPABILITY, null))
73+
public void attachCapability(AttachCapabilitiesEvent<Entity> e) {
74+
if (e.getObject() instanceof EntityPlayer
75+
&& !e.getObject().hasCapability(XP_CAPABILITY, null))
6876
e.addCapability(new ResourceLocation(MODID, "xpCapability"),
6977
new XPCapability.Provider());
7078
}

‎src/main/resources/assets/xpbox/lang/en_US.lang

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
2-
tile.xpbox.name=XP Box
3-
gui.title=XP Box
4-
gui.button_0=0
5-
gui.button_1=1
6-
gui.button_2=2
7-
gui.button_3=3
8-
gui.button_4=4
9-
gui.button_5=5
10-
gui.button_6=6
11-
gui.button_7=7
12-
gui.button_8=8
13-
gui.button_9=9
14-
gui.button_del=DEL
15-
gui.button_alldep=Deposit All
16-
gui.button_allwd=Withdraw All
17-
gui.button_dep=DEP
18-
gui.button_wd=WD
19-
gui.button_setlv=Set Level
1+
tile.xpbox.name=ExpContainer
2+
gui.title=ExpContainer
3+
gui.button_0=0
4+
gui.button_1=1
5+
gui.button_2=2
6+
gui.button_3=3
7+
gui.button_4=4
8+
gui.button_5=5
9+
gui.button_6=6
10+
gui.button_7=7
11+
gui.button_8=8
12+
gui.button_9=9
13+
gui.button_del=DEL
14+
gui.button_alldep=Deposit All
15+
gui.button_allwd=Withdraw All
16+
gui.button_dep=DEP
17+
gui.button_wd=WD
18+
gui.button_setlv=Set Level
19+
error.open_message=You can't open ExpContainer on this dimension.

‎src/main/resources/mcmod.info

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"description": "Store exp conveniently.",
66
"version": "${version}",
77
"mcversion": "${mcversion}",
8-
"url": "",
9-
"updateUrl": "",
10-
"authorList": ["clocka", "plodsoft"],
11-
"credits": "original mod was made by clocka, I (plodsoft) port it to 1.10.2",
8+
"url": "http://forum.minecraftuser.jp/viewtopic.php?t=15105",
9+
"updateUrl": "https://github.com/arucil/mc-XPBox",
10+
"authorList": ["clocka", "plodsoft","Flithor(·ÉÓðÁ÷ÐÇ)"],
11+
"credits": "original mod was made by clocka\r(view at minecraftuser.jp url)\r plodsoft port it to 1.10.2\r Flithor port it to 1.12",
1212
"logoFile": "",
1313
"screenshots": [],
1414
"dependencies": []

0 commit comments

Comments
 (0)
Please sign in to comment.