From 85a8b09ea1287a230cef3aa22f2b15c4f8431cc4 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Sat, 25 Jul 2015 19:28:17 -0400 Subject: [PATCH] Fixed some misc. build errors. --- .../src/main/java/minetweaker/mc1710/game/MCGame.java | 7 +++++-- .../main/java/minetweaker/mods/mfr/FertilizableType.java | 2 +- .../src/main/java/minetweaker/mods/mfr/PrePlantAction.java | 2 +- .../java/minetweaker/mods/mfr/machines/Fertilizer.java | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/game/MCGame.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/game/MCGame.java index b6b41da..67e167d 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/game/MCGame.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/game/MCGame.java @@ -21,7 +21,8 @@ import minetweaker.api.item.IItemDefinition; import minetweaker.api.liquid.ILiquidDefinition; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.world.IBiome; -import minetweaker.mc1710.GuiCannotRemodify; +// TODO Find this +// import minetweaker.mc1710.GuiCannotRemodify; import minetweaker.mc1710.entity.MCEntityDefinition; import minetweaker.mc1710.item.MCItemDefinition; import minetweaker.mc1710.liquid.MCLiquidDefinition; @@ -134,11 +135,13 @@ public class MCGame implements IGame { MineTweakerAPI.getLogger().logError("Reload of scripts blocked (script lock)"); if (Minecraft.isGuiEnabled()) { - Minecraft.getMinecraft().displayGuiScreen( + // Commented out due to unresolved import + /** Minecraft.getMinecraft().displayGuiScreen( new GuiCannotRemodify( "Minecraft has been tweaked for another server", "with modifications that cannot be rolled back.", "Please restart your game.")); + **/ } } diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/FertilizableType.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/FertilizableType.java index 0968b36..770d9df 100644 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/FertilizableType.java +++ b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/FertilizableType.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package stanhebben.minetweaker.mods.mfr; +package minetweaker.mods.mfr; /** * diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/PrePlantAction.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/PrePlantAction.java index 0b0ee1e..9b4598a 100644 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/PrePlantAction.java +++ b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/PrePlantAction.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package stanhebben.minetweaker.mods.mfr; +package minetweaker.mods.mfr; /** * diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Fertilizer.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Fertilizer.java index 352d0fa..393ca36 100644 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Fertilizer.java +++ b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Fertilizer.java @@ -21,7 +21,7 @@ import powercrystals.minefactoryreloaded.MFRRegistry; import powercrystals.minefactoryreloaded.api.FertilizerType; import powercrystals.minefactoryreloaded.api.IFactoryFertilizable; import powercrystals.minefactoryreloaded.api.IFactoryFertilizer; -import stanhebben.minetweaker.mods.mfr.FertilizableType; +import minetweaker.mods.mfr.FertilizableType; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod;