Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3889 commits 1 branch 0 tags 19 MiB
Commit graph

3097 commits

Author SHA1 Message Date
Christian
dae6a2d344 No more modloader references please! 2012-08-24 09:20:43 -04:00
SirSengir
6770392784 Made quarry not crash instantly. Still a horrible, horrible mess. 2012-08-24 14:13:45 +02:00
SirSengir
1a5ad78290 Hooked up some entity rendering. 2012-08-24 13:56:33 +02:00
SirSengir
15c1ce54e0 Removed ISpawnHandler references. 2012-08-24 13:41:16 +02:00
Krapht
7d3889d8df Re-enable syncing of diamond pipe filter contents 2012-08-23 07:55:08 +02:00
Krapht
dbb04486c3 Integrate serverside transport packethandler into common and wipe server folder 2012-08-22 22:45:27 +02:00
Krapht
58b3ad5f24 Clean up legacy packet ids 2012-08-22 22:09:12 +02:00
Krapht
bedc265c66 Added gatekind to corestate + some cleanup 2012-08-22 21:43:55 +02:00
SirSengir
e9469ef933 Split up some rendering code, moved init to proxy. 2012-08-21 16:07:56 +02:00
SirSengir
b29be13156 Re-enabled rendering of oil. 2012-08-21 15:53:38 +02:00
SirSengir
d1275161af Hooked up oil world generation again. 2012-08-21 15:49:18 +02:00
Krapht
aaa54ac79c Make buildcraft tiles send update packets again 2012-08-20 13:50:18 +02:00
Krapht
9f0ebac842 Fixed Tiles sending old-school BC description packets 2012-08-20 13:41:11 +02:00
SirSengir
1b13d6cf20 Reimplemented inventory rendering. 2012-08-19 11:11:24 +02:00
SirSengir
871b9edbf5 Added some stuff to creative inventory. 2012-08-19 10:50:53 +02:00
SirSengir
f12688e0a3 Changed path of configuration file. 2012-08-18 12:06:35 +02:00
SirSengir
b87d8fd817 Eliminated isClient(). 2012-08-18 11:57:24 +02:00
SirSengir
c724e960f1 Cleaned up unneeded imports. 2012-08-18 11:46:48 +02:00
SirSengir
316e2a5019 Fixed a startup crash. 2012-08-18 11:29:57 +02:00
SirSengir
c3579a70c6 Fixed a typo. 2012-08-18 11:21:58 +02:00
SirSengir
69958df8b7 Merged proxies. 2012-08-18 11:18:57 +02:00
SirSengir
146682c092 Renamed "Crafting*" to "Container*". 2012-08-17 19:38:08 +02:00
SirSengir
06ea69bfea Merged packet handlers except transport. 2012-08-17 19:31:30 +02:00
SirSengir
e04336fe5f Merged gui handlers. 2012-08-17 19:22:40 +02:00
SirSengir
2a90fffef1 Decimated server side. Removed root classes. 2012-08-17 19:14:53 +02:00
SirSengir
a27df19fdb Reorganized gui and render classes into own subpackages. (Client and Common) 2012-08-17 19:03:06 +02:00
SirSengir
d19cf6ac83 More cleanup. Redid some event handling. 2012-08-17 18:48:06 +02:00
Krapht
5ad6bd1d57 Merge branch 'buildcraft131' of github.com:SirSengir/BuildCraft into buildcraft131 2012-08-14 23:18:31 +02:00
Krapht
fc1d0fee95 Fixed GUI handler for transport, fixed gates showing up in creative inventory, moved pipeid in TEGenPipe to corestate 2012-08-14 23:18:03 +02:00
AartBluestoke
e9c9de193b Update common/buildcraft/energy/OilBucketHandler.java 
Updated to @ForgeSubscribe to the bucketHandled event, as the base class doesn't exist
 2012-08-14 09:27:50 +10:00
Krapht
796cf27f35 Started migration to common tile packets, in temporary package v2 for now 2012-08-14 00:25:19 +02:00
SirSengir
348c0e8e1f Minor cleanup and busywork on other modules. 2012-08-13 14:38:59 +02:00
Krapht
e3068f0b96 Moved configuration stuff to /config/buildcraft 
Fixed lots of stuff for core and transport, broke other stuff to get it compiling
 2012-08-13 01:09:45 +02:00
