Commit Graph
22 Commits
Author SHA1 Message Date
Richard Freimer 80b07bc4b3 Code cleanup (#5468)
* remove direct guava predicates from BlockStateMachine

* cleanup blockstatebasic

* fix a large number of e.printStacktrace calls, narrow ComputerIntegration exception signature

* fix simple todos, remove invalid todos, unify some duplicate rendering code

* use a generic method to get around unchecked warning

* remove some redundant uses of hasCapability

* experimental OptionalCapability class. not in use yet

* nullable checks/annotations & remove duplicate field controlType in factory TE

* Inline various redundant variables

* Remove unused list

* Cleanup BlockStateGenerator

* Replace string constants with pointers to the proper mod id constant

* As 9.7.5 breaks backwards compat API wise for the DynamicNetwork this is as good a time as any to remove this deprecated method

* Use two argument constructor instead of appending a ':' inbetween

* Convert other BlockState type classes to using suppliers for tile entity creation
2019-05-13 11:43:42 -04:00
Richard Freimer 0d4b50908f Formatting and code readability cleanup (#5467)
* First pass reformatting code to be more readable (common still not done)

* Replace google common collect calls with Java calls where possible

* Remove a bunch of unnecessary parenthesis leaving clarifying ones

* Add some missing @Nonnull annotations

* Fix checking wrong type

* Remove unnecessary continue/return statements and simplify comparision check

* Pass exception instead of directly printing stack trace

* Work on cleaning up common, through config so far

* Work on cleaning up common, through integration so far

* Work on cleaning up common, through network so far

* Work on cleaning up common, through tier so far

* Remove empty constructors that get created by default anyways

* Work on cleaning up common, through transmitters so far

* Work on cleaning up common, through utils so far

* Finish cleaning up spacing for common
2019-05-11 14:13:24 -04:00
Richard Freimer 5a2a902366 Port 32b040353 and keep track of active modes via uuid's instead of names (#5348) 2019-04-06 10:38:55 -04:00
Dave Smith e0b7ea62a4 The Great Reformat; moving to google-java-style w/ 4 space indent and 120 column line wrap 2019-03-09 22:47:13 -07:00
Dave Smith 23ca58442a Transitioning a few files to Google format guidelines 2019-03-08 19:51:07 -07:00
Dave Smith c050324f8b Make sure to handle state changes on main world thread 2019-03-08 19:50:10 -07:00
Dave Smith f675590372 Improvements to fix for #15; smooth out sounds and detect ongoing attempts to muffle
The previous commit made the assumption that detection of sound being complete was fast enough
that restarting a well-designed sound would be seamless -- this is not true. As such, had
to change sounds to run for as long as machine is active on repeat with ongoing detection of
muffling attempts. In addition, if sound was INITIALLY muffled, it would never have been unmuffled,
so this also fixes that problem.
2019-03-07 10:00:21 -07:00
Dave Smith c78ae6dd1d Fix #15; completely overhaul the sound system to mirror Minecraft usage 2019-03-06 13:53:59 -07:00
Tom Elfring b72d6efab3 Java 7 and 8 cleanup
Diamond operator <>
Lambdas and method references
2017-08-05 17:50:38 +02:00
Tom Elfring 6576335f44 Remove unnecessary modifiers and semicolons 2017-08-05 13:30:20 +02:00
aidancbrady 6eb8e59f3c Fix more ItemStack issues 2017-04-03 20:12:02 -04:00
aidancbrady 6a42eb64e3 Update to 1.11.2. Untested, still using outdated MCMP 2017-03-25 20:35:26 -04:00
aidancbrady 6a8dbb7a8c Fixed Configuration Cards, fixed thread instantiation 2016-09-05 16:48:12 -04:00
aidancbrady 06e011e244 Packet crash fixes, fixed Seismic Reader crash, fixed Portable Teleporter interface crash, fixed teleport crash 2016-06-17 16:45:53 -04:00
aidancbrady e4aed3f7c1 Packets should be thread safe now 2016-06-17 15:56:22 -04:00
aidancbrady ceec3e71e9 No more errors, the game launches, rejoice! 2016-05-26 03:14:44 -04:00
aidancbrady a89b8f666c <200 errors. All I have left is a bit of rendering work and the new "off hand" stuff 2016-05-25 17:30:22 -04:00
Ben Spiers 84336ec4d1 Merge branch 'development' into 1.8.9
Huge merge with 202 conflicts, hopefully not *too* broken.
2016-03-18 04:24:19 +00:00
aidancbrady 87438dcc7f Boiler work, added heat info tab, worked on polishing heat interactions among machines 2016-02-27 13:32:48 -05:00
Ben Spiers a80f724cc2 Apply various common one-to-one replacements
More work on common too. network package now done.
2016-01-23 13:24:51 +00:00
Ben Spiers 9b8d9d92d6 Start update to 1.8.9
Fix all references to cpw.mods.fml namespace
2016-01-14 19:22:48 +00:00
aidancbrady a71b6bda01 Adjustable Flamethrower modes - combat, heat, and inferno 2015-11-28 08:58:26 -07:00