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

714 commits

Author SHA1 Message Date
JP Sugarbroad
2b64be0179 Convert diamond pipes to use the new pipe data sync. 2012-10-13 12:57:12 -07:00
cpw
4c05ccbde9 Merge pull request #350 from Vany/master 
Some people wants miningwell to work with hopper
 2012-10-13 12:26:23 -07:00
Christian
5fe98733e0 Fix assembly table smp derpiness, somewhat. Should close #348 2012-10-13 15:24:57 -04:00
Christian
752a5eb2bd Remove debug 2012-10-13 15:24:43 -04:00
Christian
6299c472bb Revert "Merge pull request #329 from Xhamolk/patch-2" 
This reverts commit 83d2b51931, reversing
changes made to 2cd7857d07.

Conflicts:
	common/buildcraft/transport/Pipe.java
	common/buildcraft/transport/PipeTransportItems.java
 2012-10-13 14:54:54 -04:00
Christian
e89d3525b4 Fix facades working in SMP: the items should now exist both client and dedi server side. closes #338 2012-10-13 13:41:44 -04:00
Christian
ad8b896ef7 Attempt to fix liquid pipe flows. Should close #336 2012-10-13 12:14:07 -04:00
Vany Serezhkin
30bbb8930b Update common/buildcraft/core/utils/Utils.java 
Allow Utils.addToRandomInventory() to work with hopper
 2012-10-13 19:11:09 +04:00
CovertJaguar
1e0e23fe49 Add some null checking to the pipe GUIs 
Fixes #345
 2012-10-12 17:36:08 -07:00
CovertJaguar
d351f6455e Fix NPE if setInvSlotContents() fails. 2012-10-12 17:18:14 -07:00
CovertJaguar
b33f2ef369 Merge pull request #347 from CovertJaguar/master 
Major pipe routing and net sync rework
 2012-10-12 16:15:51 -07:00
CovertJaguar
0c8ac25122 Major pipe routing and net sync rework 2012-10-12 16:05:25 -07:00
JP Sugarbroad
fe8b1d4fa6 Allow pipes to sync data to the client. 2012-10-11 14:37:29 -07:00
CovertJaguar
89b5096d06 Merge pull request #327 from psxlover/master 
Added facade collision
 2012-10-11 14:10:31 -07:00
CovertJaguar
83d2b51931 Merge pull request #329 from Xhamolk/patch-2 
Pipes connecting improperly (fix of my last PR)
 2012-10-11 14:09:21 -07:00
CovertJaguar
2cd7857d07 Merge pull request #335 from Xhamolk/patch-3 
Machines should no longer send items to Sandstone pipes
 2012-10-11 14:08:51 -07:00
RicBr
5b2c2c7fb7 Update common/buildcraft/transport/BlockGenericPipe.java 
Added missing ;
 2012-10-10 19:17:46 +02:00
CovertJaguar
cb65663589 Added missing import 2012-10-09 14:52:15 -07:00
CovertJaguar
e84a42162a Added missing import 2012-10-09 14:51:44 -07:00
CovertJaguar
a39924a5a4 Fixed RP2 wires connecting to normal pipes 2012-10-09 14:45:35 -07:00
CovertJaguar
b2ec6d6ae8 Fixes a crash, experienced while playing. 2012-10-07 14:54:41 -07:00
SirSengir
8dca5e6fda Merge pull request #320 from tcooc/itembpt-fix 
Blueprints sync in SMP
 2012-10-06 23:34:48 -07:00
Xhamolk
db09ffe65f Only route items when pipe is connected. 
Will no longer send items to a pipe that does not allow the connection.
 2012-10-05 10:01:50 -06:00
Andrew Hill
1f6003e722 fix filter shift-click 
The gui should not direct stacks moved by shift-click to the filter
area, just to the inventory area.
 2012-10-05 19:16:44 +10:00
Andrew Hill
7fcc3dcd54 fix for #301 
filler is now sided - top for pattern, all other sides for inventory.
 2012-10-05 17:01:23 +10:00