Krapht
d8b4f0d552 removed imports of NetworkMod, changed getCollidingBoundingBoxes to addCollidingBlockToList 2012-08-11 23:36:38 +02:00
Krapht
f7c5262c09 Forgeified texturebinding for pipeitems, changed getBoundingBoxFromPool to getBoundingBox, fixed Block.getHardness calls 2012-08-11 23:30:22 +02:00
Krapht
175ba6f1e5 updated package path for ISpawnHandler 2012-08-11 22:42:06 +02:00
Krapht
d4397d4894 changed onBlockPlaced to updateBlockMetadata 2012-08-11 22:35:55 +02:00
Krapht
47dcb242f9 replaced onBlockRemoval with breakBlock 2012-08-11 22:14:02 +02:00
Krapht
987bfde84d replaced blockActivated with onBlockActivated 2012-08-11 21:56:42 +02:00
Krapht
77e694b5c8 Replaced getBlockEntity with createNewTileEntity 2012-08-11 21:39:32 +02:00
Krapht
0c81e0e9d7 Changed all implementations of addCreativeItems to use getSubItems 2012-08-11 18:49:26 +02:00
Krapht
c1f189f931 Removed ITextureProvider implementations 2012-08-11 18:34:09 +02:00
Krapht
600849413f Added missing import of ISpecialInventory 2012-08-11 18:27:24 +02:00
Krapht
970045b231 Added converter to forge Orientation in Orientations and made adjustments for ISidedInventory 2012-08-11 18:25:41 +02:00
Krapht
60cb683d27 renamed addSlot to addSlotToContainer 2012-08-11 18:20:21 +02:00
Krapht
b22facb873 Removed invalid import of ITextureProvider 2012-08-11 18:18:50 +02:00
Krapht
62a5cb1bb4 Updated imports with new forge package locations 
Realigned old Vec3d class to new name Vec3
 2012-08-11 17:38:39 +02:00
SirSengir
518b33252c Merge pull request #162 from CovertJaguar/patch-1 
Pipes should not connect to zero size inventories
 2012-08-09 22:35:41 -07:00
CovertJaguar
bff14c9134 Some convenience and safety changes. 2012-08-09 21:37:52 -07:00
CovertJaguar
f741f74e08 Added simple lookup function to LiquidDictionary 2012-08-09 21:25:41 -07:00
CovertJaguar
e20a72c200 Pipes should not connect to zero size inventories 2012-08-09 13:09:43 -07:00
Krapht
59da220fb1 Added proper names for facades 2012-08-06 23:12:02 +02:00
CovertJaguar
ea11bb3e02 Added error checking to liquid registration. 2012-08-05 19:41:18 -07:00
SirSengir
686bde08b3 Removed APIProxy.java, merged functionality into CoreProxy.java. 2012-08-04 12:37:55 +02:00
SirSengir
4e30d97f63 Added additional constructor for liquids/LiquidData.java. 2012-08-03 17:21:26 +02:00
Krapht
8187f94ac5 Prefixed unknown pipe message with [BuidCraft] and removed Added to generic inventory println 2012-08-03 00:38:10 +02:00
Krapht
e79f6bc2ae Added the key to error message 2012-08-03 00:22:51 +02:00
CovertJaguar
22c4ad532b Added Javadocs 2012-08-02 06:01:53 -07:00
CovertJaguar
fa2d488bc5 Added a way for mods to share liquids 2012-08-01 15:15:49 -07:00
Chicken Bones
f07937dae3 Added compatibility NBTLoad in TileTank for transitioning from old worlds. 2012-07-31 08:33:06 +10:00
CovertJaguar
cafad5eef5 I suppose capacity should scale too. 2012-07-30 14:19:54 -07:00
CovertJaguar
aaa35f0c5e TileTank.getTanks() now returns a composite tank 
This should fix tank triggers not working on BlockTank.
 2012-07-30 14:15:38 -07:00
CovertJaguar
7e9f61eeb2 Fixed NPE in Tank Triggers 2012-07-30 12:12:39 -07:00
CovertJaguar
94bb9bf0e8 Fixed potential NPE in TileTank 2012-07-29 05:01:43 -07:00
CovertJaguar
093d5229e2 Refactored TileTank and fixed NPE in Pipes 2012-07-28 10:50:13 -07:00
CovertJaguar
3ab29dcfad Added pipe paramter to extraction handler 2012-07-27 16:30:16 -07:00
CovertJaguar
f56a166afa Added missing file. 2012-07-27 14:19:22 -07:00
CovertJaguar
7bba02643e Reworked Extraction Exclusion hooks for API 2012-07-27 14:16:34 -07:00
SirSengir
0122ef17db Renamed steam engine to stirling engine to better fit its actual mechanic. 2012-07-27 14:28:07 +02:00
CovertJaguar
c98cd10e73 Added additional constructor for LiquidTank 2012-07-27 01:22:15 -07:00
SirSengir
f4d5abafbd Unlinking PipeManager.java from BC core. 2012-07-27 09:49:16 +02:00
CovertJaguar
5a167f8a80 Removed unused imports from BuilcraftAPI 2012-07-27 00:23:29 -07:00
SirSengir
69d3a4bd4f Implemented IBlockExtractable.java. Should close #108 2012-07-26 22:47:49 +02:00
SirSengir
f6531234e0 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-07-26 19:53:23 +02:00
SirSengir
bbc921ccdf Moved BptBlockUtils.java. Closes #134. 2012-07-26 19:52:27 +02:00
SirSengir
5402464c8d Merge pull request #132 from CovertJaguar/patch-5 
Added Iron Eng support for container.amount != 1000
 2012-07-26 10:31:12 -07:00
CovertJaguar
c927854092 Might fix issue #3 2012-07-26 10:06:28 -07:00
CovertJaguar
fed2e59254 Added support for non-standard liquid containers 2012-07-26 09:51:20 -07:00
ZeldoKavira
c8b971b0db Fixed issue 60 
Made the quarry reinitialize when you whack it with a wrench #45
 2012-07-26 06:49:12 -04:00
