Commit graph

117 commits

Author SHA1 Message Date
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
grimmauld
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
grimmauld
34bfa2f479 Remove TiC run reference 2020-10-16 17:00:43 +02:00
grimmauld
c9e2f8b05e Deforester works on slime saplings 2020-10-16 11:14:47 +02:00
grimmauld
83918a6aaf Fix build issues by not relying on modmaven, update JEI dependency to use dedicated 1.16.3 files 2020-10-11 15:43:04 +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
tterrag
c1f68ab830 Prospective 1.16 port start - only find/replace fixes so far 2020-07-22 22:16:11 -04:00
Zelophed
b2a5a4822a more changes to heater and particles
-heater now uses a enum for the blaze state
-added new particles for the heater
-changed heaters voxel shape
2020-07-18 20:07:22 +02:00
tterrag
a4a4298c20 Comment out changelog debugging code 2020-06-09 19:45:38 -04:00
tterrag
144f46251f Fix changelog html output, add changelog history 2020-06-09 19:42:57 -04:00
tterrag
6f1be11612 Remove classifier from shadow jar 2020-06-09 19:34:57 -04:00
simibubi
a8c994ec9f Hotfix the hotfix
- Fixed build issues of auto-published jars
2020-06-09 19:30:36 -04:00
tterrag
e4b3d58a88 Remove debug print from buildscript 2020-06-07 20:18:59 -04:00
tterrag
d857ebb3b7 Clean up buildscript, add automatic changelog and curseforge upload 2020-06-07 20:18:34 -04:00
simibubi
9005eae338 Config shenanigans & Terraforged support
- Serverconfig now registers together with the others
- Added missing stress config entries for components without a default stress impact greater than zero
- bumped version
- Tagged stone variants from Create palettes to generate in a terraforged world type
2020-06-05 13:02:11 +02:00
tterrag
c486854b7f Convert AllTileEntities to Registrate, refactor TE constructors
Update Registrate to build 17
2020-06-01 00:33:08 -04:00
simibubi
e9c26eed0a ColorRegistrate
- Added support for Block & ItemColors in CreateRegistrate
- Updated forge and removed obsolete warning suppressions
- Fixed mossy & overgrown block items not having their foliage layer coloured
2020-05-24 03:12:18 +02:00
simibubi
c698aec5d4 Generating complex blockstates
- Added utility for outsourcing blockstate generators into dedicated classes
- Ported Encased belt and Adjustable Pulley
- Updated Forge
2020-05-18 22:01:09 +02:00
simibubi
12e0e55b0f Generating Stairs, Slabs and Walls
- All palette variants now have auto-generated stairs, slabs and walls for certain patterns
- Layered variant types have connected textures again
- Centralized all SpriteShifts
2020-05-15 01:23:27 +02:00
tterrag
c3cdf346f7 Update Registrate, use onRegister function instead of CreateBlockBuilder 2020-05-14 00:53:12 -04:00
tterrag
7832e79b13 Update Registrate, remove now-unnecessary support code for block entries 2020-05-11 23:18:49 -04:00
simibubi
0c2a33861e Registrate Progress
- Started moving over a few kinetic blocks from AllBlocks to registrate
- Changed runData to only run client data tasks for now
- Added missing bind to the ContraptionRenderer for Stationary Contraptions
2020-05-04 19:57:16 +02:00
tterrag
c330d163ec Update Registrate, add proof of concept new block registration pattern 2020-04-26 00:58:38 -04:00
tterrag
2cccbca11b Add registrate as dependency, experimental refactor of AllBlocks 2020-04-19 16:16:00 -04:00
tterrag
a1605af46a Merge remote-tracking branch 'origin/mc1.14-v0.2.3' into mc1.15-v0.2.2
# Conflicts:
#	build.gradle
#	src/main/java/com/simibubi/create/foundation/utility/SuperByteBuffer.java
#	src/main/java/com/simibubi/create/foundation/world/AllWorldFeatures.java
#	src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelBlock.java
#	src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanBlock.java
#	src/main/java/com/simibubi/create/modules/contraptions/components/millstone/MillstoneBlock.java
#	src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableBlock.java
#	src/main/java/com/simibubi/create/modules/contraptions/processing/BasinBlock.java
#	src/main/java/com/simibubi/create/modules/contraptions/redstone/AnalogLeverBlock.java
#	src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java
#	src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltBlock.java
#	src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTileEntityRenderer.java
#	src/main/java/com/simibubi/create/modules/curiosities/partialWindows/WindowInABlockModel.java
#	src/main/java/com/simibubi/create/modules/logistics/block/RedstoneLinkBlock.java
#	src/main/java/com/simibubi/create/modules/logistics/block/StockswitchBlock.java
#	src/main/java/com/simibubi/create/modules/palettes/CTGlassPaneBlock.java
#	src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableBlock.java
#	src/main/java/com/simibubi/create/modules/schematics/block/SchematicannonBlock.java
#	src/main/resources/META-INF/mods.toml
2020-04-12 15:25:52 -04:00
simibubi
4d16961636 Bug Fixes
- Sandpaper can no longer repair tools
- Fixed players getting kicked for "flying" when moved by contraptions or fans
- Saw no longer duplicates itself when broken in an overstressed state
- Belts can no longer pass items on to a vertical belt
2020-04-11 00:55:51 +02:00
simibubi
3c0b55ac1d A cure to darkness
- Kinetic blocks no longer cause chunks to lose all block light information
- Stockpile switch and sequencer no longer open the GUI to the wrong players
- Belt items no longer skip blocking attachments while loaded in
- Nozzle explosions no longer cause block damage
- PSIs no longer transfer an excess of items, deleting them in the process
2020-04-10 21:43:28 +02:00
tterrag
1e0711fa95 1.15 port checkpoint: kinetic rendering mostly complete 2020-04-04 21:54:24 -04:00
simibubi
a4513086a1 Hotfixed Redstone Links 2020-03-29 04:44:13 +02:00
tterrag
748f8af229 Merge remote-tracking branch 'origin/mc1.14-v0.2.2' into mc1.15-v0.2.2
Conflicts:
	build.gradle
	src/main/java/com/simibubi/create/AllTileEntities.java
	src/main/java/com/simibubi/create/foundation/world/OreFeature.java
	src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionEntity.java
	src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntityRenderer.java
	src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltColor.java
