Skip to content

Commit a2791b1

Browse files
authored
Merge pull request LionZXY#2 from marcin212/patch-1
Fix server crash LionZXY#1
2 parents d32125d + 5a98c7f commit a2791b1

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

src/main/java/ru/lionzxy/fastlogblock/FastLogBlock.java

+11-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
44
import net.minecraft.item.Item;
5+
6+
import net.minecraftforge.client.event.ModelRegistryEvent;
57
import net.minecraftforge.client.model.ModelLoader;
68
import net.minecraftforge.common.MinecraftForge;
79
import net.minecraftforge.event.RegistryEvent;
@@ -11,6 +13,9 @@
1113
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
1214
import net.minecraftforge.fml.common.event.FMLServerStoppedEvent;
1315
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
16+
import net.minecraftforge.fml.relauncher.Side;
17+
import net.minecraftforge.fml.relauncher.SideOnly;
18+
1419
import ru.lionzxy.fastlogblock.handlers.EventHandlingManager;
1520
import ru.lionzxy.fastlogblock.ui.InfoItem;
1621

@@ -32,11 +37,16 @@ public void preInit(FMLPreInitializationEvent event) throws IOException {
3237
MinecraftForge.EVENT_BUS.register(eventHandlingManager);
3338
MinecraftForge.EVENT_BUS.register(this);
3439
}
40+
41+
@SubscribeEvent
42+
@SideOnly(Side.CLIENT)
43+
public void registerModels(ModelRegistryEvent event){
44+
ModelLoader.setCustomModelResourceLocation(infoitem, 0, new ModelResourceLocation(infoitem.getRegistryName(), "inventory"));
45+
}
3546

3647
@SubscribeEvent
3748
public void registerItems(RegistryEvent.Register<Item> event) {
3849
event.getRegistry().registerAll(infoitem);
39-
ModelLoader.setCustomModelResourceLocation(infoitem, 0, new ModelResourceLocation(infoitem.getRegistryName(), "inventory"));
4050
}
4151

4252
@EventHandler

src/main/java/ru/lionzxy/fastlogblock/handlers/EventHandlingManager.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package ru.lionzxy.fastlogblock.handlers;
22

3-
import net.minecraft.client.resources.I18n;
43
import net.minecraft.entity.player.EntityPlayer;
54
import net.minecraft.util.math.BlockPos;
65
import net.minecraft.util.text.TextComponentTranslation;
6+
import net.minecraft.util.text.translation.I18n;
77
import net.minecraft.world.World;
88
import net.minecraftforge.event.world.BlockEvent;
99
import net.minecraftforge.fml.common.FMLLog;
@@ -80,7 +80,7 @@ public void stop() {
8080
}
8181

8282
private void notifyAboutEvent(BlockChangeEventModel blockEvent, EntityPlayer entityPlayer) {
83-
final String dateformat = I18n.format("message.fastlogblock:blockinfo.event.dateformat");
83+
final String dateformat = I18n.translateToLocal("message.fastlogblock:blockinfo.event.dateformat");
8484
final EntityPlayer playerEvent = entityPlayer.getEntityWorld().getPlayerEntityByUUID(UUID.fromString(blockEvent.getPlayernick().toString()));
8585
String nickname;
8686
if (playerEvent == null) {

0 commit comments

Comments
 (0)