Commit graph

464 commits

Author SHA1 Message Date
LordGrimmauld
a6fab28722 fix waterlogged blockstate to not be part of blockstate json files 2020-06-19 21:49:49 +02:00
LordGrimmauld
38dbed2518 Tagging Changes
- Copper, Brass and Zinc blocks can now be used as beacon base block
- Copper, Brass and Zinc can now be used to activate a beacon
- Create ingots are now listed under the forge:ingots tag (not only forge:ingots/type)
- Create nuggets are now listed under the forge:nuggets tag (not only forge:nuggets/type)
- Create plates are now listed under the forge:plates tag (not only forge:plates/type)
- Updated registrate to support multiple tags
2020-06-19 18:37:11 +02:00
LordGrimmauld
444dc4c903 Cart Assembler sounds (placing and rail replace) 2020-06-18 09:06:31 +02:00
LordGrimmauld
197834c36c fix pipe connections and tank hitbox (again) 2020-06-18 07:57:20 +02:00
LordGrimmauld
c51e2abf48 water logging and contraptions 2020-06-17 23:16:27 +02:00
LordGrimmauld
dc43f10451 pipe water logging 2020-06-17 16:53:36 +02:00
LordGrimmauld
80e680eb9c fix fluid tank voxel shape gap 2020-06-17 16:14:46 +02:00
LordGrimmauld
7b64f06d79 fix tank flow priorities 2020-06-17 08:13:28 +02:00
LordGrimmauld
7bdc017989 Merge branch mc1.15/fluid_tank into mc1.15/dev 2020-06-16 20:56:37 +02:00
LordGrimmauld
3e8e4c1cb4 clean up dynamic tank renderer 2020-06-16 20:33:36 +02:00
LordGrimmauld
b767df3fc3 fix data sync and tank render 2020-06-16 19:33:00 +02:00
LordGrimmauld
aa9c227bee fluid distribution and render fixes 2020-06-16 15:23:33 +02:00
simibubi
cc6efa5aa2 Logistical Mockups Part I
- Added blockstates and TER for the Mechanical Arm
- Mechanical Arms will start a Grab Rave at random intervals
2020-06-16 12:54:24 +02:00
LordGrimmauld
b0950a23cb tank content renderer, tank TE, pipes connect to tanks 2020-06-16 12:46:16 +02:00
simibubi
dc1ccb6741 TankState
- Added blockstates and dynamic models for the fluid tank
- "Copper Pipe" -> "Fluid Pipe"
- BlockPartials are no longer an enum
2020-06-15 19:14:03 +02:00
simibubi
0a9816504b PumpState
- Added blockstates, models and TE rendering for mechanical pumps
- Removed unused pipe textures
- Removed hasStaticPart in IWrenchable as it became obsolete in 1.15
- Bumped version
2020-06-15 02:25:33 +02:00
simibubi
20de324b72 PipeState
- Implemented dynamic models and blockstates of copper pipes
2020-06-14 22:24:46 +02:00
simibubi
0c150ff86f Readying up 0.2.4d
- Version bump
- Added changelog
2020-06-14 00:14:06 +02:00
simibubi
0d616b7a21 Refactor and Bugs
- Added missing recipe for Dark Scoria
- Refactored Cart Assembler
- Removed reinforced rails from creative tab
- Fixed blockzappers placing waterlogged blocks #350
2020-06-13 20:41:08 +02:00
tterrag
0e9aad6763 Fix dedicated server crash when using schematicannon printing
Closes #355
2020-06-11 21:53:03 -04:00
LordGrimmauld
dd4b3385f8 fixed schematicannon cart assembler requirements 2020-06-11 16:22:43 +02:00
LordGrimmauld
45747db90a fix sneak wrenching 2020-06-11 15:51:07 +02:00
LordGrimmauld
2e835de674 deleted debug print, reduced annying 'invalid' messages to only appear on rail items 2020-06-11 15:44:57 +02:00
LordGrimmauld
3417ceb4fb Cart Assembler - behaviors, railtype update and texture fixes 2020-06-11 15:26:11 +02:00
LordGrimmauld
282d9d6801 Cart Assembler - States and Drops 2020-06-11 12:57:02 +02:00
LordGrimmauld
a0d87b56a8 reset oxidation with sand paper 2020-06-10 21:21:12 +02:00
LordGrimmauld
1c3e08bd66 Merge reinforced rails into mc1.15/dev 2020-06-10 20:44:42 +02:00
LordGrimmauld
63ec7f4dc7 reinforced rail: Tooltip and reworked model/hitbox to better fit minecarts 2020-06-10 20:42:23 +02:00
LordGrimmauld
89f22c60cc reinforced rail collision 2020-06-10 18:54:56 +02:00
simibubi
a8c994ec9f Hotfix the hotfix
- Fixed build issues of auto-published jars
2020-06-09 19:30:36 -04:00
LordGrimmauld
a57a35e867 reinforced rails 2020-06-09 23:49:39 +02:00
simibubi
7e4e262f56 Version bump 2020-06-09 23:15:26 +02:00
simibubi
c63d2a59c9 Merge branch 'mc1.15/release' into mc1.15/dev 2020-06-09 23:10:50 +02:00
LordGrimmauld
eae8ad5e37 fixed Cart Assembler Server Crash - #351 2020-06-09 23:07:36 +02:00
simibubi
8cf8dbaf74 Version bump 2020-06-08 22:16:06 +02:00
simibubi
b91a9bbf28 Kinetic loops
- Fixed cases of self-powering loops caused by blocks rotated using the wrench, addresses #319
- Fixed Extendo Grip animation for left-handed players
2020-06-08 21:39:03 +02:00
simibubi
20a97c6b39 Crafter hotfix
- Fixed crash when placing a crafter between two colliding rotation sources
2020-06-08 19:25:59 +02:00
simibubi
285cb52894 Bug and Lang Fixes
- Patched some localization gaps from the registry wipe
- TE's with an ItemStackHandler capability are now viable for mounted storage
- Fixed pulley placing down ropes when destroyed while moving
- Fixed inconsistency with glue removal and placement
2020-06-08 18:40:21 +02:00
simibubi
752bcf06c0 Bug fixes
- Fixed encoding of generated degree symbols in lang
- Fixed pistons along x moving at inconsistent speeds, overshooting their bounds
- Fixed belts along x not moving entities
- Fixed diagonal belts along z teleporting entities miles away
- Fixed tree fertilizer not working
2020-06-08 13:34:51 +02:00
simibubi
c5e783207f Bug Hunt
- Fixed extractors looking for belt inventories too eagerly, adresses #327
- Slightly refactored Extendo Grip handlers
- Fixed missing particle texture of Extendo Grips
- Fixed crash when assembled minecarts pick up the block below their assembler
- Ploughs no longer break blocks if farmland is below them, adresses #345
- Fixed Schematic tools placing lit furnaces, adresses #342
- Super glue can no longer be removed while inbetween two blocks, adresses #341
- Added a safety check in RotationPropagation, addresses #340
2020-06-07 22:40:27 +02:00
simibubi
dbb2a74839 Extendo Punch
- Players using Extendo Grips can now hurt and interact with entities within the extended range
- Hurting entities using Extendo Grips now applies massive knockback
2020-06-07 21:34:53 +02:00
LordGrimmauld
ba81d391e7 Force Crafters with a pulse 2020-06-07 19:19:46 +02:00
simibubi
34a16b05bf In memory of Gilded Rose Quartz
- Added the Extendo Grip
- Cart assemblers now center a held minecart on their position
- Fixed Minecart contraptions facing backwards upon assembly
2020-06-06 22:36:58 +02:00
LordGrimmauld
b70343b32c Cart Assemblers now stop disassembeled minecarts and send assembled minecarts on their way automatically. Power to assemble cart. 2020-06-06 17:19:42 +02:00
simibubi
e669bb3b27 Added Nixie Tubes 2020-06-05 23:26:22 +02: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
simibubi
cfdc9d0a5e Directional sources of rotation
- Fixed gearbox pretending to be a deployer
- Fixed reversed rendering in the furnace engine TER
- Motors, fans, flywheels and handcranks now reverse their rotation when facing in negative axisdirections. Addresses #236
- Cart assemblers no longer auto-attach to blocks on their sides (top only)
2020-06-04 21:02:29 +02:00
simibubi
82ed9cd85d Analog Redstone Links
- Redstone link receivers now emit their signal with the level of the strongest transmitter of the same frequency
2020-06-04 15:33:56 +02:00
simibubi
82a2d128f1 Ported ISTERs
- Removed temporary lang partial with entity names
- Fixed and Refactored the item renderers of the Wrench, Blockzappers, Worldshapers, Symmetry Wand and Deforester
- Tweaked blockzapper beam rendering to look less clunky
- Fixed selection of zapper tools not showing after they had been dual-wielded
2020-06-04 15:04:49 +02:00
simibubi
77835c3a65 Helper swap
- Replaced temporary AllItems#typeOf with ItemEntry's non-static isIn
2020-06-03 22:17:11 +02:00
simibubi
36ab939126 "Batched" rendering, huh
- Schematic previews can now render TEs
- Schematic renderer no longer relies on negative scale and noCull for mirrored previews (fixes a few inconsistencies)
- Avoided blending issues with the outliner system when using multiple textures throughout a batch
- Introduced SuperRenderTypeBuffer as an attempt to give options for render order in the RWLE context (does not fix the early flushing in the fallback buffer)
2020-06-03 22:04:05 +02:00
tterrag
c486854b7f Convert AllTileEntities to Registrate, refactor TE constructors
Update Registrate to build 17
2020-06-01 00:33:08 -04:00
tterrag
ea88e8fcf5 Convert AllEntityTypes to Registrate 2020-05-31 18:12:57 -04:00
simibubi
33b5338828 More porty todos
- Added back the silk touch requirement to suitable loot tables
- Added generated recipes and tags for glass and window blocks
- Fixed blockzappers selecting new blocks upon firing
- Removed duplicate recipes and lang entries
- Fixed some outdated translation keys in ui screens
2020-05-31 23:37:31 +02:00
simibubi
daee93dc48 Stone variant recipes
- Setup automated recipes for stone palette blocks and their stairs/slabs/etc
- Fixed datagen putting air blocks as drops for attached logistical blocks
- Fixed recipes and lang entries using outdated registry names
- Fixed kinetic blocks appearing twice in the main creative tab
2020-05-31 19:17:00 +02:00
simibubi
9973a853cc Fix build issues outside IDE (again) 2020-05-29 00:19:47 +02:00
simibubi
c53f9c2079 Contraption actors and blockzapper screen
- Fixed harvesters and drill animating incorrectly on contraptions
- Ported blockzapper and worldshaper screen
2020-05-28 13:37:15 +02:00
simibubi
467af2ea20 Renamed AllItemsNew to AllItems 2020-05-28 01:30:14 +02:00
simibubi
3d68bec18a Item registrates, and more porty
- All Items are now using registrate
- Blockzapper now renders an outline around its affected area
- Ported rainbow debug ™️
- Reworked the custom item model/renderer system
- Schematics now preview their structure again
- SuperByteBuffers now support being rendered into non-BufferBuilders
2020-05-28 01:29:26 +02:00
simibubi
8d8f96c778 Fixed outliners' culling issue 2020-05-27 13:12:57 +02:00
simibubi
68b656c6be More porty
- Ported blockzapper beams
- Terrainzapper now uses outliner utility
2020-05-26 20:45:56 +02:00
simibubi
57edbe0c38 Schematics in 1.15
- Ported Schematic placement tools to a usable state (missing preview and noCull)
2020-05-26 14:40:15 +02:00
simibubi
f9fc00855a Reversed Simi's reverse-rendering
- Fixed all TERs that had their transformations backwards
- Fixed contraptions not rendering tileentities when not near world origin
- Fixed Schematic table crashing on upload
- Made more kinetic blocks non-opaque
2020-05-25 23:09:36 +02:00
simibubi
4e8a72be8b Moving contraptions in 1.15
- Ported the contraption renderer
- Fixed sticky blockstates of the linear chassis
- SuperByteBuffers can now be given a separate matrixStack for vertex lighting
- Kinetic TERs now make use of the passed light parameter
2020-05-25 19:58:13 +02:00
simibubi
85a30afc2b Fix build issues outside IDE 2020-05-25 13:34:25 +02:00
simibubi
67f88e666c Crafter connectivity
- Ported input connection handler of mechanical crafters
- Added new TE behaviour for interacting with faces/edges between two blocks
2020-05-24 15:58:25 +02:00
simibubi
4e9cd1db49 ColorRegistrate, Part II
- Added functional interface for block vertex coloring
- Removed several unused type-check-based behaviours
- Belt now registers its color handler in the builder
- Natural scoria now registers its color handler in the builder
- Fixed wrong offset in colored vertex models
2020-05-24 12:31:05 +02: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
61aab48cdb Merging langs
- Set up a data generator to combine the generated lang from registrate with manual langs from assets/
2020-05-23 21:03:35 +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
simibubi
88337a3e0c Renamed AllBlocksNew to AllBlocks 2020-05-22 20:12:53 +02:00
simibubi
fda3c4760c Removed old block reference holder 2020-05-22 20:08:02 +02:00
simibubi
785c79786d Get registrated, Part II
- Set up datagen and registrate chains for all remaining blocks
2020-05-22 20:02:07 +02:00
simibubi
8ab9118de2 Get registrated
- Set up datagen and registrate chains for all remaining blocks from the contraptions section
2020-05-21 00:15:02 +02:00
simibubi
b773ba697f Generating water wheels and fans
- Kinetic TER now renders animated partials in the correct layer
- Ported Water wheel and Encased Fan to registrate
2020-05-19 16:41:54 +02:00
simibubi
aebbec5ffc Generating belts
- Added builder transform for registering stress config values for kinetic blocks
- Created a blockstate generator for belt blocks
- Added belts to registrate
2020-05-19 15:25:21 +02:00
Snownee
3890698a4b Fix GUI rendering order 2020-05-19 13:29:11 +08:00
simibubi
ff1f7bd207 Spiffy creative motor
- Motors can now face any direction
- Reworked motor model
- Ported motor to registrate
2020-05-19 01:07:45 +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
Snownee
f08a574653 Add deployer feeding 2020-05-19 02:06:22 +08:00
Snownee
282445d2ac Fix deployer can eat, part 2 2020-05-19 01:43:59 +08:00
Snownee
485e6c529d Implement IHaveColorHandler on WindowInABlockBlock
https://discordapp.com/channels/620934202875183104/689866656914210897/700713829407129620
2020-05-18 23:57:49 +08:00
Snownee
1378418593 Fix deployer can eat 2020-05-18 22:35:42 +08:00
Snownee
4a7ad75cd0 Fix sand paper is sometimes stackable 2020-05-18 22:29:25 +08:00
Snownee
21cdea67f6 Fix AirCurrent damage handling 2020-05-18 22:13:36 +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
78cee0bd5e Merge branch 'master' into mc1.15/dev 2020-05-18 13:06:58 +02:00
Snownee
e3d3a5de3d Fix deployer cannot place potato on campfire
https://discordapp.com/channels/620934202875183104/689866656914210897/697585687397925007
2020-05-18 18:34:02 +08:00
Snownee
830c1c6d3d Fix contraption duplication (#325) 2020-05-18 11:20:04 +08:00
Snownee
616f8f746e Remove unused import 2020-05-17 17:58:01 +08:00
Snownee
3544b981ee - Fix extractor couldn't drop items when it attaches to a moving blcoks (#317) 2020-05-17 17:56:32 +08:00
simibubi
fb72a686e7 Ported in-world interfaces
- Outlines now support shading/normals
- Refactored Value boxes to use the outliner system
- Ported scrolloption, filter and frequency slot rendering
2020-05-16 17:51:29 +02:00
Snownee
f662a1c805 - Fix schematicannon can place water in nether
- Fix schematicannon item duplicating and wrong item requirement
2020-05-16 23:47:49 +08:00
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