2020-03-28 22:28:49 -04:00
Zelophed
b885a60003 added datagen for BlockTags to AllBlocks
-use the runData run configuration to generate json data
2020-03-28 02:27:43 +01:00
simibubi
f9b9659bc6 Bugs, Recipes and Storage Blocks
- Added Zinc and Brass Block
- Added compat for mechanical Saw with BoP's logs
- Fixed Crafters and Mixers not handling container items properly
- Fixed Shafts not dropping when breaking a belt segment with pulley
- Added missing loot table for copper blocks and shingles
2020-03-23 17:04:09 +01:00
tterrag
7e5406eb05 Merge remote-tracking branch 'origin/mc1.14-v0.2.1' into mc1.15-v0.2.1
Conflicts:
	build.gradle
	src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/GaugeInformationRenderer.java
2020-03-22 23:09:28 -04:00
tterrag
96106f2a9e Merge remote-tracking branch 'origin/mc1.14-v0.2.1' into mc1.15-v0.2.1
Conflicts:
	build.gradle
2020-03-22 14:27:03 -04:00
Zelophed
fc12dd3416 added the submitted recipes from the discord
compatibility recipes for
quark:
crushing cactus replacement
crushing biotite ore
splashing iron plate

bop:
crushing flowers

silents gems:
crushing gem ores

simple farming:
crushing grains

charm:
crushing nether gold deposit

