dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,378 Commits 2 Branches 0 Tags
23bda5455399199f048a38b61e7fbac11fceddb5
Commit Graph

2138 Commits

Author SHA1 Message Date
Raoul Van den Berge
45f110acff Fix crash with opening grids that are not connected (grid.getController() will be null and the synchronized stmt will fail) 2016-03-28 19:15:59 +02:00
Raoul Van den Berge
49fc18f063 Merge branch 'mc1.9' of https://github.com/GustoniaEagle/refinedstorage into GustoniaEagle-mc1.9 2016-03-28 17:40:27 +02:00
Raoul Van den Berge
a92e998efb Another fix 2016-03-28 17:38:30 +02:00
Raoul Van den Berge
1a8be231ed Simplify wireless grid 2016-03-28 17:32:24 +02:00
GustoniaEagle
9c8db38011 Start on block textures 2016-03-28 16:05:21 +01:00
Raoul Van den Berge
2a7279ae87 Can't go over 32 when getting half.. 2016-03-28 14:17:32 +02:00
Raoul Van den Berge
f88889765f Shift on item in grid displays the real count 2016-03-28 11:52:08 +02:00
Raoul Van den Berge
a12f25761e Code style fixes 2016-03-28 11:07:13 +02:00
Raoul
cff503d1a5 Merge pull request #12 from tomevoll/patch-5 
Fixes index out of bounds and prevent list from being modified by other threads on the client while rendering
 2016-03-28 11:01:48 +02:00
Raoul
81b9e28c55 Merge pull request #8 from tomevoll/patch-1 
NullPointer crash in TileExternalStorage (worldObj is null on world load)
 2016-03-28 10:59:26 +02:00
Raoul
a25fb057dc Merge pull request #9 from tomevoll/patch-2 
NullPointer crash in TileMachine
 2016-03-28 10:58:54 +02:00
tomevoll
66df388db3 only draw power if it has power and is active 2016-03-28 09:21:53 +02:00
tomevoll
4446313ac1 better fix 2016-03-28 09:07:12 +02:00
tomevoll
d5215a5396 Correct RF usage, Use energy every tick not every sec 
Moved Energy usage outside the ticks % 20 block, amount to draw is updated every sec as before
 2016-03-28 08:49:06 +02:00
tomevoll
ac930f0d45 Fixes nullPointer in GuiGrid ? 
Think instead of all these null checks, maybe not set that list from the network packet as that is another thread, and instead set a temporary list that the gui forground then pull into the main list before rendering.
 2016-03-28 08:20:05 +02:00
tomevoll
84c4485b7f Update TileExternalStorage.java 2016-03-28 07:18:09 +02:00
tomevoll
3e08be85e7 style change 2016-03-28 07:08:01 +02:00
tomevoll
fc53745157 Update TileMachine.java 
null pointer on worldObj
 2016-03-28 07:06:36 +02:00
tomevoll
22a21aaa66 Fixes crash 
[06:55:08] [Server thread/ERROR]: Encountered an unexpected exception
net.minecraft.util.ReportedException: Ticking block entity
	at net.minecraft.server.MinecraftServer.updateTimeLightAndEntities(MinecraftServer.java:785) ~[MinecraftServer.class:?]
	at net.minecraft.server.dedicated.DedicatedServer.updateTimeLightAndEntities(DedicatedServer.java:407) ~[DedicatedServer.class:?]
	at net.minecraft.server.MinecraftServer.tick(MinecraftServer.java:683) ~[MinecraftServer.class:?]
	at net.minecraft.server.MinecraftServer.run(MinecraftServer.java:532) [MinecraftServer.class:?]
	at java.lang.Thread.run(Unknown Source) [?:1.8.0_71]
Caused by: java.lang.NoSuchFieldError: stored
	at refinedstorage.tile.TileExternalStorage.<init>(TileExternalStorage.java:37) ~[TileExternalStorage.class:?]
	at refinedstorage.block.BlockExternalStorage.createTileEntity(BlockExternalStorage.java:22) ~[BlockExternalStorage.class:?]
	at net.minecraft.world.chunk.Chunk.createNewTileEntity(Chunk.java:811) ~[Chunk.class:?]
	at net.minecraft.world.chunk.Chunk.getTileEntity(Chunk.java:828) ~[Chunk.class:?]
	at net.minecraft.world.World.getTileEntity(World.java:2571) ~[World.class:?]
	at refinedstorage.tile.MachineSearcher.search(MachineSearcher.java:22) ~[MachineSearcher.class:?]
	at refinedstorage.tile.MachineSearcher.search(MachineSearcher.java:43) ~[MachineSearcher.class:?]
	at refinedstorage.tile.MachineSearcher.search(MachineSearcher.java:43) ~[MachineSearcher.class:?]
	at refinedstorage.tile.MachineSearcher.search(MachineSearcher.java:43) ~[MachineSearcher.class:?]
	at refinedstorage.tile.MachineSearcher.search(MachineSearcher.java:43) ~[MachineSearcher.class:?]
	at refinedstorage.tile.TileController.update(TileController.java:61) ~[TileController.class:?]
	at net.minecraft.world.World.updateEntities(World.java:1936) ~[World.class:?]
	at net.minecraft.world.WorldServer.updateEntities(WorldServer.java:637) ~[WorldServer.class:?]
	at net.minecraft.server.MinecraftServer.updateTimeLightAndEntities(MinecraftServer.java:779) ~[MinecraftServer.class:?]
	... 4 more
 2016-03-28 06:57:45 +02:00
