Teleport pipes bugfixes, code cleanup, and other misc bugfixes

build.gradle

@@ -14,15 +14,20 @@ buildscript {
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "6.0.0.8"
+version = "6.0.0.11"
 group= "com.buildcraft.additionalpipes" 
 archivesBaseName = "additionalpipes"
 
 minecraft {
-    version = "${mc_version}-14.23.0.2544"
+    version = "${mc_version}-14.23.5.2847"
     runDir = "minecraft"
 	mappings = "snapshot_20171120"
 
+    if  (!developmentEnvironmentUserName.isEmpty()){
+        clientRunArgs +=['--username', developmentEnvironmentUserName.toString()]
+    }
+
+
 }
 // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 repositories {
@@ -48,18 +53,19 @@ repositories {
 		patternLayout {
 			artifact "[organization]/[revision]/[module]-main-[revision]-[classifier].jar"
 		}
-		metadataSources { artifact() } 
+		metadataSources { artifact() }
 	}
-	
+
 }
 
 dependencies {
-	compile 'BuildCraft:buildcraft:7.99.24.1:dev'
+	implementation('BuildCraft:buildcraft:7.99.24.1:dev')
+
 
 	// compile against the JEI API but do not include it at runtime
 	deobfProvided "mezz.jei:jei_${mc_version}:${jei_version}:api"
 	// at runtime, use the full JEI jar
-	runtime "mezz.jei:jei_${mc_version}:${jei_version}"
+    runtimeOnly "mezz.jei:jei_${mc_version}:${jei_version}"
 }
 // 30 96 254
 sourceSets {

gradle.properties

@@ -1,3 +1,4 @@
 org.gradle.jvmargs=-Xmx4096M
 mc_version=1.12.2
-jei_version=4.8.5.142
+jei_version=4.8.5.142
+developmentEnvironmentUserName = Hydra

src/main/java/buildcraft/additionalpipes/APPipeDefintions.java

@@ -1,7 +1,5 @@
 package buildcraft.additionalpipes;
 
-import com.google.common.collect.ImmutableSet;
-
 import buildcraft.additionalpipes.pipes.PipeBehaviorAddition;
 import buildcraft.additionalpipes.pipes.PipeBehaviorAdvWood;
 import buildcraft.additionalpipes.pipes.PipeBehaviorClosed;
@@ -14,18 +12,11 @@
 import buildcraft.additionalpipes.pipes.PipeBehaviorTeleportItems;
 import buildcraft.additionalpipes.pipes.PipeBehaviorWaterPump;
 import buildcraft.additionalpipes.utils.PipeCreator;
-import buildcraft.api.mj.MjAPI;
-import buildcraft.api.recipes.AssemblyRecipeBasic;
-import buildcraft.api.recipes.IngredientStack;
 import buildcraft.api.transport.pipe.PipeApi;
 import buildcraft.api.transport.pipe.PipeDefinition;
 import buildcraft.api.transport.pipe.PipeDefinition.PipeDefinitionBuilder;
-import buildcraft.lib.recipe.AssemblyRecipeRegistry;
-import buildcraft.silicon.BCSiliconItems;
 import buildcraft.transport.BCTransportConfig;
-import buildcraft.transport.BCTransportItems;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 
 public class APPipeDefintions
@@ -93,7 +84,7 @@ public static void createPipes()
 		additionPipeDef = new PipeDefinitionBuilder().flowItem().idTexPrefix("pipe_items_addition").logic(PipeBehaviorAddition::new, PipeBehaviorAddition::new).define();
 		additionPipeItem = PipeCreator.createPipeItem(additionPipeDef);
 
-		advWoodPipeDef = new PipeDefinitionBuilder().flowItem().idTexPrefix("pipe_items_adv_wood").texSuffixes("_output", "_input").logic(PipeBehaviorAdvWood::new, PipeBehaviorAdvWood::new).define();
+		advWoodPipeDef = new PipeDefinitionBuilder().flowItem().idTexPrefix("pipe_items_adv_wood").texSuffixes("_output", "_input").logic(PipeBehaviorAdvWood::new, PipeBehaviorAdvWood::new).enableColouring().define();
 		advWoodPipeItem = PipeCreator.createPipeItem(advWoodPipeDef);
 
 		closedPipeDef = new PipeDefinitionBuilder().flowItem().idTexPrefix("pipe_items_closed").texSuffixes("_open", "_closed").logic(PipeBehaviorClosed::new, PipeBehaviorClosed::new).define();
@@ -105,7 +96,7 @@ public static void createPipes()
 		distributionPipeDef = distPipeDefBuilder.define();
 		distributionPipeItem = PipeCreator.createPipeItem(distributionPipeDef);
 
-		gravityFeedPipeDef = new PipeDefinitionBuilder().flowItem().idTexPrefix("pipe_items_gravity_feed").texSuffixes("_up", "_sides").logic(PipeBehaviorGravityFeed::new, PipeBehaviorGravityFeed::new).define();
+		gravityFeedPipeDef = new PipeDefinitionBuilder().flowItem().idTexPrefix("pipe_items_gravity_feed").texSuffixes("_up", "_sides").logic(PipeBehaviorGravityFeed::new, PipeBehaviorGravityFeed::new).enableColouring().define();
 		gravityFeedPipeItem = PipeCreator.createPipeItem(gravityFeedPipeDef);
 
 		PipeDefinitionBuilder priorityPipeDefBuilder = new PipeDefinitionBuilder().flowItem().idTexPrefix("pipe_items_priority").logic(PipeBehaviorPriorityInsertion::new, PipeBehaviorPriorityInsertion::new);
@@ -117,27 +108,27 @@ public static void createPipes()
 		attachSidedSuffixes(jeweledPipeDefBuilder);
 		jeweledPipeDef = jeweledPipeDefBuilder.define();
 		jeweledPipeItem = PipeCreator.createPipeItem(jeweledPipeDef);
-		
+
 		itemsTeleportPipeDef = new PipeDefinitionBuilder().flowItem().idTexPrefix("pipe_items_teleport").logic(PipeBehaviorTeleportItems::new, PipeBehaviorTeleportItems::new).define();
 		itemsTeleportPipeItem = PipeCreator.createPipeItem(itemsTeleportPipeDef);	
 
-		// add assembly recipe for Item Teleport Pipe
+/*		// add assembly recipe for Item Teleport Pipe (Deprecated)
 		ImmutableSet<IngredientStack> tpRecipeIngredients = ImmutableSet.<IngredientStack>of(
 				IngredientStack.of(new ItemStack(BCSiliconItems.redstoneChipset, 1, 4)),
 				IngredientStack.of(new ItemStack(BCTransportItems.pipeItemDiamond)),
 				IngredientStack.of(new ItemStack(BCSiliconItems.redstoneChipset, 1, 3)));
-		AssemblyRecipeRegistry.register(new AssemblyRecipeBasic("teleportPipe", 10000 * MjAPI.MJ, tpRecipeIngredients, new ItemStack(itemsTeleportPipeItem, 8)));
+		AssemblyRecipeRegistry.register(new AssemblyRecipeBasic("teleportPipe", 10000 * MjAPI.MJ, tpRecipeIngredients, new ItemStack(itemsTeleportPipeItem, 8)));*/
 
 		liquidsTeleportPipeDef = new PipeDefinitionBuilder().flowFluid().idTexPrefix("pipe_fluids_teleport").logic(PipeBehaviorTeleportFluids::new, PipeBehaviorTeleportFluids::new).define();
 		liquidsTeleportPipeItem = PipeCreator.createPipeItem(liquidsTeleportPipeDef);
 
 		//powerTeleportPipeDef = new PipeDefinitionBuilder().flowPower().idTexPrefix("pipe_power_teleport").logic(PipeBehaviorTeleportPower::new, PipeBehaviorTeleportPower::new).define();
 		//powerTeleportPipeItem = PipeCreator.createPipeItemAndRecipe(1, powerTeleportPipeDef, true, new Object[] {"dustRedstone", itemsTeleportPipeItem});
 
-		itemsSwitchPipeDef = new PipeDefinitionBuilder().flowItem().idTexPrefix("pipe_items_switch").texSuffixes("_closed", "_open").logic(PipeBehaviorSwitch::new, PipeBehaviorSwitch::new).define();
+		itemsSwitchPipeDef = new PipeDefinitionBuilder().flowItem().idTexPrefix("pipe_items_switch").texSuffixes("_closed", "_open").logic(PipeBehaviorSwitch::new, PipeBehaviorSwitch::new).enableColouring().define();
 		itemsSwitchPipeItem = PipeCreator.createPipeItem(itemsSwitchPipeDef);
 
-		fluidsSwitchPipeDef = new PipeDefinitionBuilder().flowFluid().idTexPrefix("pipe_fluids_switch").texSuffixes("_closed", "_open").logic(PipeBehaviorSwitch::new, PipeBehaviorSwitch::new).define();
+		fluidsSwitchPipeDef = new PipeDefinitionBuilder().flowFluid().idTexPrefix("pipe_fluids_switch").texSuffixes("_closed", "_open").logic(PipeBehaviorSwitch::new, PipeBehaviorSwitch::new).enableColouring().define();
 		fluidsSwitchPipeItem = PipeCreator.createPipeItem(fluidsSwitchPipeDef);
 
 		powerSwitchPipeDef = new PipeDefinitionBuilder().flowPower().idTexPrefix("pipe_power_switch").texSuffixes("_closed", "_open").logic(PipeBehaviorSwitch::new, PipeBehaviorSwitch::new).define();

src/main/java/buildcraft/additionalpipes/AdditionalPipes.java

@@ -48,7 +48,7 @@
 public class AdditionalPipes {
 	public static final String MODID = "additionalpipes";
 	public static final String NAME = "Additional Pipes";
-	public static final String VERSION = "6.0.0.8";
+	public static final String VERSION = "6.0.0.11";
 
 	@Instance(MODID)
 	public static AdditionalPipes instance;

src/main/java/buildcraft/additionalpipes/CommandAdditionalPipes.java

@@ -59,7 +59,7 @@ else if(args[1].equals("power"))
 				sb.append(pipe.getPosition().getX()).append(", ");
 				sb.append(pipe.getPosition().getY()).append(", ");
 				sb.append(pipe.getPosition().getZ()).append("] ");
-				sb.append(pipe.ownerName);
+				sb.append(pipe.getOwnerName());
 				sender.sendMessage(new TextComponentString(sb.toString()));
 			}
 		}

