Sebastian Hartte
e9c7312e98
Merge fixes
2020-08-16 14:26:17 +02:00
Sebastian Hartte
ee67c5ea50
Use different naming for fullbright, and always reset it back after setting it.
2020-08-16 14:05:10 +02:00
Sebastian Hartte
6c544f2211
Reformatted, and ported back some enhancements from the Forge version.
2020-08-15 02:51:03 +02:00
yueh
0beab559a6
Fix formatting
2020-07-28 11:44:57 +02:00
Sebastian Hartte
780f68952b
Added spotless back and reformatted
2020-07-27 20:07:27 +02:00
yueh
56ecda5173
1.16 port
2020-07-27 11:21:50 +02:00
Sebastian Hartte
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
Sebastian Hartte
019f570331
Pattern Rendering and other Rendering
2020-07-20 20:13:20 +02:00
Sebastian Hartte
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
yueh
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
Sebastian Hartte
2642ced86b
Moving to source sets
2020-07-01 23:36:51 +02:00
Sebastian Hartte
ca104912d6
More fixes
2020-06-29 21:23:50 +02:00
Sebastian Hartte
0d63f560d3
More moves and compilation fixes
2020-06-29 02:15:31 +02:00
Sebastian Hartte
37ce6b262e
Fabric port in progress
2020-06-28 00:45:33 +02:00
Sebastian Hartte
b79cd732b2
Fabric port in progress
2020-06-27 23:25:38 +02:00
Sebastian Hartte
80fbb58d4f
API compiles
2020-06-27 18:09:44 +02:00
Sebastian Hartte
ba71a82288
Migrations
2020-06-27 16:18:20 +02:00
Sebastian Hartte
b4471b1abb
The Great Renamening of 2020
2020-06-22 13:21:23 +02:00
yueh
fe215f0a91
Code Cleanup
2020-06-19 16:09:06 +02:00
yueh
5225ea426b
pick 97420a31d The big reformat of 2020
2020-06-16 21:45:35 +02:00
yueh
23b6e195ac
Revert using internal API
2020-06-07 17:21:20 +02:00
Sebastian Hartte
1c7a28c606
More Rendering Fixes
2020-06-07 15:57:07 +02:00
Sebastian Hartte
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
Sebastian Hartte
5cdeff01be
Custom Model Loader
2020-06-01 04:02:37 +02:00
Sebastian Hartte
ec3b464655
Some additional fixes from other branch.
2020-05-31 16:13:07 +02:00
yueh
16d6d55d7f
1.15 port
2020-05-18 14:02:45 +02:00
yueh
15582fd1df
Always use qualified access for fields and methods
2017-07-20 21:27:22 +02:00
yueh
621910df91
Format sourcecode
2017-07-20 21:17:10 +02:00
Gunther De Wachter
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
Gunther De Wachter
da5879b667
First batch of null -> isEmpty() checks.
...
I most likely still missed a ton of checks...
2017-06-26 05:15:25 +02:00
yueh
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
Sebastian Hartte
070b35f3db
Clarified use of slight face offset.
2016-10-15 00:52:27 +02:00
Sebastian Hartte
7c8ee24f8c
Renamed QNB's getConnections to make more sense.
2016-10-15 00:47:45 +02:00
Sebastian Hartte
7761a37d59
Fixes #2431 : Implemented multi block rendering for quantum network bridge.
2016-10-14 22:59:14 +02:00