Commit graph

2466 commits

Author SHA1 Message Date
PepperBell
569975bc07 Merge remote-tracking branch 'upstream/mc1.16/dev' into mc1.17/dev
Conflicts:
	build.gradle
	gradle.properties
	src/generated/resources/.cache/cache
	src/generated/resources/assets/create/lang/unfinished/de_de.json
	src/generated/resources/assets/create/lang/unfinished/es_es.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/pt_br.json
	src/generated/resources/assets/create/lang/unfinished/zh_cn.json
	src/main/java/com/simibubi/create/AllBlocks.java
	src/main/java/com/simibubi/create/Create.java
	src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
	src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableItemInterfaceTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/actors/SawMovementBehaviour.java
	src/main/java/com/simibubi/create/content/contraptions/components/crafter/ConnectedInputHandler.java
	src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ControlledContraptionEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/LinearActuatorTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/PipeConnection.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluid.java
	src/main/java/com/simibubi/create/content/contraptions/processing/BasinRenderer.java
	src/main/java/com/simibubi/create/content/curiosities/toolbox/RadialToolboxMenu.java
	src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxBlock.java
	src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxHandlerClient.java
	src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxInventory.java
	src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/block/depot/EntityLauncher.java
	src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java
	src/main/resources/META-INF/mods.toml
2021-11-25 19:15:31 -08:00
Jozufozu
6eca281134 Hack for contraption cutout 2021-11-24 11:12:59 -08:00
simibubi
dfe2f41b59 Post-PR Datagen 2021-11-24 14:13:22 +01:00
simibubi
8a034d31a7
Merge pull request #2367 from Xandaros/patch-1
Fix de_DE controller rail translation
2021-11-24 14:10:05 +01:00
simibubi
393cc55e71 Stealthy Evaporation
- Fixed fluid networks losing fluids when extracted amount is lower than a pumps transfer speed
- Fixed JEI plugin claiming that some occultism's ritual recipes work in a compacter
- Fixed press/deployer/spout failing to process a belt item when another item is processed simultaneously further down the belt
2021-11-24 14:06:10 +01:00
Martin Zeller
b8127407fa
Fix de_DE controller rail translation 2021-11-24 06:17:21 +01:00
Jozufozu
507a1b1696 Merge remote-tracking branch 'origin/mc1.17/dev' into mc1.17/dev 2021-11-23 18:18:59 -08:00
Jozufozu
028ac4bbda Transform stack changes
- Add ToolBoxInstance
 - Move from MatrixTransformStack to TransformStack.cast where possible
 - SuperByteBuffer implements transform traits on its own
 - Bump flywheel build
