mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-15 15:03:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,338 Commits 31 Branches 14 Tags 106 MiB
b0143d604d
Commit Graph

91 Commits

Author SHA1 Message Date
simibubi
896ab01644 Packing Up 
- Added the Toolbox
 2021-09-16 04:10:34 +02:00
grimmauld
a048285699 Bulk remap, compiles 2021-07-15 11:32:03 +02:00
simibubi
0b40a57227 Instant Spook 
- Clockwork Component -> Precision Mechanism
- Re-organized bell models
- Added a little warm-up timer for held haunted bells
- Tweaks to all Sequenced assembly recipes
- Fixed missing particle of incomplete cogwheels
- Sequenced Assembly mid-products are no longer stackable
 2021-07-06 00:54:24 +02:00
reidbhuntley
202f81aa7c The Polishing 
- Added new Potato Cannon projectile types and tweaked values of existing types
- Potato projectiles can now catch fire and ignite entities like arrows
- Made splitting potato projectiles more consistent
- Lectern Controller can now be pick-blocked in creative and be placed by Schematicannon
- Fixed Schematicannon treating schematics with a single block in them as empty
- Soul base particles now also disappear early if their location gets lit
- Renamed Cursed Bell to Haunted Bell
 2021-07-04 14:23:34 -04:00
reidbhuntley
82d4a8772d Curses III, extra spooky edition 
- Added proper rendering, tooltips, sounds, and particle effects to the bells
- Added a crafting recipe for the Peculiar Bell
- Added a conversion method for obtaining Cursed Bells
- Fixed the soul indicators showing up in non-full blocks
 2021-06-27 21:38:42 -04:00
reidbhuntley
a8aa0beed9 Curses II 
- Added (temporary) rendering to the bells
- Create soul pulse effects on players holding the Cursed Bell item
 2021-06-27 11:46:56 -04:00
JozsefA
d612cfdd34 Merge remote-tracking branch 'origin/mc1.16/dev' into chromatic-projector 2021-06-11 10:31:18 -07:00
simibubi
032fa90ec6 Click to Craft 
- Added Crafting Blueprints
- Bit of "Ghost-item" Container refactoring
 2021-06-03 01:03:43 +02:00
JozsefA
2300ef2088 Organization, renaming, and fixing a dumb crash 2021-05-30 17:05:41 -07:00
JozsefA
341a385628 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector 
# Conflicts:
#	src/generated/resources/assets/create/lang/en_us.json
#	src/main/java/com/simibubi/create/AllBlocks.java
#	src/main/java/com/simibubi/create/AllTileEntities.java
#	src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java
#	src/main/java/com/simibubi/create/foundation/gui/AllIcons.java
#	src/main/java/com/simibubi/create/foundation/networking/AllPackets.java
#	src/main/resources/assets/create/textures/gui/icons.png
#	src/main/resources/create.mixins.json
 2021-05-23 14:11:40 -07:00
simibubi
b38dd90431 Subcreatica, Part II 
- Diving helmets now display a timer near the hotbar when underwater
- Copper backtanks now play an effect when accumulated air is maxed
- Copper backtank blocks can now be waterlogged
- Copper backtank cogs now animate
- Fixed subtitle of equip sounds
 2021-05-04 18:04:00 +02:00
simibubi
076783eb7e Subcreatica 
- Added the Copper Backtank
- Added Diving helmet and boots
 2021-05-04 03:50:17 +02:00
JozsefA
67e75d747a Move backend 2021-05-01 16:32:09 -07:00
JozsefA
063e98983f Oh god the line endings 
- Isolate AllBlockPartials to PartialModel
 - Further cleanup to PartialBufferer
 2021-04-29 14:03:52 -07:00
JozsefA
e33ab160ac Start to cleanup the AllBlockPartials methods 2021-04-28 22:47:51 -07:00
simibubi
edb1b59f41 Housekeeping 
- Added an .editorconfig
- Auto-Reformatted most .java files
- Auto-Organized Imports
 2021-04-08 19:22:11 +02:00
simibubi
525001e410 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-07 12:36:39 +02:00
JozsefA
5abc1e0fe7 Instanced pulleys first pass 2021-04-02 13:38:28 -07:00
JozsefA
c905aa5e2e Merge branch 'mc1.15/dev' into mc1.16/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlyWheelInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixerInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/press/PressInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionKineticRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeInstance.java
#	src/main/java/com/simibubi/create/content/logistics/block/FlapData.java
#	src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInstance.java
 2021-03-30 14:58:08 -07:00
JozsefA
a2b9dfc28a Change the locks 
- InstanceKey is no more.
 - InstanceData and co. keep track of removals and updates.
 - InstancedModel's buffer management is much more sane now.
 - Re-add mixin to #tickBlockEntities and ensure compat with Performant.
 - Move ...backend.instancing.impl to backend.core
 2021-03-30 14:14:58 -07:00
grimmauld
35c62360be Merge & Port 2021-03-26 16:03:09 +01:00
simibubi
718142e26f Faith in your Depot 
- Added Weighted Ejectors
- Fixed? some tunnel distribution inconsistencies
 2021-03-26 00:15:38 +01:00
