It compiles, disable JEI as it needs redoing

This commit is contained in:
modmuss50 2016-11-19 14:41:00 +00:00
parent a0e6a2dc34
commit 65e651f402
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
97 changed files with 246 additions and 1111 deletions

View file

@ -6,6 +6,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import techreborn.compat.ICompatModule;
import techreborn.init.ModItems;
import techreborn.parts.powerCables.ItemStandaloneCables;
/**
@ -23,7 +24,7 @@ public class StandalonePartCompact implements ICompatModule {
@Override
public void init(FMLInitializationEvent event) {
itemStandaloneCable = new ItemStandaloneCables();
GameRegistry.registerItem(itemStandaloneCable, "cables");
ModItems.registerItem(itemStandaloneCable, "cables");
}
@Override

View file

@ -1,11 +0,0 @@
package techreborn.parts.fluidPipes;
/**
* Created by modmuss50 on 12/05/2016.
*/
public class EmptyFluidPipe extends MultipartFluidPipe {
@Override
public EnumFluidPipeTypes getPipeType() {
return EnumFluidPipeTypes.EMPTY;
}
}

View file

@ -1,33 +0,0 @@
package techreborn.parts.fluidPipes;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.text.TextFormatting;
/**
* Created by modmuss50 on 09/05/2016.
*/
public enum EnumFluidPipeTypes implements IStringSerializable {
EMPTY("empty", "techreborn:blocks/fluidPipes/fluidpipe", false, false, TextFormatting.DARK_GRAY),
INSERT("insert", "techreborn:blocks/fluidPipes/fluidpipe_insert", false, true, TextFormatting.BLUE),
EXTRACT("extract", "techreborn:blocks/fluidPipes/fluidpipe_extract", true, false, TextFormatting.GOLD);
public String textureName = "minecraft:blocks/iron_block";
public boolean extract = false;
public boolean insert = false;
public TextFormatting colour = TextFormatting.WHITE;
private String name;
EnumFluidPipeTypes(String name, String textureName, boolean extract, boolean insert, TextFormatting colour) {
this.name = name;
this.textureName = textureName;
this.extract = extract;
this.insert = insert;
this.colour = colour;
}
@Override
public String getName() {
return name;
}
}

View file

@ -1,11 +0,0 @@
package techreborn.parts.fluidPipes;
/**
* Created by modmuss50 on 12/05/2016.
*/
public class ExtractingFluidPipe extends MultipartFluidPipe {
@Override
public EnumFluidPipeTypes getPipeType() {
return EnumFluidPipeTypes.EXTRACT;
}
}

View file

@ -1,10 +0,0 @@
package techreborn.parts.fluidPipes;
/**
* Created by modmuss50 on 12/05/2016.
*/
public interface IPartType {
EnumFluidPipeTypes getPipeType();
}

View file

@ -1,11 +0,0 @@
package techreborn.parts.fluidPipes;
/**
* Created by modmuss50 on 12/05/2016.
*/
public class InsertingFluidPipe extends MultipartFluidPipe {
@Override
public EnumFluidPipeTypes getPipeType() {
return EnumFluidPipeTypes.INSERT;
}
}

View file

@ -1,29 +0,0 @@
package techreborn.parts.fluidPipes;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import reborncore.RebornCore;
import reborncore.mcmultipart.item.ItemMultiPart;
import reborncore.mcmultipart.multipart.IMultipart;
import techreborn.client.TechRebornCreativeTab;
/**
* Created by modmuss50 on 09/05/2016.
*/
public class ItemFluidPipe extends ItemMultiPart {
public ItemFluidPipe() {
setCreativeTab(TechRebornCreativeTab.instance);
setUnlocalizedName("techreborn.fluidpipe");
RebornCore.jsonDestroyer.registerObject(this);
}
@Override
public IMultipart createPart(World world, BlockPos pos, EnumFacing side, Vec3d hit, ItemStack stack, EntityPlayer player) {
return new EmptyFluidPipe();
}
}

View file