Raoul Van den Berge
d7de2a6eeb Make normal grid one row larger 2016-03-27 16:41:10 +02:00
Raoul Van den Berge
2711a3d50c Show machine coords in controller 2016-03-27 16:27:26 +02:00
Raoul Van den Berge
97d635a8cc Pass TE instance to inventories 2016-03-27 15:58:36 +02:00
Raoul Van den Berge
d033b5af64 Better check for placing blocks in constructor 2016-03-27 15:13:52 +02:00
Raoul Van den Berge
9cd7010c0a Allow whitelist / blacklist and filters on destructors 2016-03-27 13:37:34 +02:00
Raoul Van den Berge
c10f2054f5 Use constant faces for solderer 2016-03-27 10:23:17 +02:00
Raoul Van den Berge
ca12a9c464 Make interface slower as well 2016-03-27 10:19:20 +02:00
Raoul Van den Berge
32b4085d70 Shift clicking for disk drive 2016-03-27 10:12:55 +02:00
Raoul Van den Berge
b91886171b Various code improvements 2016-03-27 10:00:03 +02:00
Raoul Van den Berge
0024254843 If we can't import and/ or extract, move on (otherwise we stay on the same slot forever) 2016-03-26 21:58:17 +01:00
Raoul Van den Berge
eb8ca3a796 Make exporter less fast too 2016-03-26 18:43:44 +01:00
Raoul Van den Berge
6421555a2f Better defaults for grid 2016-03-26 18:37:43 +01:00
Raoul Van den Berge
655f452a9e Make importer less fast 2016-03-26 18:34:22 +01:00
Raoul Van den Berge
b3ae29ed80 Fix interface bug 2016-03-26 15:45:09 +01:00
Raoul Van den Berge
31ead233e1 Fix controller GUI crashes 2016-03-26 00:56:34 +01:00
Raoul Van den Berge
cdf8714670 Opposite facing for shift click + certain blocks 2016-03-26 00:44:05 +01:00
Raoul Van den Berge
b0381fcee3 Fix importer 2016-03-26 00:11:14 +01:00
Raoul Van den Berge
aace77d615 Shift clicking from grid crafting 2016-03-25 23:40:58 +01:00
Raoul Van den Berge
45476cda1d Fix order 2016-03-25 23:24:38 +01:00
Raoul Van den Berge
307205359e Make the energy draw actual RF/t 2016-03-25 23:23:01 +01:00
Raoul Van den Berge
5e83b1ef8f Fix #6 2016-03-25 23:20:12 +01:00
Raoul Van den Berge
002b5c0dda Code style fixes 2016-03-25 22:22:31 +01:00
Raoul
25b302f914 Merge pull request #5 from tomevoll/mc1.9 
Smaller text in controller (machine list) removed tooltip
 2016-03-25 22:17:28 +01:00
Tom Erik
3ae02290c5 Smaller text in controller (machine list) removed tooltip 2016-03-25 22:11:27 +01:00
Raoul Van den Berge
28812b2391 Display after decimal point on big amounts 2016-03-25 22:07:24 +01:00
Raoul Van den Berge
a15ff8c41f Fixes 2016-03-25 21:51:01 +01:00
Tom Erik
ff6d35b506 remove unused draw function 2016-03-25 21:34:03 +01:00
Tom Erik
a9b243e67f shadow on text, use builtin function for damagebar 2016-03-25 21:31:42 +01:00
Tom Erik
2ec0ec5629 render damage bar if needed 2016-03-25 21:22:25 +01:00
Tom Erik
d1cd667f48 draw item overlay scaled 2016-03-25 20:54:25 +01:00
Raoul Van den Berge
69048d35fb Use hopper logic for exporter. 2016-03-25 20:23:54 +01:00