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

cleanup code, add changelog

Browse source
This commit is contained in:
asiekierka 2015-09-20 11:20:30 +02:00
parent 48e9102fa7
commit 383bd6851a
763 changed files with 4147 additions and 3661 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
buildcraft_resources/changelog/7.1.3 Normal file
View file

@ -0,0 +1,68 @@
NOTE: This changelog takes off from BuildCraft 7.0.23!
BREAKING CHANGES!
* Cobblestone Structure Pipes have a new recipe. (asie)
* Quartz Fluid Pipes no longer connect to Cobblestone or Stone Fluid Pipes. This might break existing builds! (asie)
NON-BREAKING CHANGES BUT STILL IMPORTANT!
* [#2886] Server blueprints are now saved inside [world]/buildcraft/blueprints as opposed to config/buildcraft/blueprints/server. The old directory will keep working, however.
Additions:
* Core:
* New Lists! (asie)
* Sort by type, material, or both! Precise sorting!
* See with a tooltip if an item matches the List!
* They can also sort armor, tools and fluids by type!
* Transport:
* Power Adapters! Connect Kinesis Pipes to non-Kinesis pipes. (asie)
Improvements:
* Core/Any:
* [#2345] Finish adding command localization (asie, warlordjones)
* Minor optimizations (asie, gamerForEA)
* Use integrated server data in singleplayer for certain tiles - back to the smoothness of 1.2.5! (asie)
* Builders:
* Improvements to Builder logic (asie)
* Improved pipe rotation support (asie)
* Factory:
* Chutes now support the Comparator (asie)
* Flood Gates now have configurable sides. No idea when I fixed that, but it works now. (asie)
* Less lag on Tank updating - new comparator update system (asie)
* Robotics:
* Robots can now be destroyed via swords and projectiles (asie)
* Requesters now support the Comparator (asie)
* Add events for robot interaction and removal (asie)
* Transport:
* Filtered Buffers now support the Comparator (asie)
* Lenses do not require Iron Ingots anymore (asie)
* New power beam display algorithm (asie)
* Rewritten pipe wires - should now propagate more or less instantly. (asie)
* Fluid pipe capacity and extraction rate now scales with the base flow multiplier. (asie)
Bugs fixed:
* [#3017] Crash if unable to extend stripes pipe (asie)
* [#3015] Packager pulls from input only slots from adjacent machines (asie)
* [#3010] Pipe wire does not activate when connecting by building through striped pipe (asie)
* [#2956] PipePluggable leaking state on the client (asie)
* [#2951] Obsidian Pipes not working right in certain circumstances (asie)
* [#2925] Rails on gravel not placing correctly (asie)
* A few robot bugs (hea3ven)
* Force/Forbid Robot statements not accepting lists (asie)
* "Lens-Filter" diodes not working (asie)
* Stirling engines heat up to green again (asie)
API changes (I will document the API eventually):
* Blueprints:
* Schematics can now depend on relative blocks to be built before they are placed (things like torches, ladders, redstone wire, etc.) (asie)
* Lists:
* New list matching API for custom sorting support! (asie)
* Robots:
* Rewritten request system! You can now check what items BC machines need with a simple interface! (hea3ven)
* Transport (Internal):
* PipeTransports can now have their own renderers via PipeTransportRenderer! (asie)

107
common/buildcraft/BuildCraftBuilders.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -32,6 +32,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.launchwrapper.Launch;
import net.minecraft.stats.Achievement;
import net.minecraft.world.World;
import cpw.mods.fml.client.event.ConfigChangedEvent;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
@ -41,6 +42,7 @@ import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
import cpw.mods.fml.common.event.FMLServerStoppingEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
@ -48,6 +50,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.ForgeChunkManager;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Property;
@ -87,7 +90,36 @@ import buildcraft.builders.TileConstructionMarker;
import buildcraft.builders.TileFiller;
import buildcraft.builders.TileQuarry;
import buildcraft.builders.blueprints.RealBlueprintDeployer;
import buildcraft.builders.schematics.*;
import buildcraft.builders.schematics.SchematicAir;
import buildcraft.builders.schematics.SchematicBed;
import buildcraft.builders.schematics.SchematicCactus;
import buildcraft.builders.schematics.SchematicCustomStack;
import buildcraft.builders.schematics.SchematicDirt;
import buildcraft.builders.schematics.SchematicDoor;
import buildcraft.builders.schematics.SchematicEnderChest;
import buildcraft.builders.schematics.SchematicFactoryBlock;
import buildcraft.builders.schematics.SchematicFactoryEntity;
import buildcraft.builders.schematics.SchematicFactoryMask;
import buildcraft.builders.schematics.SchematicFarmland;
import buildcraft.builders.schematics.SchematicFire;
import buildcraft.builders.schematics.SchematicGlassPane;
import buildcraft.builders.schematics.SchematicGravel;
import buildcraft.builders.schematics.SchematicHanging;
import buildcraft.builders.schematics.SchematicLever;
import buildcraft.builders.schematics.SchematicMinecart;
import buildcraft.builders.schematics.SchematicPiston;
import buildcraft.builders.schematics.SchematicPortal;
import buildcraft.builders.schematics.SchematicPumpkin;
import buildcraft.builders.schematics.SchematicRail;
import buildcraft.builders.schematics.SchematicRedstoneDiode;
import buildcraft.builders.schematics.SchematicRedstoneLamp;
import buildcraft.builders.schematics.SchematicRedstoneWire;
import buildcraft.builders.schematics.SchematicSeeds;
import buildcraft.builders.schematics.SchematicSign;
import buildcraft.builders.schematics.SchematicSkull;
import buildcraft.builders.schematics.SchematicStairs;
import buildcraft.builders.schematics.SchematicStone;
import buildcraft.builders.schematics.SchematicTripWireHook;
import buildcraft.builders.statements.BuildersActionProvider;
import buildcraft.core.CompatHooks;
import buildcraft.core.DefaultProps;
@ -107,37 +139,6 @@ import buildcraft.core.builders.schematics.SchematicTileCreative;
import buildcraft.core.builders.schematics.SchematicWallSide;
import buildcraft.core.config.ConfigManager;
import buildcraft.core.proxy.CoreProxy;
import com.google.common.collect.Lists;
import cpw.mods.fml.client.event.ConfigChangedEvent;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.event.*;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.item.*;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.launchwrapper.Launch;
import net.minecraft.stats.Achievement;
import net.minecraft.world.World;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.ForgeChunkManager;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Property;
import java.io.BufferedReader;
import java.io.File;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.util.List;
@Mod(name = "BuildCraft Builders", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Builders", dependencies = DefaultProps.DEPENDENCY_CORE)
public class BuildCraftBuilders extends BuildCraftMod {
@ -248,7 +249,7 @@ public class BuildCraftBuilders extends BuildCraftMod {
blueprintClientDir = BuildCraftCore.mainConfigManager.get("blueprints.clientDatabaseDirectory").getString();
blueprintClientDir = JavaTools.stripSurroundingQuotes(replacePathVariables(blueprintClientDir));
clientDB.init(new String[] {
clientDB.init(new String[]{
blueprintClientDir,
getDownloadsDir()
}, blueprintClientDir);
@ -278,7 +279,7 @@ public class BuildCraftBuilders extends BuildCraftMod {
// According XDG specification every user-specified folder can be localized
// or even moved to any destination, so we obtain real path with xdg-user-dir
try {
Process process = Runtime.getRuntime().exec(new String[] {"xdg-user-dir", "DOWNLOAD"});
Process process = Runtime.getRuntime().exec(new String[]{"xdg-user-dir", "DOWNLOAD"});
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream(), "utf-8"));
process.waitFor();
String line = reader.readLine().trim();
@ -311,10 +312,10 @@ public class BuildCraftBuilders extends BuildCraftMod {
} else {
result = result.replaceAll("/", "\\\\");
}
return result;
}
@Mod.EventHandler
public void postInit(FMLPostInitializationEvent evt) {
HeuristicBlockDetection.start();
@ -335,7 +336,7 @@ public class BuildCraftBuilders extends BuildCraftMod {
}
// Refresh the client database once all the library type handlers are registered
// The server database is refreshed later
// The server database is refreshed later
clientDB.refresh();
}
@ -591,10 +592,10 @@ public class BuildCraftBuilders extends BuildCraftMod {
'D', Items.diamond_pickaxe);
CoreProxy.proxy.addCraftingRecipe(new ItemStack(templateItem, 1), "ppp", "pip", "ppp", 'i',
"dyeBlack", 'p', Items.paper);
"dyeBlack", 'p', Items.paper);
CoreProxy.proxy.addCraftingRecipe(new ItemStack(blueprintItem, 1), "ppp", "pip", "ppp", 'i',
"gemLapis", 'p', Items.paper);
"gemLapis", 'p', Items.paper);
if (constructionMarkerBlock != null) {
CoreProxy.proxy.addCraftingRecipe(new ItemStack(constructionMarkerBlock, 1), "l ", "r ", 'l',
@ -602,17 +603,17 @@ public class BuildCraftBuilders extends BuildCraftMod {
}
CoreProxy.proxy.addCraftingRecipe(new ItemStack(fillerBlock, 1), "btb", "ycy", "gCg", 'b',
"dyeBlack", 't', BuildCraftCore.markerBlock, 'y', "dyeYellow",
'c', Blocks.crafting_table, 'g', "gearGold", 'C', Blocks.chest);
"dyeBlack", 't', BuildCraftCore.markerBlock, 'y', "dyeYellow",
'c', Blocks.crafting_table, 'g', "gearGold", 'C', Blocks.chest);
CoreProxy.proxy.addCraftingRecipe(new ItemStack(builderBlock, 1), "btb", "ycy", "gCg", 'b',
"dyeBlack", 't', BuildCraftCore.markerBlock, 'y', "dyeYellow",
'c', Blocks.crafting_table, 'g', "gearDiamond", 'C', Blocks.chest);
"dyeBlack", 't', BuildCraftCore.markerBlock, 'y', "dyeYellow",
'c', Blocks.crafting_table, 'g', "gearDiamond", 'C', Blocks.chest);
CoreProxy.proxy.addCraftingRecipe(new ItemStack(architectBlock, 1), "btb", "ycy", "gCg", 'b',
"dyeBlack", 't', BuildCraftCore.markerBlock, 'y', "dyeYellow",
'c', Blocks.crafting_table, 'g', "gearDiamond", 'C',
new ItemStack(blueprintItem, 1));
"dyeBlack", 't', BuildCraftCore.markerBlock, 'y', "dyeYellow",
'c', Blocks.crafting_table, 'g', "gearDiamond", 'C',
new ItemStack(blueprintItem, 1));
CoreProxy.proxy.addCraftingRecipe(new ItemStack(libraryBlock, 1), "igi", "bBb", "iri", 'B',
new ItemStack(blueprintItem), 'b', Blocks.bookshelf, 'i', "ingotIron", 'g', "gearIron", 'r', Items.redstone);
@ -628,11 +629,11 @@ public class BuildCraftBuilders extends BuildCraftMod {
TilePathMarker.clearAvailableMarkersList();
}
@Mod.EventHandler
public void serverAboutToStart(FMLServerAboutToStartEvent event) {
String blueprintPath = new File(DimensionManager.getCurrentSaveRootDirectory(), "buildcraft" + File.separator + "blueprints").getPath();
serverDB.init(new String[]{oldBlueprintServerDir, blueprintPath}, blueprintPath);
}
@Mod.EventHandler
public void serverAboutToStart(FMLServerAboutToStartEvent event) {
String blueprintPath = new File(DimensionManager.getCurrentSaveRootDirectory(), "buildcraft" + File.separator + "blueprints").getPath();
serverDB.init(new String[]{oldBlueprintServerDir, blueprintPath}, blueprintPath);
}
@SubscribeEvent
@SideOnly(Side.CLIENT)
@ -652,7 +653,7 @@ public class BuildCraftBuilders extends BuildCraftMod {
@Mod.EventHandler
public void remap(FMLMissingMappingsEvent event) {
for (FMLMissingMappingsEvent.MissingMapping mapping: event.get()) {
for (FMLMissingMappingsEvent.MissingMapping mapping : event.get()) {
if (mapping.name.equals("BuildCraft|Builders:buildToolBlock")
|| mapping.name.equals("BuildCraft|Builders:null")) {
if (mapping.type == GameRegistry.Type.ITEM) {

21
common/buildcraft/BuildCraftCore.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -9,19 +9,12 @@
package buildcraft;
import java.io.File;
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.util.UUID;
import com.mojang.authlib.GameProfile;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;
import org.lwjgl.util.glu.GLU;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLiquid;
import net.minecraft.client.renderer.GLAllocation;
import net.minecraft.entity.EntityList;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@ -30,6 +23,7 @@ import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.Achievement;
import net.minecraft.util.IIcon;
import cpw.mods.fml.client.event.ConfigChangedEvent;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
@ -44,7 +38,6 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.IPlantable;
import net.minecraftforge.common.MinecraftForge;
@ -254,7 +247,7 @@ public class BuildCraftCore extends BuildCraftMod {
public static ITriggerExternal triggerFluidContainerBelow75 = new TriggerFluidContainerLevel(TriggerFluidContainerLevel.TriggerType.BELOW75);
public static IActionInternal actionRedstone = new ActionRedstoneOutput();
public static IActionExternal[] actionControl;
public static boolean loadDefaultRecipes = true;
public static boolean consumeWaterSources = false;
public static float miningMultiplier;
@ -301,11 +294,11 @@ public class BuildCraftCore extends BuildCraftMod {
mainConfigManager.register("display.hidePowerValues", false, "Should all power values (RF, RF/t) be hidden?", ConfigManager.RestartRequirement.NONE);
mainConfigManager.register("display.hideFluidValues", false, "Should all fluid values (mB, mB/t) be hidden?", ConfigManager.RestartRequirement.NONE);
mainConfigManager.register("general.itemLifespan", 60, "How long, in seconds, should items stay on the ground? (Vanilla = 300, default = 60)", ConfigManager.RestartRequirement.NONE)
.setMinValue(5);
.setMinValue(5);
mainConfigManager.register("network.updateFactor", 10, "How often, in ticks, should network update packets be sent? Increasing this might help network performance.", ConfigManager.RestartRequirement.GAME)
.setMinValue(1);
.setMinValue(1);
mainConfigManager.register("network.longUpdateFactor", 40, "How often, in ticks, should full network sync packets be sent? Increasing this might help network performance.", ConfigManager.RestartRequirement.GAME)
.setMinValue(1);
.setMinValue(1);
mainConfigManager.register("general.canEnginesExplode", false, "Should engines explode upon overheat?", ConfigManager.RestartRequirement.NONE);
mainConfigManager.register("worldgen.enable", true, "Should BuildCraft generate anything in the world?", ConfigManager.RestartRequirement.GAME);
mainConfigManager.register("general.pumpsConsumeWater", false, "Should pumps consume water? Enabling this might cause performance issues!", ConfigManager.RestartRequirement.NONE);
@ -519,7 +512,7 @@ public class BuildCraftCore extends BuildCraftMod {
SchematicRegistry.INSTANCE.registerSchematicBlock(pathMarkerBlock, SchematicIgnore.class);
ColorUtils.initialize();
actionControl = new IActionExternal[IControllable.Mode.values().length];
for (IControllable.Mode mode : IControllable.Mode.values()) {
if (mode != IControllable.Mode.Unknown && mode != IControllable.Mode.Mode) {

13
common/buildcraft/BuildCraftEnergy.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -35,7 +35,6 @@ import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.BiomeDictionary;
import net.minecraftforge.common.MinecraftForge;
@ -137,14 +136,14 @@ public class BuildCraftEnergy extends BuildCraftMod {
OilPopulate.INSTANCE.surfaceDepositBiomes,
BuildCraftCore.mainConfigManager
.register("worldgen.biomes", "increasedOilIDs",
new String[] {BiomeDictionary.Type.SANDY.toString(), BiomeGenBase.taiga.biomeName},
new String[]{BiomeDictionary.Type.SANDY.toString(), BiomeGenBase.taiga.biomeName},
"IDs or Biome Types (e.g. SANDY,OCEAN) of biomes that should have increased oil generation rates.", RestartRequirement.GAME));
setBiomeList(
OilPopulate.INSTANCE.excessiveBiomes,
BuildCraftCore.mainConfigManager
.register("worldgen.biomes", "excessiveOilIDs",
new String[] {},
new String[]{},
"IDs or Biome Types (e.g. SANDY,OCEAN) of biomes that should have GREATLY increased oil generation rates.", RestartRequirement.GAME));
setBiomeList(OilPopulate.INSTANCE.excludedBiomes,
@ -338,7 +337,7 @@ public class BuildCraftEnergy extends BuildCraftMod {
BCLog.logger.log
(Level.WARN,
configuration.getName() + ": Could not find biome id: "
+ strippedId + " ; Skipping!");
+ strippedId + " ; Skipping!");
}
} else {
boolean found = false;
@ -360,8 +359,8 @@ public class BuildCraftEnergy extends BuildCraftMod {
if (!found) {
BCLog.logger.log
(Level.WARN,
configuration.getName() + ": Could not find biome id: "
+ strippedId + " ; Skipping!");
configuration.getName() + ": Could not find biome id: "
+ strippedId + " ; Skipping!");
}
}
}

11
common/buildcraft/BuildCraftFactory.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -15,6 +15,7 @@ import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.Achievement;
import cpw.mods.fml.client.event.ConfigChangedEvent;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
@ -169,7 +170,7 @@ public class BuildCraftFactory extends BuildCraftMod {
FMLCommonHandler.instance().bus().register(this);
MinecraftForge.EVENT_BUS.register(this);
}
public static void loadRecipes() {
if (miningWellBlock != null) {
CoreProxy.proxy.addCraftingRecipe(new ItemStack(miningWellBlock, 1),
@ -274,9 +275,9 @@ public class BuildCraftFactory extends BuildCraftMod {
}
@Mod.EventHandler
public void processIMCRequests(FMLInterModComms.IMCEvent event) {
InterModComms.processIMC(event);
}
public void processIMCRequests(FMLInterModComms.IMCEvent event) {
InterModComms.processIMC(event);
}
@SubscribeEvent
@SideOnly(Side.CLIENT)

5
common/buildcraft/BuildCraftMod.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -22,6 +22,7 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import cpw.mods.fml.common.network.FMLEmbeddedChannel;
import cpw.mods.fml.common.network.FMLOutboundHandler;
import cpw.mods.fml.common.network.FMLOutboundHandler.OutboundTarget;
@ -184,7 +185,7 @@ public class BuildCraftMod {
public void sendToEntity(Packet packet, Entity entity) {
sender.add(new EntitySendRequest(this, packet, entity));
}
public void sendToPlayer(EntityPlayer entityplayer, Packet packet) {
sender.add(new PlayerSendRequest(this, packet, entityplayer));
}

3
common/buildcraft/BuildCraftRobotics.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -17,6 +17,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.client.event.ConfigChangedEvent;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;

11
common/buildcraft/BuildCraftSilicon.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -15,6 +15,7 @@ import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.Achievement;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Optional;
@ -121,7 +122,7 @@ public class BuildCraftSilicon extends BuildCraftMod {
public void init(FMLInitializationEvent evt) {
channels = NetworkRegistry.INSTANCE
.newChannel
(DefaultProps.NET_CHANNEL_NAME + "-SILICON", new ChannelHandler(), new PacketHandlerSilicon());
(DefaultProps.NET_CHANNEL_NAME + "-SILICON", new ChannelHandler(), new PacketHandlerSilicon());
NetworkRegistry.INSTANCE.registerGuiHandler(instance, new SiliconGuiHandler());
CoreProxy.proxy.registerTileEntity(TileLaser.class, "net.minecraft.src.buildcraft.factory.TileLaser");
@ -131,7 +132,7 @@ public class BuildCraftSilicon extends BuildCraftMod {
"net.minecraft.src.buildcraft.factory.TileAssemblyAdvancedWorkbench");
CoreProxy.proxy.registerTileEntity(TileIntegrationTable.class,
"net.minecraft.src.buildcraft.factory.TileIntegrationTable");
CoreProxy.proxy.registerTileEntity(TileChargingTable.class,
CoreProxy.proxy.registerTileEntity(TileChargingTable.class,
"net.minecraft.src.buildcraft.factory.TileChargingTable");
CoreProxy.proxy.registerTileEntity(TileProgrammingTable.class,
"net.minecraft.src.buildcraft.factory.TileProgrammingTable");
@ -266,7 +267,7 @@ public class BuildCraftSilicon extends BuildCraftMod {
"dustRedstone", "ingotGold");
BuildcraftRecipeRegistry.assemblyTable.addRecipe("buildcraft:diamondChipset", Math.round(800000 * chipsetCostMultiplier),
Chipset.DIAMOND.getStack(), "dustRedstone", "gemDiamond");
BuildcraftRecipeRegistry.assemblyTable.addRecipe("buildcraft:emeraldChipset", Math.round(1200000 * chipsetCostMultiplier),
BuildcraftRecipeRegistry.assemblyTable.addRecipe("buildcraft:emeraldChipset", Math.round(1200000 * chipsetCostMultiplier),
Chipset.EMERALD.getStack(), "dustRedstone", "gemEmerald");
BuildcraftRecipeRegistry.assemblyTable.addRecipe("buildcraft:pulsatingChipset", Math.round(400000 * chipsetCostMultiplier),
Chipset.PULSATING.getStack(2), "dustRedstone", Items.ender_pearl);
@ -300,7 +301,7 @@ public class BuildCraftSilicon extends BuildCraftMod {
@Mod.EventHandler
public void remap(FMLMissingMappingsEvent event) {
for (FMLMissingMappingsEvent.MissingMapping mapping: event.get()) {
for (FMLMissingMappingsEvent.MissingMapping mapping : event.get()) {
if (mapping.name.equals("BuildCraft|Silicon:null")) {
if (mapping.type == GameRegistry.Type.ITEM) {
mapping.remap(Item.getItemFromBlock(assemblyTableBlock));

33
common/buildcraft/BuildCraftTransport.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -19,6 +19,7 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemMinecart;
import net.minecraft.item.ItemStack;
import net.minecraft.world.WorldServer;
import cpw.mods.fml.client.event.ConfigChangedEvent;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
@ -192,9 +193,9 @@ public class BuildCraftTransport extends BuildCraftMod {
public static BuildCraftTransport instance;
public static float pipeDurability;
public static int pipeFluidsBaseFlowRate;
public static boolean facadeTreatBlacklistAsWhitelist;
public static boolean additionalWaterproofingRecipe;
public static int pipeFluidsBaseFlowRate;
public static boolean facadeTreatBlacklistAsWhitelist;
public static boolean additionalWaterproofingRecipe;
public static boolean facadeForceNonLaserRecipe;
public static BlockGenericPipe genericPipeBlock;
@ -225,7 +226,7 @@ public class BuildCraftTransport extends BuildCraftMod {
public static Item pipeItemsSandstone;
public static Item pipeItemsEmzuli;
public static Item pipeItemsStripes;
public static Item pipeItemsClay;
public static Item pipeItemsClay;
public static Item pipeFluidsWood;
public static Item pipeFluidsCobblestone;
public static Item pipeFluidsStone;
@ -245,7 +246,7 @@ public class BuildCraftTransport extends BuildCraftMod {
public static Item pipePowerGold;
public static Item pipePowerDiamond;
public static Item pipePowerEmerald;
public static Item pipePowerSandstone;
public static Item pipePowerSandstone;
public static String[] facadeBlacklist;
@ -266,9 +267,9 @@ public class BuildCraftTransport extends BuildCraftMod {
public static IActionInternal actionExtractionPresetBlue = new ActionExtractionPreset(EnumColor.BLUE);
public static IActionInternal actionExtractionPresetGreen = new ActionExtractionPreset(EnumColor.GREEN);
public static IActionInternal actionExtractionPresetYellow = new ActionExtractionPreset(EnumColor.YELLOW);
public static IActionInternal[] actionValve = new IActionInternal[4];
public static IActionInternal[] actionValve = new IActionInternal[4];
public static boolean debugPrintFacadeList = false;
public static boolean debugPrintFacadeList = false;
public static boolean usePipeLoss = false;
public static float gateCostMultiplier = 1.0F;
@ -304,7 +305,7 @@ public class BuildCraftTransport extends BuildCraftMod {
BuildCraftCore.mainConfigManager.register("debug.printFacadeList", false, "Print a list of all registered facades.", ConfigManager.RestartRequirement.GAME);
BuildCraftCore.mainConfigManager.register("general.pipes.slimeballWaterproofRecipe", false, "Should I enable an alternate Waterproof recipe, based on slimeballs?", ConfigManager.RestartRequirement.GAME);
BuildCraftCore.mainConfigManager.register("power.gateCostMultiplier", 1.0D, "What should be the multiplier of all gate power costs?", ConfigManager.RestartRequirement.GAME);
BuildCraftCore.mainConfigManager.register("general.pipes.facadeBlacklist", new String[] {
BuildCraftCore.mainConfigManager.register("general.pipes.facadeBlacklist", new String[]{
Block.blockRegistry.getNameForObject(Blocks.end_portal_frame),
Block.blockRegistry.getNameForObject(Blocks.grass),
Block.blockRegistry.getNameForObject(Blocks.leaves),
@ -348,7 +349,7 @@ public class BuildCraftTransport extends BuildCraftMod {
pipeItemsVoid = buildPipe(PipeItemsVoid.class, "dyeBlack", "blockGlassColorless", "dustRedstone");
pipeItemsEmzuli = buildPipe(PipeItemsEmzuli.class, "blockLapis", "blockGlassColorless", "gemEmerald");
pipeItemsStripes = buildPipe(PipeItemsStripes.class, "gearGold", "blockGlassColorless", "gearGold");
pipeItemsClay = buildPipe(PipeItemsClay.class, Blocks.clay, "blockGlassColorless", Blocks.clay);
pipeItemsClay = buildPipe(PipeItemsClay.class, Blocks.clay, "blockGlassColorless", Blocks.clay);
pipeFluidsWood = buildPipe(PipeFluidsWood.class, pipeWaterproof, pipeItemsWood);
pipeFluidsCobblestone = buildPipe(PipeFluidsCobblestone.class, pipeWaterproof, pipeItemsCobblestone);
@ -370,9 +371,9 @@ public class BuildCraftTransport extends BuildCraftMod {
pipePowerGold = buildPipe(PipePowerGold.class, "dustRedstone", pipeItemsGold);
pipePowerDiamond = buildPipe(PipePowerDiamond.class, "dustRedstone", pipeItemsDiamond);
pipePowerEmerald = buildPipe(PipePowerEmerald.class, "dustRedstone", pipeItemsEmerald);
pipePowerSandstone = buildPipe(PipePowerSandstone.class, "dustRedstone", pipeItemsSandstone);
pipePowerSandstone = buildPipe(PipePowerSandstone.class, "dustRedstone", pipeItemsSandstone);
pipeStructureCobblestone = buildPipe(PipeStructureCobblestone.class, Blocks.cobblestone, Blocks.gravel, Blocks.cobblestone);
pipeStructureCobblestone = buildPipe(PipeStructureCobblestone.class, Blocks.cobblestone, Blocks.gravel, Blocks.cobblestone);
pipeWire = new ItemPipeWire();
CoreProxy.proxy.registerItem(pipeWire);
@ -430,7 +431,7 @@ public class BuildCraftTransport extends BuildCraftMod {
}
for (ValveState state : ValveState.VALUES) {
actionValve[state.ordinal()] = new ActionValve(state);
actionValve[state.ordinal()] = new ActionValve(state);
}
for (PowerMode limit : PowerMode.VALUES) {
@ -656,7 +657,7 @@ public class BuildCraftTransport extends BuildCraftMod {
GameRegistry.addRecipe(new PipeColoringRecipe());
RecipeSorter.register("buildcraft:pipecoloring", PipeColoringRecipe.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless");
CoreProxy.proxy.addCraftingRecipe(new ItemStack(filteredBufferBlock, 1),
"wdw", "wcw", "wpw", 'w', "plankWood", 'd',
BuildCraftTransport.pipeItemsDiamond, 'c', "chestWood", 'p',
@ -686,7 +687,7 @@ public class BuildCraftTransport extends BuildCraftMod {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(lensItem, 8, i),
"OSO", "SGS", "OSO",
'O', "ingotIron", 'S', dye, 'G', "blockGlass"
));
));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(lensItem, 8, i + 16),
"OSO", "SGS", "OSO",
'O', Blocks.iron_bars, 'S', dye, 'G', "blockGlass"
@ -712,7 +713,7 @@ public class BuildCraftTransport extends BuildCraftMod {
}
public static Item buildPipe(Class<? extends Pipe<?>> clas, BCCreativeTab creativeTab,
Object... ingredients) {
Object... ingredients) {
ItemPipe res = BlockGenericPipe.registerPipe(clas, creativeTab);
res.setUnlocalizedName(clas.getSimpleName());

7
common/buildcraft/builders/BlockArchitect.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -14,6 +14,7 @@ import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.BuildCraftBuilders;
@ -34,7 +35,7 @@ public class BlockArchitect extends BlockBuildCraft implements ICustomLEDBlock {
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int par6, float par7,
float par8, float par9) {
float par8, float par9) {
if (super.onBlockActivated(world, x, y, z, entityplayer, par6, par7, par8, par9)) {
return true;
}
@ -69,6 +70,6 @@ public class BlockArchitect extends BlockBuildCraft implements ICustomLEDBlock {
@Override
public String[] getLEDSuffixes() {
return new String[] { "led_red", "led_mode_copy", "led_mode_edit" };
return new String[]{"led_red", "led_mode_copy", "led_mode_edit"};
}
}

4
common/buildcraft/builders/BlockBlueprintLibrary.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -19,7 +19,7 @@ import buildcraft.core.GuiIds;
import buildcraft.core.lib.block.BlockBuildCraft;
public class BlockBlueprintLibrary extends BlockBuildCraft {
public BlockBlueprintLibrary() {
public BlockBlueprintLibrary() {
super(Material.iron, BCCreativeTab.get("main"));
setHardness(5F);
setRotatable(true);

3
common/buildcraft/builders/BlockBuilder.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -16,6 +16,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.common.util.ForgeDirection;

6
common/buildcraft/builders/BlockConstructionMarker.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -23,7 +23,7 @@ import buildcraft.core.lib.utils.BlockUtils;
import buildcraft.core.lib.utils.Utils;
public class BlockConstructionMarker extends BlockMarker {
public BlockConstructionMarker() {
public BlockConstructionMarker() {
}
@Override
@ -63,7 +63,7 @@ public class BlockConstructionMarker extends BlockMarker {
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int par6, float par7,
float par8, float par9) {
float par8, float par9) {
if (super.onBlockActivated(world, x, y, z, entityplayer, par6, par7, par8, par9)) {
return true;
}

3
common/buildcraft/builders/BlockFiller.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -13,6 +13,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.BuildCraftBuilders;

9
common/buildcraft/builders/BlockFrame.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -24,6 +24,7 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.BuildCraftCore;
@ -75,7 +76,7 @@ public class BlockFrame extends Block implements IFramePipeConnection {
public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
return new ArrayList<ItemStack>();
}
@Override
public int getRenderType() {
return BuildCraftCore.legacyPipeModel;
@ -113,7 +114,7 @@ public class BlockFrame extends Block implements IFramePipeConnection {
}
@Override
@SuppressWarnings({ "all" })
@SuppressWarnings({"all"})
// @Override (client only)
public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int i, int j, int k) {
return getCollisionBoundingBoxFromPool(world, i, j, k);
@ -200,7 +201,7 @@ public class BlockFrame extends Block implements IFramePipeConnection {
return blockAccess.getBlock(x2, y2, z2) == this;
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@SuppressWarnings({"unchecked", "rawtypes"})
@Override
public void getSubBlocks(Item item, CreativeTabs tab, List list) {
list.add(new ItemStack(this));

3
common/buildcraft/builders/BlockQuarry.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.BuildCraftBuilders;

5
common/buildcraft/builders/BuilderProxy.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -9,6 +9,7 @@
package buildcraft.builders;
import net.minecraft.world.World;
import cpw.mods.fml.common.SidedProxy;
import buildcraft.core.lib.EntityBlock;
@ -21,7 +22,7 @@ public class BuilderProxy {
}
public void registerBlockRenderers () {
public void registerBlockRenderers() {
}

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

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -11,6 +11,7 @@ package buildcraft.builders;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
@ -41,17 +42,17 @@ public class BuilderProxyClient extends BuilderProxy {
ClientRegistry.bindTileEntitySpecialRenderer(TileBuilder.class, new RenderBuilderTile());
ClientRegistry.bindTileEntitySpecialRenderer(TileConstructionMarker.class, new RenderConstructionMarker());
ClientRegistry.bindTileEntitySpecialRenderer(TileFiller.class, new RenderMultiTESR(new TileEntitySpecialRenderer[] {
ClientRegistry.bindTileEntitySpecialRenderer(TileFiller.class, new RenderMultiTESR(new TileEntitySpecialRenderer[]{
new RenderLEDTile(BuildCraftBuilders.fillerBlock),
new RenderFiller()
}));
ClientRegistry.bindTileEntitySpecialRenderer(TileQuarry.class, new RenderMultiTESR(new TileEntitySpecialRenderer[] {
ClientRegistry.bindTileEntitySpecialRenderer(TileQuarry.class, new RenderMultiTESR(new TileEntitySpecialRenderer[]{
new RenderLEDTile(BuildCraftBuilders.quarryBlock),
new RenderBuilder()
}));
ClientRegistry.bindTileEntitySpecialRenderer(TileArchitect.class, new RenderMultiTESR(new TileEntitySpecialRenderer[] {
ClientRegistry.bindTileEntitySpecialRenderer(TileArchitect.class, new RenderMultiTESR(new TileEntitySpecialRenderer[]{
new RenderLEDTile(BuildCraftBuilders.architectBlock),
new RenderArchitect()
}));

91
common/buildcraft/builders/BuildersGuiHandler.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -11,6 +11,7 @@ package buildcraft.builders;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.IGuiHandler;
import buildcraft.builders.gui.ContainerArchitect;
@ -35,32 +36,32 @@ public class BuildersGuiHandler implements IGuiHandler {
switch (id) {
case GuiIds.ARCHITECT_TABLE:
if (!(tile instanceof TileArchitect)) {
return null;
}
return new GuiArchitect(player, (TileArchitect) tile);
case GuiIds.ARCHITECT_TABLE:
if (!(tile instanceof TileArchitect)) {
return null;
}
return new GuiArchitect(player, (TileArchitect) tile);
case GuiIds.BLUEPRINT_LIBRARY:
if (!(tile instanceof TileBlueprintLibrary)) {
return null;
}
return new GuiBlueprintLibrary(player, (TileBlueprintLibrary) tile);
case GuiIds.BLUEPRINT_LIBRARY:
if (!(tile instanceof TileBlueprintLibrary)) {
return null;
}
return new GuiBlueprintLibrary(player, (TileBlueprintLibrary) tile);
case GuiIds.BUILDER:
if (!(tile instanceof TileBuilder)) {
return null;
}
return new GuiBuilder(player.inventory, (TileBuilder) tile);
case GuiIds.BUILDER:
if (!(tile instanceof TileBuilder)) {
return null;
}
return new GuiBuilder(player.inventory, (TileBuilder) tile);
case GuiIds.FILLER:
if (!(tile instanceof TileFiller)) {
return null;
}
return new GuiFiller(player.inventory, (TileFiller) tile);
case GuiIds.FILLER:
if (!(tile instanceof TileFiller)) {
return null;
}
return new GuiFiller(player.inventory, (TileFiller) tile);
default:
return null;
default:
return null;
}
}
@ -76,32 +77,32 @@ public class BuildersGuiHandler implements IGuiHandler {
switch (id) {
case GuiIds.ARCHITECT_TABLE:
if (!(tile instanceof TileArchitect)) {
return null;
}
return new ContainerArchitect(player, (TileArchitect) tile);
case GuiIds.ARCHITECT_TABLE:
if (!(tile instanceof TileArchitect)) {
return null;
}
return new ContainerArchitect(player, (TileArchitect) tile);
case GuiIds.BLUEPRINT_LIBRARY:
if (!(tile instanceof TileBlueprintLibrary)) {
return null;
}
return new ContainerBlueprintLibrary(player, (TileBlueprintLibrary) tile);
case GuiIds.BLUEPRINT_LIBRARY:
if (!(tile instanceof TileBlueprintLibrary)) {
return null;
}
return new ContainerBlueprintLibrary(player, (TileBlueprintLibrary) tile);
case GuiIds.BUILDER:
if (!(tile instanceof TileBuilder)) {
return null;
}
return new ContainerBuilder(player.inventory, (TileBuilder) tile);
case GuiIds.BUILDER:
if (!(tile instanceof TileBuilder)) {
return null;
}
return new ContainerBuilder(player.inventory, (TileBuilder) tile);
case GuiIds.FILLER:
if (!(tile instanceof TileFiller)) {
return null;
}
return new ContainerFiller(player.inventory, (TileFiller) tile);
case GuiIds.FILLER:
if (!(tile instanceof TileFiller)) {
return null;
}
return new ContainerFiller(player.inventory, (TileFiller) tile);
default:
return null;
default:
return null;
}
}

4
common/buildcraft/builders/EntityMechanicalArm.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -147,6 +147,6 @@ public class EntityMechanicalArm extends Entity {
}
private double[] getHead() {
return new double[] { this.headX / 32D, this.headY / 32D, this.headZ / 32D };
return new double[]{this.headX / 32D, this.headY / 32D, this.headZ / 32D};
}
}

9
common/buildcraft/builders/HeuristicBlockDetection.java
View file

@ -6,6 +6,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockBush;
import net.minecraft.block.IGrowable;
import net.minecraft.init.Blocks;
import net.minecraftforge.common.IPlantable;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidBlock;
@ -18,9 +19,9 @@ import buildcraft.core.builders.schematics.SchematicTileCreative;
public final class HeuristicBlockDetection {
private HeuristicBlockDetection() {
}
public static void start() {
Iterator i = Block.blockRegistry.iterator();
while (i.hasNext()) {
@ -28,7 +29,7 @@ public final class HeuristicBlockDetection {
if (block == null || block == Blocks.air) {
continue;
}
for (int meta = 0; meta < 16; meta++) {
if (!SchematicRegistry.INSTANCE.isSupported(block, meta)) {
try {
@ -56,7 +57,7 @@ public final class HeuristicBlockDetection {
e.printStackTrace();
}
} catch (Exception e) {
}
}
}

8
common/buildcraft/builders/ItemBlueprint.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -10,8 +10,6 @@ package buildcraft.builders;
import java.util.List;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@ -91,7 +89,7 @@ public abstract class ItemBlueprint extends ItemBuildCraft implements IBlueprint
@Override
public String[] getIconNames() {
return new String[]{ getIconType() + "/clean", getIconType() + "/used" };
return new String[]{getIconType() + "/clean", getIconType() + "/used"};
}
@Override
@ -115,7 +113,7 @@ public abstract class ItemBlueprint extends ItemBuildCraft implements IBlueprint
return null;
}
LibraryId id = new LibraryId();
id.read (nbt);
id.read(nbt);
if (BuildCraftBuilders.serverDB.exists(id)) {
return id;

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

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

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

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

5
common/buildcraft/builders/ItemConstructionMarker.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -17,6 +17,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -102,7 +103,7 @@ public class ItemConstructionMarker extends ItemBlock {
@Override
public boolean onItemUse(ItemStack marker, EntityPlayer player, World world, int x,
int y, int z, int side, float par8, float par9, float par10) {
int y, int z, int side, float par8, float par9, float par10) {
TileEntity tile = world.getTileEntity(x, y, z);
NBTTagCompound nbt = NBTUtils.getItemData(marker);

24
common/buildcraft/builders/LibraryDatabase.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -50,10 +50,10 @@ public class LibraryDatabase {
inputDirs = new ArrayList<File>();
for (int i = 0; i < inputPaths.length; ++i) {
File inputDir = new File(inputPaths[i]);
if (inputDir.exists()) {
inputDirs.add(inputDir);
}
File inputDir = new File(inputPaths[i]);
if (inputDir.exists()) {
inputDirs.add(inputDir);
}
}
refresh();
@ -62,11 +62,11 @@ public class LibraryDatabase {
public void refresh() {
blueprintIds = new TreeSet<LibraryId>();
for (File f : inputDirs) {
loadIndex(f);
}
loadIndex(f);
}
}
public void deleteBlueprint (LibraryId id) {
public void deleteBlueprint(LibraryId id) {
File blueprintFile = getBlueprintFile(id);
if (blueprintFile != null) {
@ -173,7 +173,7 @@ public class LibraryDatabase {
}
}
public boolean exists (LibraryId id) {
public boolean exists(LibraryId id) {
return blueprintIds.contains(id);
}
@ -186,12 +186,12 @@ public class LibraryDatabase {
return compound;
}
public static NBTTagCompound load (File blueprintFile) {
public static NBTTagCompound load(File blueprintFile) {
if (blueprintFile != null && blueprintFile.exists()) {
try {
FileInputStream f = new FileInputStream(blueprintFile);
byte [] data = new byte [(int) blueprintFile.length()];
f.read (data);
byte[] data = new byte[(int) blueprintFile.length()];
f.read(data);
f.close();
return NBTUtils.load(data);

26
common/buildcraft/builders/TileArchitect.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -19,6 +19,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.common.util.Constants;
@ -105,11 +106,11 @@ public class TileArchitect extends TileBuildCraft implements IInventory, IBoxPro
sendNetworkUpdate();
return;
} else {
if (BuildCraftCore.DEVELOPER_MODE) {
mode = Mode.EDIT;
} else {
mode = Mode.NONE;
}
if (BuildCraftCore.DEVELOPER_MODE) {
mode = Mode.EDIT;
} else {
mode = Mode.NONE;
}
}
} else {
mode = Mode.COPY;
@ -240,7 +241,7 @@ public class TileArchitect extends TileBuildCraft implements IInventory, IBoxPro
if (mode == Mode.COPY) {
readConfiguration.writeData(stream);
stream.writeShort(subLasers.size());
for (LaserData ld: subLasers) {
for (LaserData ld : subLasers) {
ld.writeData(stream);
}
}
@ -264,6 +265,7 @@ public class TileArchitect extends TileBuildCraft implements IInventory, IBoxPro
}
}
}
@Override
public void invalidate() {
super.invalidate();
@ -346,7 +348,7 @@ public class TileArchitect extends TileBuildCraft implements IInventory, IBoxPro
}
}
public void rpcSetConfiguration (BlueprintReadConfiguration conf) {
public void rpcSetConfiguration(BlueprintReadConfiguration conf) {
readConfiguration = conf;
BuildCraftCore.instance.sendToServer(new PacketCommand(this, "setReadConfiguration", new CommandWriter() {
@ -395,10 +397,10 @@ public class TileArchitect extends TileBuildCraft implements IInventory, IBoxPro
}
return condition ? 15 : 0;
}
@Override
@SideOnly(Side.CLIENT)
public double getMaxRenderDistanceSquared() {
return Double.MAX_VALUE;
}
public double getMaxRenderDistanceSquared() {
return Double.MAX_VALUE;
}
}

17
common/buildcraft/builders/TileBlueprintLibrary.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTSizeTracker;
import net.minecraft.nbt.NBTTagCompound;
import cpw.mods.fml.relauncher.Side;
import buildcraft.BuildCraftBuilders;
@ -255,12 +256,12 @@ public class TileBlueprintLibrary extends TileBuildCraft implements IInventory,
if (uploadingPlayer != null) {
BuildCraftCore.instance.sendToPlayer(uploadingPlayer, new PacketCommand(this, "downloadBlueprintToClient",
new CommandWriter() {
public void write(ByteBuf data) {
id.generateUniqueId(dataOut);
id.writeData(data);
NetworkUtils.writeByteArray(data, dataOut);
}
}));
public void write(ByteBuf data) {
id.generateUniqueId(dataOut);
id.writeData(data);
NetworkUtils.writeByteArray(data, dataOut);
}
}));
uploadingPlayer = null;
}
}
@ -384,7 +385,7 @@ public class TileBlueprintLibrary extends TileBuildCraft implements IInventory,
}
}
public void selectBlueprint (int index) {
public void selectBlueprint(int index) {
selected = index;
BuildCraftCore.instance.sendToServer(new PacketCommand(this, "selectBlueprint", new CommandWriter() {
@Override

21
common/buildcraft/builders/TileBuilder.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -23,6 +23,7 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.WorldSettings.GameType;
import cpw.mods.fml.relauncher.Side;
import net.minecraftforge.common.util.Constants;
import net.minecraftforge.common.util.ForgeDirection;
@ -71,7 +72,7 @@ public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluid
public Box box = new Box();
public PathIterator currentPathIterator;
public Tank[] fluidTanks = new Tank[] {
public Tank[] fluidTanks = new Tank[]{
new Tank("fluid1", FluidContainerRegistry.BUCKET_VOLUME * 8, this),
new Tank("fluid2", FluidContainerRegistry.BUCKET_VOLUME * 8, this),
new Tank("fluid3", FluidContainerRegistry.BUCKET_VOLUME * 8, this),
@ -301,9 +302,9 @@ public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluid
@Deprecated
public BptBuilderBase instanciateBluePrintBuilder(int x, int y, int z, ForgeDirection o) {
BlueprintBase bpt = instanciateBlueprint();
if (bpt == null) {
return null;
}
if (bpt == null) {
return null;
}
bpt = bpt.adjustToWorld(worldObj, x, y, z, o);
@ -543,7 +544,7 @@ public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluid
new BlockIndex((int) currentPathIterator.ix,
(int) currentPathIterator.iy, (int) currentPathIterator.iz)
.writeTo(iteratorNBT);
bptNBT.setTag ("iterator", iteratorNBT);
bptNBT.setTag("iterator", iteratorNBT);
}
nbttagcompound.setTag("bptBuilder", bptNBT);
@ -702,7 +703,7 @@ public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluid
@Override
public AxisAlignedBB getRenderBoundingBox() {
Box renderBox = new Box (this).extendToEncompass(box);
Box renderBox = new Box(this).extendToEncompass(box);
for (LaserData l : pathLasers) {
renderBox = renderBox.extendToEncompass(l.head);
@ -712,7 +713,7 @@ public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluid
return renderBox.expand(50).getBoundingBox();
}
public void build () {
public void build() {
if (currentBuilder != null) {
if (currentBuilder.buildNextSlot(worldObj, this, xCoord, yCoord, zCoord)) {
updateRequirements();
@ -731,7 +732,7 @@ public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluid
BuildCraftCore.instance.sendToPlayer(p, getItemRequirementsPacket(reqCopy));
}
}
public void updateRequirements(EntityPlayer caller) {
List<RequirementItemStack> reqCopy = null;
if (currentBuilder instanceof BptBuilderBlueprint) {
@ -742,7 +743,7 @@ public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluid
BuildCraftCore.instance.sendToPlayer(caller, getItemRequirementsPacket(reqCopy));
}
public BptBuilderBase getBlueprint () {
public BptBuilderBase getBlueprint() {
if (currentBuilder != null) {
return currentBuilder;
} else {

7
common/buildcraft/builders/TileConstructionMarker.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -17,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import cpw.mods.fml.relauncher.Side;
import net.minecraftforge.common.util.ForgeDirection;
@ -57,7 +58,7 @@ public class TileConstructionMarker extends TileBuildCraft implements IBuildingI
private NBTTagCompound initNBT;
@Override
public void initialize () {
public void initialize() {
super.initialize();
box.kind = Kind.BLUE_STRIPES;
@ -197,7 +198,7 @@ public class TileConstructionMarker extends TileBuildCraft implements IBuildingI
return !isInvalid() && bluePrintBuilder != null && !bluePrintBuilder.isDone(this);
}
public BptContext getContext () {
public BptContext getContext() {
return bptContext;
}

7
common/buildcraft/builders/TileFiller.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -15,6 +15,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import cpw.mods.fml.relauncher.Side;
import buildcraft.BuildCraftCore;
@ -241,7 +242,7 @@ public class TileFiller extends TileAbstractBuilder implements IHasWork, IContro
}
@Override
public int getInventoryStackLimit() {
public int getInventoryStackLimit() {
return inv.getInventoryStackLimit();
}
@ -390,7 +391,7 @@ public class TileFiller extends TileAbstractBuilder implements IHasWork, IContro
@Override
public AxisAlignedBB getRenderBoundingBox() {
return new Box (this).extendToEncompass(box).expand(50).getBoundingBox();
return new Box(this).extendToEncompass(box).expand(50).getBoundingBox();
}
@Override

53
common/buildcraft/builders/TileQuarry.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -27,6 +27,7 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.MathHelper;
import net.minecraft.world.ChunkCoordIntPair;
import net.minecraftforge.common.ForgeChunkManager;
import net.minecraftforge.common.ForgeChunkManager.Ticket;
import net.minecraftforge.common.ForgeChunkManager.Type;
@ -102,7 +103,7 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
private int ledState;
public TileQuarry () {
public TileQuarry() {
box.kind = Kind.STRIPES;
this.setBattery(new RFBattery((int) (2 * 64 * BuilderAPI.BREAK_ENERGY * BuildCraftCore.miningMultiplier), (int) (1000 * BuildCraftCore.miningMultiplier), 0));
}
@ -163,6 +164,7 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
&& worldObj.blockExists(box.xMin, box.yMax, box.zMax)
&& worldObj.blockExists(box.xMax, box.yMax, box.zMax);
}
@Override
public void updateEntity() {
super.updateEntity();
@ -271,6 +273,7 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
miner = null;
}
}
protected void idling() {
if (!findTarget(true)) {
// I believe the issue is box going null becuase of bad chunkloader positioning
@ -547,9 +550,9 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
if (xSize < 3 || zSize < 3 || (chunkTicket != null && ((xSize * zSize) >> 8) >= chunkTicket.getMaxChunkListDepth())) {
if (placedBy != null) {
placedBy.addChatMessage(new ChatComponentTranslation("chat.buildcraft.quarry.tooSmall",
xSize, zSize,
chunkTicket != null ? chunkTicket.getMaxChunkListDepth() : 0));
placedBy.addChatMessage(new ChatComponentTranslation("chat.buildcraft.quarry.tooSmall",
xSize, zSize,
chunkTicket != null ? chunkTicket.getMaxChunkListDepth() : 0));
}
a = new DefaultAreaProvider(xCoord, yCoord, zCoord, xCoord + 10, yCoord + 4, zCoord + 10);
@ -574,23 +577,23 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
ForgeDirection o = ForgeDirection.getOrientation(dir > 6 ? 6 : dir).getOpposite();
switch (o) {
case EAST:
xMin = xCoord + 1;
zMin = zCoord - 4 - 1;
break;
case WEST:
xMin = xCoord - 9 - 2;
zMin = zCoord - 4 - 1;
break;
case SOUTH:
xMin = xCoord - 4 - 1;
zMin = zCoord + 1;
break;
case NORTH:
default:
xMin = xCoord - 4 - 1;
zMin = zCoord - 9 - 2;
break;
case EAST:
xMin = xCoord + 1;
zMin = zCoord - 4 - 1;
break;
case WEST:
xMin = xCoord - 9 - 2;
zMin = zCoord - 4 - 1;
break;
case SOUTH:
xMin = xCoord - 4 - 1;
zMin = zCoord + 1;
break;
case NORTH:
default:
xMin = xCoord - 4 - 1;
zMin = zCoord - 9 - 2;
break;
}
box.initialize(xMin, yCoord, zMin, xMin + xSize - 1, yCoord + ySize - 1, zMin + zSize - 1);
@ -753,7 +756,7 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
public boolean isBuildingMaterialSlot(int i) {
return true;
}
public void moveHead(double instantSpeed) {
int[] target = getTarget();
double[] head = getHead();
@ -858,7 +861,7 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
@Override
public AxisAlignedBB getRenderBoundingBox() {
return new Box (this).extendToEncompass(box).expand(50).getBoundingBox();
return new Box(this).extendToEncompass(box).expand(50).getBoundingBox();
}
@Override
@ -868,7 +871,7 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
@Override
public int[] getAccessibleSlotsFromSide(int side) {
return new int[] {};
return new int[]{};
}
@Override

2
common/buildcraft/builders/blueprints/IBlueprintBuilderAgent.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

7
common/buildcraft/builders/blueprints/RealBlueprintDeployer.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -11,6 +11,7 @@ package buildcraft.builders.blueprints;
import java.io.File;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.blueprints.BlueprintDeployer;
@ -27,14 +28,14 @@ public class RealBlueprintDeployer extends BlueprintDeployer {
@Override
public void deployBlueprint(World world, int x, int y, int z,
ForgeDirection dir, File file) {
ForgeDirection dir, File file) {
deployBlueprint(world, x, y, z, dir, (Blueprint) BlueprintBase.loadBluePrint(LibraryDatabase.load(file)));
}
@Override
public void deployBlueprintFromFileStream(World world, int x, int y, int z,
ForgeDirection dir, byte [] data) {
ForgeDirection dir, byte[] data) {
deployBlueprint(world, x, y, z, dir, (Blueprint) BlueprintBase.loadBluePrint(NBTUtils.load(data)));
}

5
common/buildcraft/builders/blueprints/RecursiveBlueprintBuilder.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -12,6 +12,7 @@ import java.util.ArrayList;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.core.Box;
@ -35,7 +36,7 @@ public class RecursiveBlueprintBuilder {
private Box box = new Box();
public RecursiveBlueprintBuilder(BlueprintBase iBlueprint, World iWorld, int iX, int iY, int iZ,
ForgeDirection iDir) {
ForgeDirection iDir) {
blueprint = iBlueprint;
subBlueprints = iBlueprint.subBlueprintsNBT;
world = iWorld;

11
common/buildcraft/builders/blueprints/RecursiveBlueprintReader.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -11,6 +11,7 @@ package buildcraft.builders.blueprints;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.BuildCraftBuilders;
@ -146,10 +147,10 @@ public class RecursiveBlueprintReader {
currentSubReader.architect.yCoord - architect.getBox().yMin,
currentSubReader.architect.zCoord - architect.getBox().zMin,
ForgeDirection.values()[
currentSubReader.architect.getWorldObj().getBlockMetadata(
currentSubReader.architect.xCoord,
currentSubReader.architect.yCoord,
currentSubReader.architect.zCoord)].getOpposite());
currentSubReader.architect.getWorldObj().getBlockMetadata(
currentSubReader.architect.xCoord,
currentSubReader.architect.yCoord,
currentSubReader.architect.zCoord)].getOpposite());
currentSubReader = null;
subIndex++;

2
common/buildcraft/builders/gui/ContainerArchitect.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

2
common/buildcraft/builders/gui/ContainerBlueprintLibrary.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

6
common/buildcraft/builders/gui/ContainerBuilder.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -56,9 +56,9 @@ public class ContainerBuilder extends BuildCraftContainer {
builder.addGuiWatcher(((InventoryPlayer) playerInventory).player);
}
}
@Override
public void onContainerClosed(EntityPlayer player) {
public void onContainerClosed(EntityPlayer player) {
super.onContainerClosed(player);
builder.removeGuiWatcher(player);
}

3
common/buildcraft/builders/gui/ContainerFiller.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -12,6 +12,7 @@ import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

12
common/buildcraft/builders/gui/GuiArchitect.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -74,7 +74,7 @@ public class GuiArchitect extends GuiBuildCraft {
new ToolTipLine(StringUtils.localize("tile.architect.tooltip.allowCreative.2"))
));
buttonList.add(optionAllowCreative);
textField = new GuiTextField(this.fontRendererObj, TEXT_X, TEXT_Y, TEXT_WIDTH, TEXT_HEIGHT);
textField.setMaxStringLength(DefaultProps.MAX_NAME_SIZE);
textField.setText(architect.name);
@ -105,25 +105,25 @@ public class GuiArchitect extends GuiBuildCraft {
updateButtons();
}
private void updateButtons () {
private void updateButtons() {
BlueprintReadConfiguration conf = architect.readConfiguration;
if (conf.rotate) {
optionRotate.displayString = StringUtils.localize("tile.architect.rotate");
} else {
optionRotate.displayString = StringUtils.localize("tile.architect.norotate");
optionRotate.displayString = StringUtils.localize("tile.architect.norotate");
}
if (conf.excavate) {
optionExcavate.displayString = StringUtils.localize("tile.architect.excavate");
} else {
optionExcavate.displayString = StringUtils.localize("tile.architect.noexcavate");
optionExcavate.displayString = StringUtils.localize("tile.architect.noexcavate");
}
if (conf.allowCreative) {
optionAllowCreative.displayString = StringUtils.localize("tile.architect.allowCreative");
} else {
optionAllowCreative.displayString = StringUtils.localize("tile.architect.noallowCreative");
optionAllowCreative.displayString = StringUtils.localize("tile.architect.noallowCreative");
}
}

4
common/buildcraft/builders/gui/GuiBlueprintLibrary.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -117,7 +117,7 @@ public class GuiBlueprintLibrary extends GuiBuildCraft {
int y = j - guiTop;
if (x >= 8 && x <= 161) {
int ySlot = (y - 22) / 9 + getLibraryContainer().scrollbarWidget.getPosition();
int ySlot = (y - 22) / 9 + getLibraryContainer().scrollbarWidget.getPosition();
if (ySlot > -1 && ySlot < library.entries.size()) {
library.selectBlueprint(ySlot);

2
common/buildcraft/builders/gui/GuiBuilder.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

4
common/buildcraft/builders/gui/GuiFiller.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -137,7 +137,7 @@ public class GuiFiller extends GuiAdvancedInterface {
AdvancedSlot slot = getSlotAtLocation(x, y);
if (slot != null) {
int i = ((FillerParameterSlot) slot).slot;
int i = ((FillerParameterSlot) slot).slot;
if (i < filler.patternParameters.length) {
if (filler.patternParameters[i] != null) {
filler.patternParameters[i].onClick(filler, filler.currentPattern, mc.thePlayer.inventory.getItemStack(),

2
common/buildcraft/builders/gui/SlotArchitect.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

2
common/buildcraft/builders/gui/SlotBlueprintLibrary.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

2
common/buildcraft/builders/gui/SlotBuilderRequirement.java
View file

@ -1,7 +1,9 @@
package buildcraft.builders.gui;
import org.lwjgl.opengl.GL11;
import net.minecraft.item.ItemStack;
import buildcraft.core.blueprints.RequirementItemStack;
import buildcraft.core.lib.gui.AdvancedSlot;
import buildcraft.core.lib.gui.GuiAdvancedInterface;

2
common/buildcraft/builders/render/RenderArchitect.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

8
common/buildcraft/builders/render/RenderConstructionMarker.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -83,9 +83,9 @@ public class RenderConstructionMarker extends RenderBoxProvider {
if (marker.itemBlueprint != null) {
doRenderItem(marker.itemBlueprint,
marker.xCoord + 0.5F,
marker.yCoord + 0.2F,
marker.zCoord + 0.5F);
marker.xCoord + 0.5F,
marker.yCoord + 0.2F,
marker.zCoord + 0.5F);
}
//GL11.glEnable(GL11.GL_LIGHTING);

50
common/buildcraft/builders/schematics/SchematicBed.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -36,18 +36,18 @@ public class SchematicBed extends SchematicBlock {
int others = meta - orientation;
switch (orientation) {
case 0:
meta = 1 + others;
break;
case 1:
meta = 2 + others;
break;
case 2:
meta = 3 + others;
break;
case 3:
meta = 0 + others;
break;
case 0:
meta = 1 + others;
break;
case 1:
meta = 2 + others;
break;
case 2:
meta = 3 + others;
break;
case 3:
meta = 0 + others;
break;
}
}
@ -63,18 +63,18 @@ public class SchematicBed extends SchematicBlock {
int z2 = z;
switch (meta) {
case 0:
z2++;
break;
case 1:
x2--;
break;
case 2:
z2--;
break;
case 3:
x2++;
break;
case 0:
z2++;
break;
case 1:
x2--;
break;
case 2:
z2--;
break;
case 3:
x2++;
break;
}
context.world().setBlock(x2, y, z2, block, meta + 8, 3);

3
common/buildcraft/builders/schematics/SchematicCactus.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -14,7 +14,6 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.SchematicBlock;
import buildcraft.core.builders.schematics.SchematicBlockFloored;
public class SchematicCactus extends SchematicBlockFloored {

2
common/buildcraft/builders/schematics/SchematicCustomStack.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

2
common/buildcraft/builders/schematics/SchematicDirt.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

23
common/buildcraft/builders/schematics/SchematicDoor.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -15,7 +15,6 @@ import net.minecraft.nbt.NBTTagCompound;
import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.MappingRegistry;
import buildcraft.api.blueprints.SchematicBlock;
import buildcraft.core.builders.schematics.SchematicBlockFloored;
public class SchematicDoor extends SchematicBlockFloored {
@ -45,19 +44,19 @@ public class SchematicDoor extends SchematicBlockFloored {
meta = rotateMeta(meta);
}
private int rotateMeta (int meta) {
private int rotateMeta(int meta) {
int orientation = meta & 3;
int others = meta - orientation;
switch (orientation) {
case 0:
return 1 + others;
case 1:
return 2 + others;
case 2:
return 3 + others;
case 3:
return 0 + others;
case 0:
return 1 + others;
case 1:
return 2 + others;
case 2:
return 3 + others;
case 3:
return 0 + others;
}
return 0;
@ -99,7 +98,7 @@ public class SchematicDoor extends SchematicBlockFloored {
}
@Override
public void readSchematicFromNBT(NBTTagCompound nbt, MappingRegistry registry) {
public void readSchematicFromNBT(NBTTagCompound nbt, MappingRegistry registry) {
super.readSchematicFromNBT(nbt, registry);
upperMeta = nbt.getByte("upperMeta");

4
common/buildcraft/builders/schematics/SchematicEnderChest.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -20,7 +20,7 @@ import buildcraft.core.builders.schematics.SchematicRotateMeta;
public class SchematicEnderChest extends SchematicRotateMeta {
public SchematicEnderChest() {
super (new int[]{2, 5, 3, 4}, true);
super(new int[]{2, 5, 3, 4}, true);
}
@Override

4
common/buildcraft/builders/schematics/SchematicFactoryBlock.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -45,7 +45,7 @@ public class SchematicFactoryBlock extends SchematicFactory<SchematicBlock> {
}
@Override
public void saveSchematicToWorldNBT (NBTTagCompound nbt, SchematicBlock object, MappingRegistry registry) {
public void saveSchematicToWorldNBT(NBTTagCompound nbt, SchematicBlock object, MappingRegistry registry) {
super.saveSchematicToWorldNBT(nbt, object, registry);
nbt.setInteger("blockId", registry.getIdForBlock(object.block));

4
common/buildcraft/builders/schematics/SchematicFactoryEntity.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -34,7 +34,7 @@ public class SchematicFactoryEntity extends SchematicFactory<SchematicEntity> {
}
@Override
public void saveSchematicToWorldNBT (NBTTagCompound nbt, SchematicEntity object, MappingRegistry registry) {
public void saveSchematicToWorldNBT(NBTTagCompound nbt, SchematicEntity object, MappingRegistry registry) {
super.saveSchematicToWorldNBT(nbt, object, registry);
nbt.setInteger("entityId", registry.getIdForEntity(object.entity));

6
common/buildcraft/builders/schematics/SchematicFactoryMask.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -17,7 +17,7 @@ import buildcraft.api.blueprints.SchematicMask;
public class SchematicFactoryMask extends SchematicFactory<SchematicMask> {
@Override
protected SchematicMask loadSchematicFromWorldNBT (NBTTagCompound nbt, MappingRegistry registry) {
protected SchematicMask loadSchematicFromWorldNBT(NBTTagCompound nbt, MappingRegistry registry) {
SchematicMask s = new SchematicMask();
s.readSchematicFromNBT(nbt, registry);
@ -25,7 +25,7 @@ public class SchematicFactoryMask extends SchematicFactory<SchematicMask> {
}
@Override
public void saveSchematicToWorldNBT (NBTTagCompound nbt, SchematicMask object, MappingRegistry registry) {
public void saveSchematicToWorldNBT(NBTTagCompound nbt, SchematicMask object, MappingRegistry registry) {
super.saveSchematicToWorldNBT(nbt, object, registry);
object.writeSchematicToNBT(nbt, registry);

2
common/buildcraft/builders/schematics/SchematicFarmland.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

4
common/buildcraft/builders/schematics/SchematicFire.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -20,7 +20,7 @@ public class SchematicFire extends SchematicBlock {
@Override
public void getRequirementsForPlacement(IBuilderContext context, LinkedList<ItemStack> requirements) {
requirements.add(new ItemStack (Items.flint_and_steel));
requirements.add(new ItemStack(Items.flint_and_steel));
}
@Override

2
common/buildcraft/builders/schematics/SchematicGlassPane.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

2
common/buildcraft/builders/schematics/SchematicGravel.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

26
common/buildcraft/builders/schematics/SchematicHanging.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -24,7 +24,7 @@ public class SchematicHanging extends SchematicEntity {
private Item baseItem;
public SchematicHanging (Item baseItem) {
public SchematicHanging(Item baseItem) {
this.baseItem = baseItem;
}
@ -32,7 +32,7 @@ public class SchematicHanging extends SchematicEntity {
public void translateToBlueprint(Translation transform) {
super.translateToBlueprint(transform);
Position pos = new Position (entityNBT.getInteger("TileX"), entityNBT.getInteger("TileY"), entityNBT.getInteger("TileZ"));
Position pos = new Position(entityNBT.getInteger("TileX"), entityNBT.getInteger("TileY"), entityNBT.getInteger("TileZ"));
pos = transform.translate(pos);
entityNBT.setInteger("TileX", (int) pos.x);
entityNBT.setInteger("TileY", (int) pos.y);
@ -43,7 +43,7 @@ public class SchematicHanging extends SchematicEntity {
public void translateToWorld(Translation transform) {
super.translateToWorld(transform);
Position pos = new Position (entityNBT.getInteger("TileX"), entityNBT.getInteger("TileY"), entityNBT.getInteger("TileZ"));
Position pos = new Position(entityNBT.getInteger("TileX"), entityNBT.getInteger("TileY"), entityNBT.getInteger("TileZ"));
pos = transform.translate(pos);
entityNBT.setInteger("TileX", (int) pos.x);
entityNBT.setInteger("TileY", (int) pos.y);
@ -54,7 +54,7 @@ public class SchematicHanging extends SchematicEntity {
public void rotateLeft(IBuilderContext context) {
super.rotateLeft(context);
Position pos = new Position (entityNBT.getInteger("TileX"), entityNBT.getInteger("TileY"), entityNBT.getInteger("TileZ"));
Position pos = new Position(entityNBT.getInteger("TileX"), entityNBT.getInteger("TileY"), entityNBT.getInteger("TileZ"));
pos = context.rotatePositionLeft(pos);
entityNBT.setInteger("TileX", (int) pos.x);
entityNBT.setInteger("TileY", (int) pos.y);
@ -74,22 +74,22 @@ public class SchematicHanging extends SchematicEntity {
ItemStack stack = ItemStack.loadItemStackFromNBT(tag);
if (stack != null) {
storedRequirements = new ItemStack [2];
storedRequirements [0] = new ItemStack(baseItem);
storedRequirements [1] = stack;
storedRequirements = new ItemStack[2];
storedRequirements[0] = new ItemStack(baseItem);
storedRequirements[1] = stack;
} else {
storedRequirements = new ItemStack [1];
storedRequirements [0] = new ItemStack(baseItem);
storedRequirements = new ItemStack[1];
storedRequirements[0] = new ItemStack(baseItem);
}
} else {
storedRequirements = new ItemStack [1];
storedRequirements [0] = new ItemStack(baseItem);
storedRequirements = new ItemStack[1];
storedRequirements[0] = new ItemStack(baseItem);
}
}
@Override
public boolean isAlreadyBuilt(IBuilderContext context) {
Position newPosition = new Position (entityNBT.getInteger("TileX"), entityNBT.getInteger("TileY"), entityNBT.getInteger("TileZ"));
Position newPosition = new Position(entityNBT.getInteger("TileX"), entityNBT.getInteger("TileY"), entityNBT.getInteger("TileZ"));
int dir = entityNBT.getInteger("Direction");

2
common/buildcraft/builders/schematics/SchematicLever.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

8
common/buildcraft/builders/schematics/SchematicMinecart.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -23,7 +23,7 @@ public class SchematicMinecart extends SchematicEntity {
private Item baseItem;
public SchematicMinecart (Item baseItem) {
public SchematicMinecart(Item baseItem) {
this.baseItem = baseItem;
}
@ -56,8 +56,8 @@ public class SchematicMinecart extends SchematicEntity {
public void readFromWorld(IBuilderContext context, Entity entity) {
super.readFromWorld(context, entity);
storedRequirements = new ItemStack [1];
storedRequirements [0] = new ItemStack(baseItem);
storedRequirements = new ItemStack[1];
storedRequirements[0] = new ItemStack(baseItem);
}
@Override

4
common/buildcraft/builders/schematics/SchematicPiston.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -18,7 +18,7 @@ import buildcraft.core.builders.schematics.SchematicRotateMeta;
public class SchematicPiston extends SchematicRotateMeta {
public SchematicPiston() {
super(new int[] {2, 5, 3, 4}, true);
super(new int[]{2, 5, 3, 4}, true);
}
@Override

2
common/buildcraft/builders/schematics/SchematicPortal.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

26
common/buildcraft/builders/schematics/SchematicPumpkin.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -35,18 +35,18 @@ public class SchematicPumpkin extends SchematicBlock {
@Override
public void rotateLeft(IBuilderContext context) {
switch (meta) {
case 0:
meta = 1;
break;
case 1:
meta = 2;
break;
case 2:
meta = 3;
break;
case 3:
meta = 0;
break;
case 0:
meta = 1;
break;
case 1:
meta = 2;
break;
case 2:
meta = 3;
break;
case 3:
meta = 0;
break;
}
}

55
common/buildcraft/builders/schematics/SchematicRail.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -13,41 +13,40 @@ import java.util.LinkedList;
import net.minecraft.item.ItemStack;
import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.SchematicBlock;
import buildcraft.core.builders.schematics.SchematicBlockFloored;
public class SchematicRail extends SchematicBlockFloored {
@Override
public void rotateLeft(IBuilderContext context) {
switch (meta) {
case 0:
meta = 1;
break;
case 1:
meta = 0;
break;
case 0:
meta = 1;
break;
case 1:
meta = 0;
break;
case 2:
meta = 5;
break;
case 3:
meta = 4;
break;
case 4:
meta = 2;
break;
case 5:
meta = 3;
break;
case 2:
meta = 5;
break;
case 3:
meta = 4;
break;
case 4:
meta = 2;
break;
case 5:
meta = 3;
break;
case 6:
case 7:
case 8:
meta++;
break;
case 9:
meta = 6;
break;
case 6:
case 7:
case 8:
meta++;
break;
case 9:
meta = 6;
break;
}
}

27
common/buildcraft/builders/schematics/SchematicRedstoneDiode.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -14,7 +14,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.SchematicBlock;
import buildcraft.core.builders.schematics.SchematicBlockFloored;
public class SchematicRedstoneDiode extends SchematicBlockFloored {
@ -39,18 +38,18 @@ public class SchematicRedstoneDiode extends SchematicBlockFloored {
int step = meta - (meta & 3);
switch (meta - step) {
case 0:
meta = 1 + step;
break;
case 1:
meta = 2 + step;
break;
case 2:
meta = 3 + step;
break;
case 3:
meta = 0 + step;
break;
case 0:
meta = 1 + step;
break;
case 1:
meta = 2 + step;
break;
case 2:
meta = 3 + step;
break;
case 3:
meta = 0 + step;
break;
}
}
}

2
common/buildcraft/builders/schematics/SchematicRedstoneLamp.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

3
common/buildcraft/builders/schematics/SchematicRedstoneWire.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -13,7 +13,6 @@ import java.util.LinkedList;
import net.minecraft.item.ItemStack;
import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.SchematicBlock;
import buildcraft.core.builders.schematics.SchematicBlockFloored;
public class SchematicRedstoneWire extends SchematicBlockFloored {

4
common/buildcraft/builders/schematics/SchematicSeeds.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -19,7 +19,7 @@ import buildcraft.core.builders.schematics.SchematicBlockFloored;
public class SchematicSeeds extends SchematicBlockFloored {
public Item seeds;
public SchematicSeeds (Item seeds) {
public SchematicSeeds(Item seeds) {
this.seeds = seeds;
}

3
common/buildcraft/builders/schematics/SchematicSign.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -12,6 +12,7 @@ import java.util.LinkedList;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.blueprints.IBuilderContext;

2
common/buildcraft/builders/schematics/SchematicSkull.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

26
common/buildcraft/builders/schematics/SchematicStairs.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -38,18 +38,18 @@ public class SchematicStairs extends SchematicBlock {
int others = meta - pos;
switch (pos) {
case 0:
pos = 2;
break;
case 1:
pos = 3;
break;
case 2:
pos = 1;
break;
case 3:
pos = 0;
break;
case 0:
pos = 2;
break;
case 1:
pos = 3;
break;
case 2:
pos = 1;
break;
case 3:
pos = 0;
break;
}
meta = pos + others;

2
common/buildcraft/builders/schematics/SchematicStone.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

26
common/buildcraft/builders/schematics/SchematicTripWireHook.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -23,18 +23,18 @@ public class SchematicTripWireHook extends SchematicBlock {
int others = meta - pos;
switch (pos) {
case 0:
pos = 1;
break;
case 1:
pos = 2;
break;
case 2:
pos = 3;
break;
case 3:
pos = 0;
break;
case 0:
pos = 1;
break;
case 1:
pos = 2;
break;
case 2:
pos = 3;
break;
case 3:
pos = 0;
break;
}
meta = pos + others;

5
common/buildcraft/builders/statements/ActionFiller.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -10,6 +10,7 @@ package buildcraft.builders.statements;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.statements.IActionExternal;
@ -55,7 +56,7 @@ public class ActionFiller extends BCStatement implements IActionExternal {
@Override
public void actionActivate(TileEntity target, ForgeDirection side,
IStatementContainer source, IStatementParameter[] parameters) {
IStatementContainer source, IStatementParameter[] parameters) {
if (target instanceof TileFiller) {
((TileFiller) target).setPattern(pattern);
((TileFiller) target).patternParameters = parameters;

5
common/buildcraft/builders/statements/BuildersActionProvider.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -13,6 +13,7 @@ import java.util.HashMap;
import java.util.LinkedList;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.filler.FillerManager;
@ -26,7 +27,7 @@ import buildcraft.core.builders.patterns.FillerPattern;
public class BuildersActionProvider implements IActionProvider {
private final HashMap<String, ActionFiller> actionMap = new HashMap<String, ActionFiller>();
@Override
public Collection<IActionInternal> getInternalActions(IStatementContainer container) {
return null;

1
common/buildcraft/core/AchievementManager.java
View file

@ -2,6 +2,7 @@ package buildcraft.core;
import net.minecraft.item.Item;
import net.minecraft.stats.Achievement;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent;
import net.minecraftforge.common.AchievementPage;

2
common/buildcraft/core/BCCreativeTab.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

2
common/buildcraft/core/BlockBuildTool.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

1
common/buildcraft/core/BlockHatched.java
View file

@ -5,6 +5,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.BuildCraftCore;

3
common/buildcraft/core/BlockMarker.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -15,6 +15,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.BuildCraftCore;

6
common/buildcraft/core/BlockPathMarker.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -14,15 +14,17 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import buildcraft.core.lib.utils.ResourceUtils;
public class BlockPathMarker extends BlockMarker {
private IIcon activeMarker;
public BlockPathMarker() {
public BlockPathMarker() {
}
@Override

5
common/buildcraft/core/BlockSpring.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -19,6 +19,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -78,7 +79,7 @@ public class BlockSpring extends Block {
assertSpring(world, x, y, z);
}
// @Override
// @Override
// public void onNeighborBlockChange(World world, int x, int y, int z, int blockid) {
// assertSpring(world, x, y, z);
// }

8
common/buildcraft/core/Box.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -53,7 +53,7 @@ public class Box implements IBox, ISerializable {
}
public Box(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax) {
this ();
this();
initialize(xMin, yMin, zMin, xMax, yMax, zMax);
}
@ -109,7 +109,7 @@ public class Box implements IBox, ISerializable {
}
public void initialize(NBTTagCompound nbttagcompound) {
kind = Kind.values() [nbttagcompound.getShort("kind")];
kind = Kind.values()[nbttagcompound.getShort("kind")];
initialize(nbttagcompound.getInteger("xMin"),
nbttagcompound.getInteger("yMin"),
@ -264,7 +264,7 @@ public class Box implements IBox, ISerializable {
return "{" + xMin + ", " + xMax + "}, {" + yMin + ", " + yMax + "}, {" + zMin + ", " + zMax + "}";
}
public Box extendToEncompass (Box toBeContained) {
public Box extendToEncompass(Box toBeContained) {
if (toBeContained == null || !toBeContained.initialized) {
return this;
}

2
common/buildcraft/core/ChunkIndex.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

3
common/buildcraft/core/CompatHooks.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -11,6 +11,7 @@ package buildcraft.core;
import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import cpw.mods.fml.common.Loader;
import net.minecraftforge.common.util.ForgeDirection;

2
common/buildcraft/core/CoreConstants.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

3
common/buildcraft/core/CoreGuiHandler.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -10,6 +10,7 @@ package buildcraft.core;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.IGuiHandler;
import buildcraft.core.list.ContainerListNew;

15
common/buildcraft/core/CoreIconProvider.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -10,6 +10,7 @@ package buildcraft.core;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -17,12 +18,12 @@ import buildcraft.api.core.IIconProvider;
public class CoreIconProvider implements IIconProvider {
public static int ENERGY = 0;
public static int MAX = 1;
public static int ENERGY = 0;
public static int MAX = 1;
private IIcon[] icons;
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int iconIndex) {
@ -33,9 +34,9 @@ public class CoreIconProvider implements IIconProvider {
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister) {
icons = new IIcon[MAX];
icons[ENERGY] = iconRegister.registerIcon("buildcraftcore:icons/energy");
}
}

1
common/buildcraft/core/CoreSiliconRecipes.java
View file

@ -2,6 +2,7 @@ package buildcraft.core;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.Optional;
import buildcraft.BuildCraftCore;

2
common/buildcraft/core/DefaultAreaProvider.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

2
common/buildcraft/core/DefaultProps.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

14
common/buildcraft/core/EntityLaser.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -18,12 +18,12 @@ import buildcraft.api.core.Position;
public abstract class EntityLaser extends Entity {
public static final ResourceLocation[] LASER_TEXTURES = new ResourceLocation[]{
new ResourceLocation("buildcraftcore", "textures/laserBeams/laser_1.png"),
new ResourceLocation("buildcraftcore", "textures/laserBeams/laser_2.png"),
new ResourceLocation("buildcraftcore", "textures/laserBeams/laser_3.png"),
new ResourceLocation("buildcraftcore", "textures/laserBeams/laser_4.png"),
new ResourceLocation("buildcraftcore", "textures/laserBeams/stripes.png"),
new ResourceLocation("buildcraftcore", "textures/laserBeams/blue_stripes.png")};
new ResourceLocation("buildcraftcore", "textures/laserBeams/laser_1.png"),
new ResourceLocation("buildcraftcore", "textures/laserBeams/laser_2.png"),
new ResourceLocation("buildcraftcore", "textures/laserBeams/laser_3.png"),
new ResourceLocation("buildcraftcore", "textures/laserBeams/laser_4.png"),
new ResourceLocation("buildcraftcore", "textures/laserBeams/stripes.png"),
new ResourceLocation("buildcraftcore", "textures/laserBeams/blue_stripes.png")};
public LaserData data = new LaserData();

2
common/buildcraft/core/GuiIds.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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

4
common/buildcraft/core/InterModComms.java
View file

@ -1,7 +1,7 @@
/**
* Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
* http://www.mod-buildcraft.com
*
* <p/>
* 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
@ -16,6 +16,7 @@ import java.util.Set;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent;
import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
import net.minecraftforge.fluids.FluidStack;
@ -26,6 +27,7 @@ import buildcraft.core.recipes.RefineryRecipeManager;
public final class InterModComms {
private static final Set<IMCHandler> handlers = new HashSet<IMCHandler>();
/**
* Deactivate constructor
*/

2
common/buildcraft/core/ItemDebugger.java
View file

@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatComponentText;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.tiles.IDebuggable;
@ -21,6 +22,7 @@ public class ItemDebugger extends ItemBuildCraft {
setFull3D();
setMaxStackSize(1);
}
@Override
public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
if (world.isRemote) {

Some files were not shown because too many files have changed in this diff Show more