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

465 commits

Author SHA1 Message Date
SirSengir
3a571db502 Moved network.v2 to network. 2012-09-08 21:21:07 +02:00
JP Sugarbroad
bacc554832 Check for nulls in stacks returned from extractItem. 2012-09-08 09:53:10 -07:00
SirSengir
6576f72cb4 Fixed issue with TransactorSided.java. 2012-09-08 17:58:53 +02:00
SirSengir
2df33ac081 Removed StackUtil.java. 2012-09-08 17:45:04 +02:00
SirSengir
1e40b70649 Removed StackUtil from TileAutoWorkbench.java. 2012-09-08 17:40:38 +02:00
SirSengir
d30717b271 Replaced StackUtil.addToRandomInventory. 2012-09-08 16:20:21 +02:00
SirSengir
5059cd9abe Fixed pipes replacing other blocks in certain instances. 2012-09-08 15:58:30 +02:00
SirSengir
5a6fcf03d2 First attempt at removing StackUtil. 2012-09-08 13:40:05 +02:00
SirSengir
9e7e30bcfc Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-09-08 09:49:09 +02:00
SirSengir
495ee0bd96 Fix for dupe bugs on chests. 2012-09-08 09:42:11 +02:00
JP Sugarbroad
cf28f59ed8 Gold item pipes will accelerate if their gate emits redstone. 2012-09-07 17:16:23 -07:00
SirSengir
ff16f89921 Merge pull request #217 from taralx/master 
Consume power when pulling from ISpecialInventory.
 2012-09-06 01:20:23 -07:00
JP Sugarbroad
0488ff552a Properly update neighbors for redstone signal changes. 2012-09-05 23:17:51 -07:00
JP Sugarbroad
667bad3b92 Consume energy when pulling from ISpecialInventory. Also pull multiple stacks if energy permits. 2012-09-05 22:06:44 -07:00
SirSengir
51b8e73f26 Fixed proxy naming derp. 2012-09-05 22:56:45 +02:00
SirSengir
5a9e195938 Removed unneeded import. 2012-09-05 22:30:37 +02:00
SirSengir
be58eee547 Reorganizing namespaces. 2012-09-05 22:29:38 +02:00
SirSengir
9643f4d52d Fixed subblock adding. 2012-09-05 21:23:34 +02:00
SirSengir
c82220d562 Shuffled some stuff around in creative inventory. 2012-09-04 23:12:37 +02:00
Andrew Hill
12e4b94714 Quary should not use energy when 0 movement would result 
Position is stored in 1/32's so if the movement is less than that, it will take the energy, then not move at all. This means that energy less than about 3.2/tick will never move the quary arm.
 2012-09-04 19:31:52 +10:00
Techjar
95c0d1eacb Better fix for nether oil generation. 2012-09-03 18:50:46 -03:00
Techjar
98441500d9 Oil should only generate in the overworld. 2012-09-03 18:40:51 -03:00
Andrew Hill
7a3bbe8f14 StackUtil.itemsAdded should be >0 when doAdd is false 
all current uses of tryAdding(doAdd:false) which access itemsAdded compare the result to 0.