Xhamolk
342d6fe871 Routing and connection fixes 
2) Items pipes should no longer connect to ISidedInventory sides where getSizeInventorySide <= 0.
This allows third-party modders to prevent pipes connection to their machines without having to depend on BC's IPipeConnection.

3) Improved the routing mechanism for piped items. 
Now it's properly checked if the input is accepted, before trying to send it there.
 2012-10-04 17:16:26 -06:00
Xhamolk
76adffe05c Pipes connecting improperly (fix of my last PR) 
1) Pipes now properly check if IPipeConnection allows the connection.

2) Items pipes should no longer connect to ISideInventory sides where getSizeInventory <= 0.
This allows third-party modders to prevent pipes connection to their machines without having to depend on BC's IPipeConnection.

3) Improved the routing mechanism for piped items. 
Now it's properly checked if the input is accepted, before trying to send it there.

4) Fixes the bug my previous PR generated.
 2012-10-04 17:05:11 -06:00
psxlover
b77cf79b96 Added facade collision 2012-10-04 23:46:52 +03:00
Christian
5885f08fab IronEngines now accept Ice at a 1:1 ratio with water buckets, assuming your engine is hot 2012-10-02 00:09:26 -04:00
Christian
e8571a8e53 Fix up a bunch of "markBlockAsNeedsUpdate" to markBlockNeedsUpdate" and fixed engine to notify neighbours 
This fixes the engine being a bit derpy when being rotated
 2012-10-01 23:56:26 -04:00
Christian
890c4d45e9 Fix addToRandomInventory putting stuff from quarries etc into adjacent 
engines..
 2012-10-01 23:37:17 -04:00
Christian
ba1562b67f Revert broken pipe logic changes. No pipes are connecting anywhere now.. 
Revert "Update common/buildcraft/transport/PipeTransportItems.java"

This reverts commit 07cca7ad05.

Revert "Fixes pipes connecting improperly"

This reverts commit e7bd894e15.
 2012-10-01 23:24:16 -04:00
Christian
2e6c0ea475 Fix chunkloading for quarries. 2012-10-01 22:49:16 -04:00
SirSengir
6802a14545 Merge pull request #318 from psxlover/LaserFix 
Refactored lasers.
 2012-10-01 01:41:59 -07:00
tcooc
6635f23ec6 Blueprints sync in SMP 2012-09-30 22:28:51 -04:00
psxlover
6d5942bc8a Refactored lasers. 
Moved PowerLaser logic from EntityLaser.
 2012-09-30 22:42:09 +03:00
SirSengir
3658f908dd Merge pull request #302 from Xhamolk/patch-1 
Fixes pipes connecting improperly
 2012-09-30 01:15:16 -07:00
Christian
ded3f14ab9 It's 285, not 286 :( 2012-09-25 23:40:11 -04:00
Christian
425f131ded Depend on a known good version of Forge 2012-09-25 23:19:29 -04:00
Christian
bb7da60425 Update to use proper forge chunkloading API 2012-09-25 23:14:21 -04:00
Christian
8da16b8956 Add an example chunkloading capability to the quarry. Also fix some 
naming issues.
 2012-09-25 23:14:21 -04:00
Christian
78dc1708d0 More MCP updates 2012-09-25 23:14:21 -04:00
Christian
61fd692f77 Update to new MCP 2012-09-25 23:13:36 -04:00
Xhamolk
07cca7ad05 Update common/buildcraft/transport/PipeTransportItems.java 2012-09-22 12:23:42 -06:00
Xhamolk
e7bd894e15 Fixes pipes connecting improperly 
Pipes now check if IPipeConnection allows the connection.
 2012-09-22 12:15:48 -06:00
