diff --git a/common/forge_at.cfg b/common/forge_at.cfg index 9b1672b0c..5e3fdfcc5 100644 --- a/common/forge_at.cfg +++ b/common/forge_at.cfg @@ -114,5 +114,5 @@ public zc.* #FD:BiomeDecorator/* # All private -> protected public-f tj.a #FD:CreativeTabs/field_78032_a # creativeTabArray non-final # Packet public ef.a(IZZLjava/lang/Class;)V #MD:Packet/func_73285_a #addIdClassMapping -# World -yc.J ()Laih; #MD:World/func_72860_G #getSaveHandler +# SaveHandler +public ahv.b()Ljava/io/File; #MD:SaveHandler/func_75765_b diff --git a/common/net/minecraftforge/common/DimensionManager.java b/common/net/minecraftforge/common/DimensionManager.java index 7c2c21dcc..3e6637bf0 100644 --- a/common/net/minecraftforge/common/DimensionManager.java +++ b/common/net/minecraftforge/common/DimensionManager.java @@ -1,5 +1,6 @@ package net.minecraftforge.common; +import java.io.File; import java.util.ArrayList; import java.util.BitSet; import java.util.Hashtable; @@ -29,6 +30,7 @@ import net.minecraft.world.WorldServer; import net.minecraft.world.WorldServerMulti; import net.minecraft.world.WorldSettings; import net.minecraft.world.storage.ISaveHandler; +import net.minecraft.world.storage.SaveHandler; import net.minecraftforge.event.world.WorldEvent; public class DimensionManager @@ -311,4 +313,20 @@ public class DimensionManager } } } + + /** + * Return the current root directory for the world save. Accesses getSaveHandler from the + * @return + */ + public static File getCurrentSaveRootDirectory() + { + if (DimensionManager.getWorld(0) != null) + { + return ((SaveHandler)DimensionManager.getWorld(0).getSaveHandler()).getSaveDirectory(); + } + else + { + return null; + } + } } diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch b/patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch index a7887ae40..fc9adee8f 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch @@ -23,7 +23,7 @@ /** Array of item stacks stored in minecart (for storage minecarts). */ @@ -52,6 +59,25 @@ @SideOnly(Side.CLIENT) - public double velocityZ; + protected double velocityZ; + /* Forge: Minecart Compatibility Layer Integration. */ + public static float defaultMaxSpeedRail = 0.4f;