NOTE: while this does fix the AutoCraftingTable to accept items, it exposes the infinite recursion bug where it recursivly tries to add 1 item, then recurses without changing the stack size. (i'll do a seperate PR for that bug)
 2012-09-03 20:30:29 +10:00
JP Sugarbroad
304e776203 Small fixes 2012-09-02 20:33:10 -07:00
SirSengir
eac30bea26 Fixed broken version. 2012-09-02 20:01:35 +02:00
SirSengir
9d7bc305a8 Merge pull request #147 from Chicken-Bones/master 
Old world tank compatibility.
 2012-09-02 09:18:59 -07:00
SirSengir
a78d325cff Merge pull request #203 from tcooc/patch 
Fix for markers + moved logic to server
 2012-09-02 09:13:47 -07:00
SirSengir
e5a62dd1b5 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-09-01 15:16:30 +02:00
SirSengir
38b11a9221 Removed references to BuildCraftAPI.BUCKET_VOLUME. 2012-09-01 15:15:56 +02:00
tcooc
cb2cfb00ca fix for markers not receiving redstone 2012-08-31 14:48:22 -05:00
SirSengir
e5d1a950eb Merge pull request #200 from AartBluestoke/patch-7 
refineries now check liquid AND volume
 2012-08-31 07:10:59 -07:00
Andrew Hill
e32eef5d1a fixed derp 
should check the stack has enough for the recipe, not the reverse.
 2012-08-31 23:56:27 +10:00
Andrew Hill
167d0d6426 refineries now check liquid AND volume 
refineries which don't check volume end up with strongly negative liquid amounts, but never run out.
 2012-08-31 23:42:03 +10:00
Andrew Hill
ade53fc283 Tanks should sync to the client (set hasUpdate) 
Tanks do not set hasUpdate anywhere, and so never send the client any updates: 
client side tanks don't visually change.
client de-syncs cause buckets to behave wonky (server thinks the bucket you hold is full, client thinks the bucket you hold is empty, you right click an "empty" bucket, and you place the liquid instead.

this patch resolves the first, and mostly resolves the second. it is still possible to get a visually incorrect bucket if you right click a bucket on a client-side-empty,server-side-has-liquid tank. (ie, before a sync occurs)
 2012-08-31 23:25:29 +10:00
SirSengir
ef44692f1f Merge pull request #194 from Tinytimrob/master 
More minor fixes
 2012-08-31 01:27:07 -07:00
CovertJaguar
0073b52075 Added override tag 2012-08-30 02:58:48 -07:00
CovertJaguar
820dd20a09 Removed render distance check 2012-08-30 02:16:54 -07:00
CovertJaguar
c014124a0e Added render distance hook 2012-08-30 02:15:50 -07:00
Tinytimrob
322f305c46 Adding blueprint library and pipe wires to creative inventory 2012-08-29 23:58:42 +00:00
Tinytimrob
f2a9fc5d12 Prevent gates with damage value 0 from being shown in creative inventory twice 2012-08-29 23:30:35 +00:00
Tinytimrob
6ba900d5e3 Added configuration properties for wires, gates and facade 2012-08-29 23:26:57 +00:00
Tinytimrob
9787df588e Fix pick block function returning incorrect item ID when used on pipes 2012-08-29 20:04:51 +00:00
Tinytimrob
bfff6e7a88 Adding some missing items to the creative inventory 2012-08-29 19:41:02 +00:00
Tinytimrob
101d626c47 Added configuration properties for redstoneChipset and pipeWaterproof 2012-08-29 18:48:08 +00:00
CovertJaguar
111694b644 Removed BuildcraftAPI ref from LiquidData 2012-08-28 03:03:18 -07:00
CovertJaguar
3666f4095a update imports 2012-08-28 02:52:06 -07:00
CovertJaguar
85573e46cc Depreciated BUCKET_VOLUME + removed BP init 2012-08-28 02:51:26 -07:00
CovertJaguar
7929afd912 Moved blueprint init 2012-08-28 02:50:00 -07:00
CovertJaguar
cbc8dbb8b4 Added Bucket volume constant to Liquid Man 2012-08-28 02:46:57 -07:00
Christian
a57141bc21 Send packets for liquids and power. also assembly table but that might be wrong? 2012-08-27 22:36:00 -04:00
SirSengir
a4aec7a6c5 Merge pull request #186 from CovertJaguar/patch-6 
Gauge render tweak
 2012-08-27 14:26:17 -07:00
Christian
9bbf92b39a Fix entities on the server side 2012-08-27 14:48:14 -04:00
CovertJaguar
9ac167e7ba Gauge render tweak 2012-08-27 04:56:50 -07:00
Christian
8d05d476f6 Fix up @Instance: it should refer to the mod in a multimod package 2012-08-26 14:41:44 -04:00
SirSengir
2c401220c1 Underped dedicated server. 2012-08-26 20:35:57 +02:00
Krapht
ab119af770 Separate the static travelling item collection between client and server 2012-08-26 12:56:34 +02:00
Krapht
7faf685e42 Fix for renderer to take the filler blocks into account. 2012-08-26 12:55:59 +02:00
SirSengir
17d73a9fdf Removed WorldClient references. 2012-08-25 22:12:51 +02:00
SirSengir
05fe385507 Removed debug stacktrace in quarry arm. 2012-08-25 20:37:30 +02:00
SirSengir
d5fcbdf329 Removed unneeded imports. 2012-08-25 19:29:39 +02:00
Christian
d86472a495 Fix up quarry, also trying to fix other entities to be less 
derpy
 2012-08-25 13:04:35 -04:00
SirSengir
38fe0d4081 Merge branch 'buildcraft131' of github.com:SirSengir/BuildCraft into buildcraft131 2012-08-25 11:49:38 +02:00
Krapht
b649839ba9 Fix facades 2012-08-25 11:48:25 +02:00
SirSengir
d449eea029 Removed unneeded imports. 2012-08-25 10:00:42 +02:00
SirSengir
59c0b8511d Merge remote-tracking branch 'remotes/origin/cpwfixes' into buildcraft131 2012-08-25 09:55:20 +02:00
CovertJaguar
b0c68772e2 Pretty sure this cast shouldn't be here. 2012-08-24 20:19:04 -07:00
Xhamolk
5597599e31 Update common/buildcraft/transport/pipes/PipeItemsWood.java 
I believe setPowerProvider(IPowerProvider) was backwards, as it didn't allow the powerProvider field to be modified.
 2012-08-24 16:35:54 -06:00
Christian
a2d9670fdc Remove mod_ files, clean up client server separation a bit 2012-08-24 13:25:54 -04:00
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