lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Initial 1.9 commit

Browse source 
This DOES NOT BUILD. Do not even attempt.

Almost everything has been ported besides the block/item packages. Then it's a matter of testing what broke.
This commit is contained in:
Nick 2016-03-17 13:00:44 -07:00
parent f896383fe6
commit 6c729db70c
359 changed files with 1858 additions and 4447 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/WayofTime/bloodmagic/demonAura/PosXY.java
View file

@ -1,10 +1,6 @@
package WayofTime.bloodmagic.demonAura;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import lombok.*;
@EqualsAndHashCode
@ToString

6
src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java
View file

@ -1,11 +1,11 @@
package WayofTime.bloodmagic.demonAura;
import java.lang.ref.WeakReference;
import WayofTime.bloodmagic.api.soul.DemonWillHolder;
import lombok.Getter;
import lombok.Setter;
import net.minecraft.world.chunk.Chunk;
import WayofTime.bloodmagic.api.soul.DemonWillHolder;
import java.lang.ref.WeakReference;
@Getter
@Setter

4
src/main/java/WayofTime/bloodmagic/demonAura/WillWorld.java
View file

@ -1,10 +1,10 @@
package WayofTime.bloodmagic.demonAura;
import java.util.concurrent.ConcurrentHashMap;
import lombok.Getter;
import lombok.Setter;
import java.util.concurrent.ConcurrentHashMap;
public class WillWorld
{
int dim;

24
src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java
View file

@ -1,14 +1,14 @@
package WayofTime.bloodmagic.demonAura;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.soul.DemonWillHolder;
import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
public class WorldDemonWillHandler
{
@ -103,7 +103,7 @@ public class WorldDemonWillHandler
}
drain = currentWill.drainWill(type, drain);
markChunkAsDirty(willChunk, world.provider.getDimensionId());
markChunkAsDirty(willChunk, world.provider.getDimension());
return drain;
}
@ -120,7 +120,7 @@ public class WorldDemonWillHandler
}
fill = currentWill.addWill(type, amount, max);
markChunkAsDirty(willChunk, world.provider.getDimensionId());
markChunkAsDirty(willChunk, world.provider.getDimension());
return fill;
}
@ -136,20 +136,20 @@ public class WorldDemonWillHandler
}
currentWill.addWill(type, amount);
markChunkAsDirty(willChunk, world.provider.getDimensionId());
markChunkAsDirty(willChunk, world.provider.getDimension());
return amount;
}
public static WillChunk getWillChunk(World world, BlockPos pos)
{
WillChunk willChunk = getWillChunk(world.provider.getDimensionId(), pos.getX() >> 4, pos.getZ() >> 4);
WillChunk willChunk = getWillChunk(world.provider.getDimension(), pos.getX() >> 4, pos.getZ() >> 4);
if (willChunk == null)
{
Chunk chunk = world.getChunkFromBlockCoords(pos);
generateWill(chunk);
willChunk = getWillChunk(world.provider.getDimensionId(), pos.getX() >> 4, pos.getZ() >> 4);
willChunk = getWillChunk(world.provider.getDimension(), pos.getX() >> 4, pos.getZ() >> 4);
}
return willChunk;
@ -183,6 +183,6 @@ public class WorldDemonWillHandler
public static void generateWill(Chunk chunk)
{
addWillChunk(chunk.getWorld().provider.getDimensionId(), chunk, (short) 1, new DemonWillHolder());
addWillChunk(chunk.getWorld().provider.getDimension(), chunk, (short) 1, new DemonWillHolder());
}
}