davboecki
3518db7093 Fix ItemStack merging of ItemStacks with different NBTTagCompount information. 2012-09-20 00:41:16 +02:00
psxlover
4e13b09177 Missing import from pr #283. 2012-09-19 04:29:21 +03:00
CovertJaguar
625fb692b4 Merge pull request #291 from Flow86/patch-npe 
fix NPE if pipe does not exist (null pipe)
 2012-09-18 17:01:33 -07:00
CovertJaguar
c4633a4225 Merge pull request #293 from Xfel/master 
Fixed pipe connections with tile entities whose blocks don't extend BlockContainer
 2012-09-18 16:51:36 -07:00
CovertJaguar
f7d0b80093 Merge pull request #285 from Kubuxu/buckets 
Creative buckets behavior and template and blueprint in creative inventory
 2012-09-18 15:48:34 -07:00
Xfel
09d522be58 Fixed Pipes not connecting to tile entities whose blocks don't extend BlockContainer 2012-09-18 21:38:56 +03:00
FloSoft
788b449ad3 fix NPE if pipe does not exist (null pipe) 2012-09-18 18:42:48 +02:00
psxlover
1472cdd558 One (hopefully) last bug on path markers 2012-09-18 14:58:56 +03:00
psxlover
b4e3277f8b Proper fix for clearing the path markers list, and fix for connecting to path markers on a different world. 2012-09-18 14:25:52 +03:00
Kubuxu
123aba184c Makes buckets behavior like in creative mode 2012-09-16 16:24:13 +03:00
Kubuxu
4cb363db13 makes buckets unused while player creative mode 2012-09-16 15:40:41 +03:00
Kubuxu
8d4b0eddf5 Makes buckets while player creative mode 2012-09-16 14:59:36 +03:00
Kubuxu
1f9e6f6303 Update common/buildcraft/builders/ItemBptBase.java 
Shows templates and blueprints in creative inventory.
 2012-09-16 11:17:43 +03:00
CovertJaguar
0479fab15d Update common/buildcraft/builders/EventHandlerBuilders.java 
Referencing WorldClient is bad
 2012-09-15 19:28:26 -07:00
SirSengir
f1c67bc518 Merge pull request #278 from Kubuxu/patch-1 
Update common/buildcraft/transport/ItemFacade.java to facades won't be consumed in creative mode
 2012-09-15 14:09:55 -07:00
SirSengir
066e9b1cb8 Merge pull request #275 from tcooc/patch-3 
Fix #267
 2012-09-15 14:09:25 -07:00
Kubuxu
189e46221e Update common/buildcraft/transport/ItemFacade.java 
Facades won't be consumed in creative mode.
 2012-09-15 21:49:45 +03:00
tcooc
863f0184fc Fix #267 2012-09-15 13:20:14 -05:00
tcooc
fb86ea064a Partial fox for #267 
Switched to vanilla rendering
 2012-09-15 13:06:32 -05:00
FloSoft
52dd797b77 Fix #271 2012-09-15 16:22:22 +02:00
psxlover
ae0a265751 Fix builder with path. 
No crashing now after setting the builder.
Also made the builder not crash if there is only one point in the path (probably it was crashing in a prior version too).
 2012-09-15 00:09:15 +03:00
psxlover
362c95be2b Fixed path showing of builder. 2012-09-14 23:26:39 +03:00
psxlover
6ebd570eb1 Removed some useless code 2012-09-14 22:47:45 +03:00
psxlover
b1bc60ed0b Fixed PathMarkers. 
It was using EntityLaser while a recent commit changed the renderer to work on EntityPowerLaser.
Also the EntityLaser wasn't syncing the texture (another partial fix for #263)
Also both the client and the server threads were manipulating the available pathMarker list. Now only the server side tiles are added.
Finally synced the state of the pathMarkers (whether or not they are searching for a new marker to connect)
 2012-09-14 22:32:04 +03:00
