Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cleanup

Browse source
This commit is contained in:
Adrian 2015-06-05 09:03:47 +02:00
parent 7bed0a6227
commit 5ce27e1c2a
8 changed files with 16 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/buildcraft/api/library/LibraryAPI.java
View file

@ -19,7 +19,7 @@ public final class LibraryAPI {
}
public static LibraryTypeHandler getHandlerFor(String extension) {
for(LibraryTypeHandler h : handlers) {
for (LibraryTypeHandler h : handlers) {
if (h.isInputExtension(extension)) {
return h;
}

5
common/buildcraft/BuildCraftSilicon.java
View file

@ -26,7 +26,6 @@ import net.minecraftforge.oredict.OreDictionary;
import buildcraft.api.blueprints.BuilderAPI;
import buildcraft.api.recipes.BuildcraftRecipeRegistry;
import buildcraft.api.robots.RobotManager;
import buildcraft.core.CompatHooks;
import buildcraft.core.DefaultProps;
import buildcraft.core.InterModComms;
@ -45,7 +44,6 @@ import buildcraft.silicon.ItemLaserTable;
import buildcraft.silicon.ItemPackage;
import buildcraft.silicon.ItemRedstoneChipset;
import buildcraft.silicon.ItemRedstoneChipset.Chipset;
import buildcraft.silicon.ResourceIdAssemblyTable;
import buildcraft.silicon.SiliconGuiHandler;
import buildcraft.silicon.SiliconProxy;
import buildcraft.silicon.TileAdvancedCraftingTable;
@ -109,6 +107,7 @@ public class BuildCraftSilicon extends BuildCraftMod {
redstoneCrystal = (new ItemBuildCraft()).setUnlocalizedName("redstoneCrystal");
CoreProxy.proxy.registerItem(redstoneCrystal);
OreDictionary.registerOre("redstoneCrystal", new ItemStack(redstoneCrystal));
EntityRegistry.registerModEntity(EntityPackage.class, "bcPackageThrowable", EntityIds.PACKAGE_THROWABLE, instance, 48, 10, true);
}
@ -135,8 +134,6 @@ public class BuildCraftSilicon extends BuildCraftMod {
BuilderAPI.schematicRegistry.registerSchematicBlock(laserBlock, SchematicRotateMeta.class, new int[] {2, 5, 3, 4}, true);
RobotManager.registerResourceId(ResourceIdAssemblyTable.class, "resourceIdAssemblyTable", "buildcraft.core.robots.ResourceIdAssemblyTable");
timeForSomeLogicAchievement = BuildCraftCore.achievementManager.registerAchievement(new Achievement("achievement.timeForSomeLogic", "timeForSomeLogicAchievement", 9, -2, assemblyTableBlock, BuildCraftCore.diamondGearAchievement));
tinglyLaserAchievement = BuildCraftCore.achievementManager.registerAchievement(new Achievement("achievement.tinglyLaser", "tinglyLaserAchievement", 11, -2, laserBlock, timeForSomeLogicAchievement));

2
common/buildcraft/builders/BuilderProxyClient.java
View file

@ -15,13 +15,13 @@ import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
import buildcraft.BuildCraftBuilders;
import buildcraft.builders.render.RenderBuilderTile;
import buildcraft.builders.urbanism.TileUrbanist;
import buildcraft.core.lib.EntityBlock;
import buildcraft.core.lib.render.RenderMultiTESR;
import buildcraft.core.lib.render.RenderVoid;
import buildcraft.core.render.RenderBoxProvider;
import buildcraft.core.render.RenderBuilder;
import buildcraft.builders.render.RenderBuilderTile;
import buildcraft.core.render.RenderLEDTile;
public class BuilderProxyClient extends BuilderProxy {

24
common/buildcraft/silicon/ResourceIdAssemblyTable.java
View file

@ -1,24 +0,0 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* BuildCraft is distributed under the terms of the Minecraft Mod Public
* License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.silicon;
import buildcraft.api.core.BlockIndex;
import buildcraft.api.robots.ResourceId;
public class ResourceIdAssemblyTable extends ResourceId {
public ResourceIdAssemblyTable() {
}
public ResourceIdAssemblyTable(TileAssemblyTable tile) {
index = new BlockIndex(tile);
}
}

11
common/buildcraft/silicon/TileAssemblyTable.java
View file

@ -32,8 +32,6 @@ import buildcraft.api.recipes.CraftingResult;
import buildcraft.api.recipes.IFlexibleCrafter;
import buildcraft.api.recipes.IFlexibleRecipe;
import buildcraft.api.recipes.IFlexibleRecipeViewable;
import buildcraft.api.robots.EntityRobotBase;
import buildcraft.api.robots.RobotManager;
import buildcraft.core.lib.network.command.CommandWriter;
import buildcraft.core.lib.network.command.ICommandReceiver;
import buildcraft.core.lib.network.command.PacketCommand;
@ -99,15 +97,6 @@ public class TileAssemblyTable extends TileLaserTableBase implements IInventory,
if (currentRecipe.canBeCrafted(this)) {
ItemStack remaining = currentRecipe.craft(this, false).crafted.copy();
if (RobotManager.registryProvider != null) {
EntityRobotBase robot = RobotManager.registryProvider.getRegistry(worldObj)
.robotTaking(new ResourceIdAssemblyTable(this));
if (robot != null) {
remaining = robot.receiveItem(this, remaining);
}
}
if (remaining != null && remaining.stackSize > 0) {
remaining.stackSize -= Utils
.addToRandomInventoryAround(worldObj, xCoord, yCoord, zCoord, remaining);

3
common/buildcraft/silicon/render/RenderLaserTable.java
View file

@ -81,9 +81,11 @@ public class RenderLaserTable implements ISimpleBlockRenderingHandler {
int xI = (int) (xB * 16.0F);
int yI = 16 - (int) (yB * 16.0F) - h;
int zI = (int) (zB * 16.0F);
FakeBlock block = FakeBlock.INSTANCE;
block.setRenderMask(mask);
block.setColor(0xFFFFFF);
IIcon[] icons = block.getTextureState().popArray();
icons[0] = new SubIcon(base, topX + w - xI, topY - zI, 16, 16);
icons[1] = new SubIcon(base, topX - xI, topY - zI, 16, 16);
@ -91,6 +93,7 @@ public class RenderLaserTable implements ISimpleBlockRenderingHandler {
icons[3] = new SubIcon(base, topX + w + d - xI, topY + d - yI, 16, 16);
icons[4] = new SubIcon(base, topX - d - zI, topY + d - yI, 16, 16);
icons[5] = new SubIcon(base, topX + w - zI, topY + d - yI, 16, 16);
renderer.setRenderBounds(xB, yB, zB, xB + (w / 16.0F), yB + (h / 16.0F), zB + (d / 16.0F));
if (isInventory) {
RenderUtils.drawBlockItem(renderer, Tessellator.instance, block, 0);

3
common/buildcraft/transport/render/PipeRendererTESR.java
View file

@ -77,14 +77,13 @@ public class PipeRendererTESR extends TileEntitySpecialRenderer {
private boolean initialized = false;
private class DisplayFluidList {
public int[] sideHorizontal = new int[LIQUID_STAGES];
public int[] sideVertical = new int[LIQUID_STAGES];
public int[] centerHorizontal = new int[LIQUID_STAGES];
public int[] centerVertical = new int[LIQUID_STAGES];
}
private PipeRendererTESR() {
protected PipeRendererTESR() {
customRenderItem = new RenderItem() {
@Override
public boolean shouldBob() {

19
common/buildcraft/transport/render/PipeRendererWorld.java
View file

@ -64,9 +64,9 @@ public class PipeRendererWorld implements ISimpleBlockRenderingHandler {
} else {
fakeBlock.getTextureState().set(PipeIconProvider.TYPE.PipeStainedOverlay.getIcon());
}
fixForRenderPass(dim);
renderTwoWayBlock(renderblocks, fakeBlock, x, y, z, dim, connectivity ^ 0x3f);
}
@ -110,7 +110,7 @@ public class PipeRendererWorld implements ISimpleBlockRenderingHandler {
double[] blockBB;
if (block instanceof BlockChest) {
// work around what sems to be a vanilla bug?
// work around what seems to be a vanilla bug?
blockBB = new double[]{
0, 0.0625F, 0.0625F,
0.875F, 0.9375F, 0.9375F
@ -180,10 +180,7 @@ public class PipeRendererWorld implements ISimpleBlockRenderingHandler {
private void resetToCenterDimensions(float[] dim) {
for (int i = 0; i < 3; i++) {
dim[i] = CoreConstants.PIPE_MIN_POS;
}
for (int i = 3; i < 6; i++) {
dim[i] = CoreConstants.PIPE_MAX_POS;
dim[i + 3] = CoreConstants.PIPE_MAX_POS;
}
}
@ -199,13 +196,15 @@ public class PipeRendererWorld implements ISimpleBlockRenderingHandler {
renderblocks.renderStandardBlock(stateHost, x, y, z);
int c = stateHost.getBlockColor();
int r = (c & 0xFF0000) >> 1;
int g = (c & 0x00FF00) >> 1;
int b = (c & 0x0000FF) >> 1;
int r = (c & 0xFF0000) * 2 / 3;
int g = (c & 0x00FF00) * 2 / 3;
int b = (c & 0x0000FF) * 2 / 3;
stateHost.setColor((r & 0xFF0000) | (g & 0x00FF00) | b);
stateHost.setRenderMask((mask & 0x15) << 1 | (mask & 0x2a) >> 1); // pairwise swapped mask
renderblocks.setRenderBounds(dim[5], dim[3], dim[4], dim[2], dim[0], dim[1]);
renderblocks.renderStandardBlock(stateHost, x, y, z);
stateHost.setRenderAllSides();
stateHost.setColor(c);
}