modmuss50
d7c4f55e6c
Auto format imports
2019-02-23 19:14:30 +00:00
modmuss50
b864d551dd
Update mappings + more tile work
2019-02-22 10:29:11 +00:00
modmuss50
18b3535607
More fixes 637
2019-02-21 23:07:44 +00:00
modmuss50
61b6d30262
Bunch of tile work 752
2019-02-21 22:46:26 +00:00
modmuss50
f6a79ce579
Some random fixes, 959 errors
2019-02-21 18:11:55 +00:00
modmuss50
a93361792f
fix ConfigRegistry location, 1118 errors
2019-02-21 17:55:17 +00:00
drcrazy
5c7c29f34d
Updated @RebornRegister annotation usage
2019-02-21 12:48:35 +03:00
modmuss50
b6312b124a
1696 - find + replace pass
2019-01-13 16:51:50 +00:00
modmuss50
4440c2f305
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/TechReborn.java
# src/main/java/techreborn/blocks/BlockNuke.java
# src/main/java/techreborn/blocks/BlockOre.java
# src/main/java/techreborn/blocks/BlockRubberLog.java
# src/main/java/techreborn/blocks/generator/BlockSolarPanel.java
# src/main/java/techreborn/client/RegisterItemJsons.java
# src/main/java/techreborn/client/container/builder/BuiltContainer.java
# src/main/java/techreborn/client/container/builder/ContainerBuilder.java
# src/main/java/techreborn/client/container/builder/ContainerPlayerInventoryBuilder.java
# src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java
# src/main/java/techreborn/client/container/builder/slot/FilteredSlot.java
# src/main/java/techreborn/client/container/builder/slot/SpriteSlot.java
# src/main/java/techreborn/client/container/builder/slot/UpgradeSlot.java
# src/main/java/techreborn/client/gui/GuiAESU.java
# src/main/java/techreborn/client/gui/GuiAlloySmelter.java
# src/main/java/techreborn/client/gui/GuiAssemblingMachine.java
# src/main/java/techreborn/client/gui/GuiBase.java
# src/main/java/techreborn/client/gui/GuiBlastFurnace.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/GuiDigitalChest.java
# src/main/java/techreborn/client/gui/GuiDistillationTower.java
# src/main/java/techreborn/client/gui/GuiElectricFurnace.java
# src/main/java/techreborn/client/gui/GuiExtractor.java
# src/main/java/techreborn/client/gui/GuiFluidReplicator.java
# src/main/java/techreborn/client/gui/GuiFusionReactor.java
# src/main/java/techreborn/client/gui/GuiGasTurbine.java
# src/main/java/techreborn/client/gui/GuiGenerator.java
# src/main/java/techreborn/client/gui/GuiGrinder.java
# src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
# src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java
# src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java
# src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
# src/main/java/techreborn/client/gui/GuiIronFurnace.java
# src/main/java/techreborn/client/gui/GuiManual.java
# src/main/java/techreborn/client/gui/GuiQuantumChest.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/client/gui/GuiVacuumFreezer.java
# src/main/java/techreborn/client/gui/TRBuilder.java
# src/main/java/techreborn/client/gui/slot/GuiFluidConfiguration.java
# src/main/java/techreborn/client/gui/slot/GuiSlotConfiguration.java
# src/main/java/techreborn/client/gui/slot/elements/CheckBoxElement.java
# src/main/java/techreborn/client/gui/slot/elements/ConfigSlotElement.java
# src/main/java/techreborn/client/gui/slot/elements/ElementBase.java
# src/main/java/techreborn/client/gui/slot/elements/FluidConfigPopupElement.java
# src/main/java/techreborn/client/gui/slot/elements/ISprite.java
# src/main/java/techreborn/client/gui/slot/elements/OffsetSprite.java
# src/main/java/techreborn/client/gui/slot/elements/SlotConfigPopupElement.java
# src/main/java/techreborn/client/gui/slot/elements/Sprite.java
# src/main/java/techreborn/compat/CompatManager.java
# src/main/java/techreborn/compat/ICompatModule.java
# src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java
# src/main/java/techreborn/compat/jei/BuiltContainerTransferInfo.java
# src/main/java/techreborn/compat/jei/RecipeUtil.java
# src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
# src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java
# src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.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/fusionReactor/FusionReactorRecipeCategory.java
# src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/generators/fluid/FluidGeneratorRecipeWrapper.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/industrialGrinder/IndustrialGrinderRecipeWrapper.java
# src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java
# src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java
# src/main/java/techreborn/compat/jei/scrapbox/ScrapboxRecipeCategory.java
# src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java
# src/main/java/techreborn/events/BlockBreakHandler.java
# src/main/java/techreborn/events/StackToolTipEvent.java
# src/main/java/techreborn/init/IC2Duplicates.java
# src/main/java/techreborn/init/ModItems.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/init/OreDict.java
# src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java
# src/main/java/techreborn/init/recipes/ChemicalReactorRecipes.java
# src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
# src/main/java/techreborn/init/recipes/FusionReactorRecipes.java
# src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java
# src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java
# src/main/java/techreborn/init/recipes/RollingMachineRecipes.java
# src/main/java/techreborn/init/recipes/ScrapboxRecipes.java
# src/main/java/techreborn/items/ItemDestructopack.java
# src/main/java/techreborn/items/ItemFrequencyTransmitter.java
# src/main/java/techreborn/items/ItemManual.java
# src/main/java/techreborn/items/ItemMissingRecipe.java
# src/main/java/techreborn/items/ItemScrapBox.java
# src/main/java/techreborn/items/ItemTechManual.java
# src/main/java/techreborn/items/ItemUUmatter.java
# src/main/java/techreborn/items/ItemUpgrade.java
# src/main/java/techreborn/items/ItemUpgrades.java
# src/main/java/techreborn/items/armor/ItemCloakingDevice.java
# src/main/java/techreborn/items/ingredients/ItemDusts.java
# src/main/java/techreborn/items/ingredients/ItemDustsSmall.java
# src/main/java/techreborn/items/ingredients/ItemGems.java
# src/main/java/techreborn/items/ingredients/ItemIngots.java
# src/main/java/techreborn/items/ingredients/ItemNuggets.java
# src/main/java/techreborn/items/ingredients/ItemParts.java
# src/main/java/techreborn/items/ingredients/ItemPlates.java
# src/main/java/techreborn/items/ingredients/ItemUUmatter.java
# src/main/java/techreborn/items/tool/ItemDebugTool.java
# src/main/java/techreborn/items/tool/ItemTreeTap.java
# src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java
# src/main/java/techreborn/items/tools/ItemTechManual.java
# src/main/java/techreborn/items/tools/ItemTreeTap.java
# src/main/java/techreborn/items/tools/ItemWrench.java
# src/main/java/techreborn/lib/ModInfo.java
# src/main/java/techreborn/proxies/ClientProxy.java
# src/main/java/techreborn/tiles/TileChargeOMat.java
# src/main/java/techreborn/tiles/TileChunkLoader.java
# src/main/java/techreborn/tiles/TileDigitalChest.java
# src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java
# src/main/java/techreborn/tiles/TileMatterFabricator.java
# src/main/java/techreborn/tiles/TileQuantumChest.java
# src/main/java/techreborn/tiles/TileQuantumTank.java
# src/main/java/techreborn/tiles/cable/TileCable.java
# src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java
# src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java
# src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java
# src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java
# src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java
# src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java
# src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java
# src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java
# src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java
# src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java
# src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java
# src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java
# src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java
# src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java
# src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java
# src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java
# src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java
# src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java
# src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java
# src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java
# src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.java
# src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java
# src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java
# src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java
# src/main/java/techreborn/tiles/storage/TileAdjustableSU.java
# src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
# src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java
# src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java
# src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java
# src/main/java/techreborn/tiles/storage/idsu/TileInterdimensionalSU.java
# src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java
# src/main/java/techreborn/utils/StackWIPHandler.java
# src/main/java/techreborn/world/TechRebornRetroGen.java
# src/main/resources/assets/techreborn/textures/items/armor/lithium_batpack.png
2018-12-26 16:08:04 +00:00
modmuss50
b399e211fa
Move container builder to Reborn Core
2018-12-02 01:15:03 +00:00
drcrazy
809c02934a
Moved generators to enum
2018-09-24 16:49:44 +03:00
drcrazy
dd94ff31c9
Blocks moved to TRContent
2018-09-24 15:45:48 +03:00
drcrazy
bf7f7ba871
Renamed ModBlocks to TRBlocks
2018-09-23 23:21:19 +03:00
modmuss50
f6d5d88a4b
rename TileLegacyMachineBase to TileMachineBase
2018-09-17 07:31:41 +01:00
ProfessorProspector
e5736669ca
Refactoring & cleaning
2018-09-16 13:48:51 -07:00
drcrazy
1d4116a215
Flattened frames
2018-09-14 17:16:59 +03:00
modmuss50
01a3663b11
more changes to the inventory stuff
2018-09-13 19:56:32 +01:00
modmuss50
01644e4f65
Fix slot config, some changes to the way Inventory works as well to allow for this.
2018-09-13 19:33:14 +01:00
Modmuss50
3444c05c40
IInventory > IItemHandler
...
Most things should work, but havent been tested
Slot config will not work just yet
2018-09-07 14:05:19 +01:00
drcrazy
452932c04e
More formatting changes.
2018-06-23 19:00:44 +03:00
Eric Chai
52ff6699b4
Fusion reactor consumes resources. Fixes #1551 ( #1556 )
...
Since resources are consumed during start up, they should also
be consumed when resetting the crafting cycle.
2018-06-23 18:40:56 +03:00
modmuss50
7db0097d23
Fusion reactor uses inputs before the craft starts to prevent power exploit, closes #1539
2018-06-10 11:53:03 +01:00
modmuss50
c201b3dbcf
Make fusion reactor recipe shapeless, so it can work either way around
2018-06-10 11:47:51 +01:00
modmuss50
32ea97b29e
Fix #1541
2018-06-10 11:41:45 +01:00
modmuss50
354a80572c
Tweak power output of fusion reactor, closes #1521
2018-06-09 12:26:11 +01:00
modmuss50
dc32c9505d
Nerf the fusion reactor a little.
2018-04-25 16:17:38 +01:00
modmuss50
5c81430c4c
Finish off the reactor changes, feel free to suggest some more tweaks to it.
2018-04-18 17:15:33 +01:00
modmuss50
09a75893e4
Add larger fusion reactor sizes
2018-04-18 15:46:56 +01:00
modmuss50
10106715d3
Right click the fusion control computer with coils to autoplace them.
2018-04-18 15:07:28 +01:00
modmuss50
d94eb03a06
Update Fusion reactor to use new method for coil location.
2018-04-18 14:48:19 +01:00
drcrazy
d563ff748a
Cleanup and configs. Closes #1469
2018-04-01 00:39:58 +03:00
modmuss50
369b8a6266
Fixes #1461
2018-03-18 23:43:03 +00:00
modmuss50
9c7f1995a8
Update year in license
2018-02-11 14:08:13 +00:00
drcrazy
a6df9441ec
Updated reactor GUI. Closes #1422
2018-01-29 18:17:32 +03:00
modmuss50
1bfb5d5604
Fix crash with Fusion Control computer, fixes part of #1395
2018-01-12 19:51:06 +00:00
Modmuss50
cbcb465c97
Added support for individual slot configuration
...
* start work on slot config
* More slot work
* More gui work for slot config
* Remove old sided code
* More slot work
* More slot memes
* Stuff seems to be working :)
* Start work on auto input / output
* Slot IO check boxes now work
* Fix buttons at different screen resolutions
* Improve close button
* Gui polish
* Fix multiblock hologram rendering
* More fixes + changes
* Cleanup + output fix
2017-12-25 00:18:43 +00:00
drcrazy
eab088c094
Merge branch '1.12' into feature/solar-panles
...
Conflicts:
build.gradle
src/main/java/techreborn/blocks/generator/BlockSolarPanel.java
src/main/java/techreborn/blocks/lighting/BlockLamp.java
2017-11-28 17:28:47 +03:00
drcrazy
5bfe649360
Added coils check in onLoad. Closes #1337
2017-11-08 03:16:51 +03:00
drcrazy
c7f599ead1
Merge with upstream
2017-10-27 09:39:31 +03:00
modmuss50
31f3aff11f
Remove ghost upgrade slots on some machines.
2017-10-12 21:51:07 +01:00
modmuss50
c80cc0101f
Allow changing of the power cost view in fusion reactor recipes.
2017-10-11 12:56:29 +01:00
modmuss50
55b09da681
Fix fusion reactor not using its starting power.
2017-10-11 12:44:42 +01:00
drcrazy
ca829c18cc
Added wrench support
2017-10-08 00:04:08 +03:00
drcrazy
08c2f8921e
Add ability to insert\extract from fusion reactor. Closes #1237
2017-10-02 21:08:05 +03:00
drcrazy
0ae99ebae8
Keep state for running reactor. Closes #1187
2017-10-02 18:38:47 +03:00
drcrazy
1b4fee595d
Fixed warnings
2017-09-30 03:58:01 +03:00
alexpic57
885ba9210c
fix bug duplication #1012
2017-09-08 21:18:57 +02:00
David Vierra
a016a6dd49
Replace all emptiness checks == ItemStack.Empty
with .isEmpty()
( #1247 )
...
Fixes #1157 and probably a few other things.
2017-08-25 11:08:15 -07:00
Prospector
40e3062903
Continue the great refactor of mid 2017 (A lot of stuff still broken, it's a WIP)
2017-06-14 08:56:09 -07:00
modmuss50
b25742dde0
Auto format code
2017-06-12 14:23:32 +01:00