tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Merge a few more fixes

Browse source
This commit is contained in:
Aidan C. Brady 2014-07-21 16:45:08 -04:00
parent 27056da3e4
commit 0864e1061a
3 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/mekanism/common/CommonWorldTickHandler.java
View file

@ -131,7 +131,7 @@ public class CommonWorldTickHandler
int dimensionId = world.provider.dimensionId;
//Credit to E. Beef :)
//Credit to E. Beef
if(chunkRegenMap.containsKey(dimensionId))
{
Queue<ChunkCoordIntPair> chunksToGen = chunkRegenMap.get(dimensionId);
@ -152,6 +152,7 @@ public class CommonWorldTickHandler
fmlRandom.setSeed((xSeed*nextChunk.chunkXPos + zSeed*nextChunk.chunkZPos) ^ world.getSeed());
Mekanism.genHandler.generate(fmlRandom, nextChunk.chunkXPos, nextChunk.chunkZPos, world, world.getChunkProvider(), world.getChunkProvider());
Mekanism.logger.info("[Mekanism] Regenerating ores at chunk " + nextChunk);
}
if(chunksToGen.isEmpty())

13
src/main/java/mekanism/common/Mekanism.java
View file

@ -215,6 +215,7 @@ public class Mekanism
/** A list of the usernames of players who have donated to Mekanism. */
public static List<String> donators = new ArrayList<String>();
/** The server's world tick handler. */
public static CommonWorldTickHandler worldTickHandler = new CommonWorldTickHandler();
/** The Mekanism world generation handler. */
@ -1508,6 +1509,18 @@ public class Mekanism
}
}
@SubscribeEvent
public void chunkSave(ChunkDataEvent.Save event)
{
if(!event.world.isRemote)
{
NBTTagCompound nbtTags = event.getData();
nbtTags.setInteger("MekanismWorldGen", baseWorldGenVersion);
nbtTags.setInteger("MekanismUserWorldGen", userWorldGenVersion);
}
}
@SubscribeEvent
public synchronized void onChunkDataLoad(ChunkDataEvent.Load event)
{

13
src/main/java/mekanism/common/recipe/BinRecipe.java
View file

@ -10,14 +10,21 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent;
public class BinRecipe implements IRecipe//, ICraftingHandler
public class BinRecipe implements IRecipe
{
private static boolean registered;
public BinRecipe()
{
MinecraftForge.EVENT_BUS.register(this);
if(!registered)
{
FMLCommonHandler.instance().bus().register(this);
registered = true;
}
}
@Override
@ -114,7 +121,7 @@ public class BinRecipe implements IRecipe//, ICraftingHandler
}
@SubscribeEvent
public void onCrafting(ItemCraftedEvent event) //EntityPlayer player, ItemStack item, IInventory craftMatrix)
public void onCrafting(ItemCraftedEvent event)
{
if(getResult(event.craftMatrix) != null)
{