Commit Graph

409 Commits

Author SHA1 Message Date
simibubi
170f154b74 Merge branch 'master' into mc1.15/dev 2020-05-16 09:58:14 +02:00
simibubi
8212d39d95 Ported superglue entityrenderer 2020-05-16 09:57:06 +02:00
simibubi
d5ec1d6fef Ported Schematic and Quill handler
- Updated outlines rendered by the schematic and quill
- Removed some now auto-generated leftovers from the asset folder
- Fixed Schematic Table screen not rendering the table properly
2020-05-16 00:13:49 +02:00
Snownee
6ed79de6c7 Fix potential item duplicating (Block like bell) 2020-05-16 01:55:52 +08:00
Snownee
1578a2ac68 Improve glue behavior. Glue can no longer place on torch or so on 2020-05-16 01:49:32 +08:00
Snownee
2a9795f411 Fix contraption blocks do not drop while replacing by bedrock 2020-05-16 01:44:58 +08:00
simibubi
071482bb26 Ported Outline utility to 1.15
- Outliner can now be used in 1.15
- Ported Chassis range display to use new Outlines
2020-05-15 17:13:38 +02:00
tterrag
afd6ec17e0 Fix material blocks model generation, clean up unnecessary loot tables 2020-05-14 23:17:31 -04:00
tterrag
7f07a4af6e Remove PalettesRegistrate, can't have multiple datagens for same output 2020-05-14 22:32:36 -04:00
tterrag
02d052ed44 Port material blocks to Registrate 2020-05-14 22:07:19 -04:00
simibubi
c501de8c21 Merge branch 'master' into mc1.15/dev 2020-05-15 02:06:28 +02:00
simibubi
78b3d2c47e Goodbye, tools
- Removed shadow steel, rose quartz and blazing toolsets
- Removed some other unused assets
- Fixed limesand not registering an item
2020-05-15 02:05:01 +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
simibubi
a070792248 Generating Glass and Window Panes
- Re-implemented framed, tiled glass panes and window panes in the palettes registrate
2020-05-14 19:06:40 +02:00
Snownee
a4e7db5788
Merge pull request #313 from Snownee/fix-contraptions
Fix bell duplicating
2020-05-14 23:26:23 +08:00
Snownee
463bf0b641 Fix super glue behavior. Fix super glue can stay between two unmovable blocks 2020-05-14 23:00:43 +08:00
Snownee
8d4e6895bc Fix bell duplicating 2020-05-14 21:42:52 +08:00
Snownee
ca4877430e Fix deployers getting stuck in water or bedrock as contraption 2020-05-14 18:45:34 +08:00
tterrag
702a79684b Fix server launch 2020-05-14 01:04:52 -04:00
tterrag
c3cdf346f7 Update Registrate, use onRegister function instead of CreateBlockBuilder 2020-05-14 00:53:12 -04:00
simibubi
deb03d10de Ported window blocks
- window and glass blocks entered the registrate
- updated palette textures
- removed windowlogging
- removed cocoa logs
2020-05-14 01:23:15 +02:00
simibubi
7536e22eed Connected Textures and Registrate
- CT behaviour is no longer tied to blocks implementing interfaces
- Custom models and connected textures can now be assigned in a custom blockbuider
- Ported framed glass to Palette Registrate
2020-05-13 21:56:46 +02:00
simibubi
bf57058e4e A new home for palette blocks
- Set up datagen for basic palette models and blockstates
- Overgrown blocks now follow foliage colour
- Paved blocks now connect vertically
2020-05-13 01:11:07 +02:00
simibubi
2696fc2a51 BlockState gen progress
- Clutch, Gearshift and Gearbox joined the registrate
- Fixed belt and gearbox items not being assigned creative tabs properly
- Cleaned up and extended the blockstate generator helpers
- Removed advancements from static assets
- Added datagen .cache to gitignore
- Split the palettes section into its own Creative tab
- Fixed Clutch and Gearshift rendering their casing in the TER
2020-05-12 14:06:50 +02:00
tterrag
7832e79b13 Update Registrate, remove now-unnecessary support code for block entries 2020-05-11 23:18:49 -04:00
simibubi
3eee3d2c87 Block entry wrappers
- Simi wants his helpers back
2020-05-11 22:34:02 +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
e69af69b0a Ported new changes to 1.15 2020-05-11 00:48:58 +02:00
simibubi
901c530f62 Merge branch 'master' into mc1.15/dev 2020-05-11 00:23:28 +02:00
simibubi
1fe647b16e Place & Crash
- Fixed some incompatibilities between kinetic blocks and schematic tools
2020-05-09 19:17:51 +02:00
simibubi
32cce4e9b9 Bug-fixes
- Reduced tracking range of mounted contraptions
- Fixed carpets not able to be pushed directly
- Fixed Water Wheels and Belt Tunnels crashing when rendered in a schematic preview
2020-05-09 18:32:47 +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
simibubi
0bd3a8d880 More portable blocks
- Fixed latch hotfix still not making it work properly
- Cocoa pods can now be harvested by harvesters
- Fans, RSCs, basins, stockpile switches, gauges, engines, cranks and other blocks can now be moved in a contraption
- Most of creates technical blocks can now be picked up using a wrench
- Fixed Stockpile switch not reacting to movement.
- Fixed Stockpile switch not reacting to changes to a double container
- Chassis range display no longer shows the overlay for non-sticky directions
2020-05-09 12:14:26 +02:00
simibubi
4cbf424f4d The Bugs win
- Condensed mechanical crafting into one JEI page category, scaling down slots if necessary
- Fixed ploughs trying to break water blocks
- Fixed stationary contraptions getting nudged around by expiring farmland blocks
- Shulker boxes can now be used as portable storage on contraptions
- Added vertical rotation support to buttons, levers
- Fixed certain directional blocks flipping around inconsistently when contraptions rotate by 180 degress
- Random safety checks
- Vertical belts no longer pop when rotated horizontally
- Fixed inconsistent funnel activation when items are inserted on the same segment
- Fixed adjustable pulley popping off due to floating point precision issues
- Fixed toggle latch acting strangely with input signals
- Schematicannons can now place belts safely
- Removed invalid Schematic item from creative tab
2020-05-09 00:09:10 +02:00
Snownee
505b251132 Fix build error 2020-05-09 01:05:56 +08:00
Snownee
6d67c6e30b Fix basin renderer causing crash 2020-05-09 01:05:41 +08:00
Snownee
774f1b5f56 Fix broken rendering state 2020-05-09 01:05:01 +08:00
simibubi
4b1c187d64 Config watching
- Fixed client and common config not being picked up by the configwatcher, thus not reacting to changes
2020-05-08 12:55:52 +02:00
Snownee
5f406d0b74 Fix: belt connector shows twice in creative tab 2020-05-08 11:53:46 +08:00
Snownee
1b040658e4 Remove invalid recipe. It seems BoP has removed this item 2020-05-08 11:43:55 +08:00
Snownee
97aba40cb4 Fix all blockstates 2020-05-08 11:42:54 +08:00
Snownee
5ac6ded468 Fix belt keeping dropping item in debug world 2020-05-08 10:42:01 +08:00
simibubi
65853c9da0 Creative Crate Revival
- The creative crate is back on the menu
- Schematicannons with creative crates no longer require gunpowder to operate
- Creative crates can now be used for infinite item supply and voiding
- Added a few more advancements
2020-05-07 19:52:36 +02:00
Snownee
9c5987310e Fix crash while opening JEI splashing category (Closes #297) 2020-05-07 22:23:47 +08:00
Snownee
e95e62f7ae Fix crash while rendering crafter 2020-05-07 22:22:57 +08:00
Snownee
5fb65d68f7 Fix JEI tab background is not transparent 2020-05-07 22:22:25 +08:00
Snownee
9b8c985b2b Fix blockstates json 2020-05-07 22:19:06 +08:00
simibubi
6c3c0600d3 Rebooting Advancements
- Reworked basic advancement tree, to be continued
- Removed unused trigger and damage source for sandpaper
- Added some new crate assets
2020-05-06 20:24:04 +02:00
simibubi
ef541493c5 Asset tweak
- Made new belt sprite less aggressive
2020-05-05 20:36:42 +02:00
simibubi
0f67b9afe2 Merge branch 'master' into mc1.14/dev 2020-05-05 20:26:53 +02:00
simibubi
d8c00dccb4 Merge branch 'master' into mc1.14/dev 2020-05-05 20:24:22 +02:00
simibubi
c4513020df Schematics and Entities
- Fixed sidedness issue with glue effect packets
- Fixed duplication issue with Schematic tables
- Schematics can now include entities
- Schematicannons can now print:
    - superglue
    - (filled) item frames
    - (equipped) armor stands
    - end crystals
    - boats and minecarts
    - paintings
- Special blocks/entities placed by a schematicannon can now specify custom item requirements (used currently for belts & superglue)
- Fixed superglue not being rotated/mirrored correctly
2020-05-05 20:21:22 +02:00
b9053f7902 the "count":<n> is now supported in recipe inputs, changed mixer recipes to use this new feature 2020-05-05 10:38:06 +02: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
simibubi
e27927de15 Sections
- Removed pseudo-modularity of Create's content
2020-05-02 18:07:46 +02:00
369c2d7d9d added apparently missing stonecutter recipe for create:polished_dark_scoria 2020-05-02 10:13:15 +02:00
simibubi
901cb00426 merged mc1.15/dev into mc1.15-registrate 2020-05-02 00:34:36 +02:00
simibubi
aea5918636 Port new code to 1.15 (help)
- Shoddily eliminated compilation errors with new code from 0.2.3
2020-05-02 00:19:29 +02: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
8bfc4445b0 Minecart Issues
- Fixed displaced coords between contraptions and their mounts, should fix cart structures from disappearing when loaded near chunk borders
- Contraptions no longer render with default yaw if their mount is out of render distance
- Fixed ploughs and other actors not activating properly when other actors had just stalled the contraption
- Fixed ploughs leaving behind breaking overlays when stopped/disassembled
- Fixed ploughs, drills and saws throwing entities back by unreasonable distances
- Drills now break columns of falling blocks from top to bottom while moved
2020-05-01 15:21:00 +02:00
simibubi
75638b7c8d Pocket Carts
- Minecarts with mounted contraptions can now be picked up as an item
- Furnace Minecarts can now be used in the cart assembler
- Fixed superglue not re-appearing when moved in piston contraptions
- Fixed deployer not being able to interact with non-living entities
- Fixed Schematic deploy tool outline not rendering at the right location for certain boundary sizes
- Fixed leaking GL texture parameters from outline rendering
- Added Italian localization
- Fixed file extension of Japanese localization
2020-04-30 16:45:35 +02:00
simibubi
885791f878 Cart Rotation Lock
- Minecart assemblers can now be configured to 3 different rotation modes
2020-04-29 23:32:17 +02:00
simibubi
45897e4c18 Mechanical Ploughs
- Added the Mechanical Plough
- Mounted Drills now briefly stall a contraption after breaking a block below falling blocks (sand, gravel, etc)
- Mechanical Saws can now harvest Bamboo, Chorus, Kelp, Sugar Cane, Cactus, Melons and Pumpkins
- Fixed harvester position inconsistency when moved vertically
- Fixed saws/drills not hurting entities in some cases
- Fixed saws/drill throwing back hurt entities in weird directions
2020-04-29 19:12:42 +02:00
simibubi
83cfc097ae Merge branch 'mc1.14-v0.2.2b' into mc1.14-v0.2.3 2020-04-27 14:50:12 +02:00
simibubi
76f81910c4 SGS hotfix
- Fixed Sequenced Gearshift crashing when removing instructions while active
2020-04-27 14:44:57 +02:00
simibubi
d2c1122786 Create in korean
- added ko_kr localization by qkrehf2
2020-04-27 14:09:47 +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
tterrag
0a11c62661 Stub out more invalid datagen, fix creative crate model reference 2020-04-26 12:11:44 -04:00
tterrag
c330d163ec Update Registrate, add proof of concept new block registration pattern 2020-04-26 00:58:38 -04: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
2cccbca11b Add registrate as dependency, experimental refactor of AllBlocks 2020-04-19 16:16:00 -04:00
simibubi
db8e52be2e Bugs & Refactors
- Added new selection/outline particles for use in place of bounding box rendering
- Refactored JEI categories
- Slots for chance outputs now have a slighly different appearance in JEI
- Redstone links no longer cause a redstone update when loaded in
- Redstone links no longer mess up windmill bearings on chunk reload
- Fixed redstone links not working properly after movement in a contraption
- Filter output amounts can no longer be increased beyond the stack limit
- Chassis range visualization now uses the new outline particle
- Kinetic networks are now aware of movement, such as NBT-item placement, schematic placement and other means of tileentity movement and will reset/reconnect
- Fixed pistons/bearings/etc not being movable by chassis
- Fixed pistons/bearings/etc moving a clone of themselves when attached to the initial block
- Fixed pistons/bearings/etc stopping or losing their structure when loaded incorrecly
- Pulleys can now be moved while extended, moving attached ropes and their own attached structure with them
- Brittle blocks such as ladders/torches/etc can no longer be moved unless their attached block is moved
- Fixed mechanical pistons messing up their kinetic information when changing into a different extension state.
- Fixed misplaced client code introduced by a ScreenOpener hotfix
- Fixed inconsistent belt initialization when belts are placed by schematics or structures, causing them to break at random
- Clutches and Gearshifts now await their turn to re-attach when changed, allowing multiple to be used in a network and swapped within one tick without causing components to break.
- Fixed flexcrate interface crashing if the block gets removed while open
- Some additions/modifications in texture assets
- Pistons no longer get blocked by their push limit if the blocks pushed are attached to each other
2020-04-16 20:46:15 +02:00
cripsy_chips1234
38c9415f87
Update zh_cn.json 2020-04-13 14:52:18 +08:00
tterrag
ed19a65b9f Port new code to 1.15 2020-04-12 16:27:08 -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
91ba47ba33 Merge branch 'master' into mc1.14-v0.2.2b 2020-04-11 01:42:23 +02: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
simibubi
72ddc1251a Pushing the Pusher
- Ore features no longer spawn in the "void" or "hell" biome
- Fixed Minecart contraptions killing their own mount using saws/drills
- Pistons, Bearings and Pulleys can now be moved unless they are moving something themselves
- Fixed cart assemblers blocking in the powered rail kickstart logic
- Piston poles can now be moved
- Crushing wheels no longer spawn missing texture particles when sprinting on the central block
- Deployers' hand items can now be directly inserted/extracted using hoppers, extractors, funnels, etc
- Fixed Deployers not dropping held items when destroyed
- Millstones now empty their input inventory when clicked on while their output buffer is empty
- Millstones no longer accept items they cannot process
- Fixed hoppers not being able to pull items from belts in certain cases
- Fixed adjustable crates corrupting chunks
2020-04-09 21:29:51 +02:00
simibubi
e2742f6fb2 Not enough Zinc
- Reverted the misplaced nerf on worldgen, applied due to a previous bug in feature placement
- Critical worldgen changes now override everyones' configs
2020-04-08 20:33:49 +02:00
simibubi
d1ff9f4e30 Broken UVs
- Fixed UV shifts not working consistently with high-res resource packs
- Fixed window panes not connecting their textures with windowlogged blocks
- Fixed buttons and pressure plates not resetting after being moved
- Fixed missing tooltips on custom swords
- Redstone links now move when the block they are attached to is moved
2020-04-08 20:31:06 +02:00
simibubi
810191aa89 Cast with Caution
- Revisited every unchecked TileEntity cast
- Redstone Links can now be toggled with a wrench
- Redstong Links are now portable on contraptions
- Schematicannon no longer inserts held schematics automatically
- Saws no longer accept items when their speed is zero
2020-04-05 18:02:46 +02:00
MORIMORI0317
a9848c48c4
Create ja_jp.lang 2020-04-05 19:53:29 +09:00
tterrag
a7c1ae3ec5 Fix crash in JEI rendering -- still far from functional 2020-04-04 22:08:57 -04:00
tterrag
1e0711fa95 1.15 port checkpoint: kinetic rendering mostly complete 2020-04-04 21:54:24 -04:00
zelophed
f1057bf558 changed how the wrench rotates blocks
- wrench now rotates the target block around the axis of the face that the it was used on
2020-03-30 18:48:07 +02:00
tterrag
f16e534a89 The rest of the compile errors, a few rendering fixes 2020-03-30 01:45:29 -04:00
tterrag
c849bb188e Port remaining uses of RenderHelper and getCombinedLight 2020-03-29 15:18:14 -04:00
tterrag
e1e3220b68 Add server versions of wrapped worlds 2020-03-29 14:39:51 -04:00
tterrag
9f2dcc5635 Port most remaining instances of manual lightmap modification 2020-03-29 14:21:22 -04:00
tterrag
3c07aa51de Finish porting most TERs 2020-03-29 12:20:33 -04:00
tterrag
11ae3bc820 Port all instances of Block.onBlockActivated 2020-03-29 12:05:07 -04:00
tterrag
53f0524200 Some mass renames: onBlockActivated, Entity.posXYZ, etc. 2020-03-29 11:46:00 -04:00
tterrag
3e82cf6a90 Merge remote-tracking branch 'origin/mc1.14-v0.2.2' into mc1.15-v0.2.2
Conflicts:
	build.gradle
2020-03-29 00:08:49 -04:00
tterrag
e52fa26fda Yet more porting work 2020-03-29 00:07:49 -04:00
simibubi
3371267e79 Merge branch 'mc1.14-v0.2.2' 2020-03-29 04:44:35 +02: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
tterrag
844dc42501 More porting work 2020-03-28 22:10:23 -04:00
simibubi
9a77081f3a Recipe tweaks
- Gunpowder can now be multiplied in the mixer
- Metal blocks can now be crushed back into the crushed ores. (Inefficient enough to avoid any loops)
- Crushing wool in the millstone is less effective
2020-03-29 00:48:18 +01:00