Krapht
1f29062a78 Now render the correct texture for sub-mod pipes 2012-07-25 20:22:02 +02:00
ZeldoKavira
7fc41d8d29 Fix import bug from refactoring 2012-07-25 13:32:54 -04:00
ZeldoKavira
879a268f40 Merge remote-tracking branch 'SenGir/master' 2012-07-25 12:21:18 -04:00
ZeldoKavira
739ef3e450 Iron Engine Fix, removed the iron engine explosion options 2012-07-25 12:07:09 -04:00
SirSengir
ef603b0d42 Fixed namespace. 2012-07-25 12:45:15 +02:00
SirSengir
6589f16ea9 Moved common API to seperate subpackage. 2012-07-25 12:17:22 +02:00
SirSengir
0fe5c6a31e Moved blueprint related API to seperate subpackage. 2012-07-25 12:06:15 +02:00
SirSengir
4194aacfad Moved transport related API into own subpackage. 2012-07-25 12:00:15 +02:00
SirSengir
fbdefd5d5d Merge branch 'master' of github.com:SirSengir/BuildCraft 
Conflicts:
	common/net/minecraft/src/buildcraft/factory/BlockFrame.java
	common/net/minecraft/src/buildcraft/factory/BlockPlainPipe.java
	common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java
	common/net/minecraft/src/buildcraft/transport/PipeTransportPower.java
	common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsWood.java
 2012-07-25 11:54:43 +02:00
ZeldoKavira
1ca0d48e31 PipeLoss config option and rare quarry NPE fix 2012-07-25 01:57:15 -04:00
Krapht
beca597140 Added saving of facades to NBT 2012-07-25 00:36:12 +02:00
Krapht
b6dcb9749f Added netsync for liquids 2012-07-24 23:53:57 +02:00
Krapht
414b6e5aa4 Merge branch 'master' of github.com:SirSengir/BuildCraft into FacadesRefactor 2012-07-24 21:36:37 +02:00
SirSengir
ed1c5590f6 Renamed and moved ILegacyPipeConnection.java out of API. 2012-07-24 12:19:04 +02:00
SirSengir
d3b7045810 Move TileNetworkData.java from API to core. 2012-07-24 12:13:19 +02:00
SirSengir
2184f902f1 Removed obsolete imports. 2012-07-24 12:11:23 +02:00
SirSengir
81b5004112 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-07-24 12:09:49 +02:00
SirSengir
6562aa1810 Removed obsolete API functions and classes. 2012-07-24 12:07:47 +02:00
SirSengir
5662915ecb Merge pull request #120 from bartbes/WoodenPipeNPE 
Fix NullPointerException on wooden pipes when the inventory is empty / also closes #117
 2012-07-23 08:01:06 -07:00
Bart van Strien
60c13e0f70 Fix NullPointerException on wooden pipes when the inventory is empty 2012-07-23 16:57:15 +02:00
Kyprus
c73f10752e Fixed missing import. 2012-07-22 20:39:40 -04:00
Krapht
906df0a278 Merge branch 'master' into FacadesRefactor 
Conflicts:
	common/net/minecraft/src/buildcraft/transport/Pipe.java
	common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java
	common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java
	common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java
	common/net/minecraft/src/buildcraft/transport/TriggerPipeContents.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsObsidian.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsStripes.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsWood.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsSandstone.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsVoid.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsWood.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipePowerWood.java
 2012-07-22 13:14:25 +02:00
Bart
cdc429872a Added Work scheduled and Work done triggers to Assembly Table. 2012-07-22 14:02:53 +03:00
SirSengir
b50c4de239 Merge branch 'LiquidPipeRewrite' of github.com:SirSengir/BuildCraft into LiquidPipeRewrite 2012-07-22 09:43:58 +02:00
SirSengir
c6c6a0c9cb Merge branch 'master' into LiquidPipeRewrite 2012-07-22 09:43:03 +02:00
Krapht
40d96a1602 Added saving, liquid wooden pipes no longer allow liquid to go back into the tank, fixed so it works with iron liquid pipe 2012-07-21 23:55:45 +02:00
SirSengir
d6fa02ad35 Added interface for pipettes. 2012-07-21 19:56:31 +02:00
Krapht
500aab5925 Merge branch 'master' of github.com:SirSengir/BuildCraft into LiquidPipeRewrite 2012-07-21 13:18:49 +02:00
SirSengir
b4c529382f Added setter for capacity of ILIquidTanks. 2012-07-21 12:57:16 +02:00
Krapht
e1665f504b Merge branch 'master' of github.com:SirSengir/BuildCraft into LiquidPipeRewrite 2012-07-21 12:32:37 +02:00
SirSengir
53b3ec5dc0 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-07-21 10:56:33 +02:00
SirSengir
5bd849d60f Engines use float for energy now. 2012-07-21 10:55:40 +02:00
Krapht
c353aad072 Merge branch 'master' into LiquidPipeRewrite 
Conflicts:
	common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java
	common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java
	common/net/minecraft/src/buildcraft/transport/TriggerPipeContents.java
 2012-07-21 02:12:00 +02:00
