780f68952b
Added spotless back and reformatted
2020-07-27 20:07:27 +02:00
1933b4b10d
Merge remote-tracking branch 'origin/master' into fabric-1.16
...
# Conflicts:
# src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java
# src/main/java/appeng/block/qnb/QnbFormedBakedModel.java
# src/main/java/appeng/client/gui/AEBaseScreen.java
# src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java
# src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java
# src/main/java/appeng/client/gui/implementations/PriorityScreen.java
# src/main/java/appeng/client/gui/widgets/NumberBox.java
# src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java
# src/main/java/appeng/client/render/cablebus/SmartCableTextures.java
# src/main/java/appeng/container/implementations/CraftingCPUContainer.java
# src/main/java/appeng/container/implementations/LevelEmitterContainer.java
# src/main/java/appeng/container/implementations/PriorityContainer.java
# src/main/java/appeng/core/AEConfig.java
# src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java
# src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java
# src/main/java/appeng/me/cluster/MBCalculator.java
# src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java
# src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java
# src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
# src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java
# src/main/java/appeng/tile/crafting/CraftingBlockEntity.java
# src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java
# src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java
2020-07-20 20:19:42 +02:00
019f570331
Pattern Rendering and other Rendering
2020-07-20 20:13:20 +02:00
749ebeb91d
Moved part textures from parts to part to be consistent with singular naming used in Minecraft (and for the model directory).
2020-07-19 14:14:18 +02:00
be4fdfed85
Merge remote-tracking branch 'origin/master' into fabric-1.16
...
# Conflicts:
# src/main/java/appeng/block/spatial/SpatialPylonBlock.java
# src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java
# src/main/java/appeng/core/AppEng.java
# src/main/java/appeng/hooks/TickHandler.java
# src/main/java/appeng/me/cluster/MBCalculator.java
# src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
# src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
# src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java
# src/main/java/appeng/me/helpers/AENetworkProxy.java
# src/main/java/appeng/tile/networking/CableBusBlockEntity.java
# src/main/java/appeng/tile/networking/DenseEnergyCellBlockEntity.java
# src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java
# src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java
# src/main/java/appeng/util/Platform.java
2020-07-19 01:05:14 +02:00
5b3c4aef79
When blocks adjacent to multiblock-capable blocks are updated, ( #4474 )
...
do not always recalculate existing multiblocks. Only do so,
if the adjacent block is either part of the multiblock's bounding
box, or if the adjacent block would be a valid part of the multiblock.
2020-07-18 18:18:24 +02:00
0d43ca15be
Removed AEApi
...
Moved all internal access to the internal `Api` class using a new static
getter.
2020-07-11 19:40:34 +02:00
1478e4c378
Lots more moved
2020-07-04 21:03:30 +02:00
bafc65d3a8
Changed AEGlassMaterial to Materials
...
Preparation in case we need more to support custom non solid, non
opaque, or similar blocks.
Removed custom fullSize/opaque blocks in favour of Material
2020-07-02 09:57:47 +02:00
2642ced86b
Moving to source sets
2020-07-01 23:36:51 +02:00
f2e3d81fd7
Working in part placement
2020-07-01 21:27:37 +02:00
ca104912d6
More fixes
2020-06-29 21:23:50 +02:00
0d63f560d3
More moves and compilation fixes
2020-06-29 02:15:31 +02:00
f5412152a4
Utils ported
2020-06-28 15:47:44 +02:00
37ce6b262e
Fabric port in progress
2020-06-28 00:45:33 +02:00
b79cd732b2
Fabric port in progress
2020-06-27 23:25:38 +02:00
80fbb58d4f
API compiles
2020-06-27 18:09:44 +02:00
ba71a82288
Migrations
2020-06-27 16:18:20 +02:00
b4471b1abb
The Great Renamening of 2020
2020-06-22 13:21:23 +02:00
c4b5100283
Removal of lots of fixmes.
...
Removed InvTweaks sort order (mod indicates it wont update, suggested replacement cpw sorting mod only sorts by count and reg-id).
Reactivated dissassemble special recipe.
Removed leftovers from cable bus non-tesr tile.
Added JEI facade recipes back in.
Removed superflous datagen for quartz tools.
2020-06-22 02:32:19 +02:00
fe215f0a91
Code Cleanup
2020-06-19 16:09:06 +02:00
5225ea426b
pick 97420a31d The big reformat of 2020
2020-06-16 21:45:35 +02:00
69c9407796
Fix block state updates for tile-entity dependent block states.
2020-06-14 21:41:25 +02:00
2e41d44964
Fix default block properties.
2020-06-13 22:46:13 +02:00
23b6e195ac
Revert using internal API
2020-06-07 17:21:20 +02:00
1c7a28c606
More Rendering Fixes
2020-06-07 15:57:07 +02:00
46b1d1ffdc
GUI Rendering and various fixes
2020-06-07 03:29:57 +02:00
ff042a394b
All GUI compile errors fixed, switched to excludes over includes in gradle build and lots, LOTS of more fixes.
2020-06-06 21:16:05 +02:00
c402390282
Compiles again.
2020-06-04 19:58:58 +02:00
237463dd94
Lots of compile fixes
2020-06-04 03:02:48 +02:00
2de3a2ecee
Grindr, GUI, Container.
2020-06-02 22:52:35 +02:00
cf9ab8a13b
ActionResultType in onActivated
2020-06-02 19:15:23 +02:00
2a1ba12516
QuartzFixture and (semi-borked) LightningFX
2020-06-01 16:59:11 +02:00
5cdeff01be
Custom Model Loader
2020-06-01 04:02:37 +02:00
077ff17078
More stuff ingame and showing up.
2020-06-01 01:01:32 +02:00
ec3b464655
Some additional fixes from other branch.
2020-05-31 16:13:07 +02:00
16d6d55d7f
1.15 port
2020-05-18 14:02:45 +02:00
15582fd1df
Always use qualified access for fields and methods
2017-07-20 21:27:22 +02:00
621910df91
Format sourcecode
2017-07-20 21:17:10 +02:00
fbcf8c4705
Highly incomplete code. First work on porting to 1.12. Still need to rework a LOT of things.
2017-07-06 01:57:19 +02:00
49a6df5bc7
Fixed up the Tile Entity mess a bit, still need to look at the CableBus stuff a bit though.
2017-06-30 17:22:06 +02:00
da5879b667
First batch of null -> isEmpty() checks.
...
I most likely still missed a ton of checks...
2017-06-26 05:15:25 +02:00
ed9e6dd21c
Port to 1.11
2016-12-21 20:38:36 +01:00
a14cf2204d
Fixes anchor rendering ( #2698 )
...
* Fixes #2680 : Use a shorter cable anchor model when blocked by a facade.
* Fixes #2664 : Prevent anchors from creating intersection.
Replaced the simple List<ResourceLocation> for the static models with a
new container also indicating a solid part, which can be used to prevent
the creation of an intersection.
2016-12-14 22:37:10 +01:00
070b35f3db
Clarified use of slight face offset.
2016-10-15 00:52:27 +02:00
7c8ee24f8c
Renamed QNB's getConnections to make more sense.
2016-10-15 00:47:45 +02:00
7761a37d59
Fixes #2431 : Implemented multi block rendering for quantum network bridge.
2016-10-14 22:59:14 +02:00
6f2bbfab4c
Major Refactoring of Bootstrap Code ( #75 )
...
- Refactored boostrap code:
* Completely reworked item/block/tile registration.
* Fixed server side startup.
* Fixed server side startup.
* More documentation.
* More heavy cleanup
* More cleanups.
* Major refactoring of state mapping and fixes a lot of other issue related to item rendering.
* Fixes sky chest item models (no item TESR).
* Only use CachingRotatingBakedModel for tile entities automatically.
Fix default rotation of quartz pillar for item model.
* Used method reference instead of lambda for ItemMeshDefinition for multiparts.
* Removed unnecessary IHasSpecialItemModel
* Removed unused IconReg class.
* Updated resource pack version.
2016-08-26 12:42:21 +02:00
03aa59521c
Removed old rendering system
...
Removed old rendering system. Some parts may be left over, but they
won't affect testing.
1.10-R todo tag marks things to do with rendering.
2016-06-29 12:22:18 +02:00
05aa6972c4
Second update pass (2/3) - 82 -> 0 errors
...
Second update pass which fixes all compile errors. Some parts may have
aftermath effect, hence why 3rd pass will check those maked with
"aftermath".
Errors: 82 -> 0. Mod can be launched.
2016-06-21 11:03:10 +02:00
Sebastian Hartte