Commit graph

2318 commits

Author SHA1 Message Date
Ourten
25e683b2e9 Fix some tiles update on clientside 2017-01-08 23:49:56 +01:00
ProfessorProspector
0c4895efa4 Electric Furnace gui! 2017-01-08 14:46:13 -08:00
ProfessorProspector
8b56947c28 Charge bench GUI 2017-01-08 14:27:45 -08:00
ProfessorProspector
eea9b83a9c Generator gui! 2017-01-08 14:07:34 -08:00
modmuss50
2ec7340383
Added better checks to ore dict, Closes #894 2017-01-08 21:58:32 +00:00
modmuss50
6aa8fde64a
Update to support updated recipe format in reborn core. 2017-01-08 21:43:15 +00:00
Ourten
cd33860403 Remove comment 2017-01-08 22:34:04 +01:00
Ourten
a700d80e0f Fix icon of SpriteSlot 2017-01-08 22:33:50 +01:00
ProfessorProspector
2a78196939 Revamp centrifuge jei support 2017-01-08 12:29:14 -08:00
Ourten
eb220643fc Change all containers init to IContainerProvider + Add Enum for gui ids handling 2017-01-08 20:34:46 +01:00
Ourten
b93fe6c5ad Convert FusionReactor 2017-01-08 16:32:03 +01:00
Ourten
bd16289c60 Convert IndustrialElectrolyzer, IndustrialGrinder and IndustrialSawmill 2017-01-08 16:20:13 +01:00
Ourten
b5881e2102 Convert VacuumFreezer and ImplosionCompressor 2017-01-08 16:01:24 +01:00
Ourten
ea98e4a8a0 Convert BlastFurnace 2017-01-08 15:45:05 +01:00
Ourten
665b5f7569 Convert MatterFabricator 2017-01-08 15:22:59 +01:00
Ourten
ad890079ec Convert RollingMachine 2017-01-08 14:00:19 +01:00
Ourten
8a0a133e02 Convert AlloyFurnace and AlloySmelter 2017-01-08 13:10:13 +01:00
Ourten
619ddb14b8 Convert Scrapboxinator 2017-01-08 12:28:16 +01:00
ProfessorProspector
3c40e25b6a Centrifuge stuff 2017-01-08 03:18:28 -08:00
ProfessorProspector
0a9a62c455 Only clear if id 0 2017-01-08 01:37:44 -08:00
ProfessorProspector
a785d2a514 Make things better 2017-01-08 01:27:18 -08:00
ProfessorProspector
32c86b535b Merge branch '1.11.2' of https://github.com/TechReborn/TechReborn into feature/containers-builder 2017-01-07 20:59:41 -08:00
ProfessorProspector
9cbe6008c4 Fix batbox player slot positions 2017-01-07 20:25:26 -08:00
ProfessorProspector
0cccb0a91b Merge branch 'feature/containers-builder' of https://github.com/TechReborn/TechReborn into feature/containers-builder
# Conflicts:
#	src/main/java/techreborn/client/gui/GuiBatbox.java
#	src/main/java/techreborn/client/gui/GuiQuantumChest.java
2017-01-07 20:22:34 -08:00
ProfessorProspector
d385e6eaf4 Batbox gui overhaul 2017-01-07 20:09:46 -08:00
Ourten
b9444b5ce5 Convert recycler + Fix slot indexes 2017-01-08 02:41:50 +01:00
Ourten
d77ed99e8a Convert AssemblingMachine 2017-01-08 02:31:37 +01:00
Ourten
35329cdc4a Convert ChemicalReactor 2017-01-08 02:23:03 +01:00
Ourten
60c88884a7 Convert Centrifuge 2017-01-08 02:19:26 +01:00
Ourten
94a0616d8e Add JEI transfer support for ContainerBuilder + Convert Compressor, Extractor and Grinder 2017-01-08 02:04:02 +01:00
Ourten
1df2c84e16 Convert ElectricFurnace 2017-01-07 22:11:54 +01:00
Ourten
af524f169f Convert IronFurnace 2017-01-07 21:56:23 +01:00
Ourten
0325383d21 Convert Fluid Generators 2017-01-07 21:06:08 +01:00
Ourten
f771b7a78d Convert Generator + Add fuelSlot 2017-01-07 20:34:03 +01:00
Ourten
53a3869092 Convert MFSU and BatBox 2017-01-07 19:12:50 +01:00
Ourten
e7eaa40bde Add convenient energy sync method to builder + Convert MFE + Fix slots range again 2017-01-07 17:21:14 +01:00
Ourten
28c4932ef6 Fix shift slots range 2017-01-07 16:16:00 +01:00
Ourten
89d3e8538b Cleanup some ContainerBuilder code 2017-01-07 15:59:59 +01:00
ProfessorProspector
49ae0045aa Fix a few recipes 2017-01-07 00:29:19 -08:00
ProfessorProspector
61688e1d62 Actually call mixed metal ingot recipes #releaseBuild Fixes #890 2017-01-07 00:05:08 -08:00
ProfessorProspector
0f172ddf52 some things 2017-01-07 00:02:57 -08:00
Ourten
9f74feabff Add container syncing helper + Rename slot builder methods
An example of the new syncing system can be found in the ChargeBench
2017-01-07 02:46:46 +01:00
Ourten
b688fe72e4 Fix shift-click deleting pre-existing stack 2017-01-06 22:57:40 +01:00
Ourten
728e956d69 Fix merge-shifting bypass of slot filters 2017-01-06 22:39:06 +01:00
ProfessorProspector
6acded92ed The return of Mr. Gui Builder 2017-01-05 21:01:28 -08:00
Ourten
19cdb5b4eb Fix shift-click bypass of slot filters + Remade ChargeBench and ChunkLoader with ContainerBuilder 2017-01-06 02:30:51 +01:00
Ourten
b70d9b41c6 Begin the ContainerBuilder system
Right now it doesn't do much and the internal code is quite ugly.
2017-01-06 00:43:34 +01:00
modmuss50
c3fe135498
Fixes issues with red garnets dropping, Closes #871 2017-01-05 21:26:31 +00:00
modmuss50
039cab23eb
Fixes some final issues with ic2 de-duplication, closes #875 2017-01-05 21:22:33 +00:00
ProfessorProspector
56b8b346f0 The Great Refactor of 2017 - make things more abstract 2017-01-05 13:16:51 -08:00
ProfessorProspector
e86c0d175c The Great Refactor of 2017 - More recipes moved over! 2017-01-05 13:14:24 -08:00
modmuss50
a0c3cc644a
Add MissingIngredientExpection 2017-01-05 21:11:44 +00:00
Ourten
11c67f68a9 Fix TechReborn chests inventory capabilities. close #878 2017-01-05 00:17:53 +01:00
ProfessorProspector
2ad33bd6a9 The Great Refactor of 2017 - Remove old Plate Cutting Machine stuff, move UU matter and cable recipes over, fix industrial grinder eu usage, clean up EnumStandaloneCableType, move Fluid Generator, Rolling Machine, Scrapbox, and Smelting recipes over. Add some alternative rolling recipes for metal recipes that are more efficient. 2017-01-04 14:19:41 -08:00
Prospector
1215c47fc2 The Great Refactor of 2017 - Extractor Recipes 2017-01-03 09:32:55 -08:00
modmuss50
eb2453480f
Remove this other event handler, and move it to RC 2017-01-03 15:13:36 +00:00
modmuss50
ab301d25db
Move multiblock event registry to reborn core 2017-01-03 15:04:30 +00:00
Prospector
bd4103b7df The Great Refactor of 2017 - Industrial Centrifuge Recipes 2017-01-03 00:33:25 -08:00
Prospector
1831ff4dbc The Great Refactor of 2017 - Implosion Compressor Recipes 2017-01-02 18:00:14 -08:00
modmuss50
345a319d98
WIP changes for updates MineTweaker 2017-01-02 23:41:46 +00:00
Prospector
cf6fbb5ddc Remove debug lines and make tools children of item/handheld. 2017-01-02 15:31:28 -08:00
Prospector
f88f0f3cdb Fix cell outputs and lang 2017-01-02 15:14:09 -08:00
Prospector
c4b003f946 Localize Compressed Air and Electrolyzed Water 2017-01-02 13:24:53 -08:00
Prospector
a29006cae2 Electrolyzed Water recipe 2017-01-02 13:20:57 -08:00
Prospector
8bd1660c41 Remove duplicate recipe and fix bonemeal recipe in electrolyzer 2017-01-02 13:18:37 -08:00
Prospector
206b20ac9e The Great Refactor of 2017: Electrolyzer Edition 2017-01-02 13:08:58 -08:00
Prospector
007c6ca38a Add a use for bauxite and continue the great refactor of 2017 2017-01-01 19:32:53 -08:00
Prospector
6a70424252 Continue the "Great refactor of 2017". Massive variable name refactoring and start splitting crafting table recipes to their own class. 2016-12-31 23:29:32 -08:00
ProfessorProspector
c24116e259 Redo all Industrial Grinder recipes, and move them to a separate class (Here starts the great recipe cleanup of 2017!) 2016-12-30 23:45:42 -08:00
ProfessorProspector
9b73f20ad0 Fix lazurite plate recipe. not ready for a new build yet 2016-12-30 14:49:31 -08:00
modmuss50
b2d070c7f3
Fix compile errors, and bump forge to 1.11.2 2016-12-27 19:47:54 +00:00
modmuss50
0922e0b886
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/init/IC2Dict.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/init/OreDict.java
2016-12-26 23:49:42 +00:00
ProfessorProspector
415660c988 Tweak how nugget recipes are done once again, and \o/ 2500th commit! 2016-12-22 15:12:13 -08:00
ProfessorProspector
2e9bf11569 Fix nuggets -> ingot recipes 2016-12-22 14:40:24 -08:00
ProfessorProspector
68d5a49d75 Add iridium reinforced stone & tungstensteel block recipes 2016-12-22 14:39:10 -08:00
ProfessorProspector
a446c76397 Add nuggets -> ingot and ingot -> nuggets recipes 2016-12-22 14:33:21 -08:00
al132
8306ebc72c Fix display slots in Fusion Reactor JEI 2016-12-22 11:29:07 -06:00
ProfessorProspector
3162422ee2 remove more debug code 2016-12-21 17:12:24 -08:00
ProfessorProspector
73f362bf76 Actually fix gems ore dict 2016-12-21 17:08:13 -08:00
ProfessorProspector
2ecf8400b8 Fix red garnet drops 2016-12-21 17:03:34 -08:00
ProfessorProspector
bdde7859f9 Fix any other potential bugs with the gems or any other forgotten items from the great rename of December 2016. This day shall be known as the day that I have prevented more bugs from the 8 or so bug reports I have caused from a single line of code changed about a week ago. It was a shame that it had gotten so far, but this should make sure that it does not happen again. All ingots/gems/plates/dusts/nuggets/smalldusts now convert any camelCase input to snake_case before handling it. This is probably the longest commit message I have ever written. Closes #860 2016-12-21 16:47:53 -08:00
ProfessorProspector
948d4de3ad Fix block ore dictionary names 2016-12-21 16:41:33 -08:00
ProfessorProspector
1759199601 Remove debug code 2016-12-21 16:22:34 -08:00
ProfessorProspector
011f164bd7 Fix gem ore dictionary entries 2016-12-21 16:20:34 -08:00
ProfessorProspector
78a3d1f589 Revert ore dictionary commit which said it fixed it but actually broke it :P #releaseBuild 2016-12-21 15:59:27 -08:00
modmuss50
7a6b3b6b48
Added a config to allow the de-duplication of ic2 items. When this is enabled TR will require you to use ic2's recipes. #releaseBuild 2016-12-21 17:57:36 +00:00
modmuss50
936ee13686
Remove last duplicated items. 2016-12-21 17:44:44 +00:00
modmuss50
5ff09a7eda
Some more work on deduplicating ic2 items/blocks 2016-12-21 17:31:52 +00:00
modmuss50
10ef977fd9
Fix ore dic names, closes #853 2016-12-20 14:08:15 +00:00
modmuss50
3e6fc0647f
Fix crash with certain mods, closes #854 2016-12-20 14:02:21 +00:00
modmuss50
ca98d7d8b8
Fixes Breaking Ruby ore, closes #856 and #855 2016-12-20 14:00:58 +00:00
modmuss50
bfcc3a2117
Initial work on IC2 de-duplication 2016-12-18 21:36:29 +00:00
Ourten
c8b3568a0c Unify TechReborn chests + Fix deep chests inventory drops 2016-12-18 22:06:07 +01:00
Ourten
da41ae7731 Apply QuantumChest fixes to DigitalChest 2016-12-18 21:34:01 +01:00
Ourten
baebc948d9 Add JEI integration for fluid generators recipes 2016-12-18 04:02:51 +01:00
Ourten
1d27182cc2 Fix FluidGenerators activation and energy production 2016-12-17 17:18:49 +01:00
Ourten
003d124667 Allow FluidGenerators to refill items with their tank 2016-12-17 16:22:31 +01:00
modmuss50
75c82353fa
Fix #843, Some fluids dont have a texture so they wont render. 2016-12-17 15:07:03 +00:00
modmuss50
cb69f10c88
Fix Watermill missing texture, closes #841 2016-12-17 14:54:32 +00:00
Ourten
97192ee3f4 Add the unified FluidGenerator recipe system + Restructure FluidGenerators tiles
They should all be pretty now
2016-12-17 01:25:32 +01:00
Ourten
3bf346f39a Fix QuantumChest duplication bug and content sync 2016-12-16 21:44:32 +01:00
Ourten
f65999f960 Fix QuantumTank fluid updates 2016-12-16 15:11:46 +01:00
Ourten
1181ce49f2 Add tryAddingEnergy to ThermalGenerator to fix eternal activation with adjacent lava 2016-12-15 14:41:04 +01:00
Ourten
d727c2698b Add tryAddingEnergy method to SemifluidGenerator 2016-12-15 14:39:53 +01:00
Ourten
487fdeddcb Add activation state change for HeatGenerator + Cleanup side-check code 2016-12-15 14:39:27 +01:00
Ourten
a0e068cad4 Add tryAddingEnergy method to GasTurbine
This method will avoid blocking of the generator a little bit before it's max capacity
2016-12-15 14:36:48 +01:00
Ourten
8f0cc22472 Add activation state change to DragonEggSiphoner + Add convenient energy add method 2016-12-15 14:35:37 +01:00
Modmuss50
b67e08e267 Merge pull request #837 from Ourten/fix/energy-generators
Energy generators fix
2016-12-14 21:12:15 +00:00
Prospector
811d9edf54 Fix #836 2016-12-14 11:25:50 -08:00
Ourten
4c2a5b3f23 Add missing import in GasTurbine 2016-12-14 19:51:33 +01:00
Ourten
82ae50f5a8 Fix Semifluid generator activate state and fix fluid sync 2016-12-14 19:22:29 +01:00
Ourten
caf5d56e3c Fix GasTurbine activate state and fix fluid amount sync 2016-12-14 18:36:43 +01:00
Ourten
65ec0db2de Fix ThermalGenerator logic and packet updates
There is one bug left, the displayed liquid stack is always air.
2016-12-14 17:43:33 +01:00
modmuss50
57720c61de Fix Iridum Recipe, fixes #792 2016-12-14 10:10:07 +00:00
modmuss50
32785e4f5b Fix multiblocks, add holo renderer back, closes #802 #833 #768 2016-12-14 10:03:54 +00:00
modmuss50
4f8bfcb2df Fix missing textures on some blocks 2016-12-14 09:41:11 +00:00
modmuss50
ccdb5c0761 Fix merge issues, fix build 2016-12-14 09:28:05 +00:00
modmuss50
c1d2e875bf Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/blocks/BlockRubberLog.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/items/tools/ItemElectricTreetap.java
#	src/main/java/techreborn/items/tools/ItemTreeTap.java
2016-12-14 09:23:24 +00:00
modmuss50
47df52a7f2 Improve power transfur between items, closes https://github.com/TechReborn/TechReborn/issues/835 2016-12-14 09:13:30 +00:00
Ourten
abcef5aace Add fluidstack info to jei recipe for IndustrialGrinder 2016-12-14 02:08:22 +01:00
modmuss50
ee96908775 Disable recipe, to fix crash with a certain set of mods. #releaseBuild 2016-12-13 19:19:12 +00:00
Thomas Guillemard
ebf569a906 Make treetap working with the IC2 rubber tree (Fix #786) (#831)
Changes:
- The dependency of IC2 have been updated to the last version
- This implementation follow the original treetap logic but use
Techreborn original electrical cost.
2016-12-13 16:24:38 +00:00
modmuss50
601194685b Merge 1.10 changes, bump version for #releaseBuild 2016-12-13 11:53:33 +00:00
modmuss50
a3b4e9de6e Merge 1.10, bump version for #releaseBuild 2016-12-13 11:51:33 +00:00
ProfessorProspector
3378c910a3 Fix lang 2016-12-12 16:05:32 -08:00
ProfessorProspector
c271422e11 Remove deprecated empty cell 2016-12-12 15:57:04 -08:00
ProfessorProspector
de5ebf5ae3 Merge branch '1.11' of https://github.com/TechReborn/TechReborn into 1.11 2016-12-12 15:44:33 -08:00
ProfessorProspector
764396d7ef ALL ITEMS USE JSON NOW \o/ 2016-12-12 15:44:16 -08:00
modmuss50
0d7e26e74a Remove log, and add small dusts to ore dict 2016-12-12 17:54:20 +00:00
modmuss50
29f40e1f98 Add plate recipes based of ore dic 2016-12-12 15:53:04 +00:00
modmuss50
27862b0a28 Add some more recipes listed in #818 2016-12-12 15:29:25 +00:00
modmuss50
7a4c7cfea9 Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 2016-12-12 09:53:30 +00:00
modmuss50
71d8a3c7e8 Iron furnace now uses the same sides as the vanilla furnace, closes #622 2016-12-12 09:49:00 +00:00
modmuss50
59b7610227 Fix extractor recipe allowing any wood for sap extraction, close #381 again 2016-12-12 09:22:19 +00:00
ProfessorProspector
0273a619f1 Remove old jsondestroyer things 2016-12-11 23:03:51 -08:00
ProfessorProspector
a681fe4be6 Even more jsons: Cloaking device, electric treetap, lapotronic orbpack, lithium batpack, rockcutter, omnitool, manual, treetap, wrench, and refactor some model paths 2016-12-11 23:00:08 -08:00
ProfessorProspector
b3988e4c4f Register cables in preinit, and switch cable items and storage blocks to jsons 2016-12-11 22:25:27 -08:00
ProfessorProspector
14c2b540f2 Modify galena texture 2016-12-11 22:12:52 -08:00
ProfessorProspector
e6ba58eb45 Fusion Coils now use jsons 2016-12-11 18:22:35 -08:00
ProfessorProspector
7379e32a17 Ores use json 2016-12-11 18:05:03 -08:00
ProfessorProspector
49f227ca81 MORE JSONS: UU matter, upgrades, scrapboxes, and rubber sapling! Also fix rubber sapling model 2016-12-11 17:27:39 -08:00
ProfessorProspector
257a838c2c couple more langs 2016-12-11 16:48:30 -08:00
ProfessorProspector
7b5c6a6102 Fix some lang and models 2016-12-11 16:47:28 -08:00
ProfessorProspector
8012abee3b Move dusts and smalldusts to json 2016-12-11 11:34:56 -08:00
ProfessorProspector
3da6083c68 Nuggets now use jsons, and nuggets now return proper subtypes 2016-12-11 10:58:20 -08:00
ProfessorProspector
718fc53bbd Let players set freq. transmitter to interactive block (shift click no longer clears on blocks) and unify tooltip 2016-12-11 10:07:56 -08:00
ProfessorProspector
ab1b1ca409 Fix #829 hopefully 2016-12-10 22:53:02 -08:00
ProfessorProspector
03b0aef687 slight adjustment #betaBuild 2016-12-10 21:56:00 -08:00
ProfessorProspector
86b98cab13 Unify tooltip messages, fix cable subtypes, and fix ruby drops 2016-12-10 18:13:27 -08:00
ProfessorProspector
61de7101c3 TOP support now changes colours based on energy system config 2016-12-10 17:15:30 -08:00