Krapht
3a4f867b34 Fixed the averaging to not overwrite the actual liquids 2012-07-21 01:57:19 +02:00
Krapht
e785c910fd Added hooks for validate, invalidate and onChunkUnload 2012-07-21 01:20:07 +02:00
Krapht
888fdb459a Added renderer support for liquid meta, added liquid avarages to smooth liquid rendering, extracted some methods 2012-07-21 01:12:53 +02:00
SirSengir
81b58867a5 Fixed lava not being accepted as combustion engine fuel. 2012-07-21 00:00:01 +02:00
SirSengir
910fee26a7 Added coolant for combustion engines to API. 2012-07-20 23:43:27 +02:00
Krapht
589f6ad4de Added bouncing and cleaned up code 2012-07-20 21:08:27 +02:00
SirSengir
b318fc818e Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-07-20 20:26:53 +02:00
SirSengir
556b5da7ff Changed overlooked hardcoded types to use interfaces. 2012-07-20 20:26:20 +02:00
SirSengir
9931e31b41 Merge pull request #112 from CovertJaguar/patch-4 
Fixed potential liquid duplication bug when filling containers.
 2012-07-20 11:14:52 -07:00
SirSengir
52c807b8fd Refactored action and trigger API to use interfaces. 2012-07-20 20:13:05 +02:00
Krapht
2045547ff0 Repaired liquid triggers 2012-07-20 20:06:53 +02:00
CovertJaguar
6f3f3544f7 Fixed potential liquid duplication bug when filling containers with capacity greater than a bucket. 2012-07-20 10:58:52 -07:00
Krapht
77529c04b2 Center drains equally from all inputs 2012-07-20 19:38:27 +02:00
Krapht
63a496062f Removed stackTagCompound from liquidstacks, it doesn't play nice with liquidpipes 2012-07-20 19:37:30 +02:00
Krapht
5db9fb2e72 Merge branch 'master' into LiquidPipeRewrite 
Conflicts:
	common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java
 2012-07-20 18:48:32 +02:00
SirSengir
372d090a67 Fixed addition to generic inventories. 2012-07-20 16:02:04 +02:00
SirSengir
22d7a716fe Replaced old ISpecialInventory in transport. 2012-07-20 09:19:46 +02:00
Krapht
0b38427203 Started rewrite of liquid pipes for the new liquid API, will only connect to TEs that implement the new one. 
Missing: center pipesection pulling fairly from multiple inputs, bounceback timeout when target tile haven't accepted liquid in a while.
Other: Netsync, NBT save, code cleanup, triggers,
 2012-07-20 02:04:36 +02:00
SirSengir
4efd07332a Refactored everything outside of .transport to use ITankContainer and new ISpecialInventory. 2012-07-19 21:24:56 +02:00
SirSengir
be7bb5d31b More work on inventory interfaces. 2012-07-19 14:18:43 +02:00
SirSengir
d6f5adac9e Added new inventory interfaces. (Not functional yet!) 2012-07-18 23:03:50 +02:00
Krapht
4f88ded2f7 Fixed the changed location of AssemblyTable recipes 2012-07-18 19:41:58 +02:00
SirSengir
4d93993797 Fixed PneumaticPowerFramework.java 2012-07-18 17:42:54 +02:00
Krapht
618e04a910 Merge branch 'master' into FacadesRefactor 2012-07-18 17:40:22 +02:00
SirSengir
a617ef9ef9 Moved power framework API to new format. 2012-07-18 17:17:10 +02:00
SirSengir
4078a8367c Refactored LiquidTank to be an interface, added fill and drain functions. 2012-07-18 13:42:51 +02:00
Krapht
ef3f12d333 Fixed display power sync, liquid sync still broken 2012-07-18 02:26:34 +02:00
SirSengir
6ac8ec1db6 Moved assembly table recipes to API. 2012-07-17 22:40:36 +02:00
SirSengir
8bf5f2b703 Added function to set liquid on LiquidTank.java 2012-07-17 21:28:56 +02:00
SirSengir
305947fe66 Converted refinery, tank and pump to use ITankContainer. 2012-07-17 18:21:11 +02:00
SirSengir
45a4c299dd Completing new API for liquids. 2012-07-17 17:49:05 +02:00
Krapht
24e342abbc Adds sync to renderstate (works in SMP), however, pipe-content sync is now broken, as are any gate interfaces for gates that you have not placed yourself. Also fixes autarchic gates being converted to non-autarchic gates. 2012-07-17 00:12:15 +02:00
Krapht
68a911f36a Fixed hardcoded texturefile 2012-07-16 17:48:06 +02:00
Krapht
6138cd3811 Merge branch 'FacadesRefactor' of github.com:SirSengir/BuildCraft into FacadesRefactor 2012-07-16 01:26:01 +02:00
Krapht
5c450bf0cf Massive change to Pipe baseclasses which will require substantial refactorings of submods, minor refactorings and general dogfooding 2012-07-16 01:23:19 +02:00
Krapht
cd4dfad71b Add refresh renderstate to Wood and Iron logic for input/output direction switching 2012-07-16 00:59:14 +02:00
SirSengir
2f33943438 Tank liquids drop down into empty tanks below. 2012-07-15 23:00:35 +02:00
SirSengir
53cc613c9f Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-07-15 22:24:51 +02:00
SirSengir
45a4449c1c Fixed incorrect bucket registrations, liquid container handling. Closes #105 2012-07-15 22:23:40 +02:00
Kyprus
eb5fb522e1 Fixed assembly table lasers not showing up in SSP. 
Closes #89
 2012-07-15 14:55:06 -04:00