ready your shovels:
splashing ore deposits
splashing dirt smoothing
2020-03-22 14:41:41 +01:00
tterrag
f8ce736385 Update buildscript to 1.15.2 2020-03-21 15:42:00 -04:00
simibubi
b4cdcb9729 Bug Fixes
- Fixed compat crash when tooltips are loaded early
- Buffed all sources
- Render buffers are now cleared when loading a world. Might help with shader issues
- Fixed eager loading of biomes in ore features
- Kinetic blocks now always clear their source when placed (needs testing)
- Kinetic blocks now remember their applied stress to a network before a config change
- Chassis range is now displayed with an overlay instead of outlines
- Crushing wheels are now more lenient about having different speeds
- Crushing wheels no longer pull players in peaceful mode
- Mixers no longer ignore items inserted during processing
- Powered Latch now reacts to weak power on the sides
- Fixed flexcrates not updating their inventory properly when extended
2020-03-21 18:32:53 +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
e902d269f4 A less messy mess Part I
- Reworked Particle Registry to fix sidedness issues
- Removed some unused models, blocks and textures
- Added missing loot tables
- Fixed all models falsely inheriting from block/cube
- Updated Forge
- Restored server functionality
2020-01-20 13:41:41 +01:00
simibubi
039edb5519 Omnidirectional Extractors
- Extractors and Linked Extractors have vertical variants
- Minor reworks to Extractor models
2019-12-22 01:31:40 +01:00
simibubi
fca3b74909 Flicker awareness & Tree cutting
- Kinetic blocks break when their speed updates to frequently
- Fixed Stress gauge not resetting when source was removed
- Fixed Kinetic networks doubling their stress when saving and loading the world
- Fixed Generators not updating network stress when their speed changed
- Fixed Processing saw crashing when used
- Fixed tree cutting algorithm looping indefinitely
- Fixed sourceless kinetic blocks in rainbow debug
- Horizontal saws cut trees in front of them
- Deforester now works in creative mode
2019-12-13 18:15:11 +01:00
simibubi
c2814f8ad2 Cutting Edge
- Fixed Entity Types not registering correctly
- Fixed WorldRenderer being loaded server side
- Fixed the Tree Cutter search used by the Deforester
- Fixed Crushing wheel controller not dropping contents when removed
- Mechanical Saw can now process Cutting and Stonecutting Recipes
2019-11-10 15:53:44 +01:00
simibubi
7304f59f55 Merge branch '0.1.2' into 0.2 2019-10-30 01:23:40 +01:00
simibubi
00be0f57f0 Last Minute Fixes - 0.1.1a
- Added safety check for other Tile Entities blocking two Crushing Wheels, addresses #36
- Overwrote blockzapper preview renders of Fourway-blocks, addresses #21
- Added safety check for Crushing Wheels in null Worlds, addresses #38
2019-10-22 00:26:21 +02:00
simibubi
baba95e0eb Spiffy Blockzapper
- Reworked animated models for the Handheld Blockzapper
- Fixed beam render on non-default FOV settings
2019-10-21 23:45:16 +02:00
simibubi
835a4a638b Better Pistons Part I
- Started work on cascading chassis and better block models
2019-10-18 13:14:03 +02:00
simibubi
facef0ddb1 Bug Fixes in 0.1.1a
- Fixed id downcasing not working properly in non-english environments #25
- Removed event subscriber annotations for mod & registry events
- Added more displayable slots in the Washing JEI view
- Fixed Windowed blocks referencing IBakedModel on the server
- Changed stairs to use blockstate supplier
- Fixed Symmetry Wand crashing when configured in the off-hand
- Fixed "Hold Shift" in tooltips not being translated
- Chassis now drop applied slime balls
- Slime Balls are now craftable
- Mechanical Belts now lock living entities in place
- Blockzapper recipes can now be viewed from the uses of their ingredient materials
- Configured FlexPeaters now synchronize with other players
- Fixed client crash when rendering lava in a deployed schematic #15
- Made encased fans a little less expensive
- Added other coral types to tree fertilizer recipe
2019-10-15 22:22:19 +02:00
simibubi
98f568f887 Addressing Todos
- Started work on changing how moving constructs are assembled and ticked
2019-10-13 21:30:25 +02:00
simibubi
488a9f63a9 Lazy Logisticians
- Added a new Villager type for delivering packages
- Added the Logisticians Table
- Added Package Funnels
- Added a generic colorable indicator tileentityrenderer
2019-10-11 05:56:32 +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
0a1b85fe39 Fancy Windows
- Added ability to put glass panes inside partial blocks such as Fences, Stairs and Slabs.
- Added Tiled Glass and Tiled Glass Panes
- Fixed Translation Chassis pulling blocks even without being sticky
- Added Palette Blocks to corresponding tag groups
- Added translation to zh_cn (Thanks to Thirace446)
- Split gearboxes into two interchangeable Items
2019-09-24 14:40:01 +02:00
simibubi
687e96135a Bug Busting 0.1 Part II
- Removed WIP Items from Creative Tab
- Added option to disable tooltips
- Moved common config values to synced serverconfig
- Numbers on Scrollable Blocks are centered
- Motors can be configured to rotate with negative speed
- Fixed Processing Recipes Serializer (severe)
- Fixed Moving constructs not rendering at a reasonable distance
- Mechanical Bearing always solidifies when empty
- Fixed some movement incosistencies with translation constructs
- Fixed Crushing Wheel Controller not stopping when Wheels do
- Fixed Crushing Wheels ejecting entities on world reload
- Fixed Movement inconsistencies with Mechanical Belts
- Added rotation propagation through large cogwheels connected at a 90 degree angle
- Fixed Client code being called server side
- Fixed Abstract Method errors regarding Extractors and FrequencyHolders
- Added a unit character to Flexpeater display
- Fixed additional washing outputs from flying all over the place
- Schematicannon now ignores Structure Void blocks
- Fixed Schematic hologram not displaying
- Added little indicators to the Mechanical Bearing to visualize curent angle
- Bumped version
2019-09-18 11:16:57 +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
6fb5da3d6a Configure Everything
- Added config file handling for server and client parameters, also adresses #6
- Attached most constants to a config value
2019-09-10 22:51:26 +02:00
simibubi
9420d874fe Smelty on the Belty
- Encased Fans can smelt items
- Added some random textures for future items
- Moved some event calls
- More Renames
2019-09-03 23:03:52 +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
4cfd7a1bb9 Constructs, Pistons and Blocks
- Added Mechanical Pistons
- Added Chassis blocks for multiblock movement
- Improved memory usage of kinetic renders
- Added Mechanical Harvester
- Added Mechanical Drill
- Visual hints for the Belt connector
- Added Crushing Wheel Model
- Added Encased Belt
- Added Redstone Contact
- Fixed Invalid Schematics crashing on shift-right-click
- Added a variety of building materials
- Updated textures of kinetic blocks to be rotation independent
- Fixed axes rotating with fixed shaded sides
2019-08-17 00:57:36 +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
simibubi
f67a61290f Forge Proofing
- Updated to Forge 28.0.45, Fixes #5
- Tidied up mods.toml and build.gradle
2019-08-06 19:00:51 +02:00
simibubi
903ad95bf0 Handheld Blockzapper
+ Added the Handheld Blockzapper Tool
+ Added several craftable upgrades for
the Tool
+ Added animated Models for Symmetry wand and Handheld Blockzapper
- Schematicannon now uses two items for Double Slabs
- Fixed Warn messages for client packets
- Added misc Crafting Ingredients
- Changed recipe unlock triggers
2019-07-28 10:08:49 +02:00
simibubi
a9c710f81d Schematicannon and Complex blocks
- Fixed double blocks being counted twice as requirement
- Fixed beds not showing in Hologram
- Fixed Blocks like flowers not showing in Hologram at certain conditions
- Added a print option to blueprints in creative (Bypassing the cannon)
- Fixed pistons placed by the cannon
2019-07-22 14:40:28 +02:00
simibubi
dbfb60b809 Fix, Refactor and Polish
- Tidied up and renamed Classes
- Added useful tooltips to all items
- Added tooltips to blueprint overlay tools
- Made Schematic And Quill more bearable to use
- Changed rendering order for blueprint overlay, Fixes Issue #1
2019-07-19 17:50:23 +02:00
simibubi
f0b9c30ef5 Jar Fixes
- Fixed ScrollFixer not working in built jar
- updated mods.toml
- moved TreeFertilizer to item package
2019-07-18 10:24:36 +02:00
simibubi
ddc846d860 Setup Infrastructure
- Relevant Mod files
- Relevant Classes
- Resources
- Added Symmetry Wand from TMA
2019-07-11 09:03:08 +02:00