Commit Graph

3453 Commits

Author SHA1 Message Date
PepperCode1
f12701ccc4 Merge branch 'mc1.18/dev' into mc1.19/dev
Conflicts:
	build.gradle
	gradle.properties
	src/generated/resources/.cache/cache
	src/generated/resources/data/create/tags/blocks/fan_transparent.json
	src/generated/resources/data/create/tags/blocks/tree_attachments.json
	src/generated/resources/data/create/tags/blocks/windowable.json
	src/generated/resources/data/forge/tags/items/beacon_payment.json
	src/main/java/com/simibubi/create/AllFluids.java
	src/main/java/com/simibubi/create/AllTags.java
	src/main/java/com/simibubi/create/Create.java
	src/main/java/com/simibubi/create/content/contraptions/processing/BasinRecipe.java
	src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java
	src/main/java/com/simibubi/create/foundation/block/render/DestroyProgressRenderingHandler.java
	src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java
	src/main/java/com/simibubi/create/foundation/mixin/DestroyProgressMixin.java
	src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
	src/main/resources/META-INF/mods.toml
	src/main/resources/create.mixins.json
2022-11-22 20:25:55 -08:00
PepperCode1
5b038d419c Instanced steam engines
- Add SteamEngineInstance
- Delete contraption models on contraption invalidate
- Do not use enum subclasses in BottomlessFluidMode
- Fix ContraptionDriverInteractMixin being added twice
- Update Flywheel
2022-11-22 14:35:37 -08:00
jacquerol
24c13dab89 Added PlayerEntityRendererMixin
- Added crossbow animation to potato cannon and zapper
- Updated potato cannon model to fit animation
2022-11-21 00:37:36 -03:00
PepperCode1
131c9a5479 Hard-working Registrate
- Deprecate CreateRegistrate#lazy, add CreateRegistrate#create, and call
registerEventListeners manually
- Remove Create#registrate and use Create.REGISTRATE instead
- Move tag datagen code and methods to TagGen
- Pass event busses directly to Curios#init
- Update logging to use SLF4J
- Update Flywheel to 0.6.8-95
- Increment version to 0.5.0.g
2022-11-17 13:50:15 -08:00
starlottemusic
8fbaaa60f2
Scroll Tick sound in GUIs
Added the Scroll Tick sound to ScrollInput boxes within GUIs for consistency with in-world scroll boxes.
2022-11-14 17:37:47 -05:00
starlottemusic
bbe0c2a5cb
Sails use vanilla dye/shear sounds
Adds the "Dye stains" and "Shears click" sounds to the sail block when the respective action occurs.
2022-11-14 17:29:47 -05:00
Falxie_
c06d9bf81c Remove unnecessary variable 2022-11-12 02:02:58 +00:00
Falxie_
c5e178de80 Fix StationUnloadedCondition not working in other dimensions 2022-11-10 23:08:38 -08:00
PepperCode1
cf87508276 Refactor multi-pos block destruction
- Replace DestroyProgressMixin with BlockDestructionProgressMixin and
LevelRendererMixin
- Replace DestroyProgressRenderingHandler with
MultiPosDestructionHandler
2022-11-09 16:52:22 -08:00
PepperCode1
b77388a8e4 Refactor map station marker mixins
- Map update packet now sends station indices instead of guessing that
certain decorations are stations
- Do not use MapDecoration.Type.MANSION for stations to allow map
extending
- Create CustomRenderedMapDecoration
- Change how custom MapDecorations are rendered
- Fix some code in MapItemSavedDataMixin
2022-11-09 15:01:10 -08:00
FortressNebula
e053c9240f AllLangPartials also now supports more mod ids 2022-11-06 12:24:37 +00:00
PepperCode1
ce03a91983 Refactor map station marker mixins
- Map update packet now sends station indices instead of guessing that
certain decorations are stations
- Do not use MapDecoration.Type.MANSION for stations to allow map
extending
- Create CustomRenderedMapDecoration
- Change how custom MapDecorations are rendered
- Fix some code in MapItemSavedDataMixin
2022-11-05 21:13:35 -07:00
PepperCode1
8d68dff7a5 Render only the boots
- Do not render the leggings texture when rendering netherite diving
boots
2022-11-05 18:07:17 -07:00
FortressNebula
f0311f3245 Add support for other mod ids in LangMerger 2022-11-05 22:31:59 +00:00
PepperCode1
d3a33896e2 Proper armor rendering
- Add CustomRenderedArmorItem
- Remove old code in HumanoidArmorLayerMixin
- Move HumanoidArmorLayerMixin from common to client
2022-11-05 15:04:51 -07:00
PepperCode1
8e936a0096 Aqua Infinity and Under-lava Visibility
- Diving helmets now always grant aqua affinity
- Diving helmets can no longer be enchanted with aqua affinity
- Netherite diving helmets now improve under-lava visiblity by 6.25x
2022-11-04 23:17:42 -07:00
Kryppers
dc7bd7de4c missing texture fixes
tidied up textures missing from the asset rework
2022-11-01 16:03:08 +00:00
simibubi
dceab37d5a Metal Scaffolds, Part I 2022-11-01 16:02:54 +01:00
simibubi
9498dacfc9 Counter balance
- Elevator contacts no longer cause observer updates whenever an elevator is leaving
2022-11-01 14:25:04 +01:00
Kryppers
b458b02c94 spit and shine part 4: tech support
added scaffolding models and textures

