Skip to content

Commit

Permalink
Fix server compatibility
Browse files Browse the repository at this point in the history
Wow, completely forgot to test this.  Derp.
  • Loading branch information
multiplemonomials committed Jun 25, 2016
1 parent fbcfd97 commit 5d536a0
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Compiled binaries can be found in `build/libs`.
8. Hit finish.
9. Click the down arrow next to the play button on the top bar, select `Run Configurations...`, and click on AP Client 1.8 in the left pane.
10. Click on `AP Client 1.8` in the left pane and go to the arguments tab.
11. Replace `username` with your Mojang account email, and `<password>` with your Mojang account password
11. Replace `<username>` with your Mojang account email, and `<password>` with your Mojang account password
11. Hit run. If it works, you're done!
12. If it doesn't, it's probably because your `.gradle` folder is not in your home directory, or you have unusual environment variables defined. Either way, in the Arguments tab, replace `${env_var:userprofile}${env_var:HOME}/.gradle` with the full path to the folder containing your `.gradle` folder.

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ buildscript {
}
apply plugin: 'net.minecraftforge.gradle.forge'

version = "5.0.0"
version = "5.0.1"
group= "com.buildcraft.additionalpipes"
archivesBaseName = "additionalpipes"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,13 @@ public void registerRendering() {

public void createPipeSpecial(ItemPipe item, Class<? extends Pipe<?>> clas) {
}

/**
* Sets the pipe item's icon provider to the Additional Pipes one
* @param pipeItem
*/
public void setPipeTextureProvider(ItemPipe pipeItem)
{
//do nothing
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import net.minecraftforge.fml.relauncher.SideOnly;
import buildcraft.additionalpipes.keyboard.KeyInputEventHandler;
import buildcraft.additionalpipes.keyboard.Keybindings;
import buildcraft.additionalpipes.textures.Textures;
import buildcraft.additionalpipes.utils.Log;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.transport.ItemPipe;
Expand Down Expand Up @@ -52,4 +53,10 @@ public void createPipeSpecial(ItemPipe item, Class<? extends Pipe<?>> clas)
e.printStackTrace();
}
}

@Override
public void setPipeTextureProvider(ItemPipe pipeItem)
{
pipeItem.setPipesIcons(Textures.pipeIconProvider);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class APPipeIconProvider implements IIconProvider {
private TextureAtlasSprite icons[];

//1 more than highest-numbered icon
private final int iconCount = 41;
private final static int iconCount = 41;

public APPipeIconProvider() {
icons = new TextureAtlasSprite[iconCount];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import buildcraft.additionalpipes.AdditionalPipes;
import buildcraft.additionalpipes.item.ItemPipeAP;
import buildcraft.additionalpipes.pipes.APPipe;
import buildcraft.additionalpipes.textures.Textures;
import buildcraft.transport.BlockGenericPipe;
import buildcraft.transport.ItemPipe;
import buildcraft.transport.Pipe;
Expand Down Expand Up @@ -51,7 +50,7 @@ public static ItemPipe createPipe(Class<? extends Pipe<?>> clas)
{
ItemPipe res = BlockGenericPipe.registerPipe(clas, AdditionalPipes.instance.creativeTab);
res.setUnlocalizedName(clas.getSimpleName());
res.setPipesIcons(Textures.pipeIconProvider);
AdditionalPipes.proxy.setPipeTextureProvider(res);
return res;
}

Expand Down

0 comments on commit 5d536a0

Please sign in to comment.