CovertJaguar
2b00da5446 Added bottles as a water container. 2012-09-14 10:17:12 -07:00
SirSengir
0ce95c3134 Removed incorrect optimization for landmarks and path markers. 2012-09-14 19:04:58 +02:00
SirSengir
92195e8613 Synch powerAverage on laser entities. Partial fix for #263 2012-09-14 18:24:20 +02:00
SirSengir
151b576b49 Cleaned up a bunch of unneeded imports. Clean up your stuff before doing PRs please! 2012-09-14 14:04:36 +02:00
SirSengir
2f2dbe65b9 Merge pull request #249 from krisavi/Buildstuff 
Builders language file fix
 2012-09-14 04:57:46 -07:00
Andrew Hill
fdb3e85346 place the actual block consumed, rather than what is in the template 
in almost all cases there is no difference, but there have been reports
that mod items with inventories get the inventories duplicated. this
should fix that.
 2012-09-14 19:44:15 +10:00
Andrew Hill
2df8069c57 correctly save and restore hasPulsar() 
tested by saving and restoring a std. aut. gate.
 2012-09-14 07:37:57 +10:00
Kris Avi
92fb7e8afe Translatable areas 
Translatable Template table gui title, gates gui title, still and moving
oil (in NEI) (and added Oils to en_US.properties)
 2012-09-13 10:49:26 +03:00
Kris Avi
b264f29f88 Builders language file fix 2012-09-13 06:32:20 +03:00
tcooc
2d40f13d5b Added ClassMapping for String[] and finished bpt library fixes 2012-09-12 12:03:09 -05:00
tcooc
9ae784309e Architects create bpts properly now + some bpt library fixes 2012-09-12 01:09:11 -05:00
SirSengir
a00f6129fa Added special case handling for the vanilla furnace to squash XP exploits. 2012-09-11 22:38:16 +02:00
SirSengir
20df5fe093 Fixed renderer for pipe items using a max of two render passes. 2012-09-11 17:49:40 +02:00
tcooc
2ce657e4aa Added missing fields and imports 2012-09-10 21:29:04 -05:00
tcooc
a65b768f34 Synched Blueprint Library progress bars 2012-09-10 20:10:29 -05:00
tcooc
450ca9e59e Added Builder to creative inventory 2012-09-10 20:06:37 -05:00
Andrew Hill
9d80b9e4fb fixed wrong variable in condition. 2012-09-10 08:17:36 +10:00
SirSengir
047cb4eaed Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-09-09 18:59:34 +02:00
SirSengir
1131a8d661 Added AartBluestoke's PR for RoundRobin transactor. Closes #234 2012-09-09 18:59:05 +02:00
Techjar
1bf15b06cd I don't think pipe recipes should have to be in the middle row of the crafting grid. 2012-09-09 07:29:55 -03:00
SirSengir
30aef0704c End tank rendering if contained liquid does not exist. Closes #227 2012-09-09 12:14:35 +02:00
SirSengir
585095b0c2 Fixed exception in conjunction with NEI integration server side. Closes #229 2012-09-09 12:10:33 +02:00
SirSengir
d24b26d960 Fixed chunk reset related to autarchic gates. Closes #231 2012-09-09 12:06:59 +02:00
SirSengir
a47461a306 Some fixing of assembly table lasers. 2012-09-09 11:54:17 +02:00
SirSengir
8f298b4eb7 Fixed double chests not being recognized by pipes. 2012-09-09 09:59:17 +02:00
SirSengir
5303b5a5de Possible fix for rendering NPE. 2012-09-09 09:31:44 +02:00
Christian
8335cbd15e Change the quarry so all processing is in the TileEntity. The entity is 
now completely dumb and does nothing on either side.
Also, the quarry now plays the block break effect when it breaks a block
for sheer awesome :)
 2012-09-09 02:45:27 -04:00
SirSengir
37994cdbd5 Moved BuildCraftBlockUtil.java which was located in the wrong package. 2012-09-08 21:59:19 +02:00
SirSengir
10143101da Added versioning. 2012-09-08 21:46:17 +02:00
SirSengir
428d119699 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-09-08 21:21:31 +02:00
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
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