PepperBell
dbe46a6f28
Merge remote-tracking branch 'origin/1.17/dev' into 1.17/fabric/dev
...
Conflicts:
build.gradle
gradle.properties
src/main/java/com/jozufozu/flywheel/backend/Loader.java
src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedRenderDispatcher.java
src/main/java/com/jozufozu/flywheel/config/BooleanConfig.java
src/main/java/com/jozufozu/flywheel/config/SConfigureBooleanPacket.java
src/main/java/com/jozufozu/flywheel/core/AtlasStitcher.java
src/main/java/com/jozufozu/flywheel/core/PartialModel.java
src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingRenderer.java
src/main/java/com/jozufozu/flywheel/core/model/BakedModelModel.java
src/main/java/com/jozufozu/flywheel/core/model/BlockModel.java
src/main/java/com/jozufozu/flywheel/event/BeginFrameEvent.java
src/main/java/com/jozufozu/flywheel/event/RenderLayerEvent.java
src/main/java/com/jozufozu/flywheel/mixin/FixFabulousDepthMixin.java
src/main/java/com/jozufozu/flywheel/mixin/RenderHooksMixin.java
src/main/java/com/jozufozu/flywheel/util/BakedQuadWrapper.java
src/main/java/com/jozufozu/flywheel/util/BufferBuilderReader.java
src/main/resources/flywheel.mixins.json
src/main/resources/pack.mcmeta
2021-11-20 09:54:22 -08:00
PepperBell
f14aca4517
Server crash fix and formatting
...
- Fix matrix mixins being applied on dedicated server
- Expand PartialModel functionality: add location getter and model
setter
- Remove Loader.getResourceType since selective reloading is deprecated
- Organize imports and mixin order
- Other formatting
- Update Gradle and Forge
2021-11-18 14:59:39 -08:00
Jozufozu
35b542fb68
Parchment and gradle changes
2021-11-08 13:19:48 -08:00
PepperBell
9a1c381f70
Port to Fabric
2021-10-14 16:20:56 -07:00
Jozufozu
ef48504caa
UNTESTED - Replace ATs
...
- Matrices use #store
- Accessor for pausedPartialTick
2021-09-26 19:40:53 -07:00
Jozufozu
5ce960c5d5
MDK println build test
2021-09-18 17:01:20 -07:00
Jozufozu
d53c9b0a32
It renders stuff
...
- The lightmap moved
- Begin to move away from access transformers
- .textureManager -> .getTextureManager()
- RIP cutout, saw that coming
2021-09-16 20:03:45 -07:00
Jozufozu
a930bc97cc
It launches
...
- yeet the fog
- update mixin compatibility level
2021-09-15 13:49:18 -07:00
2ae580259c
Remap, update forge, minecraft and java
2021-09-15 09:14:30 +02:00
6fd544837c
update gradle and mixin
2021-09-15 08:33:12 +02:00
Jozufozu
9e066f8d41
Documentation and organization
...
- Add a package-info.java to many packages.
- Annotate the world parameter in Backend#canUseInstancing as nullable.
- New utility constructor for BlockModel
- Note that IDynamicInstance#beginFrame and ITickableInstance#tick are run in parallel.
- Refactor internals of InstancedRenderDispatcher to group things by InstanceWorlds.
- InstanceWorlds take over most responsibility for dispatching calls.
- Simplify massive private call chains in InstanceMaterial.
- Reorganize methods and add some documentation in MaterialManager, MaterialGroup, InstanceMaterial, and Instancer.
- Remove unused field from MaterialSpec.
- Remove unused fields from Instancer and InstanceMaterial
- Document RenderLayer
- Add RenderLayer field to RenderLayerEvent
2021-07-27 17:31:58 -07:00
Jozufozu
e4a72544ea
Update forge
...
- but not to 36.2.0 because gradle hates me
2021-07-23 16:45:38 -07:00
Jozufozu
2238a00bac
Remap to Mojmap, update gradle
2021-07-15 11:36:24 -07:00
Jozufozu
c6b0996b8a
Ready for 0.1.1 (finally)
...
- Might have bumped the version too early.
- Fix crash rendering breaking overlay after reloading resource packs.
2021-07-14 16:52:35 -07:00
Jozufozu
30cc011ee9
Lids everywhere
...
- Ender chests and trapped chests, too
- Chests orient themselves correctly
- Lids do not position themselves correctly
- Some math, will probably replace with JOML
2021-07-10 11:33:01 -07:00
Jozsef
608204ee0a
Crash fix and refactor
...
- Check that sectionY is within the bounds of the chunk's section array, fixes #2
- Refactor usages of Tile and Entity InstanceManagers to refer to the base class InstanceManager<>
2021-07-02 13:12:33 -07:00
Jozsef
f615825846
Pre-port tasks I
...
- Rename Client to FlywheelClient
- Remove Shadow plugin
- Remove generated source set
- Remove unused properties in gradle.properties
- Organize all imports
- Thanks for the list pepper!
2021-06-30 12:43:54 -07:00
JozsefA
78611b0038
Print final shader source on compilation error
2021-06-23 09:08:34 -07:00
JozsefA
c3f1c05630
Update buildscript
...
- Maven publish
2021-06-21 13:56:27 -07:00
JozsefA
1c5efa6e50
Update buildscript
...
- Generate sources jar
- Include build number
2021-06-20 16:20:18 -07:00
JozsefA
9565a679be
Little tweaks and add the logo to mods.toml
2021-06-19 16:52:23 -07:00
JozsefA
ac5af96db1
Fancy buildscript and 0.0.2
2021-06-18 23:52:13 -07:00
JozsefA
3c6de355e8
Add licence
2021-06-16 11:58:17 -07:00
JozsefA
7b427e3c92
Yeet
2021-06-16 11:19:33 -07:00
PepperBell
9235aa93ba
JEI Fixes
...
- Fix #1661 : blasting-only recipes would not be shown under the bulk blasting category
- Add ability to remove matching recipes by type while using the category builder
- Fix fan catalyst items being italicized
- Add and tweak some visibility modifiers
2021-05-28 23:10:12 -07:00
Eivind
a2903182b0
Bumping registrate version to fix incompatibility with mojmap mods
2021-05-19 12:20:53 +02:00
JozsefA
2db49997df
Clean up build.gradle
2021-04-09 16:23:49 -07:00
JozsefA
cbb7e48565
Revert "Don't crash with starlight"
...
This reverts commit 4ae1ce3d
2021-04-09 16:21:38 -07:00
JozsefA
4ae1ce3dbe
Don't crash with starlight
2021-04-05 23:23:35 -07:00
zelophed
d03ea3488a
Merge branch 'mc1.15/dev' into mc1.16/dev
...
# Conflicts:
# src/generated/resources/.cache/cache
# src/generated/resources/assets/create/blockstates/andesite_funnel.json
# src/generated/resources/assets/create/blockstates/brass_funnel.json
# src/generated/resources/assets/create/lang/unfinished/de_de.json
# src/generated/resources/assets/create/lang/unfinished/es_es.json
# src/generated/resources/assets/create/lang/unfinished/fr_fr.json
# src/generated/resources/assets/create/lang/unfinished/it_it.json
# src/generated/resources/assets/create/lang/unfinished/ja_jp.json
# src/generated/resources/assets/create/lang/unfinished/ko_kr.json
# src/generated/resources/assets/create/lang/unfinished/nl_nl.json
# src/generated/resources/assets/create/lang/unfinished/pt_br.json
# src/main/java/com/simibubi/create/AllBlocks.java
# src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java
# src/main/java/com/simibubi/create/content/contraptions/components/actors/ContraptionActorData.java
# src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java
# src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AssemblyException.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IDisplayAssemblyExceptions.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementBehaviour.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/LinearChassisBlock.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageBlock.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java
# src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java
# src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticle.java
# src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java
# src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java
# src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlotPositioning.java
# src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelMovementBehaviour.java
# src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelTileEntity.java
# src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/AbstractFilterScreen.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java
# src/main/java/com/simibubi/create/content/schematics/SchematicWorld.java
# src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java
# src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java
# src/main/java/com/simibubi/create/events/ClientEvents.java
# src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java
# src/main/java/com/simibubi/create/foundation/collision/CollisionDebugger.java
# src/main/java/com/simibubi/create/foundation/collision/OBBCollider.java
# src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java
# src/main/java/com/simibubi/create/foundation/gui/AbstractSimiContainerScreen.java
# src/main/java/com/simibubi/create/foundation/gui/AbstractSimiScreen.java
# src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java
# src/main/java/com/simibubi/create/foundation/gui/AllIcons.java
# src/main/java/com/simibubi/create/foundation/gui/widgets/SelectionScrollInput.java
# src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java
# src/main/java/com/simibubi/create/foundation/mixin/LightUpdateMixin.java
# src/main/java/com/simibubi/create/foundation/mixin/RenderHooksMixin.java
# src/main/java/com/simibubi/create/foundation/render/KineticRenderer.java
# src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
# src/main/java/com/simibubi/create/foundation/render/backend/Backend.java
# src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedTileRenderer.java
# src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java
# src/main/java/com/simibubi/create/foundation/utility/ColorHelper.java
# src/main/java/com/simibubi/create/foundation/utility/Lang.java
# src/main/java/com/simibubi/create/foundation/utility/MatrixStacker.java
# src/main/java/com/simibubi/create/foundation/utility/TreeCutter.java
# src/main/java/com/simibubi/create/foundation/utility/VecHelper.java
# src/main/java/com/simibubi/create/foundation/utility/placement/IPlacementHelper.java
# src/main/java/com/simibubi/create/foundation/utility/placement/util/PoleHelper.java
2021-03-20 12:58:02 +01:00
simibubi
21d87a0cfe
Change mixin repo
2021-03-08 17:29:42 +01:00
JozsefA
36e81857a3
Unmeddle the build script, but profiling is good.
2021-02-24 16:57:26 -08:00
JozsefA
e62d89b21c
Everything is lit, hopefully all the time now.
2021-02-24 16:52:49 -08:00
31e3c5b0bd
Port recent changes
2021-02-20 17:27:51 +01:00
simibubi
4ee9dd8a8a
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-02-19 00:49:39 +01:00
8c8a9abd8a
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
...
# Conflicts:
# src/generated/resources/assets/create/blockstates/fluid_pipe.json
2021-02-18 22:32:45 +01:00
JozsefA
2aa06b0786
useful debug arg in build.gradle
2021-02-05 22:50:07 -08:00
3d2edc492b
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-02-05 21:36:10 +01:00
simibubi
667f27d9b7
Update build.gradle
...
- Oops, messed with the buildscript again
2021-01-22 20:57:48 +01:00
fbb1c6b221
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
...
# Conflicts:
# src/generated/resources/.cache/cache
# src/generated/resources/assets/create/lang/unfinished/de_de.json
# src/generated/resources/assets/create/lang/unfinished/fr_fr.json
# src/generated/resources/assets/create/lang/unfinished/it_it.json
# src/generated/resources/assets/create/lang/unfinished/ja_jp.json
# src/generated/resources/assets/create/lang/unfinished/ko_kr.json
# src/generated/resources/assets/create/lang/unfinished/nl_nl.json
# src/generated/resources/assets/create/lang/unfinished/pt_br.json
# src/generated/resources/assets/create/lang/unfinished/ru_ru.json
# src/generated/resources/assets/create/lang/unfinished/zh_cn.json
2021-01-22 20:56:46 +01:00
simibubi
525fc03278
Demise of the hopper funnel
...
- Added smart chutes
- Reworked non-mounted funnels to be consistent will all other funnel configurations
- Non-mounted funnels no longer occupy a full block length
- Non-mounted funnels can now insert and extract ground items
- Vertical funnels can no longer transfer between inventories
- Redstone links can now be placed onto any non-empty space
- Mechanical arms no longer arbitrarily wait between operations unless targets are overflowing
- Gave indicators on funnels better visibility
- Chutes now display contents in their goggle overlay
- Mechanical Arms and Wrenches can no longer be assigned to filter slots directly
2021-01-22 20:43:59 +01:00
28cd9a1fe1
Druidcraft woodcutter compatibility
2021-01-20 22:36:04 +01:00
JozsefA
0cb18c532d
uncomment the mixin annotation processor whoops
2021-01-15 20:07:04 -08:00
JozsefA
37e64e4c1d
fix vertex attribute data types
...
blockcolors and ao now work in contraptions
be smarter about allocating buffers
use gl buffer mapping, more to come
2021-01-15 16:17:13 -08:00
2b615b68bd
Fix mixins outside dev env
2021-01-13 09:50:00 +01:00
JozsefA
e5b61891fc
update forge and setup mixins
2021-01-12 21:58:40 -08:00
simibubi
069d5c962d
Revert temporary changes to build.gradle
2021-01-03 22:33:07 +01:00
simibubi
1498cb1cfc
Why are we still here, Part IV
...
- Mixers can no longer process single-item recipes
- Added processing recipes for items in AE2
- Fixed pams harvestcraft recipe catalysts not recycling properly
- Windmill bearings no longer assemble when the attached kinetics update
- Hose pulleys now display additional goggle info when their target fluid body is considered infinite
- Protected the natural scoria model from vertex-format changes made by optifine
- Andesite tunnels now split off single items to side outputs
- Fixed non-interpolated item animation on the Mechanical Saw
- Attempted fix to oriented contraption causing serialization issues
- Fixed mounted contraptions not updating yaw interpolation when stalled
- Fixed "shifting gears" advancement not triggering when using the cogwheel placement assist
- Schematicannons no longer cause pasted kinetic networks to be virtually interconnected
- Added sandstone -> sand; milling/crushing recipe
- Fixed Spouts duplicating container items in some configurations
- Fixed block cutting recipe outputs piling up beyond the gui boundaries
2021-01-03 22:29:55 +01:00
34bfa2f479
Remove TiC run reference
2020-10-16 17:00:43 +02:00
c9e2f8b05e
Deforester works on slime saplings
2020-10-16 11:14:47 +02:00