Krapht
f112d90363 Pipes now drop the Facades when destroyed 2012-07-15 02:09:52 +02:00
Krapht
9840c0e406 Moved facade adding to onItemUseFirst() in order to be able to add them to pipes with gates 2012-07-15 01:37:50 +02:00
Krapht
ebe9e3a020 Shift clicking a facade with facade equipped will now remove the facade from the pipe 2012-07-15 01:32:00 +02:00
SirSengir
8b8471fca2 Fixed infinite fuel production. 2012-07-14 18:04:30 +02:00
SirSengir
760dcf1d17 Cleaned up code. 2012-07-14 17:12:52 +02:00
SirSengir
8653702e84 Steam engines accept vanilla fuels again. 2012-07-14 17:06:00 +02:00
SirSengir
6566cae096 Merge pull request #99 from CovertJaguar/patch-2 
Added putting liquid in the tank from non-standard capacity containers.
 2012-07-14 07:54:31 -07:00
SirSengir
503e1242c5 Merge pull request #98 from CovertJaguar/patch-1 
Added support for non-standard capacity liquid container filling.
 2012-07-14 16:47:47 +02:00
CovertJaguar
74d4be1b11 Fixed liquid id. 2012-07-14 07:37:31 -07:00
CovertJaguar
18ba26eff2 Added ability to put liquid in the tank from non-standard capacity containers. 2012-07-14 07:33:54 -07:00
CovertJaguar
5e5c3dba08 Added support for non-standard capacity liquid container filling. 2012-07-14 06:11:40 -07:00
SirSengir
639aceb5d9 Fixed refinery recipes not working. Closes #95. 2012-07-14 14:32:12 +02:00
SirSengir
90cc4999d4 Stopping gates from updating client side. 2012-07-14 11:25:17 +02:00
Krapht
f6e9377bc5 Do not render the structure support pipe if the pipe is connected in that direction, Added AssemblyTable recipes for all facades, Made using facades decrese the stacksize, Made replacing a facade pop off the previous one, 2012-07-14 00:40:16 +02:00
Krapht
1df6245237 Implemented facades. 
Still to do:
Proper names
Hollow facades
Bounding boxes
Crafing recipe (assembly table?)
Look into multiple bounding boxes for pipes to be able to access stuff through the gaps
 2012-07-13 21:55:26 +02:00
Krapht
8365d1ca35 Rewrote pipe world renderer to render from a state object instead of containing logic to calculate what to render. This state object can then be synced to the client to completely overwrite the client's view of the world 2012-07-13 21:55:25 +02:00
Krapht
19c4de5a1c Refactoring of PipeWorldRenderer and initial commit of PipeRenderState 2012-07-13 21:55:25 +02:00
Krapht
eec4aa0323 Pulled the pipe world renderer out of core and put it in transport, also made the actual rendering a class of its own. Legacy world rendering not touched (quarry frames) 2012-07-13 21:55:25 +02:00
SirSengir
604fa62374 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-07-12 14:33:59 +02:00
SirSengir
7f3163636f Refactored API for combustion engine fuels and refinery. 2012-07-12 14:33:22 +02:00
SirSengir
c632f79150 Cleaned up liquids/LiquidStack.java 2012-07-12 13:11:59 +02:00
SirSengir
486cc38229 Merge pull request #91 from AartBluestoke/master 
fixes issue 66
 2012-07-12 03:19:28 -07:00
AartBluestoke
89c69427db fixes issue 66, by using a temporary PRNG until the next full packet update comes through 2012-07-12 10:26:51 +10:00
psxlover
2cdbf7494d Refactored Localization.java to support addon localizations. 2012-07-12 03:19:33 +03:00
psxlover
c3dc022880 Fixed an NPE when a power pipe tries to give power to a ghost pipe. 
This has been bugging me a long time, but since the old svn is gone I don't know what change caused it (it's not happening in 3.1.5).
It may not be the best approach but it prevents mc from crashing.
 2012-07-12 00:22:19 +03:00
psxlover
610be32388 Discovered more NPEs related to LiquidManager so I took a new approach. 2012-07-12 00:16:52 +03:00
psxlover
edf5e8eb32 Null pointer exception when starting a server. 2012-07-12 00:04:05 +03:00
SirSengir
e24e663fbd Redirected old liquid api references. 2012-07-11 19:20:37 +02:00
SirSengir
d3d4473d82 Fixed last commit. 2012-07-11 19:15:45 +02:00
SirSengir
57760812bd Merge pull request #86 from CovertJaguar/master 
Added filling of generic liquid containers to the Tank
 2012-07-11 10:13:09 -07:00
