From f4ac62247a54c38466fb7544aae63e6d97fb2740 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Wed, 7 Feb 2018 22:28:35 +1000 Subject: $ Work on GT Chunkloader. --- .../xmod/gregtech/api/enums/GregtechItemList.java | 5 +- .../basic/GregtechMetaTileEntityChunkLoader.java | 290 ++++++++++++++++++++- .../gregtech/GregtechTieredChunkloaders.java | 25 ++ 3 files changed, 306 insertions(+), 14 deletions(-) create mode 100644 src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java (limited to 'src/Java/gtPlusPlus/xmod/gregtech') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index da2b24e38f..bcf4777acd 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -284,7 +284,10 @@ public enum GregtechItemList implements GregtechItemContainer { Super_Chest_LV, Super_Chest_MV, Super_Chest_HV, Super_Chest_EV, Super_Chest_IV, //Fish Pond - Casing_FishPond, Industrial_FishingPond, + Casing_FishPond, Industrial_FishingPond, + + //Chunkloader + GT_Chunkloader_HV, diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java index b68c49c48c..d8304aaa77 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java @@ -1,6 +1,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; import static gregtech.api.enums.GT_Values.V; +import static gtPlusPlus.api.objects.ChunkManager.mChunkLoaders; + +import java.io.IOException; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + +import com.google.common.collect.MapMaker; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; @@ -9,15 +17,29 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_SpawnEventHandler; +import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.interfaces.IChunkLoader; +import gtPlusPlus.api.objects.ChunkManager; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.util.array.BlockPos; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.ChunkCoordIntPair; +import net.minecraft.world.MinecraftException; +import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; +import net.minecraftforge.common.ForgeChunkManager; +import net.minecraftforge.common.ForgeChunkManager.Ticket; +import net.minecraftforge.common.ForgeChunkManager.Type; -public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_TieredMachineBlock { +public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_TieredMachineBlock implements IChunkLoader { public int mRange = 16; + private long mTicksLeft = 0; + private UUID mUUID = UUID.randomUUID(); public GregtechMetaTileEntityChunkLoader(final int aID, final String aName, final String aNameRegional, final int aTier) { - super(aID, aName, aNameRegional, aTier, 0, "Reprells nasty Creatures. Range: " + (4 + (12 * aTier)) + " unpowered / " + (16 + (48 * aTier)) + " powered"); + super(aID, aName, aNameRegional, aTier, 0, "Loads chunks: " + (16 + (48 * aTier)) + " powered"); } public GregtechMetaTileEntityChunkLoader(final String aName, final int aTier, final int aInvSlotCount, final String aDescription, final ITexture[][][] aTextures) { @@ -34,31 +56,69 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_TieredM return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1], (aSide != 1) ? null : aActive ? new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE) : new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER)}; } + private int xCoord, yCoord, zCoord; + private int prevX, prevY, prevZ; @Override public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTimer) { + if (!aBaseMetaTileEntity.isServerSide()) { + return; + } + if (aBaseMetaTileEntity.isAllowedToWork() && aBaseMetaTileEntity.isServerSide()) { - final int[] tCoords = new int[]{aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(), aBaseMetaTileEntity.getZCoord(), aBaseMetaTileEntity.getWorld().provider.dimensionId}; - if (((aTimer % 600) == 0) && !GT_SpawnEventHandler.mobReps.contains(tCoords)) { - GT_SpawnEventHandler.mobReps.add(tCoords); + + + + if (this.mTicksLeft > 0) { + this.mTicksLeft--; } - if (aBaseMetaTileEntity.isUniversalEnergyStored(this.getMinimumStoredEU()) && aBaseMetaTileEntity.decreaseStoredEnergyUnits(1 << (this.mTier * 2), false)) { - this.mRange = 16 + (48 * this.mTier); - } else { - this.mRange = 4 + (12 * this.mTier); + else if (this.mTicksLeft < 0) { + this.mTicksLeft = 0; + } + if (mTicksLeft < 10) { + long h = this.getEUVar(); + if (h > 0) { + if (h >(this.maxEUInput()+this.getMinimumStoredEU())) { + this.setEUVar((this.getEUVar()-this.maxEUInput())); + this.mTicksLeft += 10; + } + } + } + + xCoord = aBaseMetaTileEntity.getXCoord(); + yCoord = aBaseMetaTileEntity.getYCoord(); + zCoord = aBaseMetaTileEntity.getZCoord(); + + if (xCoord != prevX || yCoord != prevY || zCoord != prevZ) { + releaseTicket(); + prevX = xCoord; + prevY = yCoord; + prevZ = zCoord; } + + if (hasActiveTicket() && (getTicket().world != aBaseMetaTileEntity.getWorld() || refreshTicket || !aBaseMetaTileEntity.isAllowedToWork())) { + releaseTicket(); + } + + if (!hasActiveTicket() && this.mTicksLeft > 0) { + requestTicket(); + } + + } + + + + } @Override public void onFirstTick(final IGregTechTileEntity aBaseMetaTileEntity) { - final int[] tCoords = new int[]{aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(), aBaseMetaTileEntity.getZCoord(), aBaseMetaTileEntity.getWorld().provider.dimensionId}; - GT_SpawnEventHandler.mobReps.add(tCoords); + registerLoader(); } @Override public void onRemoval() { - final int[] tCoords = new int[]{this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord(), this.getBaseMetaTileEntity().getWorld().provider.dimensionId}; - GT_SpawnEventHandler.mobReps.remove(tCoords); + ChunkManager.mChunkLoaders.remove(new BlockPos(this.xCoord, this.yCoord, this.zCoord, this.getBaseMetaTileEntity().getWorld().provider.dimensionId)); } @Override @@ -123,9 +183,213 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_TieredM @Override public void saveNBTData(final NBTTagCompound aNBT) { + aNBT.setLong("mTicksLeft", getTicksRemaining()); } @Override public void loadNBTData(final NBTTagCompound aNBT) { + this.mTicksLeft = aNBT.getLong("mTicksLeft"); + } + + + + + + /** + * Chunk Handling + */ + private static final Map tickets = new MapMaker().makeMap(); + private static final byte ANCHOR_RADIUS = 1; + private boolean hasTicket; + private boolean refreshTicket; + private Set chunks; + private short mChunkLoaderMapID = -1; + + public void registerLoader() { + short mSize = (short) ChunkManager.mChunkLoaders.size(); + this.mChunkLoaderMapID = mSize; + if (!mChunkLoaders.containsValue(this)) { + mChunkLoaders.put(new BlockPos(this.xCoord, this.yCoord, this.zCoord, this.getBaseMetaTileEntity().getWorld().provider.dimensionId),this); + } + } + + public short getLoaderID() { + return this.mChunkLoaderMapID; + } + + public void onBlockRemoval() { + releaseTicket(); + } + + public void invalidate() { + refreshTicket = true; + } + + public void validate() { + refreshTicket = true; + } + + protected void releaseTicket() { + refreshTicket = false; + setTicket(null); + } + + protected void requestTicket() { + Ticket chunkTicket = getTicketFromForge(); + if (chunkTicket != null) { + setTicketData(chunkTicket); + forceChunkLoading(chunkTicket); + } + } + + protected Ticket getTicketFromForge() { + return ForgeChunkManager.requestTicket(GTplusplus.instance, this.getBaseMetaTileEntity().getWorld(), Type.NORMAL); + } + + protected void setTicketData(Ticket chunkTicket) { + chunkTicket.getModData().setInteger("xCoord", this.getBaseMetaTileEntity().getXCoord()); + chunkTicket.getModData().setInteger("yCoord", this.getBaseMetaTileEntity().getYCoord()); + chunkTicket.getModData().setInteger("zCoord", this.getBaseMetaTileEntity().getZCoord()); + //chunkTicket.getModData().setString("type", getMachineType().getTag()); + } + + public boolean hasActiveTicket() { + return getTicket() != null; + } + + public Ticket getTicket() { + //Logger.INFO("[Chunk Loader] "+"Getting Ticking. ["+this.getLoaderID()+"] @ [x: "+this.xCoord+"][y: "+this.yCoord+"][z: "+this.zCoord+"]"); + return tickets.get(this.mUUID); + } + + public void setTicket(Ticket t) { + boolean changed = false; + Ticket ticket = getTicket(); + if (ticket != t) { + if (ticket != null) { + if (ticket.world == this.getBaseMetaTileEntity().getWorld()) { + for (ChunkCoordIntPair chunk : ticket.getChunkList()) { + if (ForgeChunkManager.getPersistentChunksFor(this.getBaseMetaTileEntity().getWorld()).keys().contains(chunk)) + ForgeChunkManager.unforceChunk(ticket, chunk); + } + ForgeChunkManager.releaseTicket(ticket); + } + Logger.INFO("[Chunk Loader] "+"Removing Ticking. ["+this.getLoaderID()+"] @ [x: "+this.xCoord+"][y: "+this.yCoord+"][z: "+this.zCoord+"]"); + tickets.remove(mUUID); + } + changed = true; + } + hasTicket = t != null; + if (hasTicket) { + Logger.INFO("[Chunk Loader] "+"Putting Ticking. ["+this.getLoaderID()+"] @ [x: "+this.xCoord+"][y: "+this.yCoord+"][z: "+this.zCoord+"]"); + tickets.put(mUUID, t); + } + //if (changed) + //sendUpdateToClient(); + } + + public void forceChunkLoading(Ticket ticket) { + setTicket(ticket); + + setupChunks(); + + if (chunks != null) + for (ChunkCoordIntPair chunk : chunks) { + ForgeChunkManager.forceChunk(ticket, chunk); + } + } + + public void setupChunks() { + if (!hasTicket) + chunks = null; + else + chunks = ChunkManager.getInstance().getChunksAround(this.getBaseMetaTileEntity().getXCoord() >> 4, this.getBaseMetaTileEntity().getZCoord() >> 4, ANCHOR_RADIUS); + } + + + @Override + public Chunk loadChunk(World p_75815_1_, int p_75815_2_, int p_75815_3_) throws IOException { + // TODO Auto-generated method stub + return null; + } + + @Override + public void saveChunk(World p_75816_1_, Chunk p_75816_2_) throws MinecraftException, IOException { + // TODO Auto-generated method stub + + } + + @Override + public void saveExtraChunkData(World p_75819_1_, Chunk p_75819_2_) { + // TODO Auto-generated method stub + + } + + @Override + public void chunkTick() { + // TODO Auto-generated method stub + + } + + @Override + public void saveExtraData() { + // TODO Auto-generated method stub + + } + + @Override + public long getTicksRemaining() { + return this.mTicksLeft; + } + + @Override + public String[] getDescription() { + // TODO Auto-generated method stub + return super.getDescription(); + } + + @Override + public void onExplosion() { + this.releaseTicket(); + super.onExplosion(); } + + @Override + public void inValidate() { + invalidate(); + super.inValidate(); + } + + @Override + public void onMachineBlockUpdate() { + validate(); + super.onMachineBlockUpdate(); + } + + @Override + public void markDirty() { + validate(); + super.markDirty(); + } + + @Override + public void doExplosion(long aExplosionPower) { + this.releaseTicket(); + super.doExplosion(aExplosionPower); + } + + @Override + public boolean isGivingInformation() { + return true; + } + + @Override + public String[] getInfoData() { + return new String[] { + this.getLocalName(), + "Ticks Left: "+this.mTicksLeft, + "mRange: "+this.mRange, + "chunks: "+this.chunks.size()}; + } + } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java new file mode 100644 index 0000000000..6e5274536f --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java @@ -0,0 +1,25 @@ +package gtPlusPlus.xmod.gregtech.registration.gregtech; + +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.LoadedMods; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntityChunkLoader; +import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredTank; + +public class GregtechTieredChunkloaders { + public static void run() { + if (LoadedMods.Gregtech) { + Logger.INFO("Gregtech5u Content | Registering Portable Fluid Tanks."); + run1(); + } + + } + + private static void run1() { + int ID = 945; + GregtechItemList.GT_Chunkloader_HV + .set(new GregtechMetaTileEntityChunkLoader(ID++, "chunkloader.tier.00", "Chunkloader MK I", 4) + .getStackForm(1L)); + } +} -- cgit