grimmauld
cbbf502003 port recent changes 2021-03-24 14:54:24 +01:00
JozsefA
1310b88828 Lieutenant Scatterbrain II. 
- Swich to tabs. (not everything is tabs yet)
 - Refactor light and color attributes to their own Enum.
 - Quaternion/pivot/position attribute shader.
 - Always update an instance when the WorldRenderer checks if it should rerender a block.
 - Simplify some names.
 - Remove generics in InstanceData classes.
 - Deployer Tiles now use the oriented material.
 - Press heads now correctly orient themselves.
 - ModelData buffers things faster and is simpler.
 2021-03-22 20:20:52 -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
JozsefA
d0a6f4123b Instanced flywheels, engines, and schematicannons. 2021-03-10 13:44:04 -08:00
simibubi
1a315a11cf Merge branch 'mc1.15/ponder-ui' into mc1.15/dev 2021-03-08 17:29:06 +01:00
simibubi
c1c6e5e046 Controlled attachment 
- Added the Sticker, a redstone-driven block attachment component
- Fixed lighting of TileEntities lowered by a pulley
 2021-03-03 05:21:58 +01:00
simibubi
e87849deca Vector's food expansion 
- Added honeyed apples
- Added sweet rolls
- Added chocolate glazed berries
- New goggles item model
- Other texture tweaks
 2021-03-03 02:30:21 +01:00
simibubi
2e1129a3a5 Thinking about Gantries 
- Added Ponder entries for gantry shafts and carriages
- Added ability to mark lang key prefixes as ignored, leaving out 'dev-only' lang entries from the localization templates
- Gantry Pinion -> Gantry Carriage
- Scenes can now be "re-assembled" by their storyboard while Ponder is opened using shift+refresh
- removed the requirement of editor provided lang keys for text windows
- couple fixes, changes to instructions
 2021-03-02 05:53:43 +01:00
simibubi
4ee9dd8a8a Merge branch 'mc1.15/dev' into mc1.16/dev 2021-02-19 00:49:39 +01:00
simibubi
d59fea1079 Bloat. 
- Auto-Organize inputs
- runData after lang PRs
- change runWhenOn to non-deprecated unsafeRunWhenOn, now that late forge version is required
- Address a few warnings
 2021-02-18 19:43:22 +01:00
JozsefA
15302495f5 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering-merge 
# Conflicts:
#	src/main/java/com/simibubi/create/AllEntityTypes.java
#	src/main/java/com/simibubi/create/AllSpriteShifts.java
#	src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntityRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java
#	src/main/java/com/simibubi/create/foundation/command/AllCommands.java
#	src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java
 2021-02-15 21:27:08 -08:00
JozsefA
31a1fd71ce everything is somewhere else 2021-02-11 23:36:05 -08:00
simibubi
2700832dff Merge branch 'mc1.15/dev' into mc1.16/dev 2021-02-06 21:41:02 +01:00
simibubi
72ec08ddfa Asset attack 
- Fixed floor-mounted cogbrackets not having a particle texture
- Redesigned clutch, gearshift, seq. gearshift and speed controller with up-to-date palettes
 2021-02-04 23:46:59 +01:00
simibubi
374f3c9547 Climb or Convey 
- Added Gantry shafts and Gantry pinions
- Further attempts at stabilizing kinetic propagation
- Contraption types can now be added from external code
- Kinetic tile entities now have more control over kinetic propagation rules
- Added backend for loading schematic configurations globally for any component to see
- Encased chain drives are less likely to create a kinetic source loop when wrenched
- Piston and Pulley contraptions are less likely to overshoot targets at high speeds
 2021-02-04 21:02:30 +01:00
JozsefA
8c0e983f36 An absolutely ridiculous amount of refactoring. Shader system got a complete makeover, but still needs a little work. 
Objective was GL compatibility, now runs with 3.3, 2.0 is target.
Remove old tile rendering code. Need to bring back old old (vanilla) tile rendering code.
 2021-02-03 23:21:10 -08:00
JozsefA
e690f2b8ac okay you can use it now 
fixed a lighting bug (with a hack, again)
everything now uses the new api
(kinetic components on contraptions are slightly broken)
 2021-01-27 14:03:18 -08:00
JozsefA
67d59540cf THIS IS NOT READY FOR USE 
new rendering api/pipeline
not everything is there yet, but a lot is
 2021-01-26 19:45:13 -08: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
JozsefA
f6518d5c5d insane amounts of refactoring 
surprisingly it all still works the same, but better
maybe still some more cleanup to do
 2021-01-22 11:28:39 -08:00
JozsefA
03205c277b move render package up one level 2021-01-13 12:15:48 -08:00
JozsefA
a56d08b78e a bunch of refactoring to make things easier later 
it's not any more stable but belts render on contraptions
rotating things almost do
actually fix a bunch of memory leaks
 2021-01-11 00:29:02 -08:00
JozsefA
0b3615b50e time for some organization pt I 2021-01-07 14:57:10 -08:00
JozsefA
102e392ab4 merge experimental rendering from 1.16 to 1.15 part II 2021-01-05 10:58:31 +01:00
JozsefA
7d43bb056a merge experimental rendering from 1.16 to 1.15 2021-01-05 10:56:47 +01:00
simibubi
afa477d81b Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-09 21:00:06 +01:00
simibubi
9a7886f406 Backwards for Progress 
- Rebuilt the entire fluid propagation and transfer system with a new approach
 2020-12-09 16:05:52 +01:00
simibubi
e8edbcdb11 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-26 00:57:29 +01:00