diff --git a/StevenDimDoors/mod_pocketDim/CraftingManager.java b/StevenDimDoors/mod_pocketDim/CraftingManager.java index 065ae05f..4ee47c37 100644 --- a/StevenDimDoors/mod_pocketDim/CraftingManager.java +++ b/StevenDimDoors/mod_pocketDim/CraftingManager.java @@ -98,8 +98,8 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(itemStableFabric, 1), new Object[] { - " y ", "yxy", " y ", 'x', coreCraftingItem, 'y', mod_pocketDim.itemWorldThread - }); + "yyy", "yxy", "yyy", 'x', coreCraftingItem, 'y', mod_pocketDim.itemWorldThread + }); } if (properties.CraftingStabilizedRiftSignatureAllowed) diff --git a/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/StevenDimDoors/mod_pocketDim/EventHookContainer.java index 26fe6871..d68ecd43 100644 --- a/StevenDimDoors/mod_pocketDim/EventHookContainer.java +++ b/StevenDimDoors/mod_pocketDim/EventHookContainer.java @@ -36,15 +36,15 @@ public class EventHookContainer @ForgeSubscribe public void onSoundLoad(SoundLoadEvent event) { - event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/monk.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/monk.ogg"))); - event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/crack.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/crack.ogg"))); - event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/tearing.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/tearing.ogg"))); - event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/rift.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/rift.ogg"))); - event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftStart.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/riftStart.ogg"))); - event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftEnd.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/riftEnd.ogg"))); - event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftClose.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/riftClose.ogg"))); - event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftDoor.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/riftDoor.ogg"))); - event.manager.soundPoolMusic.addSound("mods/DimDoors/sfx/creepy.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/creepy.ogg"))); + event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/monk.ogg"); + event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/crack.ogg"); + event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/tearing.ogg"); + event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/rift.ogg"); + event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftStart.ogg"); + event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftEnd.ogg"); + event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftClose.ogg"); + event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftDoor.ogg"); + event.manager.soundPoolMusic.addSound("mods/DimDoors/sfx/creepy.ogg"); } @SideOnly(Side.CLIENT) @@ -96,7 +96,7 @@ public class EventHookContainer ChunkCoordinates coords = LimboProvider.getLimboSkySpawn(player.worldObj.rand); Point4D destination = new Point4D((int) (coords.posX+entity.posX), coords.posY, (int) (coords.posZ+entity.posZ ), mod_pocketDim.properties.LimboDimensionID); DDTeleporter.teleportEntity(player, destination, false); - player.setEntityHealth(player.getMaxHealth()); + player.setHealth(player.getMaxHealth()); event.setCanceled(true); return false; } @@ -119,7 +119,7 @@ public class EventHookContainer SoundSystem sndSystem = FMLClientHandler.instance().getClient().sndManager.sndSystem; sndSystem.stop("BgMusic"); SoundPoolEntry soundPoolEntry = FMLClientHandler.instance().getClient().sndManager.soundPoolMusic.getRandomSoundFromSoundPool("mods.DimDoors.sfx.creepy"); - sndSystem.backgroundMusic("LimboMusic", soundPoolEntry.soundUrl, soundPoolEntry.soundName, false); + sndSystem.backgroundMusic("LimboMusic", soundPoolEntry.getSoundUrl(), soundPoolEntry.getSoundName(), false); sndSystem.play("LimboMusic"); } else if(world.isRemote && !(world.provider instanceof LimboProvider)) diff --git a/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java b/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java index c9e9c66a..1128a71d 100644 --- a/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java +++ b/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java @@ -357,7 +357,7 @@ public class DDTeleporter oldWorld.getChunkFromChunkCoords(entX, entZ).isModified = true; } // Memory concerns. - oldWorld.releaseEntitySkin(entity); + oldWorld.releaseEntitySkin(entity); if (player == null) // Are we NOT working with a player? { diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index 570b2b1f..4c19fd73 100644 --- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -1,6 +1,8 @@ package StevenDimDoors.mod_pocketDim; +import java.io.File; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -95,7 +97,7 @@ serverPacketHandlerSpec = public class mod_pocketDim { public static final String version = "1.5.2R1.4.1RC1"; - public static final String modid = "DimDoors"; + public static final String modid = "dimdoors"; //need to clean up @SidedProxy(clientSide = "StevenDimDoors.mod_pocketDimClient.ClientProxy", serverSide = "StevenDimDoors.mod_pocketDim.CommonProxy") @@ -160,7 +162,9 @@ public class mod_pocketDim { this.instance = this; //This should be the FIRST thing that gets done. - properties = DDProperties.initialize(event.getSuggestedConfigurationFile()); + String path = event.getSuggestedConfigurationFile().getAbsolutePath().replace(modid, "DimDoors"); + + properties = DDProperties.initialize(new File(path)); //Now do other stuff MinecraftForge.EVENT_BUS.register(new EventHookContainer(properties)); diff --git a/StevenDimDoors/mod_pocketDim/saving/DimDataProcessor.java b/StevenDimDoors/mod_pocketDim/saving/DimDataProcessor.java index 55a01d9a..c539396c 100644 --- a/StevenDimDoors/mod_pocketDim/saving/DimDataProcessor.java +++ b/StevenDimDoors/mod_pocketDim/saving/DimDataProcessor.java @@ -11,8 +11,6 @@ import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; -import scala.Char; - import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; diff --git a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java b/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java index ce3e0c6b..5ae69c6d 100644 --- a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java +++ b/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java @@ -350,13 +350,13 @@ public class TileEntityRift extends TileEntity NBTTagCompound nbt = new NBTTagCompound(); writeToNBT(nbt); - packet.customParam1 = nbt; + packet.data = nbt; return packet; } @Override public void onDataPacket(INetworkManager net, Packet132TileEntityData pkt) { - readFromNBT(pkt.customParam1); + readFromNBT(pkt.data); } }