SirSengir
1098c2ef72 Moved item inventory into Engine object. 2012-07-11 19:09:17 +02:00
CovertJaguar
785c51660f Added filling of generic containers to Tank 2012-07-11 03:37:24 -07:00
SirSengir
792f2bff5f Started refactor of liquid handling. 2012-07-10 19:35:43 +02:00
CovertJaguar
ace10b05f4 Changed fill code to safer BuildcraftAPI.fillLiquidContainer() 2012-07-10 03:07:56 -07:00
CovertJaguar
2f0f8d9081 Added Liquid fill function. 2012-07-10 03:05:30 -07:00
SirSengir
6956322fd8 Merge pull request #79 from mistaqur/master 
Compatibility fix to pipes with custom connection logic
 2012-07-09 06:56:41 -07:00
Chicken Bones
9755eadfb0 Patches so that pumps and pipes can be moved by frames properly, other buildcraft tiles not tested 2012-07-09 23:41:27 +10:00
mistaqur
692d0ff6d5 Compatibility fix to pipes with custom connection logic (e.g. pipes from Additional Buildcraft Objects) 2012-07-07 07:04:20 +04:00
SirSengir
7fbe8623ac Diamond pipes now handle metadata when updating. Removed IInventory from TileGenericPipe. 2012-07-06 14:53:15 +02:00
SirSengir
51303806e3 Merge pull request #78 from rhilenova/issue_68 
Issue 68: Stripping a gate will not clear the pipe of any active actions
 2012-07-06 02:47:11 -07:00
rhilenova
16e33933c0 Reset all gate parameters when gate is stripped from pipe. This includes triggers, trigger parameters, actions, redstone, and pipe wires. 2012-07-05 21:30:41 -04:00
Krapht
85316e16f3 Check that we have a quarry arm before trying to tell it what to do 2012-07-05 18:27:46 +02:00
Krapht
cadd088f0b Fix NPE when worldObj is null while reading NBT 2012-07-05 17:36:41 +02:00
Maeyanie
7f642772ed Add config option to support Fillers destroying blocks instead of breaking them. 
Prevents Fillers from being (ab)used as cheap Quarries.
 2012-07-04 21:47:52 -04:00
Krapht
0ae552395e Invalidating a TE should not cause the pipe to drop 2012-07-01 16:36:16 +02:00
Krapht
1befa02ad5 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-07-01 15:11:22 +02:00
Kyprus
92e7fe2d24 Fixed quarry not being removed properly. 
Fixes #71
 2012-07-01 08:58:17 -04:00
Kyprus
e3c38609ed Fixed an NPE the can happen when using a builder with path markers. 2012-06-29 18:20:03 -04:00
Kyprus
f135d09d03 Fixed robot not moving. 2012-06-29 17:56:33 -04:00
Krapht
744ef7a25b Fix NPE on world load when tileBuffer is not yet fully initialized 2012-06-29 16:10:07 +02:00
Krapht
21d5ae99c8 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-06-29 01:00:00 +02:00
Krapht
1d4b8b9279 Added shapeless reversal recipes for all gates AND <-> OR at the cost of a redstone circuit 2012-06-29 00:59:20 +02:00
SirSengir
3a162283bc Decreased amount of network updates required for engines significantly. 2012-06-28 23:08:00 +02:00
Krapht
abe7ef1b6a Added Sandstone pipe and waterproof pipe 2012-06-28 17:25:09 +02:00
Krapht
343f2b277b Added void pipes for items and liquids 2012-06-28 16:26:50 +02:00
Kyprus
afdf4d2ddf Removed a couple debug messages 2012-06-27 17:11:27 -04:00
Kyprus
03fcd8fabc Refactor of TileQuarry to fix the robot and laser in SMP. 2012-06-26 12:48:48 -04:00
Kyprus
d32f719cb6 Reverted accidental change and updated the build script. 2012-06-23 10:37:15 -04:00
Kyprus
783d0f8c1c Removed the devel files. 2012-06-23 10:31:42 -04:00
Kyprus
d1c686b6c3 Fixed the assembly table laser in SMP. 2012-06-23 10:06:43 -04:00
Kyprus
5d6031a8b1 Forgot a file. 2012-06-23 09:46:22 -04:00
Kyprus
c6574d77b6 Fixed assembly table not dropping items Fixes #63 2012-06-19 21:21:41 -04:00
Kyprus
e193bdbf46 A little enitty code cleanup. 2012-06-19 21:13:33 -04:00
Kyprus
a22568790a Merge pull request #58 from psxlover/CleanHead 
Small enchancements
 2012-06-15 10:41:54 -07:00
psxlover
0224e57357 Display an error message in the console when a ghost pipe is detected instead of printing the StackTrace. 2012-06-15 20:34:43 +03:00
psxlover
6ab4ad9044 Prevent addon pipes from becoming permanent ghosts. Now when the addon is used again the pipes should at least display again. 2012-06-15 20:31:57 +03:00
Kyprus
085737117b Couple small tweaks to TileGenericPipe 2012-06-15 13:27:45 -04:00
Kyprus
7150cbb30f Fixs for the PersistentWorld removal. Thanks psx 2012-06-15 13:10:51 -04:00
Kyprus
f1b9e30d88 Removed PersistentWorld/Tile +LegacyBlock support. 2012-06-15 12:23:08 -04:00
psxlover
6540aed3f9 Removed WorldIterator.java and WorldIteratorRadius.java since they are no longer used anywhere else. 
Also small change and cleanup
 2012-06-14 22:04:29 +03:00