continued texture tweaks
2022-11-01 13:11:28 +00:00
NotSoEpic
172c8da43e Fix: blaze burner overfill and automation issue
Currently when inserting an item that smelts > 50 items such as lava buckets into an unfueled blaze burner, its burn time will go over maximum.
This fixes that by limiting added burn time from a single item to 98% of max burn time.
Also fixes #3518
2022-10-29 09:43:20 +08:00
Kryppers
29a777653c Spit and Shine part 3: the curious case of encased curios.
Continued work on brass assets

Removed surplus Vault textures

Adjusted the crushed aluminium compat asset to match xycraft set.
2022-10-29 00:41:39 +01:00
simibubi
98820283d4 Industrial Iron Block, Part II 2022-10-24 15:16:33 +02:00
Kryppers
5125c00855 Industrial Iron Block
Industrial iron block texture

continued model+texture improvements
2022-10-24 14:04:48 +01:00
Kryppers
20d3d32cc7 Spit and Shine part 3: The Purge
Replaced textures on models referencing redundant assets

First batch of redundant assets removed

Minor model optimisations.
2022-10-23 00:38:16 +01:00
simibubi
3ae59269e1 Firing up the tunnel generator 2022-10-22 19:48:32 +02:00
Kryppers
61f8a23d20 spit and shine part 2: tunnel vision
Updated tunnel models
introduced WIP tunnel textures

WIP update to andesite Block

Vault textures updated and re-organised
2022-10-22 17:28:36 +01:00
simibubi
f04da38583 Firing up the funnel generator 2022-10-22 00:27:33 +02:00
simibubi
f361c5f707 Merge branch 'mc1.18/0.5.1' into mc1.18/0.5.1-repolish 2022-10-21 23:37:43 +02:00
Kryppers
447d4236fc Spit and Shine part 1
Reworked funnel models
Reorganised funnel assets
WIP textures for funnels

WIP texture for andesite_block