src/main/java/buildcraft/additionalpipes/api/ITeleportPipe.java

@@ -46,6 +46,8 @@ public interface ITeleportPipe
 
 	public String getOwnerName();
 
+	public UUID getPipeUUID();
+
 	public TilePipeHolder getContainer();
 
 	/**

src/main/java/buildcraft/additionalpipes/gui/ContainerAdvancedWoodPipe.java

@@ -13,7 +13,6 @@
 import buildcraft.transport.tile.TilePipeHolder;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IContainerListener;
-import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.SlotItemHandler;
@@ -23,7 +22,7 @@ public class ContainerAdvancedWoodPipe extends ContainerBC_Neptune {
 	private boolean exclude;
 	private PipeBehaviorAdvWood pipe;
 
-	public ContainerAdvancedWoodPipe(EntityPlayer player, IInventory playerInventory, PipeBehaviorAdvWood pipe) {
+	public ContainerAdvancedWoodPipe(EntityPlayer player, PipeBehaviorAdvWood pipe) {
 		super(player);
 		this.pipe = pipe;
 		exclude = !pipe.getExclude(); // force a network update
@@ -35,13 +34,13 @@ public ContainerAdvancedWoodPipe(EntityPlayer player, IInventory playerInventory
 
 		for(int l = 0; l < 3; l++) {
 			for(int k1 = 0; k1 < 9; k1++) {
-				addSlotToContainer(new Slot(playerInventory, k1 + l * 9 + 9, 8 + k1 * 18, 76 + l * 18));
+				addSlotToContainer(new Slot(player.inventory, k1 + l * 9 + 9, 8 + k1 * 18, 76 + l * 18));
 			}
 
 		}
 
 		for(int i1 = 0; i1 < 9; i1++) {
-			addSlotToContainer(new Slot(playerInventory, i1, 8 + i1 * 18, 134));
+			addSlotToContainer(new Slot(player.inventory, i1, 8 + i1 * 18, 134));
 		}
 	}
 

src/main/java/buildcraft/additionalpipes/gui/ContainerTeleportPipe.java

@@ -13,6 +13,7 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.inventory.IContainerListener;
+import net.minecraft.util.EnumFacing;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.relauncher.Side;
 
@@ -25,6 +26,7 @@ public class ContainerTeleportPipe extends ContainerBC_Neptune {
 	private int freq;
 	private byte state;
 	private boolean isPublic;
+	private EnumFacing tpSide;
 
 	//true if the provided pipe is sending items to other pipes
 	//and output locations should be shown on the ledger
@@ -40,7 +42,7 @@ public ContainerTeleportPipe(EntityPlayer player, PipeBehaviorTeleport pipe)
 
 		//set these variables to invalid values so that they will be updated
 		state = -1;
-		isPublic = !pipe.isPublic;
+		isPublic = !pipe.isPublic();
 		freq = -1;
 
 		isSendingPipe = pipe.canSend();
@@ -56,7 +58,7 @@ public ContainerTeleportPipe(EntityPlayer player, PipeBehaviorTeleport pipe)
 				locations[3 * i + 2] = connectedPipe.getContainer().getPos().getZ();
 			}
 
-			MessageTelePipeData message = new MessageTelePipeData(pipe.getPos(), locations, pipe.ownerUUID, pipe.ownerName);
+			MessageTelePipeData message = new MessageTelePipeData(pipe.getPos(), locations, pipe.getOwnerUUID(), pipe.getOwnerName());
 			PacketHandler.INSTANCE.sendTo(message, (EntityPlayerMP) player);
 
 			//save the pipe's old frequency so it can be removed later
@@ -88,37 +90,45 @@ public void detectAndSendChanges() {
 		for(IContainerListener crafter : listeners) {
 			if(freq != pipe.getFrequency()) {
 				crafter.sendWindowProperty(this, 0, pipe.getFrequency());
+				freq = pipe.getFrequency();
 			}
-			if(state != pipe.state) {
-				crafter.sendWindowProperty(this, 1, pipe.state);
+			if(state != pipe.getState()) {
+				crafter.sendWindowProperty(this, 1, pipe.getState());
+				state = pipe.getState();
 			}
 			if(connectedPipesNew != connectedPipes) {
 				crafter.sendWindowProperty(this, 2, connectedPipesNew);
+				connectedPipes = connectedPipesNew;
 			}
-			if(isPublic != pipe.isPublic) {
-				crafter.sendWindowProperty(this, 3, pipe.isPublic ? 1 : 0);
+			if(isPublic != pipe.isPublic()) {
+				crafter.sendWindowProperty(this, 3, pipe.isPublic() ? 1 : 0);
+				isPublic = pipe.isPublic();
+			}
+			if(tpSide != pipe.getTeleportSide()) {
+				crafter.sendWindowProperty(this, 4, pipe.getTeleportSide().ordinal());
+				tpSide = pipe.getTeleportSide();
+				pipe.pipe.markForUpdate();
 			}
 		}
-		state = pipe.state;
-		freq = pipe.getFrequency();
-		isPublic = pipe.isPublic;
-		connectedPipes = connectedPipesNew;
 	}
 
 	@Override
-	public void updateProgressBar(int i, int j) {
-		switch(i) {
+	public void updateProgressBar(int id, int data) {
+		switch(id) {
 		case 0:
-			pipe.setFrequency(j);
+			pipe.setFrequency(data);
 			break;
 		case 1:
-			pipe.state = (byte) j;
+			pipe.setState((byte) data);
 			break;
 		case 2:
-			connectedPipes = j;
+			connectedPipes = data;
 			break;
 		case 3:
-			pipe.isPublic = (j == 1);
+			pipe.setPublic((data == 1));
+			break;
+		case 4:
+			pipe.setTeleportSide(EnumFacing.values()[data]);
 			break;
 		}
 	}

src/main/java/buildcraft/additionalpipes/gui/GuiAdvancedWoodPipe.java

@@ -8,22 +8,22 @@
 
 package buildcraft.additionalpipes.gui;
 
+import buildcraft.lib.gui.GuiBC8;
 import org.lwjgl.opengl.GL11;
 
 import buildcraft.additionalpipes.network.PacketHandler;
 import buildcraft.additionalpipes.network.message.MessageAdvWoodPipe;
 import buildcraft.additionalpipes.pipes.PipeBehaviorAdvWood;
 import buildcraft.additionalpipes.textures.Textures;
 import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 @SideOnly(Side.CLIENT)
-public class GuiAdvancedWoodPipe extends GuiContainer {
+public class GuiAdvancedWoodPipe extends GuiBC8<ContainerAdvancedWoodPipe> {
 
 	int inventoryRows = 1;
 	IInventory playerInventory;
@@ -32,24 +32,29 @@ public class GuiAdvancedWoodPipe extends GuiContainer {
 
 	int guiX, guiY; 
 
-	public GuiAdvancedWoodPipe(EntityPlayer player, IInventory playerInventory, PipeBehaviorAdvWood pipe)
+	public GuiAdvancedWoodPipe(EntityPlayer player, PipeBehaviorAdvWood pipe)
 	{
-		super(new ContainerAdvancedWoodPipe(player, playerInventory, pipe));
-		this.playerInventory = playerInventory;
+		super(new ContainerAdvancedWoodPipe(player, pipe));
+		this.playerInventory = player.inventory;
 		this.pipe = pipe;
 		// container = theContainer;
-		xSize = 175;
-		ySize = 156;
+		xSize = 176;
+		ySize = 158;
 
 	}
 
+	@Override
+	protected boolean shouldAddHelpLedger() {
+		return false;
+	}
+
 	@Override
 	public void initGui() 
 	{
 		super.initGui();
 		guiX = (width - xSize) / 2;
 		guiY = (height - ySize) / 2;
-		buttons[0] = new GuiButton(1, guiX + 8, guiY + 40, 140, 20, "");
+		buttons[0] = new GuiButton(1, guiLeft + 7, guiTop + 38, 140, 20, "");
 		buttonList.add(buttons[0]);
 	}
 
@@ -61,8 +66,10 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks)
     }
 
 	@Override
-	protected void drawGuiContainerForegroundLayer(int p1, int p2) 
+	protected void drawForegroundLayer()
 	{
+		fontRenderer.drawString(I18n.format("gui.advwood_pipe.title"), guiLeft + 8, guiTop + 6, 4210752);
+
 		if(pipe.getExclude()) 
 		{
 			buttons[0].displayString = I18n.format("gui.advwood_pipe.blacklist");
@@ -71,8 +78,10 @@ protected void drawGuiContainerForegroundLayer(int p1, int p2)
 		{
 			buttons[0].displayString = I18n.format("gui.advwood_pipe.whitelist");
 		}
-
-		fontRenderer.drawString(I18n.format("gui.advwood_pipe.title"), guiX + 42, guiY + 22, 4210752);
+
+		double invY = mainGui.rootElement.getY() + ySize - 95;
+		fontRenderer.drawString(I18n.format("gui.inventory"), (int) mainGui.rootElement.getX() + 8, (int) invY, 0x404040);
+
 	}
 
 	@Override
@@ -86,13 +95,10 @@ protected void actionPerformed(GuiButton guibutton) {
 	}
 
 	@Override
-	protected void drawGuiContainerBackgroundLayer(float f, int i, int j) {
-
+	protected void drawBackgroundLayer(float partialTicks) {
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 		mc.renderEngine.bindTexture(Textures.GUI_ADVANCEDWOOD);
-		int j1 = (width - xSize) / 2;
-		int k = (height - ySize) / 2;
-		drawTexturedModalRect(j1, k, 0, 0, xSize, ySize);
+		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
 	}
 
 }