Skip to content

Commit 76f3617

Browse files
arucilarucil
authored
Merge pull request #2 from arucil/revert-1-MC-1.12
Revert "update to 1.12 port of minecraft"
2 parents 66d99f7 + c1c4047 commit 76f3617

File tree

6 files changed

+40
-51
lines changed

6 files changed

+40
-51
lines changed

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

+3-6
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@
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;
1211
import net.minecraft.item.ItemStack;
1312
import net.minecraft.util.EnumFacing;
1413
import net.minecraft.util.EnumHand;
15-
import net.minecraft.util.ResourceLocation;
1614
import net.minecraft.util.math.BlockPos;
1715
import net.minecraft.world.World;
18-
import net.minecraftforge.fml.common.registry.ForgeRegistries;
1916
import net.minecraftforge.fml.common.registry.GameRegistry;
2017

2118
import javax.annotation.Nullable;
@@ -34,7 +31,7 @@ public BlockXPBox() {
3431
}
3532

3633
public static void registerRecipe() {
37-
GameRegistry.addShapedRecipe(new ResourceLocation(NAME), null, new ItemStack(blockXPBox),
34+
GameRegistry.addShapedRecipe(new ItemStack(blockXPBox),
3835
"OGO",
3936
"ICI",
4037
"ERE",
@@ -45,14 +42,14 @@ public static void registerRecipe() {
4542
'C', Blocks.CHEST,
4643
'G', Blocks.GLASS_PANE);
4744
}
45+
4846
@Override
49-
public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
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) {
5048
if (!worldIn.isRemote) {
5149
sendXPMessage(playerIn);
5250
}
5351
return true;
5452
}
55-
5653

5754
private static void sendXPMessage(EntityPlayer player) {
5855
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-
fontRenderer.drawString(I18n.translateToLocal("gui.title"), x + 8, y + 4, 0x404040);
166+
fontRendererObj.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().player,
40+
() -> BlockXPBox.updateXP(ctx.getServerHandler().playerEntity,
4141
message.op, message.xp));
4242
return null;
4343
}

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

+12-20
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
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;
64
import net.minecraft.entity.player.EntityPlayer;
75
import net.minecraft.init.Blocks;
86
import net.minecraft.init.Items;
9-
import net.minecraft.item.Item;
107
import net.minecraft.item.ItemBlock;
118
import net.minecraft.item.ItemStack;
129
import net.minecraft.util.ResourceLocation;
13-
import net.minecraftforge.client.model.ModelLoader;
1410
import net.minecraftforge.common.MinecraftForge;
1511
import net.minecraftforge.common.capabilities.*;
1612
import net.minecraftforge.event.AttachCapabilitiesEvent;
@@ -20,15 +16,14 @@
2016
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
2117
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
2218
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
23-
import net.minecraftforge.fml.common.registry.ForgeRegistries;
2419
import net.minecraftforge.fml.common.registry.GameRegistry;
2520

2621
@Mod(modid = XPBox.MODID, name = XPBox.NAME, version = XPBox.VERSION,
27-
acceptedMinecraftVersions = "[1.12]")
22+
acceptedMinecraftVersions = "[1.10.2]")
2823
public class XPBox {
2924
public static final String MODID = "xpbox";
3025
public static final String NAME = "XPBox";
31-
public static final String VERSION = "1.0.1.12";
26+
public static final String VERSION = "1.0";
3227

3328
public static Block blockXPBox;
3429

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

4237
@Mod.EventHandler
4338
public void preInit(FMLPreInitializationEvent e) {
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));
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);
5245

5346
// init network
5447
PacketHandler.init();
5548
}
5649

5750
@Mod.EventHandler
58-
public void init(FMLInitializationEvent e) {
51+
public void init(FMLInitializationEvent e) {
5952
// register recipe
6053
BlockXPBox.registerRecipe();
6154

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

6760
// register event handler
6861
MinecraftForge.EVENT_BUS.register(this);
69-
7062
}
7163

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

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

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
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.
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

‎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": "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",
8+
"url": "",
9+
"updateUrl": "",
10+
"authorList": ["clocka", "plodsoft"],
11+
"credits": "original mod was made by clocka, I (plodsoft) port it to 1.10.2",
1212
"logoFile": "",
1313
"screenshots": [],
1414
"dependencies": []

0 commit comments

Comments
 (0)