Cleaned up some unused files
2022-10-21 22:35:57 +01:00
simibubi
da5b752e1f Merge branch 'mc1.18/copycat' into mc1.18/0.5.1 2022-10-21 22:04:42 +02:00
simibubi
069d154396 Trapdoors everything
- Added Copycat Panels and Copycat Steps
2022-10-21 21:58:30 +02:00
simibubi
cd0c748e0b Too much elevation
- Elevator contacts no longer power adjacent elevator contacts
- Fixed elevator contraptions travelling to unreachable floors
- Switch to redstone palette for controls indicator
- Added localised elevator assembly hints
- Multiple elevators can no longer be assembled into the same column
2022-10-19 13:15:47 +02:00
simibubi
945ecefe0d Bumpo 2022-10-19 00:37:05 +02:00
simibubi
ad57fe158c Merge branch 'mc1.18/netherite-diving' into mc1.18/0.5.1 2022-10-18 23:02:56 +02:00
simibubi
1a475f7373 Next level elevation
- Added the Contraption Controls
- Added the Elevator Pulley
- Pulley ropes are now climbable
- Lowered hitbox of seats for improved traversability inside contraptions
- Improved safety for players standing on vertically moving contraptions
- Fixed seated entities on controlled contraptions not rendering at the correct location
- Multiple pulleys can now attach to contraptions in a synchronised group
- Display Boards now update text instantaneously at high input rpm
2022-10-18 19:31:26 +02:00
PepperCode1
8afc834f0c Unobtainium Backtank
- Allow any netherite boots to complete netherite diving set
- Fix picking up backtank creating unobtainable placeable item
- Add tooltip for netherite backtank
- Remove direct references to copper backtank in tooltips
2022-10-10 13:10:02 -07:00
caelwarner
0c5ccf38ee
Added server-side check to BackTankUtil
- Added server-side check to BackTankUtil#isBarVisible, BackTankUtil#getBarWidth, BackTankUtil#getBarColor
- Fixes #3751
2022-10-08 02:01:54 -07:00
PepperCode1
53cc386b86 Layered with mixins
- Render netherite diving gear with both layers properly
- Mixin to HumanoidArmorLayer to render both layers for all slots
2022-10-07 18:48:49 -07:00
PepperCode1
3d74c41c2d Netherite Diving
- Add netherite diving helmet, netherite backtank, and netherite diving
boots
- Full netherite diving set makes entity fire immune
2022-10-07 12:32:44 -07:00
simibubi
959aa4afbd Pick a better side
- Pass local coordinates to blocks when calling pick() in identify mode
2022-10-07 19:47:22 +02:00
simibubi
7cd149ba06 Pick a side
- Ponder's Identify mode now supports blocks with ray-specific pick block results
2022-10-07 19:33:10 +02:00
simibubi
c4eb62c862 World of Tags
- Tile Entities in ponder are now backed up as their nbt compound instead of a cloned instance
2022-10-07 18:43:39 +02:00
simibubi
c7a75f8ffd Subcontraption Overlap
- Fixes #3871
2022-10-03 00:31:42 +02:00
Cael Warner
0098f0e147
Merge pull request #3860 from Creators-of-Create/mc1.18/basin-recipe-fix
Fixed basin recipes that override Recipe#getRemainingItems
2022-10-01 13:35:12 -07:00
caelwarner
b03aaef5a2
Switched getInputInventory() to availableItems
- Using availableItems instead of getInputInventory() in case an item in the output inventory is being used as an ingredient
- Removed commented code
2022-09-30 15:39:19 -07:00
caelwarner
7f6cf4b4a2
Fixed basin recipes that override Recipe#getRemainingItems
- The output of Recipe#getRemainingItems was being ignored by basin recipes. This could cause duplication of container items
- Created DummyCraftingContainer to allow us to call Recipe#getRemainingItems for CraftingRecipes
2022-09-30 13:38:21 -07:00
simibubi
5303d69bf1 Better guard for Deployer#initHandler
- Addresses #3685
2022-09-29 13:00:33 +02:00
PepperCode1
80ae80b39b Mixing up the mud
- Add mixing recipe for mud
- Add BlockTagIngredient
- Update Flywheel
- Bump version
2022-09-28 22:16:18 -07:00
PepperCode1
be57d096f8 Merge branch 'mc1.18/dev' into mc1.19/dev 2022-09-28 22:14:33 -07:00