2021-11-23 18:16:57 -08:00
simibubi
52eca118ad Back on Patch, Part III
- Better visibility for low/half amounts of fluids in basins
- Fixed Mechanical Press head getting stuck in extended position when off-screened or when its basin changes
- Added processingTime support to mixing recipes (defaults to 100)
- Fixed Basin recipes with fluid output not starting when targeted output inventory supports items only
- Fixed item extraction from create creating stacks of unstackable items when source inventory allows stacking them (Storage Drawers)
- Fixed Deployers not having a valid item capability when asked before their first tick
- Fixed Mechanical Crafting recipes able to be automated via packing
2021-11-23 18:55:39 +01:00
Alonso
ebf1a895c9
es_cl.json by Alonsinwhat (#2365) 2021-11-23 16:39:30 +01:00
PepperBell
3129672f3a Add CustomUseEffectsItem
- Add CustomUseEffectsItem interface implemented on items to control use
effects behavior
- Replace SandPaperEffectsHandler and SandPaperSoundMixin
- Fix broken polishing particles when no items in other hand (polishing
last item)
2021-11-22 20:12:45 -08:00
simibubi
97bff0f95f Other pipes are available
- Moved fluid update fix from encased pipes to all pipes
2021-11-22 12:44:36 +01:00
simibubi
27c69250d1 Portable Spillage Interface
- Fixed Chutes spilling items when inserting into disconnected storage interfaces
- Blaze Burners can now be picked up using the Wrench
- Additional safety checks from random crash reports
2021-11-22 11:38:52 +01:00
simibubi
67afe74250 Contraption launcher
- Fixed Contraptions being affected by Weighted Ejectors
2021-11-22 02:11:36 +01:00
simibubi
88e487cdf5 Back on Patch, Part II
- Fixed piston/pulleys moving before their attached entity is loaded
- Recipes with an id suffixed "_manual_only" are now ignored in auto-shaped, auto-shapeless and auto-cutting processing features
- Fixed pipes spawning particles at connections between chunks
- Fixed pipes not initialising target fluid holders properly when the source is loaded in first
- Fixed encased fluid pipes not updating flows when neighbouring blocks change
- Fixed fluid pipes not updating flows when adjacent block changes from fluid to block
2021-11-22 00:55:08 +01:00
simibubi
f3109b28ab Back on Patch
- Fixed Crafters voiding any inserted items after being moved on a contraption
- Fixed Crafters crashing the game after being placed by a Schematicannon
- A couple of two-ingredient recipes have been made shapeless
- Improved piston/pulley contraption collision with blocks in the world
- Fixed pistons/pulley contraptions merging into world blocks when disassembling shortly after loaded in
- Added jei support for toolbox colouring recipes
- Disabled item shadows on belts
- Toolbox radial can now be navigated using hotbar shortcuts
- Toolbox radial now steps back when right-clicked
- Toolbox radial now immediately opens the multi-toolbox view when right-clicking the central "unequip" button
- Fixed hidden slots visible in toolbox screen in some gui scales
- Toolbox sorting in the radial menu is now deterministic
- Fixed Toolboxes not always updating their inventory state to clients
- Shulker boxes can no longer be placed inside toolboxes
- Fixed potion fluids not displaying their full name in jei
- Fixed JEI showing all potion recipes when looking up a specific one
2021-11-21 22:03:38 +01:00
DreiMu
64f8e98011
Updates to de_de.json by DreiMu (#2358) 2021-11-21 16:50:32 +01:00
PepperBell
7b4f9f924f Over-rendered
- Replace AngleHelper.horizontalAngle with horizontalAngleNew (return 0
instead of -90 for vertical directions)
- Fix FluidRenderer not calculating correct UVs for integer positions
- Fix FluidRenderer rendering streams and flowing texture incorrectly
- Slightly improve performance of outlines
- Rename PartialBufferer to CachedBufferer
- Move specific code out of SuperByteBufferCache into CachedBufferer and
BakedModelRenderHelper
- Move Compartment inside SuperByteBufferCache
- Rename some methods and fields
2021-11-21 00:44:37 -08:00
PepperBell
d15b2281c1 Update Registrate 2021-11-20 09:04:55 -08:00
simibubi
91ba2780e7 Post-PR Datagen
- move pt_br to correct location
- bump version
2021-11-20 13:57:12 +01:00
qkrehf2
973eed6c10
Updates to ko_kr.json by qkrehf2 (#2340) 2021-11-20 13:43:42 +01:00
璀境石
dc0f5e58eb
Updates to zh_cn.json by Demonese (#2313) 2021-11-20 13:36:05 +01:00
Nekrodamus
f5369ebe63
Updates to es_es.json by FrannDzs (#2303) 2021-11-20 13:34:30 +01:00
vyhi
db4fcf8065
Updates to pt_br.json by vyhi (#2284) 2021-11-20 13:31:17 +01:00
CKenJa
78dd569986
Updates to ja_jp.json by CKenJa (#2280) 2021-11-20 13:28:38 +01:00
simibubi
a3808365dd
Merge pull request #2275 from Eriksonnaren/patch-1
Allows generator blocks to output different speeds in different direc…
2021-11-20 13:25:30 +01:00
simibubi
1d143e9271
Merge pull request #2288 from khjxiaogu/patch-1
Add Gantry Shaft Impact
2021-11-20 13:20:56 +01:00
Jozufozu
075e194f8a Polish polish
- Sanding particles are of the item you are sanding
 - Sanding sounds are played slower
2021-11-17 20:48:09 -08:00
Jozufozu
3aeef5d0ff The sounds of sand 2021-11-17 19:42:34 -08:00
PepperBell
f9000bf777 Extreme polishing
- Add sanding sounds
- Allow sandpaper to polish vanilla copper
- Spawn particles when polishing Create copper blocks
- Make Create copper blocks inherit properties from copper block instead
of iron block
- Fix empty blaze burner not lighting with flint and steel
2021-11-16 17:42:35 -08:00
PepperBell
ad350507c9 The great screen refactor
- Use vanilla's widget lists instead of custom ones
- Use press callback instead of overriding mouseClicked
- Switch old container classes to extend ContainerBase or
GhostItemContainer
- Organize foundation.gui package
- Remove deprecated methods in Color
- Various other changes
2021-11-14 16:11:14 -08:00
PepperBell
1e90f84875 Update dependencies
- Gradle: 7.2 -> 7.3
- Forge: 37.0.104 -> 37.0.108
- JEI: 8.1.0.31 -> 8.2.0.34
2021-11-12 11:01:27 -08:00
PepperBell
0298d4cdf7 Clean up access transformer 2021-11-11 23:15:42 -08:00
PepperBell
795ef07b38 Fix Flywheel contraption lighting
- Fix some events being registered to the wrong event bus
- Organize some event registration
- Fully fix FluidRenderer
2021-11-10 22:15:26 -08:00
simibubi
2078899ed9 Bigger Boxes
- Added the Item Vault
2021-11-10 21:07:47 +01:00
simibubi
6224a3e444 Time well spent
- Fixed shaft models misaligning near large cogwheels
2021-11-10 17:27:03 +01:00
simibubi
70803db5c6 Thanks, Mojang
- Removed the Copper Ingot
- Removed Copper Ore
- Block of Copper -> Copper Plating
2021-11-10 03:30:55 +01:00
simibubi
91e03de96b Blocks of Cogs
- Slightly tweaked cogwheel models
- Added Encased Cogwheels and Encased Large Cogwheels
2021-11-10 02:41:49 +01:00
Jozufozu
e8cddfdfea Fix textures on contraptions
- bump flywheel build
2021-11-09 16:53:52 -08:00
Jozufozu
9597d8832f Bump flywheel build 2021-11-09 15:07:29 -08:00
Jozufozu
5284fe742f Chipping away at light 2021-11-09 14:59:31 -08:00
Jozufozu
8261be3d80 Named models 2021-11-08 20:48:02 -08:00
Jozufozu
302b15551a Fix contraption step sounds 2021-11-08 18:54:46 -08:00
simibubi
a6e60d704c Brass Circuitry
- Removed the pulse repeater
- Removed the adjustable repeater
- Adjustable Pulse Repeater -> Pulse Repeater
- Added the Pulse Extender
- Latches now play a sound when flipped manually
- ponder todo
2021-11-08 03:01:27 +01:00
PepperBell
acd932f65e Caching and config
- Replace old uses of BlockEntity.clearCache appropriately
- Slightly improve handling of non-Forge config specs
- Minor cleanup
2021-11-07 13:09:11 -08:00
simibubi
bea8cea59d Get building
- Fixed super glue not spawning particles on break
- Fixed logspam when goggle overlays are shown
- Fixed blocks launched by a schematicannon spiraling through the air
- Fixed javadoc errors
2021-11-07 20:58:46 +01:00
zelophed
35239d10f4 fix StencilElements not rendering correctly 2021-11-07 20:43:40 +01:00
PepperBell
d82146a541 Fix cube particle rendering 2021-11-07 11:12:00 -08:00
PepperBell
ad9a6272c2 Fully fix GuiGameElements
- Replace all GUI y-flip scalings to not scale normals
- Rotate CustomLightingSettings along XN instead of XP
- Apply custom lighting to all fluids in JEI scenes
- Fix fluid rendering: fix normals, normal scaling, and color
2021-11-07 10:31:19 -08:00
PepperBell
4909546457 Revert "Patch GuiGameElements"
This reverts commit 55c95b347b.
2021-11-07 10:27:51 -08:00