Commit graph

53 commits

Author SHA1 Message Date
33b8d2bd85 Fix matrix stack rotations 2020-10-04 15:39:32 +02:00
eda8bfd0a1 Fixed crash on pressing alt key on schematic screen 2020-10-04 14:16:05 +02:00
fdf9fdcd78 Fixed some text component stuff i messed up earlier 2020-10-04 10:35:58 +02:00
simibubi
bc4418a929 Port recent changes to compile 2020-10-04 01:59:51 +02:00
31e35d060f fixed merge conflicts 2020-10-04 01:08:13 +02:00
tterrag
3be810a9eb Yet more porting, bodge to let SchematicWorld implement IServerWorld 2020-10-03 16:27:09 -04:00
simibubi
334bde9de5 Quality
- Visual rework of all active UIs
- Fixed large scale renderers such as belts, cannons, pulleys to disappear when partially out of frame
- Schematic and Quill now has the ability to convert a selection to a readied schematic instantly
- Moved option input of cart assemblers to side faces
- Fixed crash when attempting to smelt items on belts/depots
- Stockpile switches can now be inverted
- Fixed stockpile switches not dynamically updating gui indicators frequently enough
- Tanks can no longer be directly interacted with in survival mode
- Sequenced gearshifts now emit a comparator signal based on their current instruction index
- The Piston instruction for sequencers can now accept distances up to 128m
- Fixed some rendering inconsistencies with symmetry mirrors
- Reworked symmetry mirror models to match the tool better
- Attribute filters can now add inverted conditions to the list
- Added the attribute "can be crushed"
- Made the schematicannon interface a little less confusing
- Fixed launched items of the schematicannon rendering warped
2020-10-02 14:28:48 +02:00
92a6e32b19 Fixed some more stuff 2020-09-24 16:17:16 +02:00
88d52814c5 Fixed tagging and some misc 2020-09-23 23:14:00 +02:00
ae7a24d2a3 Below 3 digit compile errors, finally 2020-09-23 21:42:31 +02:00
5538441e9f Still 3 digit compile errors? Fixed a bunch, probably broke a bit too 2020-09-23 11:15:32 +02:00
2f2a5674f3 Ok, still above 100 compile errors, but progress... 2020-09-22 23:18:13 +02:00
f01aeee43e even more porty? 2020-09-22 22:00:44 +02:00
fe92f8fb41 Even more porty 2020-09-22 21:17:11 +02:00
83c64121eb Do some porty stuff 2020-09-22 17:44:22 +02:00
tterrag
4beaab9b97 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev
Update to 1.16.3

Conflicts:
	src/main/java/com/simibubi/create/AllBlockPartials.java
	src/main/java/com/simibubi/create/AllBlocks.java
	src/main/java/com/simibubi/create/AllTags.java
	src/main/java/com/simibubi/create/ClientEvents.java
	src/main/java/com/simibubi/create/CommonEvents.java
	src/main/java/com/simibubi/create/content/contraptions/components/actors/StorageInterfaceMovement.java
	src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/fan/AirCurrent.java
	src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueItem.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueRenderer.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPipeBlock.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPipeModel.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTankBlock.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTankCTBehaviour.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTankModel.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java
	src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticle.java
	src/main/java/com/simibubi/create/content/contraptions/processing/HeaterBlock.java
	src/main/java/com/simibubi/create/content/contraptions/processing/HeaterRenderer.java
	src/main/java/com/simibubi/create/content/contraptions/processing/HeaterTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltHelper.java
	src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java
	src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java
	src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperPolishingRecipe.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorBlock.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorMovementBehaviour.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorSlots.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/LinkedExtractorBlock.java
	src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlotPositioning.java
	src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java
	src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/belt/TransportedItemStackHandlerBehaviour.java
	src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/SynchronizedExtraction.java
	src/main/java/com/simibubi/create/foundation/utility/AngleHelper.java
	src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java
	src/main/java/com/simibubi/create/foundation/utility/VecHelper.java
	src/main/java/com/simibubi/create/foundation/utility/outliner/BlockClusterOutline.java
	src/main/java/com/simibubi/create/foundation/utility/outliner/Outline.java