psxlover
90905e38b3 Optimized Path Markers. Connecting should be instant and doesn't iterate all the blocks around the marker like before. 
Now increasing the max range between the path markers wont increase the load of the cpu and the time to connect.
 2012-06-14 21:53:40 +03:00
psxlover
422e1b048e Corrected a bug where the pathMarkers didn't save properly, that sometimes (depending on the order they were loaded) resulted in "lost" connections after a world load. 2012-06-14 19:31:41 +03:00
Kyprus
cd39bcf4b1 Fixed a couple texture paths. 2012-06-11 13:22:42 -04:00
Kyprus
8eb78d0e29 Fixed laser texture and jumping TileLaser. 2012-06-11 10:19:42 -04:00
Kyprus
d9a34f0ab1 Merge branch 'EntityRefactor' 
Conflicts:
	buildcraft_client/net/minecraft/src/buildcraft/core/RenderLaser.java
	common/net/minecraft/src/BuildCraftCore.java
	common/net/minecraft/src/buildcraft/builders/TileBuilder.java
	common/net/minecraft/src/buildcraft/builders/TilePathMarker.java
	common/net/minecraft/src/buildcraft/core/EntityEnergyLaser.java
	common/net/minecraft/src/buildcraft/core/EntityLaser.java
	common/net/minecraft/src/buildcraft/core/EntityRobot.java
	common/net/minecraft/src/buildcraft/factory/EntityMechanicalArm.java
	common/net/minecraft/src/buildcraft/factory/TileQuarry.java
	common/net/minecraft/src/buildcraft/silicon/TileLaser.java
 2012-06-10 19:19:34 -04:00
Kyprus
41cfa93e76 Lasers showing in SMP. 2012-06-10 19:08:16 -04:00
Krapht
31682c4c7b Fix texture paths 2012-06-10 21:32:35 +02:00
Kyprus
b872485663 Removed a couple debug messages. 2012-06-10 15:16:04 -04:00
Krapht
8d32860b3a Fix frame decay. Closes #23 
Destroys TE when block is destroyed
 2012-06-10 02:57:21 +02:00
Krapht
054c8ed792 Organize imports 2012-06-09 13:41:28 +02:00
SirSengir
e1de3ecd1a Moved resources to seperate directory. 
Fixed a NPE in assembly table on SSP.
 2012-06-08 11:49:14 +02:00
SirSengir
c420b80716 Fixed incorrect inheritance. 2012-06-08 10:59:48 +02:00
Kyprus
e78fcf297c Code cleanup attempt #2 2012-06-07 20:17:08 -04:00
SirSengir
76ea5f4b91 Added mcmod.info for FML. 
Small refactoring.
 2012-06-08 00:58:25 +02:00
Kyprus
59ee83677b Fixing conflict resolutions derps. 2012-06-07 18:54:28 -04:00
Kyprus
e984ac27a0 Work on the laser in SMP. 2012-06-07 18:51:16 -04:00
Kyprus
1c2c729c36 Fix for multiple quarry arms. 2012-06-07 18:26:16 -04:00
Kyprus
65895a1cfc More entity refactoring 2012-06-07 18:24:37 -04:00
Krapht
f4409810d6 Hopper: 
Now pushes topleft stack instead of bottom one
Does not manipulate client inventory in SMP
Code cleanup
Closes #47
 2012-06-06 13:17:33 +02:00
Landrash
16cd3a7942 Added translation for new gui items. Corrected gramar and spelling. 2012-06-05 16:36:10 +02:00
Landrash
707cd3eb9f Updated translation and corrected gramatic errors. 2012-06-05 16:27:40 +02:00
SirSengir
d474612978 Code cleanup. 2012-06-04 22:48:18 +02:00
SirSengir
15d239a6a9 Hopper now drops inventory contents when broken. Closes #46 2012-06-04 22:45:16 +02:00
SirSengir
90f3466960 Fixed issues when picking up engines of different types. Closes #42 2012-06-04 22:30:23 +02:00
SirSengir
175703ddf2 Added Forestry-style energy ledger to engines. 2012-06-03 13:41:41 +02:00
SirSengir
6f8d594197 Pipe wires are synched on first connect of client. Wire signal synching is still missing. 2012-06-03 11:48:15 +02:00
CovertJaguar
294a3a5008 Should fix black laser beams. 2012-05-31 04:56:34 -07:00
Krapht
5940f6026d Pickup items after digging 
Increase pickup range
 2012-05-31 00:40:28 +02:00
Kyprus
b3afe87210 Bumped the range on sending packets to 128. 2012-05-30 14:06:28 -04:00
Kyprus
5022848678 Fixed quarry NPE and lasers not showing 
For #20
 2012-05-30 10:42:37 -04:00
SirSengir
9077e9dedf Improved diamond pipe client synch. 2012-05-30 12:27:30 +02:00
Kyprus
f4a018c286 Made the robot build again. 
Build still needs a rewrite.
 2012-05-30 01:56:39 -04:00
Kyprus
9dc2c768fa Starting refactor of the robot and laser entites. 
For issue #20
 2012-05-30 01:50:44 -04:00