@ -1,430 +0,0 @@
package techreborn.parts.fluidPipes;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyBool;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.*;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World;
import net.minecraftforge.common.property.ExtendedBlockState;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.common.property.Properties;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import reborncore.common.misc.Functions;
import reborncore.common.misc.vecmath.Vecs3dCube;
import reborncore.common.util.ChatUtils;
import reborncore.common.util.Tank;
import reborncore.common.util.WorldUtils;
import reborncore.mcmultipart.MCMultiPartMod;
import reborncore.mcmultipart.microblock.IMicroblock;
import reborncore.mcmultipart.multipart.*;
import reborncore.mcmultipart.raytrace.PartMOP;
import techreborn.lib.MessageIDs;
import techreborn.parts.TechRebornParts;
import java.util.*;
/**
* Created by modmuss50 on 09/05/2016.
*/
public abstract class MultipartFluidPipe extends Multipart implements INormallyOccludingPart, ISlottedPart, ITickable, IPartType {
public static final IUnlistedProperty<Boolean> UP = Properties.toUnlisted(PropertyBool.create("up"));
public static final IUnlistedProperty<Boolean> DOWN = Properties.toUnlisted(PropertyBool.create("down"));
public static final IUnlistedProperty<Boolean> NORTH = Properties.toUnlisted(PropertyBool.create("north"));
public static final IUnlistedProperty<Boolean> EAST = Properties.toUnlisted(PropertyBool.create("east"));
public static final IUnlistedProperty<Boolean> SOUTH = Properties.toUnlisted(PropertyBool.create("south"));
public static final IUnlistedProperty<Boolean> WEST = Properties.toUnlisted(PropertyBool.create("west"));
public static final IProperty<EnumFluidPipeTypes> TYPE = PropertyEnum.create("type", EnumFluidPipeTypes.class);
public static final double thickness = 11;
public static int mbt = 20;
public Vecs3dCube[] boundingBoxes = new Vecs3dCube[14];
public float center = 0.6F;
public float offset = 0.10F;
public Map<EnumFacing, BlockPos> connectedSides;
Tank tank = new Tank("MultipartFluidPipe", 1000, null);
public MultipartFluidPipe() {
connectedSides = new HashMap<>();
refreshBounding();
}
public static MultipartFluidPipe getPartFromWorld(World world, BlockPos pos, EnumFacing side) {
if (world == null || pos == null) {
return null;
}
IMultipartContainer container = MultipartHelper.getPartContainer(world, pos);
if (side != null && container != null) {
ISlottedPart slottedPart = container.getPartInSlot(PartSlot.getFaceSlot(side));
if (slottedPart instanceof IMicroblock.IFaceMicroblock && !((IMicroblock.IFaceMicroblock) slottedPart)
.isFaceHollow()) {
return null;
}
}
if (container == null) {
return null;
}
ISlottedPart part = container.getPartInSlot(PartSlot.CENTER);
if (part instanceof MultipartFluidPipe) {
return (MultipartFluidPipe) part;
}
return null;
}
public void refreshBounding() {
float centerFirst = center - offset;
double w = (thickness / 16) - 0.5;
boundingBoxes[6] = new Vecs3dCube(centerFirst - w, centerFirst - w, centerFirst - w, centerFirst + w,
centerFirst + w, centerFirst + w);
int i = 0;
for (EnumFacing dir : EnumFacing.VALUES) {
double xMin1 = (dir.getFrontOffsetX() < 0 ?
0.0 :
(dir.getFrontOffsetX() == 0 ? centerFirst - w : centerFirst + w));
double xMax1 = (dir.getFrontOffsetX() > 0 ?
1.0 :
(dir.getFrontOffsetX() == 0 ? centerFirst + w : centerFirst - w));
double yMin1 = (dir.getFrontOffsetY() < 0 ?
0.0 :
(dir.getFrontOffsetY() == 0 ? centerFirst - w : centerFirst + w));
double yMax1 = (dir.getFrontOffsetY() > 0 ?
1.0 :
(dir.getFrontOffsetY() == 0 ? centerFirst + w : centerFirst - w));
double zMin1 = (dir.getFrontOffsetZ() < 0 ?
0.0 :
(dir.getFrontOffsetZ() == 0 ? centerFirst - w : centerFirst + w));
double zMax1 = (dir.getFrontOffsetZ() > 0 ?
1.0 :
(dir.getFrontOffsetZ() == 0 ? centerFirst + w : centerFirst - w));
boundingBoxes[i] = new Vecs3dCube(xMin1, yMin1, zMin1, xMax1, yMax1, zMax1);
i++;
}
}
@Override
public void addCollisionBoxes(AxisAlignedBB mask, List<AxisAlignedBB> list, Entity collidingEntity) {
for (EnumFacing dir : EnumFacing.VALUES) {
if (connectedSides.containsKey(dir) && mask
.intersectsWith(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB()))
list.add(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB());
}
if (mask.intersectsWith(boundingBoxes[6].toAABB())) {
list.add(boundingBoxes[6].toAABB());
}
super.addCollisionBoxes(mask, list, collidingEntity);
}
@Override
public void addSelectionBoxes(List<AxisAlignedBB> list) {
for (EnumFacing dir : EnumFacing.VALUES) {
if (connectedSides.containsKey(dir))
list.add(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB());
}
list.add(boundingBoxes[6].toAABB());
super.addSelectionBoxes(list);
}
@Override
public void onRemoved() {
super.onRemoved();
for (EnumFacing dir : EnumFacing.VALUES) {
MultipartFluidPipe multipart = getPartFromWorld(getWorld(), getPos().offset(dir), dir);
if (multipart != null) {
multipart.nearByChange();
}
}
}
@Override
public void addOcclusionBoxes(List<AxisAlignedBB> list) {
for (EnumFacing dir : EnumFacing.VALUES) {
if (connectedSides.containsKey(dir))
list.add(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB());
}
list.add(boundingBoxes[6].toAABB());
}
@Override
public void onNeighborBlockChange(Block block) {
super.onNeighborBlockChange(block);
nearByChange();
}
public void nearByChange() {
checkConnectedSides();
for (EnumFacing direction : EnumFacing.VALUES) {
BlockPos blockPos = getPos().offset(direction);
WorldUtils.updateBlock(getWorld(), blockPos);
MultipartFluidPipe part = getPartFromWorld(getWorld(), blockPos, direction);
if (part != null) {
part.checkConnectedSides();
}
}
}
@Override
public void onAdded() {
nearByChange();
}
public boolean shouldConnectTo(EnumFacing dir) {
if (dir != null) {
if (internalShouldConnectTo(dir)) {
MultipartFluidPipe multipartFluidPipe = getPartFromWorld(getWorld(), getPos().offset(dir), dir);
if (multipartFluidPipe != null && multipartFluidPipe.internalShouldConnectTo(dir.getOpposite())) {
return true;
}
} else {
TileEntity tile = getNeighbourTile(dir);
if (tile instanceof IFluidHandler && (getPipeType() == EnumFluidPipeTypes.EXTRACT
|| getPipeType() == EnumFluidPipeTypes.INSERT)) {
return true;
}
}
}
return false;
}
public boolean internalShouldConnectTo(EnumFacing dir) {
ISlottedPart part = getContainer().getPartInSlot(PartSlot.getFaceSlot(dir));
if (part instanceof IMicroblock.IFaceMicroblock) {
if (!((IMicroblock.IFaceMicroblock) part).isFaceHollow()) {
return false;
}
}
if (!OcclusionHelper.occlusionTest(getContainer().getParts(), p -> p == this,
boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB())) {
return false;
}
MultipartFluidPipe multipartFluidPipe = getPartFromWorld(getWorld(), getPos().offset(dir), dir.getOpposite());
return multipartFluidPipe != null;
}
public TileEntity getNeighbourTile(EnumFacing side) {
return side != null ? getWorld().getTileEntity(getPos().offset(side)) : null;
}
public void checkConnectedSides() {
refreshBounding();
connectedSides = new HashMap<>();
for (EnumFacing dir : EnumFacing.values()) {
int d = Functions.getIntDirFromDirection(dir);
if (getWorld() == null) {
return;
}
TileEntity te = getNeighbourTile(dir);
if (shouldConnectTo(dir)) {
connectedSides.put(dir, te.getPos());
}
}
}
@Override
public EnumSet<PartSlot> getSlotMask() {
return EnumSet.of(PartSlot.CENTER);
}
@Override
public IBlockState getExtendedState(IBlockState state) {
IExtendedBlockState extendedBlockState = (IExtendedBlockState) state;
return extendedBlockState.withProperty(DOWN, shouldConnectTo(EnumFacing.DOWN))
.withProperty(UP, shouldConnectTo(EnumFacing.UP)).withProperty(NORTH, shouldConnectTo(EnumFacing.NORTH))
.withProperty(SOUTH, shouldConnectTo(EnumFacing.SOUTH))
.withProperty(WEST, shouldConnectTo(EnumFacing.WEST))
.withProperty(EAST, shouldConnectTo(EnumFacing.EAST)).withProperty(TYPE, getPipeType());
}
@Override
public BlockStateContainer createBlockState() {
return new ExtendedBlockState(MCMultiPartMod.multipart, new IProperty[] { TYPE },
new IUnlistedProperty[] { DOWN, UP, NORTH, SOUTH, WEST, EAST });
}
@Override
public float getHardness(PartMOP hit) {
return 0.5F;
}
public Material getMaterial() {
return Material.CLOTH;
}
@Override
public List<ItemStack> getDrops() {
List<ItemStack> list = new ArrayList<>();
list.add(new ItemStack(TechRebornParts.fluidPipe, 1, 0));
return list;
}
@Override
public ResourceLocation getModelPath() {
return new ResourceLocation("techreborn:fluidpipe");
}
@Override
public boolean canRenderInLayer(BlockRenderLayer layer) {
return layer == BlockRenderLayer.CUTOUT;
}
@Override
public void update() {
if (!getWorld().isRemote) {
for (EnumFacing dir : EnumFacing.VALUES) {
//if (connectedSides.containsKey(dir)) {
MultipartFluidPipe fluidPipe = getPartFromWorld(getWorld(), getPos().offset(dir), dir);
if (fluidPipe != null) {
if (!tank.isEmpty()) {
if (fluidPipe.tank.isEmpty() || fluidPipe.tank.getFluid().getFluid() == tank.getFluid()
.getFluid()) {
if (fluidPipe.tank.getFluidAmount() < tank.getFluidAmount()) {
int freeSpace = fluidPipe.tank.getCapacity();
if (!fluidPipe.tank.isEmpty()) {
freeSpace = fluidPipe.tank.getCapacity() - fluidPipe.tank.getFluidAmount();
}
int difference = tank.getFluidAmount() - freeSpace;
int amountToChange = difference / 2;
fluidPipe.tank.setFluid(tank.getFluid());
fluidPipe.tank.setFluidAmount(fluidPipe.tank.getFluidAmount() + amountToChange);
tank.setFluidAmount(tank.getFluidAmount() - amountToChange);
}
}
}
}
// }
TileEntity tileEntity = getNeighbourTile(dir);
if (tileEntity != null) {
if (tileEntity instanceof IFluidHandler) {
IFluidHandler handler = (IFluidHandler) tileEntity;
if (getPipeType() == EnumFluidPipeTypes.EXTRACT) {
if (!tank.isFull()) {
FluidTankInfo[] fluidTankInfos = handler.getTankInfo(dir.getOpposite());
if (fluidTankInfos.length != 0) {
FluidTankInfo info = fluidTankInfos[0];
if (info != null & info.fluid != null) {
if (tank.isEmpty() || info.fluid.getFluid() == tank.getFluid().getFluid()) {
if (handler.canDrain(dir.getOpposite(), info.fluid.getFluid())) {
int amountToMove = Math
.min(mbt, tank.getCapacity() - tank.getFluidAmount());
int fluidAmount = tank.getFluidAmount();
FluidStack fluidStack = handler
.drain(dir.getOpposite(), amountToMove, true);
tank.fill(fluidStack, true);
tank.setFluid(fluidStack);
tank.setFluidAmount(fluidAmount + amountToMove);
}
}
}
}
}
} else if (getPipeType() == EnumFluidPipeTypes.INSERT) {
if (!tank.isEmpty()) {
FluidTankInfo[] fluidTankInfos = handler.getTankInfo(dir.getOpposite());
if (fluidTankInfos.length != 0) {
FluidTankInfo info = fluidTankInfos[0];
if (info.fluid == null || info.fluid.getFluid() == null
|| info.fluid.getFluid() == tank.getFluid().getFluid() && handler
.canFill(dir.getOpposite(), tank.getFluid().getFluid())) {
int infoSpace = info.capacity;
if (info.fluid != null) {
infoSpace = info.capacity - info.fluid.amount;
}
int amountToMove = Math.min(mbt, infoSpace);
FluidStack fluidStack = tank.drain(amountToMove, true);
handler.fill(dir.getOpposite(), fluidStack, true);
}
}
}
}
}
}
}
}
}
@Override
public boolean onActivated(EntityPlayer player, EnumHand hand, PartMOP hit) {
//TODO make only wrench able to change mode, shift-click with wrench picks up pipe, and click with empty hand displays current mode in chat (doesn't change it)
System.out.println(getWorld().isRemote);
if (!getWorld().isRemote) {
if (getPipeType() == EnumFluidPipeTypes.EMPTY) {
setPartType(EnumFluidPipeTypes.EXTRACT, this);
} else if (getPipeType() == EnumFluidPipeTypes.EXTRACT) {
setPartType(EnumFluidPipeTypes.INSERT, this);
} else if (getPipeType() == EnumFluidPipeTypes.INSERT) {
setPartType(EnumFluidPipeTypes.EMPTY, this);
}
}
return true;
}
public void setPartType(EnumFluidPipeTypes type, MultipartFluidPipe pipe) {
World world = pipe.getWorld();
BlockPos pos = pipe.getPos();
Tank tank = pipe.tank;
pipe.getContainer().removePart(pipe);
MultipartFluidPipe newPipe = null;
switch (type) {
case EMPTY:
newPipe = new EmptyFluidPipe();
break;
case INSERT:
newPipe = new InsertingFluidPipe();
break;
case EXTRACT:
newPipe = new ExtractingFluidPipe();
break;
}
newPipe.tank = tank;
MultipartHelper.addPart(world, pos, newPipe);
ChatUtils.sendNoSpamMessages(MessageIDs.fluidPipeID, new TextComponentString(
TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.setTo") + " " +
type.colour + reborncore.common.util.StringUtils.toFirstCapital(type.getName())));
}
@Override
public NBTTagCompound writeToNBT(NBTTagCompound tag) {
super.writeToNBT(tag);
tank.writeToNBT(tag);
return tag;
}
@Override
public void readFromNBT(NBTTagCompound tag) {
super.readFromNBT(tag);
tank.readFromNBT(tag);
}
}