2020-09-20 00:37:27 -04:00
simibubi
990d80412e Logistics' final stretch, Part I
- Brass tunnels once again have the ability to synchronize inputs among a chain
- Mechanical arms now have a range limitation
- Mechanical arms now wait with initialization until their area is fully loaded
- Chutes no longer ignore the direction of an attached fans air flow
- Chutes now render particles indicating their movement direction
- Chutes can now pull items up from belts or off the ground
- Fixed item model of shadow casing
- Fixed invisible quads under funnels when no casing is applied to the belt
- Belt mounted funnels can now be perpendicular to the belt theyre on
- Funnels can now transpose items like a hopper when facing down
2020-09-19 15:19:22 +02:00
simibubi
03cf441674 Distribution modes for tunnels
- Item distribution across belts using brass tunnels can now be configured with a wrench
- Added new icons for the distribution options of arms and tunnels
- Removed obsolete code
- Fixed some weirdness with creative crates and funnels
2020-09-13 22:00:11 +02:00
Zelophed
8e349380a5 fix tooltips getting occluded by certain gui elements
- addresses #412
- addresses #366
2020-08-21 20:46:09 +02:00
tterrag
c1f68ab830 Prospective 1.16 port start - only find/replace fixes so far 2020-07-22 22:16:11 -04:00
simibubi
f820e2be27 Mechanical Arm Implementation
- The arm blockitem can now be used to select inputs & outputs
- Arms now transfer items between inputs and outputs
- Arm support for Belts, Depots and Funnels
- Some safety checks in net code
- Minor refactor to NBTHelper
2020-07-01 22:02:00 +02:00
simibubi
78ad674c22 Re-organized packages and utilities 2020-05-23 14:02:38 +02:00
simibubi
029b7e2123 Merge branch 'master' into mc1.15/dev 2020-05-23 12:15:55 +02:00
Snownee
3890698a4b Fix GUI rendering order 2020-05-19 13:29:11 +08:00
simibubi
9c96ee8bb8 Removed Symmetry Particles from block registry
- Fixed fluid rendering in fan recipe JEI
- Made symmetry mirror models partials instead of blockstates
- Ported symmetry wand GUI Screen
2020-05-18 15:51:24 +02:00
simibubi
20ab49e46e Better game element rendering in GUIs
- Fixed uv issues with connected textures
- Fixed chromatic scope not showing on blockzappers
- Refactored game element rendering in user interfaces, such as JEI screens
2020-05-11 17:48:00 +02:00
simibubi
901c530f62 Merge branch 'master' into mc1.15/dev 2020-05-11 00:23:28 +02:00
simibubi
0a869190b2 Deployer dupes
- Fixed blazing sword taking damage in the nether
- Fixed blazing sword not igniting entities
- More safety checks
- Fixed stack overflow when overpowering a RSC from both inputs
- Fixed outrageous duplication glitch in deployer item handler
- Fixed crafters not able to return multiple buckets
- Super glue can now be used to make chassis sticky
2020-05-09 14:27:09 +02:00
Snownee
9c5987310e Fix crash while opening JEI splashing category (Closes #297) 2020-05-07 22:23:47 +08:00
simibubi
83ceb7d215 Merge remote-tracking branch 'origin/mc1.14-v0.2.3' into mc1.15/dev 2020-05-02 00:16:04 +02:00
simibubi
a97418e784 Better Schematics
- Visual rework to Schematic items and their interface
- Written Schematics can now be re-used in Schematic Tables
- Schematic and Quill selection is now smoother and more precise
- Schematics no longer re-render their preview every time they are re-positioned
- Schematic tools now move, rotate or flip the schematic more smoothly
- Schematic tools now render the new cuboid outlines rather than plain GL lines
- Fixed Schematics not rendering TileEntities in their preview
- Fixed inconsistent shifting when rotating Schematics with an "odd by even" size
- Fixed typo in Mechanical Press tooltip
2020-04-27 14:04:06 +02:00
simibubi
c62d356f9b Superglue
- Added superglue, an alternative to chassis blocks
- Added some random safety checks
- Fixed some more bad gl states left by event handlers
2020-04-20 23:27:34 +02:00
tterrag
a7c1ae3ec5 Fix crash in JEI rendering -- still far from functional 2020-04-04 22:08:57 -04:00
tterrag
f16e534a89 The rest of the compile errors, a few rendering fixes 2020-03-30 01:45:29 -04:00
tterrag
53f0524200 Some mass renames: onBlockActivated, Entity.posXYZ, etc. 2020-03-29 11:46:00 -04:00
tterrag
844dc42501 More porting work 2020-03-28 22:10:23 -04:00
tterrag
85d0d5244a Misc porting, mostly rendering. Mass rename RenderSystem/ILightReader
Under 500 errors!
2020-03-22 23:06:37 -04:00
simibubi
14e053fafd Sequenced Gearshift
- Added Sequenced Gearshifts
- Fixed custom swords breaking blocks when held in creative mode
- Fixed belts cancelling flight when touched
- Fixed Entities being blocked by contraption boundaries when moved on belts
- Fixed Flexpeater going funky when edited while active
- Fixed Links not firing when placed into a powered location
2020-03-11 21:40:55 +01:00
simibubi
aacc52d84a Refactored animated block partials
- Moved all block partials used only for rendering out of the registry
- Refactored model registry hooks and custom block model handling
- Added a safety layer for all tile entity renderers, addresses #76
- Overstressed indicator no longer shows when the kinetic source changes
- Fixed framed glass rendering glass textures inbetween blocks
- Fixed blockzapper adding itself twice to the item group
- Fixed basing not spawning particles properly
- Updated Forge
- Reworked Schematicannon model
2020-02-04 14:48:21 +01:00
simibubi
40e9a1ee41 The Filter Brothers
- Torque generators no longer show stress impact levels
- Added Filters for matching outputs against a group of items / nested filters
- Added Attribute Filters for matching outputs against a collection of item properties
- Extraction count on Extractors and Transposers can now be adjusted through scrolling on the value box
2020-01-19 19:29:39 +01:00
simibubi
7304f59f55 Merge branch '0.1.2' into 0.2 2019-10-30 01:23:40 +01:00
BuildTools
8eb10d68a8 added gui handlers from the jei api to FlexcrateScreen and SchematicannonScreen, addresses #42 2019-10-27 03:54:20 +01:00
simibubi
4e69d98ebc Configurable Logistical Contollers
- Added Containers and GUIs for Logistical Controllers
2019-10-06 21:49:44 +02:00
simibubi
0f9cb916cd Advanced Logistics Headstart
- Added Logistical Controllers
- Added Logistical Casings
- Added the Logistical Index
- Added a Logistical Dial
- Started laying out logic for Logistical Networks
2019-10-05 19:00:43 +02:00
simibubi
e95060f997 JEI integration & Placement QOL
- Added JEI support for all added recipe types
- Changed a few recipes
- Kinetic blocks with shafts now try to connect to other shafts when placed
2019-09-16 12:27:28 +02:00
simibubi
0d924bc1f7 Internationalize!
- Moved all language specific content to the lang file
- Tooltips are now loaded from the lang file
2019-09-14 18:21:30 +02:00
simibubi
d20ac87f2c Refactoring Events
- Moved main Client code to separate class
- Bundled some events into a single subscriber
- Renamed a few things
- Keybinds and Keys have their own enum now
2019-09-03 08:34:02 +02:00
simibubi
22fc9d1100 Logistics Part III
- Fixed Redstone bridges activating inconsistently
- Fixed Redstone bridges breaking on world reload
- Completed the Stockpile Switch
- Added Skeleton for filters
- Added Skeleton for extractors
- Renamed some stuff
2019-08-27 17:35:34 +02:00
simibubi
f5f9ac7989 Logistics Part II
- Added Screens for Flexcrate and Stockswitch
- Added Models for Flexcrate and Stockswitch
- Added Container and Inventory to Flexcrate
- Redstone bridges are now divided into senders and receivers
- Fixed some GUI inconsistencies and repetitive code
2019-08-26 20:17:16 +02:00
simibubi
5e9950ba98 Last Minute changes 0.0.5
- Fixed inconsistent version
- Added control tooltip for scroll inputs
- Particles of symmetrically broken blocks appear at the correct location
- Fixed crash in schematictable when refreshing an emptied folder
2019-08-06 21:51:02 +02:00