Commit Graph

72 Commits

Author SHA1 Message Date
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
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
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