Commit graph

110 commits

Author SHA1 Message Date
modmuss50
7f4fb6d80b Cleanup 2019-09-22 13:01:34 +01:00
modmuss50
a4a578917d Update energy api 2019-09-16 23:11:56 +01:00
modmuss50
aa6eb60d46 Finish porting to new power api 2019-09-15 19:14:42 +01:00
modmuss50
4f80a8c651 start on new power api 2019-09-10 14:09:15 +01:00
modmuss50
aab3a02184 cleanup config field names 2019-08-18 17:09:10 +01:00
drcrazy
dc8511f1f0 Fix armor textures 2019-08-14 14:04:49 +03:00
drcrazy
b0576e3aba Charge powered items from chest armor 2019-08-13 21:20:41 +03:00
drcrazy
f9023d7b0f Itemgroup filler moved to init utils. 2019-08-13 17:02:34 +03:00
modmuss50
77eee6f5b4 Move configs to one class 2019-08-12 17:57:00 +01:00
drcrazy
56d1d196f0 Items use energy to do work. Closes #1770 2019-08-12 00:41:44 +03:00
drcrazy
d80bf3a1ce Update import to a proper one 2019-08-08 02:17:18 +03:00
modmuss50
2308ed0f05 Fix power durability display 2019-07-29 16:02:14 +01:00
drcrazy
d0dedc6893 Cleanup 2019-07-22 02:43:22 +03:00
drcrazy
7977a8e73b Few warnings and moar recipes 2019-07-18 01:32:37 +03:00
drcrazy
4f1593771e Fixed imports 2019-07-15 10:59:08 +03:00
modmuss50
f8f20ce6ba 1.14.2 2019-06-13 13:14:11 +01:00
modmuss50
6b9f6cb4f8 it compiles :D 2019-06-12 19:29:04 +01:00
modmuss50
d18d1b820e 397 2019-06-04 12:05:18 +01:00
modmuss50
e8396dbc33 831, doesnt seem impossible 2019-05-27 22:21:58 +01:00
modmuss50
4e03ac893c 1147 - Initial auto mappings pass 2019-05-26 12:37:59 +01:00
drcrazy
0feec0612c Done with models for items. Except cell ( 2019-03-27 03:49:30 +03:00
drcrazy
f9c484090f Model for lithium batpack 2019-03-26 22:22:24 +03:00
drcrazy
59b0633353 Added ArmorMaterials 2019-02-27 17:58:00 +03:00
modmuss50
d7c4f55e6c Auto format imports 2019-02-23 19:14:30 +00:00
drcrazy
e513e20e5a Migrated batteries + TR Itemgroup 2019-02-22 00:22:43 +03:00
modmuss50
02d2d9cf1c Start work on porting tool and armor materials, values still need porting over 2019-02-21 17:53:30 +00:00
drcrazy
5c7c29f34d Updated @RebornRegister annotation usage 2019-02-21 12:48:35 +03:00
drcrazy
5bc08557b3 Migration work on TR armor 2019-02-20 23:12:36 +03:00
modmuss50
b6312b124a 1696 - find + replace pass 2019-01-13 16:51:50 +00:00
modmuss50
7df4742784 Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts:
#	src/main/java/techreborn/blocks/BlockRubberLog.java
#	src/main/java/techreborn/client/gui/GuiAlloySmelter.java
#	src/main/java/techreborn/client/gui/GuiAssemblingMachine.java
#	src/main/java/techreborn/client/gui/GuiChemicalReactor.java
#	src/main/java/techreborn/client/gui/GuiCompressor.java
#	src/main/java/techreborn/client/gui/GuiDieselGenerator.java
#	src/main/java/techreborn/client/gui/GuiElectricFurnace.java
#	src/main/java/techreborn/client/gui/GuiExtractor.java
#	src/main/java/techreborn/client/gui/GuiGasTurbine.java
#	src/main/java/techreborn/client/gui/GuiGrinder.java
#	src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java
#	src/main/java/techreborn/client/gui/GuiIronFurnace.java
#	src/main/java/techreborn/client/gui/GuiRecycler.java
#	src/main/java/techreborn/client/gui/GuiScrapboxinator.java
#	src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java
#	src/main/java/techreborn/client/gui/GuiThermalGenerator.java
#	src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java
#	src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeWrapper.java
#	src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeWrapper.java
#	src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java
#	src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java
#	src/main/java/techreborn/compat/jei/compressor/CompressorRecipeWrapper.java
#	src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeWrapper.java
#	src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeWrapper.java
#	src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeWrapper.java
#	src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java
#	src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java
#	src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java
#	src/main/java/techreborn/events/StackToolTipEvent.java
#	src/main/java/techreborn/items/armor/ItemCloakingDevice.java
#	src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java
#	src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java
#	src/main/java/techreborn/items/battery/ItemBattery.java
#	src/main/java/techreborn/items/battery/ItemEnergyCrystal.java
#	src/main/java/techreborn/items/battery/ItemLapotronCrystal.java
#	src/main/java/techreborn/items/battery/ItemLapotronicOrb.java
#	src/main/java/techreborn/items/battery/ItemLithiumIonBattery.java
#	src/main/java/techreborn/items/battery/ItemRedCellBattery.java
#	src/main/java/techreborn/items/tool/ItemChainsaw.java
#	src/main/java/techreborn/items/tool/ItemDrill.java
#	src/main/java/techreborn/items/tool/ItemJackhammer.java
#	src/main/java/techreborn/items/tool/advanced/ItemAdvancedChainsaw.java
#	src/main/java/techreborn/items/tool/advanced/ItemAdvancedDrill.java
#	src/main/java/techreborn/items/tool/advanced/ItemAdvancedJackhammer.java
#	src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java
#	src/main/java/techreborn/items/tool/basic/ItemBasicChainsaw.java
#	src/main/java/techreborn/items/tool/basic/ItemBasicDrill.java
#	src/main/java/techreborn/items/tool/basic/ItemBasicJackhammer.java
#	src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java
#	src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java
#	src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java
#	src/main/java/techreborn/items/tool/industrial/ItemIndustrialJackhammer.java
#	src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java
#	src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java
#	src/main/java/techreborn/tiles/TileChargeOMat.java
#	src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
2019-01-07 22:58:42 +00:00
coderbot16
fbec0c89c2 Finalize IC2 electric item support (#1644)
* Item charging no longer uses CapabilityEnergy, now fully uses ExternalPowerSystems

* Remove accidental update from build.gradle

* Remove some unused imports

* Use requestEnergyFromArmor in all powered tools
2018-12-28 09:25:40 +00:00
coderbot16
a766cdfa53 Remove almost all explicit uses of CapabilityEnergy (#1643)
* Battery packs (ItemLithiumBackpack/ItemLapotronPack) still use CapEnergy explicitly, but don't charge IC2 items.
 * Note: Before we can remove FE, we have to modify StackInfoHUD and ItemUtils in RebornCore.
2018-12-27 13:58:55 +00:00
drcrazy
9f9595f955 Moved items into content 2018-09-24 14:28:58 +03:00
drcrazy
0918bceb23 Call getHeatFromState in a static way. 2018-09-18 12:45:29 +03:00
drcrazy
0c54a4538e More cleanup after refactoring 2018-09-17 16:42:17 +03:00
ProfessorProspector
e5736669ca Refactoring & cleaning 2018-09-16 13:48:51 -07:00
drcrazy
6d3d1f2df2 Organized items. MOved creative tab setter to parent. 2018-09-07 14:51:41 +03:00
drcrazy
a40635e75f Renamed ModItems to TRItems. Sorted members inside it. 2018-09-03 17:46:21 +03:00
modmuss50
f5c6b59ebd
Mappings 2018-07-20 22:31:20 +01:00
modmuss50
95b49e5e23
Move some stuff around in RC 2018-07-20 22:02:46 +01:00
drcrazy
daf4b6fad6 Capacity changes for powered armor 2018-07-20 12:58:52 +03:00
drcrazy
523d0284b7 Updated powered items to match RC changes 2018-07-19 18:30:47 +03:00
modmuss50
d4a43d24a1
Fix incorrect usage of item stack checking
I have no idea how they worked without issue for this long :D
2018-06-25 12:34:13 +01:00
Prospector
6d3b415ddd Unify creative tabs 2018-06-12 15:42:20 -07:00
modmuss50
548d393820
Allow repairing gem tools and armor in anvil 2018-06-08 18:33:26 +01:00
drcrazy
250a25d25f Fixed durability bar 2018-05-23 01:33:07 +03:00
drcrazy
f203bbbefd Started work on capability for powered item 2018-05-23 00:27:35 +03:00
drcrazy
c4c5f2135c Started work in switching powered items to capability 2018-05-23 00:27:33 +03:00
modmuss50
9c7f1995a8
Update year in license 2018-02-11 14:08:13 +00:00
drcrazy
bf5b649fc4 Removed unused code, added Override annotation 2017-11-12 12:15:32 +03:00