Version 1.3.3

misterplus · Mar 8, 2020 · c76a1ca · c76a1ca
1 parent 7802158
commit c76a1ca
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/com/misterplus/plustweaks/handlers/EventHandler.java b/src/main/java/com/misterplus/plustweaks/handlers/EventHandler.java
@@ -9,6 +9,7 @@
 import net.minecraft.init.Blocks;
 import net.minecraft.launchwrapper.Launch;
 import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.world.BlockEvent;
 import net.minecraftforge.fml.common.Loader;
@@ -34,15 +35,17 @@ public static void onPortalSpawnEvent(BlockEvent.PortalSpawnEvent event) {
     @SuppressWarnings("deprecation")
     @SubscribeEvent
     public static void onRightClickBlock(PlayerInteractEvent.RightClickBlock event) {
-        if (Loader.isModLoaded("torcherino") && dangerousSettings.disableTorcherino) {
+        if (Loader.isModLoaded("torcherino") && dangerousSettings.disableTorcherino && !event.getWorld().isRemote) {
             IBlockState state = event.getWorld().getBlockState(event.getPos());
             Block block = state.getBlock();
             if (block instanceof BlockLanterino) {
                 event.getWorld().setBlockState(event.getPos(), Blocks.LIT_PUMPKIN.getStateFromMeta(block.getMetaFromState(state)));
+                event.getEntityPlayer().sendMessage(new TextComponentTranslation("message.plustweaks.torcherino"));
                 event.setCanceled(true);
             }
             else if (block instanceof BlockTorcherino) {
                 event.getWorld().setBlockState(event.getPos(), Blocks.TORCH.getStateFromMeta(block.getMetaFromState(state)));
+                event.getEntityPlayer().sendMessage(new TextComponentTranslation("message.plustweaks.torcherino"));
                 event.setCanceled(true);
             }
         }

diff --git a/src/main/resources/assets/plustweaks/lang/en_us.lang b/src/main/resources/assets/plustweaks/lang/en_us.lang
@@ -0,0 +1 @@
+message.plustweaks.torcherino=Opps, you broke it
diff --git a/src/main/resources/assets/plustweaks/lang/zh_cn.lang b/src/main/resources/assets/plustweaks/lang/zh_cn.lang
@@ -0,0 +1 @@
+message.plustweaks.torcherino=¿
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		message.plustweaks.torcherino=Opps, you broke it