Krapht
44973bc2b1 Fix gate sync to server 
Fix gate values to client
 2012-05-28 02:39:39 +02:00
Kyprus
73506ba153 Revert "Merge branch 'TransportSecure'" 
This reverts commit a6872c5053, reversing
changes made to ff20f682fc.
 2012-05-27 15:53:52 -04:00
SirSengir
999d26eb23 Fixed previous commit. 2012-05-27 11:29:37 +02:00
SirSengir
a6872c5053 Merge branch 'TransportSecure' 2012-05-27 11:20:17 +02:00
SirSengir
ff20f682fc Suppress pipe stripping client side. 2012-05-27 11:19:11 +02:00
psxlover
50a4fa1ea0 A exception that was already being caught. 2012-05-27 09:58:35 +02:00
psxlover
37cac720e6 Fixed filler respawning striped tape after it gets destroyed. 2012-05-27 09:56:32 +02:00
psxlover
6ccc3c9e36 Removed some compilation warnings. 2012-05-27 09:56:32 +02:00
psxlover
7836986f04 Fix a localization issue. 2012-05-27 09:56:31 +02:00
psxlover
82fd2f651b NPE in Refinery GUI 
https://github.com/SirSengir/BuildCraft/issues/10
 2012-05-27 09:56:31 +02:00
Krapht
7e00bd6a7f Add NPE protection 2012-05-27 09:54:45 +02:00
SirSengir
64b9fdd460 Fixed compile error. 2012-05-27 09:45:02 +02:00
psxlover
f445024282 A exception that was already being caught. 2012-05-27 01:56:33 +03:00
psxlover
eb44f8fab1 Fixed filler respawning striped tape after it gets destroyed. 2012-05-27 01:36:01 +03:00
psxlover
e5e1ec40ee Removed some compilation warnings. 2012-05-26 22:44:51 +03:00
psxlover
f1cfcaaae6 Fix a localization issue. 2012-05-26 22:42:40 +03:00
psxlover
031035bd7d NPE in Refinery GUI 
https://github.com/SirSengir/BuildCraft/issues/10
 2012-05-26 20:54:03 +03:00
Krapht
4d3851ca28 Add NPE protection 2012-05-26 17:49:26 +02:00
SirSengir
9d30299a91 Fixed tile assembly table on SMP. 2012-05-26 15:40:32 +02:00
SirSengir
1162025f98 Merge branch 'master' into TransportSecure 
Conflicts:
	common/net/minecraft/src/buildcraft/transport/PipeTransportItems.java
 2012-05-26 15:32:12 +02:00
SirSengir
fac800c8d2 Fixed tile assembly table on SMP. 2012-05-26 15:25:42 +02:00
Krapht
1916435724 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-05-26 02:15:19 +02:00
Krapht
1ab3c3e2d5 Added recipe for the Hopper 2012-05-26 02:14:36 +02:00
mistaqur
08683fd7dd Fixed several localization issues. 2012-05-22 01:31:30 +04:00
SirSengir
9422a33f41 Update common/lang/buildcraft/sv_SE.properties 2012-05-21 10:37:39 +03:00
Landrash
50d6d57006 Swedish translation of buildcraft 2012-05-20 22:38:52 +02:00
SirSengir
3c17b73551 Merge pull request #6 from psxlover/Fixes 
SendToPlayers only on specified world instead of all worlds.
 2012-05-20 07:33:16 -07:00
SirSengir
a6c357cb23 Added secure wooden pipe. 2012-05-20 16:27:53 +02:00
SirSengir
e3ce7e9063 Merge branch 'master' into TransportSecure 2012-05-20 15:52:56 +02:00
SirSengir
cd6cd174cc Update to de_DE localization. 2012-05-20 15:51:37 +02:00
psxlover
6ea0d5979a Fixed weird bug where sendtoplayers would send to the players on all worlds instead of only the one where the block calling sendtoplayer is. 2012-05-20 14:34:23 +03:00
SirSengir
4404fc3b16 Updated localization files, added russian localization courtesy of mistaqur. 2012-05-19 23:04:52 +02:00
SirSengir
e0e0b3e55d Updated german translation. 2012-05-19 12:38:45 +02:00
SirSengir
760d6f316c Added localization support to guis. 2012-05-19 12:36:43 +02:00
SirSengir
d4681e4cef Localization support, de_DE localization. 2012-05-19 11:42:36 +02:00
SirSengir
bc1fd20417 Reordered transport inheritance to fix steel pipes. 2012-05-15 20:10:34 +02:00
SirSengir
47a4c58052 More secure logic. 2012-05-14 20:12:24 +02:00
SirSengir
2d1e11fc81 Initial iteration of steel pipe. 2012-05-14 19:07:16 +02:00
SirSengir
73e04b24b1 Pipes track the player that placed them now. 2012-05-14 18:21:23 +02:00
Kyprus
169a8a4805 Fixed the quarry arm in SMP. 2012-05-12 15:25:46 -04:00
SirSengir
ce61cb65dc close[t:1] Stripping a gate will reset triggers on pipe. 2012-05-11 17:09:12 +02:00
SirSengir
82607ee9d2 Initial commit to github. 2012-05-09 22:43:05 +02:00