mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-03-04 06:44:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev

Browse source
This commit is contained in:
IThundxr 2025-01-18 13:07:01 -05:00
commit e261439c63
Failed to generate hash of commit
911 changed files with 3329 additions and 2416 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
build.gradle
View file

@ -24,19 +24,14 @@ base {
} }
boolean inMultiModWorkspace = rootProject.hasProperty('multiModWorkspace.enabled') boolean inMultiModWorkspace = rootProject.hasProperty('multiModWorkspace.enabled')
boolean catnipInWorkspace = rootProject.hasProperty('multiModWorkspace.catnip')
boolean ponderInWorkspace = rootProject.hasProperty('multiModWorkspace.ponder') boolean ponderInWorkspace = rootProject.hasProperty('multiModWorkspace.ponder')
if (catnipInWorkspace) {
evaluationDependsOn(":catnip:NeoForge")
}
if (ponderInWorkspace) { if (ponderInWorkspace) {
evaluationDependsOn(":ponder:NeoForge") evaluationDependsOn(":ponder:NeoForge")
} }
project.logger.lifecycle("MultiModWorkspace ${inMultiModWorkspace ? 'enabled' : 'disabled'} for project ${project.name}.") project.logger.lifecycle("MultiModWorkspace ${inMultiModWorkspace ? 'enabled' : 'disabled'} for project ${project.name}.")
project.logger.lifecycle("Dependencies included in Workspace: [Catnip: ${catnipInWorkspace}], [Ponder: ${ponderInWorkspace}]") project.logger.lifecycle("Dependencies included in Workspace: [Ponder: ${ponderInWorkspace}]")
println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
@ -62,13 +57,6 @@ neoForge {
sourceSet(sourceSets.main) sourceSet(sourceSets.main)
} }
if (catnipInWorkspace) {
catnip {
sourceSet(project(":catnip:Common").sourceSets.main)
sourceSet(project(":catnip:NeoForge").sourceSets.main)
}
}
if (ponderInWorkspace) { if (ponderInWorkspace) {
ponder { ponder {
sourceSet(project(":ponder:Common").sourceSets.main) sourceSet(project(":ponder:Common").sourceSets.main)
@ -159,13 +147,6 @@ dependencies {
compileOnly("dev.engine_room.flywheel:flywheel-neoforge-api-${flywheel_minecraft_version}:${flywheel_version}") compileOnly("dev.engine_room.flywheel:flywheel-neoforge-api-${flywheel_minecraft_version}:${flywheel_version}")
jarJar(runtimeOnly("dev.engine_room.flywheel:flywheel-neoforge-${flywheel_minecraft_version}:${flywheel_version}")) jarJar(runtimeOnly("dev.engine_room.flywheel:flywheel-neoforge-${flywheel_minecraft_version}:${flywheel_version}"))
if (catnipInWorkspace) {
implementation(project(":catnip:Common"))
implementation(project(":catnip:NeoForge"))
} else {
implementation("net.createmod.catnip:Catnip-NeoForge-${minecraft_version}:${catnip_version}")
}
if (ponderInWorkspace) { if (ponderInWorkspace) {
implementation(project(":ponder:Common")) implementation(project(":ponder:Common"))
implementation(project(":ponder:NeoForge")) implementation(project(":ponder:NeoForge"))
@ -173,7 +154,6 @@ dependencies {
implementation("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}") implementation("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}")
} }
jarJar("net.createmod.catnip:Catnip-NeoForge-${catnip_and_ponder_mc_ver}:${catnip_version}")
jarJar("net.createmod.ponder:Ponder-NeoForge-${catnip_and_ponder_mc_ver}:${ponder_version}") jarJar("net.createmod.ponder:Ponder-NeoForge-${catnip_and_ponder_mc_ver}:${ponder_version}")
//compileOnly("mezz.jei:jei-${jei_minecraft_version}-common-api:${jei_version}") //compileOnly("mezz.jei:jei-${jei_minecraft_version}-common-api:${jei_version}")

3
gradle.properties
View file

@ -33,8 +33,7 @@ jei_minecraft_version = 1.21
jei_version = 19.5.0.33 jei_version = 19.5.0.33
curios_minecraft_version = 1.21.1 curios_minecraft_version = 1.21.1
curios_version = 9.2.2 curios_version = 9.2.2
catnip_version = 0.8.53 ponder_version = 0.9.12
ponder_version = 0.8.7
catnip_and_ponder_mc_ver = 1.21.1 catnip_and_ponder_mc_ver = 1.21.1
cc_tweaked_enable = true cc_tweaked_enable = true

10
src/generated/resources/.cache/3055aa55530438925fbff1670d3e8dc6cc209bf3
View file

@ -1,4 +1,4 @@
// 1.20.1 2025-01-17T00:09:44.5040448 Registrate Provider for create [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] // 1.20.1 2025-01-18T13:14:26.2262033 Registrate Provider for create [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
60bbdf92d2ac9824ea6144955c74043a6005f79d assets/create/blockstates/acacia_window.json 60bbdf92d2ac9824ea6144955c74043a6005f79d assets/create/blockstates/acacia_window.json
6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json 6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json
c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json
@ -569,7 +569,7 @@ a60c9c8241e40c2e28f5760c0ca6e80cfe9d59f3 assets/create/blockstates/steam_whistle
8865500bcd2e4d467e74edb3509850fa92a5809f assets/create/blockstates/sticker.json 8865500bcd2e4d467e74edb3509850fa92a5809f assets/create/blockstates/sticker.json
bed0534e618105184bc877b104230403ca85bb58 assets/create/blockstates/sticky_mechanical_piston.json bed0534e618105184bc877b104230403ca85bb58 assets/create/blockstates/sticky_mechanical_piston.json
c7c17ff17b98ce85d355f2f9b4509271bc283843 assets/create/blockstates/stockpile_switch.json c7c17ff17b98ce85d355f2f9b4509271bc283843 assets/create/blockstates/stockpile_switch.json
2d66ca4b6916eac170b3b8552705b699f569bae2 assets/create/blockstates/stock_link.json d17e6ac368278bd60442e2f19eb064a31c4106d2 assets/create/blockstates/stock_link.json
9989bda294fbffc5f659d2e608e01dea424c7694 assets/create/blockstates/stock_ticker.json 9989bda294fbffc5f659d2e608e01dea424c7694 assets/create/blockstates/stock_ticker.json
a70c025de5d85180f371ff05bbdc531d8bdfaab1 assets/create/blockstates/stressometer.json a70c025de5d85180f371ff05bbdc531d8bdfaab1 assets/create/blockstates/stressometer.json
8086f80c532fad42b37fcdc590b890ed7e8c3fe9 assets/create/blockstates/tiled_glass.json 8086f80c532fad42b37fcdc590b890ed7e8c3fe9 assets/create/blockstates/tiled_glass.json
@ -642,8 +642,8 @@ b0d8f08968763a5f74e5cd5644377a76a9f39753 assets/create/blockstates/yellow_toolbo
fe8c497aacc641c2f01cec90bba9f19e59cc2ed2 assets/create/blockstates/yellow_valve_handle.json fe8c497aacc641c2f01cec90bba9f19e59cc2ed2 assets/create/blockstates/yellow_valve_handle.json
e819e93fdcbe9fd9c050a052d2718ff3b3539365 assets/create/blockstates/zinc_block.json e819e93fdcbe9fd9c050a052d2718ff3b3539365 assets/create/blockstates/zinc_block.json
64121dcb216381c83b4fe28aa361ea07c24c9ad0 assets/create/blockstates/zinc_ore.json 64121dcb216381c83b4fe28aa361ea07c24c9ad0 assets/create/blockstates/zinc_ore.json
7c975eddc8318d59bb77fa5667d4358f1bd168c5 assets/create/lang/en_ud.json 1c24597f2b10409d8b8cf6819dd8dfe41f2861f2 assets/create/lang/en_ud.json
5bb378436e68d5a1428ac801c3bc5a4443f8b657 assets/create/lang/en_us.json 575042f88772cd1553c19a924aa1d95d38cd93ba assets/create/lang/en_us.json
a97e1060e00ae701a02e39cd4ef8054cf345fac4 assets/create/models/block/acacia_window.json a97e1060e00ae701a02e39cd4ef8054cf345fac4 assets/create/models/block/acacia_window.json
103e032c0b1a0a6a27c67da8c91179a564bd281c assets/create/models/block/acacia_window_pane_noside.json 103e032c0b1a0a6a27c67da8c91179a564bd281c assets/create/models/block/acacia_window_pane_noside.json
fb00b627abda76ad4fea867ca57dbfadd24fffa3 assets/create/models/block/acacia_window_pane_noside_alt.json fb00b627abda76ad4fea867ca57dbfadd24fffa3 assets/create/models/block/acacia_window_pane_noside_alt.json
@ -2477,7 +2477,7 @@ b82ab0c69df330f6f938ed1beee7b4add67d2e50 assets/create/models/item/steam_engine.
54f200be903e056e5cf9e2186f0a0a51f8f0f84e assets/create/models/item/sticker.json 54f200be903e056e5cf9e2186f0a0a51f8f0f84e assets/create/models/item/sticker.json
0f88de164439640cc175ceef2017f7416b5a7018 assets/create/models/item/sticky_mechanical_piston.json 0f88de164439640cc175ceef2017f7416b5a7018 assets/create/models/item/sticky_mechanical_piston.json
4b640b66765b206f8c2884b7c1a1ef860b81d841 assets/create/models/item/stockpile_switch.json 4b640b66765b206f8c2884b7c1a1ef860b81d841 assets/create/models/item/stockpile_switch.json
c04a4ef6debb04d305d74d9b034c1e95c6b9e956 assets/create/models/item/stock_link.json 97222d9eb36944a89b8047423eafa6af3da82b0b assets/create/models/item/stock_link.json
67c98c6c7f2122850acfbee34688572934fdd226 assets/create/models/item/stock_ticker.json 67c98c6c7f2122850acfbee34688572934fdd226 assets/create/models/item/stock_ticker.json
6ee792277b9fd980c40e18e841afa63fc500ed0b assets/create/models/item/stressometer.json 6ee792277b9fd980c40e18e841afa63fc500ed0b assets/create/models/item/stressometer.json
8d4ce1ccf180016506292f63188c10d0dabe0ee3 assets/create/models/item/sturdy_sheet.json 8d4ce1ccf180016506292f63188c10d0dabe0ee3 assets/create/models/item/sturdy_sheet.json

160
src/generated/resources/assets/create/blockstates/stock_link.json
View file

@ -1,216 +1,200 @@
{ {
"variants": { "variants": {
"face=ceiling,facing=east,powered=false,waterlogged=false": { "face=ceiling,facing=east,powered=false,waterlogged=false": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_vertical",
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"face=ceiling,facing=east,powered=false,waterlogged=true": { "face=ceiling,facing=east,powered=false,waterlogged=true": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_vertical",
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"face=ceiling,facing=east,powered=true,waterlogged=false": { "face=ceiling,facing=east,powered=true,waterlogged=false": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_vertical_powered",
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"face=ceiling,facing=east,powered=true,waterlogged=true": { "face=ceiling,facing=east,powered=true,waterlogged=true": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_vertical_powered",
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"face=ceiling,facing=north,powered=false,waterlogged=false": { "face=ceiling,facing=north,powered=false,waterlogged=false": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_vertical",
"x": 180, "x": 180,
"y": 180 "y": 180
}, },
"face=ceiling,facing=north,powered=false,waterlogged=true": { "face=ceiling,facing=north,powered=false,waterlogged=true": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_vertical",
"x": 180, "x": 180,
"y": 180 "y": 180
}, },
"face=ceiling,facing=north,powered=true,waterlogged=false": { "face=ceiling,facing=north,powered=true,waterlogged=false": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_vertical_powered",
"x": 180, "x": 180,
"y": 180 "y": 180
}, },
"face=ceiling,facing=north,powered=true,waterlogged=true": { "face=ceiling,facing=north,powered=true,waterlogged=true": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_vertical_powered",
"x": 180, "x": 180,
"y": 180 "y": 180
}, },
"face=ceiling,facing=south,powered=false,waterlogged=false": { "face=ceiling,facing=south,powered=false,waterlogged=false": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_vertical",
"x": 180 "x": 180
}, },
"face=ceiling,facing=south,powered=false,waterlogged=true": { "face=ceiling,facing=south,powered=false,waterlogged=true": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_vertical",
"x": 180 "x": 180
}, },
"face=ceiling,facing=south,powered=true,waterlogged=false": { "face=ceiling,facing=south,powered=true,waterlogged=false": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_vertical_powered",
"x": 180 "x": 180
}, },
"face=ceiling,facing=south,powered=true,waterlogged=true": { "face=ceiling,facing=south,powered=true,waterlogged=true": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_vertical_powered",
"x": 180 "x": 180
}, },
"face=ceiling,facing=west,powered=false,waterlogged=false": { "face=ceiling,facing=west,powered=false,waterlogged=false": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_vertical",
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"face=ceiling,facing=west,powered=false,waterlogged=true": { "face=ceiling,facing=west,powered=false,waterlogged=true": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_vertical",
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"face=ceiling,facing=west,powered=true,waterlogged=false": { "face=ceiling,facing=west,powered=true,waterlogged=false": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_vertical_powered",
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"face=ceiling,facing=west,powered=true,waterlogged=true": { "face=ceiling,facing=west,powered=true,waterlogged=true": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_vertical_powered",
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"face=floor,facing=east,powered=false,waterlogged=false": { "face=floor,facing=east,powered=false,waterlogged=false": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_vertical",
"y": 90 "y": 270
}, },
"face=floor,facing=east,powered=false,waterlogged=true": { "face=floor,facing=east,powered=false,waterlogged=true": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_vertical",
"y": 90 "y": 270
}, },
"face=floor,facing=east,powered=true,waterlogged=false": { "face=floor,facing=east,powered=true,waterlogged=false": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_vertical_powered",
"y": 90 "y": 270
}, },
"face=floor,facing=east,powered=true,waterlogged=true": { "face=floor,facing=east,powered=true,waterlogged=true": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_vertical_powered",
"y": 90 "y": 270
}, },
"face=floor,facing=north,powered=false,waterlogged=false": { "face=floor,facing=north,powered=false,waterlogged=false": {
"model": "create:block/stock_link/block" "model": "create:block/stock_link/block_vertical",
"y": 180
}, },
"face=floor,facing=north,powered=false,waterlogged=true": { "face=floor,facing=north,powered=false,waterlogged=true": {
"model": "create:block/stock_link/block" "model": "create:block/stock_link/block_vertical",
"y": 180
}, },
"face=floor,facing=north,powered=true,waterlogged=false": { "face=floor,facing=north,powered=true,waterlogged=false": {
"model": "create:block/stock_link/block_powered" "model": "create:block/stock_link/block_vertical_powered",
"y": 180
}, },
"face=floor,facing=north,powered=true,waterlogged=true": { "face=floor,facing=north,powered=true,waterlogged=true": {
"model": "create:block/stock_link/block_powered" "model": "create:block/stock_link/block_vertical_powered",
"y": 180
}, },
"face=floor,facing=south,powered=false,waterlogged=false": { "face=floor,facing=south,powered=false,waterlogged=false": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_vertical"
"y": 180
}, },
"face=floor,facing=south,powered=false,waterlogged=true": { "face=floor,facing=south,powered=false,waterlogged=true": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_vertical"
"y": 180
}, },
"face=floor,facing=south,powered=true,waterlogged=false": { "face=floor,facing=south,powered=true,waterlogged=false": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_vertical_powered"
"y": 180
}, },
"face=floor,facing=south,powered=true,waterlogged=true": { "face=floor,facing=south,powered=true,waterlogged=true": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_vertical_powered"
"y": 180
}, },
"face=floor,facing=west,powered=false,waterlogged=false": { "face=floor,facing=west,powered=false,waterlogged=false": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_vertical",
"y": 270 "y": 90
}, },
"face=floor,facing=west,powered=false,waterlogged=true": { "face=floor,facing=west,powered=false,waterlogged=true": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_vertical",
"y": 270 "y": 90
}, },
"face=floor,facing=west,powered=true,waterlogged=false": { "face=floor,facing=west,powered=true,waterlogged=false": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_vertical_powered",
"y": 270 "y": 90
}, },
"face=floor,facing=west,powered=true,waterlogged=true": { "face=floor,facing=west,powered=true,waterlogged=true": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_vertical_powered",
"y": 270 "y": 90
}, },
"face=wall,facing=east,powered=false,waterlogged=false": { "face=wall,facing=east,powered=false,waterlogged=false": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_horizontal",
"x": 90, "y": 270
"y": 90
}, },
"face=wall,facing=east,powered=false,waterlogged=true": { "face=wall,facing=east,powered=false,waterlogged=true": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_horizontal",
"x": 90, "y": 270
"y": 90
}, },
"face=wall,facing=east,powered=true,waterlogged=false": { "face=wall,facing=east,powered=true,waterlogged=false": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_horizontal_powered",
"x": 90, "y": 270
"y": 90
}, },
"face=wall,facing=east,powered=true,waterlogged=true": { "face=wall,facing=east,powered=true,waterlogged=true": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_horizontal_powered",
"x": 90, "y": 270
"y": 90
}, },
"face=wall,facing=north,powered=false,waterlogged=false": { "face=wall,facing=north,powered=false,waterlogged=false": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_horizontal",
"x": 90 "y": 180
}, },
"face=wall,facing=north,powered=false,waterlogged=true": { "face=wall,facing=north,powered=false,waterlogged=true": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_horizontal",
"x": 90 "y": 180
}, },
"face=wall,facing=north,powered=true,waterlogged=false": { "face=wall,facing=north,powered=true,waterlogged=false": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_horizontal_powered",
"x": 90 "y": 180
}, },
"face=wall,facing=north,powered=true,waterlogged=true": { "face=wall,facing=north,powered=true,waterlogged=true": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_horizontal_powered",
"x": 90 "y": 180
}, },
"face=wall,facing=south,powered=false,waterlogged=false": { "face=wall,facing=south,powered=false,waterlogged=false": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_horizontal"
"x": 90,
"y": 180
}, },
"face=wall,facing=south,powered=false,waterlogged=true": { "face=wall,facing=south,powered=false,waterlogged=true": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_horizontal"
"x": 90,
"y": 180
}, },
"face=wall,facing=south,powered=true,waterlogged=false": { "face=wall,facing=south,powered=true,waterlogged=false": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_horizontal_powered"
"x": 90,
"y": 180
}, },
"face=wall,facing=south,powered=true,waterlogged=true": { "face=wall,facing=south,powered=true,waterlogged=true": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_horizontal_powered"
"x": 90,
"y": 180
}, },
"face=wall,facing=west,powered=false,waterlogged=false": { "face=wall,facing=west,powered=false,waterlogged=false": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_horizontal",
"x": 90, "y": 90
"y": 270
}, },
"face=wall,facing=west,powered=false,waterlogged=true": { "face=wall,facing=west,powered=false,waterlogged=true": {
"model": "create:block/stock_link/block", "model": "create:block/stock_link/block_horizontal",
"x": 90, "y": 90
"y": 270
}, },
"face=wall,facing=west,powered=true,waterlogged=false": { "face=wall,facing=west,powered=true,waterlogged=false": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_horizontal_powered",
"x": 90, "y": 90
"y": 270
}, },
"face=wall,facing=west,powered=true,waterlogged=true": { "face=wall,facing=west,powered=true,waterlogged=true": {
"model": "create:block/stock_link/block_powered", "model": "create:block/stock_link/block_horizontal_powered",
"x": 90, "y": 90
"y": 270
} }
} }
} }

14
src/generated/resources/assets/create/lang/en_ud.json
View file

@ -269,7 +269,6 @@
"block.create.cardboard_block": "pɹɐoqpɹɐƆ ɟo ʞɔoןᗺ", "block.create.cardboard_block": "pɹɐoqpɹɐƆ ɟo ʞɔoןᗺ",
"block.create.cart_assembler": "ɹǝןqɯǝssⱯ ʇɹɐƆ", "block.create.cart_assembler": "ɹǝןqɯǝssⱯ ʇɹɐƆ",
"block.create.chain_conveyor": "ɹoʎǝʌuoƆ uıɐɥƆ", "block.create.chain_conveyor": "ɹoʎǝʌuoƆ uıɐɥƆ",
"block.create.chain_conveyor.tooltip.summary": "˙ǝpıɹ ɐ ǝʞɐʇ oʇ ɥɔuǝɹʍ ǝs∩ ˙ɯǝɥʇ uo sǝbɐʞɔɐd ʇɹodsuɐɹʇ oʇ sʇɹodboɹɟ ǝs∩ ˙sʞɹoʍʇǝu ɹoʎǝʌuoɔ ɯɹoɟ oʇ suıɐɥɔ ɥʇıʍ ʇɔǝuuoƆ ]ɹǝpuod[",
"block.create.cherry_window": "ʍopuıM ʎɹɹǝɥƆ", "block.create.cherry_window": "ʍopuıM ʎɹɹǝɥƆ",
"block.create.cherry_window_pane": "ǝuɐԀ ʍopuıM ʎɹɹǝɥƆ", "block.create.cherry_window_pane": "ǝuɐԀ ʍopuıM ʎɹɹǝɥƆ",
"block.create.chocolate": "ǝʇɐןoɔoɥƆ", "block.create.chocolate": "ǝʇɐןoɔoɥƆ",
@ -476,11 +475,6 @@
"block.create.exposed_copper_tile_stairs": "sɹıɐʇS ǝןı⟘ ɹǝddoƆ pǝsodxƎ", "block.create.exposed_copper_tile_stairs": "sɹıɐʇS ǝןı⟘ ɹǝddoƆ pǝsodxƎ",
"block.create.exposed_copper_tiles": "sǝןı⟘ ɹǝddoƆ pǝsodxƎ", "block.create.exposed_copper_tiles": "sǝןı⟘ ɹǝddoƆ pǝsodxƎ",
"block.create.factory_gauge": "ǝbnɐ⅁ ʎɹoʇɔɐℲ", "block.create.factory_gauge": "ǝbnɐ⅁ ʎɹoʇɔɐℲ",
"block.create.factory_gauge.tooltip.behaviour1": "˙ssǝɹppɐ uɐ ʇǝs oʇ ןǝuɐd ǝɥʇ ʞɔıןɔ ʇɹoɥS ˙ɹǝuıɐʇuoɔ ǝɥʇ uı sı ʇunoɯɐ ʇǝbɹɐʇ ǝɥʇ ןıʇun ssǝɹppɐ pǝıɟıɔǝds ǝɥʇ oʇ ʞɹoʍʇǝu ǝɥʇ ɯoɹɟ sɯǝʇı sʇsǝnbǝɹ ןǝuɐԀ :ǝpoɯ ɹǝʞɔoʇsǝᴚ",
"block.create.factory_gauge.tooltip.behaviour2": "˙sןǝuɐd ɹǝɥʇo ɹoɟ ʇnduı uɐ sɐ pǝsnǝɹ ǝq osןɐ uɐɔ ɯǝʇı ʇndʇno uɐ buıʎɟıɔǝds sןǝuɐԀ ˙sɯǝʇı ʇnduı sɐ sןǝuɐd ɹǝɥʇo ʇɔǝuuoɔ puɐ ssǝɹppɐ uɐ ʇǝs oʇ ןǝuɐd ǝɥʇ ʞɔıןɔ ʇɹoɥS ˙)ʞɹoʍʇǝu uo sʞuɐןԀ ㄣ9 ʇsɐǝן ʇɐ ןıʇun 'sʞuɐןԀ 9 ʇɔǝdxǝ puɐ ,ʍɐs, oʇ boꞀ Ɩ puǝS ˙b˙ǝ( ʞɹoʍʇǝu ǝɥʇ uo punoɟ sı ɯǝʇı ʇndʇno ǝɥʇ ɟo pǝʇunoɯɐ ʇǝbɹɐʇ ǝɥʇ ןıʇun ssǝɹppɐ uɐ oʇ sʇuǝıpǝɹbuı sʇsǝnbǝɹ ןǝuɐԀ :ǝpoɯ ǝdıɔǝᴚ",
"block.create.factory_gauge.tooltip.condition1": "ɹǝbɐʞɔɐԀ oʇ pǝɥɔɐʇʇɐ uǝɥM",
"block.create.factory_gauge.tooltip.condition2": "ɹǝbɐʞɔɐԀ oʇ pǝɥɔɐʇʇɐ ʇou uǝɥM",
"block.create.factory_gauge.tooltip.summary": "˙ǝbɐɹoʇs uı uıɐʇuıɐɯ oʇ ʇunoɯɐ ʇǝbɹɐʇ ɐ ʎɟıɔǝds oʇ ʞɔıןɔ pןoH ˙ʇoןs ɹǝʇןıɟ uı ɹoʇıuoɯ oʇ ɯǝʇı ǝɔɐןԀ ˙ʎɔuǝnbǝɹɟ sʇı ǝsn oʇ ʇuǝɯǝɔɐןd ǝɹoɟǝq ʞuıן ʞɔoʇs ʞɔıןƆ ]ɹǝpuod[",
"block.create.fake_track": "sdɐW ɹoɟ ɹǝʞɹɐW ʞɔɐɹ⟘", "block.create.fake_track": "sdɐW ɹoɟ ɹǝʞɹɐW ʞɔɐɹ⟘",
"block.create.fluid_pipe": "ǝdıԀ pınןℲ", "block.create.fluid_pipe": "ǝdıԀ pınןℲ",
"block.create.fluid_tank": "ʞuɐ⟘ pınןℲ", "block.create.fluid_tank": "ʞuɐ⟘ pınןℲ",
@ -628,10 +622,7 @@
"block.create.oxidized_copper_tile_stairs": "sɹıɐʇS ǝןı⟘ ɹǝddoƆ pǝzıpıxO", "block.create.oxidized_copper_tile_stairs": "sɹıɐʇS ǝןı⟘ ɹǝddoƆ pǝzıpıxO",
"block.create.oxidized_copper_tiles": "sǝןı⟘ ɹǝddoƆ pǝzıpıxO", "block.create.oxidized_copper_tiles": "sǝןı⟘ ɹǝddoƆ pǝzıpıxO",
"block.create.package_frogport": "ʇɹodboɹℲ ǝbɐʞɔɐԀ", "block.create.package_frogport": "ʇɹodboɹℲ ǝbɐʞɔɐԀ",
"block.create.package_frogport.tooltip.summary": "˙ɐsɹǝʌ ǝɔıʌ puɐ suıɐɥɔ ɯoɹɟ pǝʌoɯǝɹ ǝq ןןıʍ sǝbɐʞɔɐd buıɥɔʇɐW ˙I∩ uı ɹǝʇןıɟ ssǝɹppɐ ʇǝS ˙ssǝɹppɐ ɹıǝɥʇ uo pǝsɐq suıɐɥɔ ɯoɹɟ puɐ oʇ sǝbɐʞɔɐd sǝʌoW ˙ǝɔɐןd uǝɥʇ ʞuıן oʇ ɹoʎǝʌuoɔ uıɐɥɔ ɐ ʞɔıןƆ ]ɹǝpuod[",
"block.create.package_postbox.tooltip.summary": "˙ɐsɹǝʌ ǝɔıʌ puɐ suıɐɹʇ ɯoɹɟ pǝʌoɯǝɹ ǝq ןןıʍ sǝbɐʞɔɐd buıɥɔʇɐW ˙I∩ uı ɹǝʇןıɟ ssǝɹppɐ ʇǝS ˙ssǝɹppɐ ɹıǝɥʇ uo pǝsɐq suıɐɹʇ ɯoɹɟ puɐ oʇ sǝbɐʞɔɐd sǝʌoW ˙ǝɔɐןd uǝɥʇ ʞuıן oʇ uoıʇɐʇs uıɐɹʇ ɐ ʞɔıןƆ ]ɹǝpuod[",
"block.create.packager": "ɹǝbɐʞɔɐԀ", "block.create.packager": "ɹǝbɐʞɔɐԀ",
"block.create.packager.tooltip.summary": "˙ʞɹoʍʇǝu sɔıʇsıboן ɐ oʇ sʇuǝʇuoɔ ʎɹoʇuǝʌuı ʇıɯqns oʇ ʞuıן ʞɔoʇs ɥɔɐʇʇɐ 'ʎןǝʌıʇɐuɹǝʇןⱯ ˙ssǝɹppɐ ʇǝbɹɐʇ ʎɟıɔǝds oʇ ubıs ɥɔɐʇʇⱯ ˙ǝuoʇspǝɹ uo ʎɹoʇuǝʌuı pǝɥɔɐʇʇɐ ɯoɹɟ sǝbɐʞɔɐd sǝʇɐǝɹƆ ]ɹǝpuod[",
"block.create.peculiar_bell": "ןןǝᗺ ɹɐıןnɔǝԀ", "block.create.peculiar_bell": "ןןǝᗺ ɹɐıןnɔǝԀ",
"block.create.peculiar_bell.tooltip.summary": "˙˙˙sʇɔǝɟɟǝ-ǝpıs ǝʌɐɥ ʎɐɯ ‾ǝɹıℲ ןnoS‾ uǝdo ǝʌoqɐ ʇɥbıɹ ʇı buıɔɐןԀ ˙‾ןןǝᗺ ssɐɹᗺ‾ ǝʌıʇɐɹoɔǝp Ɐ", "block.create.peculiar_bell.tooltip.summary": "˙˙˙sʇɔǝɟɟǝ-ǝpıs ǝʌɐɥ ʎɐɯ ‾ǝɹıℲ ןnoS‾ uǝdo ǝʌoqɐ ʇɥbıɹ ʇı buıɔɐןԀ ˙‾ןןǝᗺ ssɐɹᗺ‾ ǝʌıʇɐɹoɔǝp Ɐ",
"block.create.pink_nixie_tube": "ǝqn⟘ ǝıxıN ʞuıԀ", "block.create.pink_nixie_tube": "ǝqn⟘ ǝıxıN ʞuıԀ",
@ -713,7 +704,6 @@
"block.create.pulse_extender": "ɹǝpuǝʇxƎ ǝsןnԀ", "block.create.pulse_extender": "ɹǝpuǝʇxƎ ǝsןnԀ",
"block.create.pulse_repeater": "ɹǝʇɐǝdǝᴚ ǝsןnԀ", "block.create.pulse_repeater": "ɹǝʇɐǝdǝᴚ ǝsןnԀ",
"block.create.pulse_timer": "ɹǝɯı⟘ ǝsןnԀ", "block.create.pulse_timer": "ɹǝɯı⟘ ǝsןnԀ",
"block.create.pulse_timer.tooltip.summary": "˙ןɐubıs ʇuɐʇsuoɔ ɐ ʎq pǝɹǝʍod sı ǝpıs ʇnduı ǝɥʇ ssǝןun sǝsןnd ǝuoʇspǝɹ sʇıɯǝ ʎןpǝʇɐǝdǝᴚ ˙ʇoןs ʇnduı ǝɥʇ buısn ʎɐןǝp ɐ ʇǝS ]ɹǝpuod[",
"block.create.purple_nixie_tube": "ǝqn⟘ ǝıxıN ǝןdɹnԀ", "block.create.purple_nixie_tube": "ǝqn⟘ ǝıxıN ǝןdɹnԀ",
"block.create.purple_postbox": "xoqʇsoԀ ǝןdɹnԀ", "block.create.purple_postbox": "xoqʇsoԀ ǝןdɹnԀ",
"block.create.purple_sail": "ןıɐS ǝןdɹnԀ", "block.create.purple_sail": "ןıɐS ǝןdɹnԀ",
@ -734,7 +724,6 @@
"block.create.redstone_contact": "ʇɔɐʇuoƆ ǝuoʇspǝᴚ", "block.create.redstone_contact": "ʇɔɐʇuoƆ ǝuoʇspǝᴚ",
"block.create.redstone_link": "ʞuıꞀ ǝuoʇspǝᴚ", "block.create.redstone_link": "ʞuıꞀ ǝuoʇspǝᴚ",
"block.create.redstone_requester": "ɹǝʇsǝnbǝᴚ ǝuoʇspǝᴚ", "block.create.redstone_requester": "ɹǝʇsǝnbǝᴚ ǝuoʇspǝᴚ",
"block.create.redstone_requester.tooltip.summary": "˙ʇuǝɯǝɔɐןd ǝɹoɟǝq ɹǝdǝǝʞ ʞɔoʇs ɐ ʇɐ pǝɹnbıɟuoɔ ǝq uɐɔ ʇsǝnbǝɹ sıɥʇ ʎןǝʌıʇɐuɹǝʇןⱯ ˙pǝʌıǝɔǝɹ sı ǝsןnd ǝuoʇspǝɹ ɐ uǝɥʍ ssǝɹppɐ uɐ oʇ pǝʇsǝnbǝɹ sɯǝʇı ʎɟıɔǝds oʇ I∩ uǝdO ˙ʎɔuǝnbǝɹɟ sʇı ǝsn oʇ ʇuǝɯǝɔɐןd ǝɹoɟǝq ʞuıן ʞɔoʇs ʞɔıןƆ ]ɹǝpuod[",
"block.create.refined_radiance_casing": "buısɐƆ ʇuɐıpɐᴚ", "block.create.refined_radiance_casing": "buısɐƆ ʇuɐıpɐᴚ",
"block.create.repackager": "ɹǝbɐʞɔɐԀ-ǝᴚ", "block.create.repackager": "ɹǝbɐʞɔɐԀ-ǝᴚ",
"block.create.rope": "ǝdoᴚ", "block.create.rope": "ǝdoᴚ",
@ -833,12 +822,9 @@
"block.create.sticker": "ɹǝʞɔıʇS", "block.create.sticker": "ɹǝʞɔıʇS",
"block.create.sticky_mechanical_piston": "uoʇsıԀ ןɐɔıuɐɥɔǝW ʎʞɔıʇS", "block.create.sticky_mechanical_piston": "uoʇsıԀ ןɐɔıuɐɥɔǝW ʎʞɔıʇS",
"block.create.stock_link": "ʞuıꞀ ʞɔoʇS", "block.create.stock_link": "ʞuıꞀ ʞɔoʇS",
"block.create.stock_link.tooltip.summary": "suoıʇɐʇıɯıן ǝbuɐɹ oN ˙ʎɔuǝnbǝɹɟ ɹıǝɥʇ ǝɹɐɥs oʇ ʇuǝɯǝɔɐןd ǝɹoɟǝq sʞuıן ɹǝɥʇo ʞɔıןƆ ˙ɯoɹɟ ʇsǝnbǝɹ oʇ ǝןqɐןıɐʌɐ ʎɹoʇuǝʌuı ʇǝbɹɐʇ sʇı ǝʞɐɯ oʇ ɹǝbɐʞɔɐd oʇ ɥɔɐʇʇⱯ ]ɹǝpuod[",
"block.create.stock_ticker": "ɹǝʞɔı⟘ ʞɔoʇS", "block.create.stock_ticker": "ɹǝʞɔı⟘ ʞɔoʇS",
"block.create.stock_ticker.tooltip.summary": "˙sǝıɹobǝʇɐɔ oʇuı sɯǝʇı pǝʎɐןdsıp ǝsıuɐbɹo oʇ ʞɔoןq ɹǝʞɔıʇ ʞɔoʇs ǝɥʇ ʞɔıןƆ ˙ssǝɹppɐ uǝʌıb ɐ oʇ sɹǝbɐʞɔɐd pǝʞuıן ʎuɐ ɯoɹɟ sɯǝʇı ʇsǝnbǝɹ oʇ ʎʇıʇuǝ ǝɥʇ ʞɔıןƆ ˙ɹǝdǝǝʞ ʞɔoʇs sʇı sɐ ʇɐǝs ɐ uo ʎʇıʇuǝ ʇuǝɔɐظpɐ uɐ spǝǝN ˙ʎɔuǝnbǝɹɟ sʇı ǝsn oʇ ʇuǝɯǝɔɐןd ǝɹoɟǝq ʞuıן ʞɔoʇs ʞɔıןƆ ]ɹǝpuod[",
"block.create.stockpile_switch": "ɥɔʇıʍS pןoɥsǝɹɥ⟘", "block.create.stockpile_switch": "ɥɔʇıʍS pןoɥsǝɹɥ⟘",
"block.create.stressometer": "ɹǝʇǝɯossǝɹʇS", "block.create.stressometer": "ɹǝʇǝɯossǝɹʇS",
"block.create.table_cloth.tooltip.summary": "˙ɥʇoןɔ ǝןqɐʇ pǝɹnbıɟuoɔ ǝɥʇ buıɔɐןd ɹǝʇɟɐ pǝıɟıɔǝds ǝq uɐɔ ʇsoɔ ǝɥ⟘ ˙sɹǝʎɐןd ɹǝɥʇo ʎq pǝsɐɥɔɹnd ǝq uɐɔ ʇɐɥʇ ʞɹoʍʇǝu ɹnoʎ ɯoɹɟ ʇsǝnbǝɹ ɐ ʎɟıɔǝds 'ɹǝdǝǝʞ ʞɔoʇs ɐ uo pǝsn uǝɥʍ 'ʎןǝʌıʇɐuɹǝʇןⱯ ˙ɯǝɥʇ ʎɐןdsıp oʇ ɯǝʇı ɥʇıʍ ʞɔıןɔ 'uoıʇɐɹoɔǝp ɹoɟ pǝsn ǝq uɐƆ ]ɹǝpuod[",
"block.create.tiled_glass": "ssɐן⅁ pǝןı⟘", "block.create.tiled_glass": "ssɐן⅁ pǝןı⟘",
"block.create.tiled_glass_pane": "ǝuɐԀ ssɐן⅁ pǝןı⟘", "block.create.tiled_glass_pane": "ǝuɐԀ ssɐן⅁ pǝןı⟘",
"block.create.toolbox.tooltip.behaviour1": "˙‾sʇuǝʇuoƆ‾ ʎɹoʇuǝʌuI ‾suıɐʇǝᴚ‾", "block.create.toolbox.tooltip.behaviour1": "˙‾sʇuǝʇuoƆ‾ ʎɹoʇuǝʌuI ‾suıɐʇǝᴚ‾",

14
src/generated/resources/assets/create/lang/en_us.json
View file

@ -269,7 +269,6 @@
"block.create.cardboard_block": "Block of Cardboard", "block.create.cardboard_block": "Block of Cardboard",
"block.create.cart_assembler": "Cart Assembler", "block.create.cart_assembler": "Cart Assembler",
"block.create.chain_conveyor": "Chain Conveyor", "block.create.chain_conveyor": "Chain Conveyor",
"block.create.chain_conveyor.tooltip.summary": "[ponder] Connect with chains to form conveyor networks. Use frogports to transport packages on them. Use wrench to take a ride.",
"block.create.cherry_window": "Cherry Window", "block.create.cherry_window": "Cherry Window",
"block.create.cherry_window_pane": "Cherry Window Pane", "block.create.cherry_window_pane": "Cherry Window Pane",
"block.create.chocolate": "Chocolate", "block.create.chocolate": "Chocolate",
@ -476,11 +475,6 @@
"block.create.exposed_copper_tile_stairs": "Exposed Copper Tile Stairs", "block.create.exposed_copper_tile_stairs": "Exposed Copper Tile Stairs",
"block.create.exposed_copper_tiles": "Exposed Copper Tiles", "block.create.exposed_copper_tiles": "Exposed Copper Tiles",
"block.create.factory_gauge": "Factory Gauge", "block.create.factory_gauge": "Factory Gauge",
"block.create.factory_gauge.tooltip.behaviour1": "Restocker mode: Panel requests items from the network to the specified address until the target amount is in the container. Short click the panel to set an address.",
"block.create.factory_gauge.tooltip.behaviour2": "Recipe mode: Panel requests ingredients to an address until the target amounted of the output item is found on the network (e.g. Send 1 Log to 'saw' and expect 6 Planks, until at least 64 Planks on network). Short click the panel to set an address and connect other panels as input items. Panels specifying an output item can also be reused as an input for other panels.",
"block.create.factory_gauge.tooltip.condition1": "When attached to Packager",
"block.create.factory_gauge.tooltip.condition2": "When not attached to Packager",
"block.create.factory_gauge.tooltip.summary": "[ponder] Click stock link before placement to use its frequency. Place item to monitor in filter slot. Hold click to specify a target amount to maintain in storage.",
"block.create.fake_track": "Track Marker for Maps", "block.create.fake_track": "Track Marker for Maps",
"block.create.fluid_pipe": "Fluid Pipe", "block.create.fluid_pipe": "Fluid Pipe",
"block.create.fluid_tank": "Fluid Tank", "block.create.fluid_tank": "Fluid Tank",
@ -628,10 +622,7 @@
"block.create.oxidized_copper_tile_stairs": "Oxidized Copper Tile Stairs", "block.create.oxidized_copper_tile_stairs": "Oxidized Copper Tile Stairs",
"block.create.oxidized_copper_tiles": "Oxidized Copper Tiles", "block.create.oxidized_copper_tiles": "Oxidized Copper Tiles",
"block.create.package_frogport": "Package Frogport", "block.create.package_frogport": "Package Frogport",
"block.create.package_frogport.tooltip.summary": "[ponder] Click a chain conveyor to link then place. Moves packages to and from chains based on their address. Set address filter in UI. Matching packages will be removed from chains and vice versa.",
"block.create.package_postbox.tooltip.summary": "[ponder] Click a train station to link then place. Moves packages to and from trains based on their address. Set address filter in UI. Matching packages will be removed from trains and vice versa.",
"block.create.packager": "Packager", "block.create.packager": "Packager",
"block.create.packager.tooltip.summary": "[ponder] Creates packages from attached inventory on redstone. Attach sign to specify target address. Alternatively, attach stock link to submit inventory contents to a logistics network.",
"block.create.peculiar_bell": "Peculiar Bell", "block.create.peculiar_bell": "Peculiar Bell",
"block.create.peculiar_bell.tooltip.summary": "A decorative _Brass Bell_. Placing it right above open _Soul Fire_ may have side-effects...", "block.create.peculiar_bell.tooltip.summary": "A decorative _Brass Bell_. Placing it right above open _Soul Fire_ may have side-effects...",
"block.create.pink_nixie_tube": "Pink Nixie Tube", "block.create.pink_nixie_tube": "Pink Nixie Tube",
@ -713,7 +704,6 @@
"block.create.pulse_extender": "Pulse Extender", "block.create.pulse_extender": "Pulse Extender",
"block.create.pulse_repeater": "Pulse Repeater", "block.create.pulse_repeater": "Pulse Repeater",
"block.create.pulse_timer": "Pulse Timer", "block.create.pulse_timer": "Pulse Timer",
"block.create.pulse_timer.tooltip.summary": "[ponder] Set a delay using the input slot. Repeatedly emits redstone pulses unless the input side is powered by a constant signal.",
"block.create.purple_nixie_tube": "Purple Nixie Tube", "block.create.purple_nixie_tube": "Purple Nixie Tube",
"block.create.purple_postbox": "Purple Postbox", "block.create.purple_postbox": "Purple Postbox",
"block.create.purple_sail": "Purple Sail", "block.create.purple_sail": "Purple Sail",
@ -734,7 +724,6 @@
"block.create.redstone_contact": "Redstone Contact", "block.create.redstone_contact": "Redstone Contact",
"block.create.redstone_link": "Redstone Link", "block.create.redstone_link": "Redstone Link",
"block.create.redstone_requester": "Redstone Requester", "block.create.redstone_requester": "Redstone Requester",
"block.create.redstone_requester.tooltip.summary": "[ponder] Click stock link before placement to use its frequency. Open UI to specify items requested to an address when a redstone pulse is received. Alternatively this request can be configured at a stock keeper before placement.",
"block.create.refined_radiance_casing": "Radiant Casing", "block.create.refined_radiance_casing": "Radiant Casing",
"block.create.repackager": "Re-Packager", "block.create.repackager": "Re-Packager",
"block.create.rope": "Rope", "block.create.rope": "Rope",
@ -833,12 +822,9 @@
"block.create.sticker": "Sticker", "block.create.sticker": "Sticker",
"block.create.sticky_mechanical_piston": "Sticky Mechanical Piston", "block.create.sticky_mechanical_piston": "Sticky Mechanical Piston",
"block.create.stock_link": "Stock Link", "block.create.stock_link": "Stock Link",
"block.create.stock_link.tooltip.summary": "[ponder] Attach to packager to make its target inventory available to request from. Click other links before placement to share their frequency. No range limitations",
"block.create.stock_ticker": "Stock Ticker", "block.create.stock_ticker": "Stock Ticker",
"block.create.stock_ticker.tooltip.summary": "[ponder] Click stock link before placement to use its frequency. Needs an adjacent entity on a seat as its stock keeper. Click the entity to request items from any linked packagers to a given address. Click the stock ticker block to organise displayed items into categories.",
"block.create.stockpile_switch": "Threshold Switch", "block.create.stockpile_switch": "Threshold Switch",
"block.create.stressometer": "Stressometer", "block.create.stressometer": "Stressometer",
"block.create.table_cloth.tooltip.summary": "[ponder] Can be used for decoration, click with item to display them. Alternatively, when used on a stock keeper, specify a request from your network that can be purchased by other players. The cost can be specified after placing the configured table cloth.",
"block.create.tiled_glass": "Tiled Glass", "block.create.tiled_glass": "Tiled Glass",
"block.create.tiled_glass_pane": "Tiled Glass Pane", "block.create.tiled_glass_pane": "Tiled Glass Pane",
"block.create.toolbox.tooltip.behaviour1": "_Retains_ Inventory _Contents_.", "block.create.toolbox.tooltip.behaviour1": "_Retains_ Inventory _Contents_.",

2
src/generated/resources/assets/create/models/item/stock_link.json
View file

@ -1,3 +1,3 @@
{ {
"parent": "create:block/stock_link/block" "parent": "create:block/stock_link/block_vertical"
} }

9
src/main/java/com/simibubi/create/AllBlockEntityTypes.java
View file

@ -529,10 +529,11 @@ public class AllBlockEntityTypes {
.renderer(() -> TableClothRenderer::new) .renderer(() -> TableClothRenderer::new)
.register(); .register();
public static final BlockEntityEntry<PackagerLinkBlockEntity> PACKAGER_LINK = REGISTRATE public static final BlockEntityEntry<PackagerLinkBlockEntity> PACKAGER_LINK =
.blockEntity("packager_link", PackagerLinkBlockEntity::new) REGISTRATE.blockEntity("packager_link", PackagerLinkBlockEntity::new)
.validBlocks(AllBlocks.STOCK_LINK) .validBlocks(AllBlocks.STOCK_LINK)
.register(); .renderer(() -> LinkBulbRenderer::new)
.register();
public static final BlockEntityEntry<StockTickerBlockEntity> STOCK_TICKER = REGISTRATE public static final BlockEntityEntry<StockTickerBlockEntity> STOCK_TICKER = REGISTRATE
.blockEntity("stock_ticker", StockTickerBlockEntity::new) .blockEntity("stock_ticker", StockTickerBlockEntity::new)

19
src/main/java/com/simibubi/create/AllBlocks.java
View file

@ -161,6 +161,7 @@ import com.simibubi.create.content.kinetics.waterwheel.LargeWaterWheelBlock;
import com.simibubi.create.content.kinetics.waterwheel.LargeWaterWheelBlockItem; import com.simibubi.create.content.kinetics.waterwheel.LargeWaterWheelBlockItem;
import com.simibubi.create.content.kinetics.waterwheel.WaterWheelBlock; import com.simibubi.create.content.kinetics.waterwheel.WaterWheelBlock;
import com.simibubi.create.content.kinetics.waterwheel.WaterWheelStructuralBlock; import com.simibubi.create.content.kinetics.waterwheel.WaterWheelStructuralBlock;
import com.simibubi.create.content.kinetics.waterwheel.WaterWheelStructuralBlock.RenderProperties;
import com.simibubi.create.content.logistics.chute.ChuteBlock; import com.simibubi.create.content.logistics.chute.ChuteBlock;
import com.simibubi.create.content.logistics.chute.ChuteGenerator; import com.simibubi.create.content.logistics.chute.ChuteGenerator;
import com.simibubi.create.content.logistics.chute.ChuteItem; import com.simibubi.create.content.logistics.chute.ChuteItem;
@ -188,6 +189,7 @@ import com.simibubi.create.content.logistics.packager.PackagerBlock;
import com.simibubi.create.content.logistics.packager.repackager.RepackagerBlock; import com.simibubi.create.content.logistics.packager.repackager.RepackagerBlock;
import com.simibubi.create.content.logistics.packagerLink.LogisticallyLinkedBlockItem; import com.simibubi.create.content.logistics.packagerLink.LogisticallyLinkedBlockItem;
import com.simibubi.create.content.logistics.packagerLink.PackagerLinkBlock; import com.simibubi.create.content.logistics.packagerLink.PackagerLinkBlock;
import com.simibubi.create.content.logistics.packagerLink.PackagerLinkGenerator;
import com.simibubi.create.content.logistics.redstoneRequester.RedstoneRequesterBlock; import com.simibubi.create.content.logistics.redstoneRequester.RedstoneRequesterBlock;
import com.simibubi.create.content.logistics.redstoneRequester.RedstoneRequesterBlockItem; import com.simibubi.create.content.logistics.redstoneRequester.RedstoneRequesterBlockItem;
import com.simibubi.create.content.logistics.stockTicker.StockTickerBlock; import com.simibubi.create.content.logistics.stockTicker.StockTickerBlock;
@ -274,6 +276,7 @@ import com.simibubi.create.foundation.block.CopperBlockSet;
import com.simibubi.create.foundation.block.DyedBlockList; import com.simibubi.create.foundation.block.DyedBlockList;
import com.simibubi.create.foundation.block.ItemUseOverrides; import com.simibubi.create.foundation.block.ItemUseOverrides;
import com.simibubi.create.foundation.block.WrenchableDirectionalBlock; import com.simibubi.create.foundation.block.WrenchableDirectionalBlock;
import com.simibubi.create.foundation.block.render.ReducedDestroyEffects;
import com.simibubi.create.foundation.data.AssetLookup; import com.simibubi.create.foundation.data.AssetLookup;
import com.simibubi.create.foundation.data.BlockStateGen; import com.simibubi.create.foundation.data.BlockStateGen;
import com.simibubi.create.foundation.data.BuilderTransformers; import com.simibubi.create.foundation.data.BuilderTransformers;
@ -290,7 +293,7 @@ import com.tterrag.registrate.providers.RegistrateRecipeProvider;
import com.tterrag.registrate.util.DataIngredient; import com.tterrag.registrate.util.DataIngredient;
import com.tterrag.registrate.util.entry.BlockEntry; import com.tterrag.registrate.util.entry.BlockEntry;
import net.createmod.catnip.utility.Couple; import net.createmod.catnip.data.Couple;
import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderType;
import net.minecraft.core.Direction.Axis; import net.minecraft.core.Direction.Axis;
import net.minecraft.core.Direction.AxisDirection; import net.minecraft.core.Direction.AxisDirection;
@ -329,6 +332,7 @@ import net.minecraft.world.level.storage.loot.functions.CopyNameFunction;
import net.minecraft.world.level.storage.loot.predicates.ExplosionCondition; import net.minecraft.world.level.storage.loot.predicates.ExplosionCondition;
import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
import net.neoforged.neoforge.client.model.generators.ConfiguredModel; import net.neoforged.neoforge.client.model.generators.ConfiguredModel;
import net.neoforged.neoforge.client.model.generators.ModelFile; import net.neoforged.neoforge.client.model.generators.ModelFile;
import net.neoforged.neoforge.common.Tags; import net.neoforged.neoforge.common.Tags;
@ -550,6 +554,7 @@ public class AllBlocks {
.transform(BlockStressDefaults.setImpact(0)) .transform(BlockStressDefaults.setImpact(0))
.onRegister(assignDataBehaviour(new ItemNameDisplaySource(), "combine_item_names")) .onRegister(assignDataBehaviour(new ItemNameDisplaySource(), "combine_item_names"))
.onRegister(CreateRegistrate.blockModel(() -> BeltModel::new)) .onRegister(CreateRegistrate.blockModel(() -> BeltModel::new))
.clientExtension(() -> BeltBlock.RenderProperties::new)
.register(); .register();
public static final BlockEntry<ChainConveyorBlock> CHAIN_CONVEYOR = public static final BlockEntry<ChainConveyorBlock> CHAIN_CONVEYOR =
@ -611,6 +616,7 @@ public class AllBlocks {
public static final BlockEntry<WaterWheelStructuralBlock> WATER_WHEEL_STRUCTURAL = public static final BlockEntry<WaterWheelStructuralBlock> WATER_WHEEL_STRUCTURAL =
REGISTRATE.block("water_wheel_structure", WaterWheelStructuralBlock::new) REGISTRATE.block("water_wheel_structure", WaterWheelStructuralBlock::new)
.initialProperties(SharedProperties::wooden) .initialProperties(SharedProperties::wooden)
.clientExtension(() -> RenderProperties::new)
.blockstate((c, p) -> p.getVariantBuilder(c.get()) .blockstate((c, p) -> p.getVariantBuilder(c.get())
.forAllStatesExcept(BlockStateGen.mapToAir(p), WaterWheelStructuralBlock.FACING)) .forAllStatesExcept(BlockStateGen.mapToAir(p), WaterWheelStructuralBlock.FACING))
.properties(p -> p.noOcclusion() .properties(p -> p.noOcclusion()
@ -824,6 +830,7 @@ public class AllBlocks {
.isRedstoneConductor((level, pos, state) -> false)) .isRedstoneConductor((level, pos, state) -> false))
.transform(pickaxeOnly()) .transform(pickaxeOnly())
.addLayer(() -> RenderType::cutoutMipped) .addLayer(() -> RenderType::cutoutMipped)
.clientExtension(() -> ReducedDestroyEffects::new)
.blockstate(new ChuteGenerator()::generate) .blockstate(new ChuteGenerator()::generate)
.item(ChuteItem::new) .item(ChuteItem::new)
.transform(customItemModel("_", "block")) .transform(customItemModel("_", "block"))
@ -837,6 +844,7 @@ public class AllBlocks {
.isSuffocating((level, pos, state) -> false) .isSuffocating((level, pos, state) -> false)
.isRedstoneConductor((level, pos, state) -> false)) .isRedstoneConductor((level, pos, state) -> false))
.addLayer(() -> RenderType::cutoutMipped) .addLayer(() -> RenderType::cutoutMipped)
.clientExtension(() -> ReducedDestroyEffects::new)
.transform(pickaxeOnly()) .transform(pickaxeOnly())
.blockstate((c, p) -> BlockStateGen.simpleBlock(c, p, AssetLookup.forPowered(c, p))) .blockstate((c, p) -> BlockStateGen.simpleBlock(c, p, AssetLookup.forPowered(c, p)))
.item() .item()
@ -1619,6 +1627,7 @@ public class AllBlocks {
.forceSolidOn()) .forceSolidOn())
.addLayer(() -> RenderType::cutoutMipped) .addLayer(() -> RenderType::cutoutMipped)
.transform(pickaxeOnly()) .transform(pickaxeOnly())
.clientExtension(() -> TrackBlock.RenderProperties::new)
.onRegister(CreateRegistrate.blockModel(() -> TrackModel::new)) .onRegister(CreateRegistrate.blockModel(() -> TrackModel::new))
.blockstate(new TrackBlockStateGenerator()::generate) .blockstate(new TrackBlockStateGenerator()::generate)
.tag(AllBlockTags.RELOCATION_NOT_SUPPORTED.tag) .tag(AllBlockTags.RELOCATION_NOT_SUPPORTED.tag)
@ -1727,6 +1736,7 @@ public class AllBlocks {
.properties(p -> p.mapColor(MapColor.STONE)) .properties(p -> p.mapColor(MapColor.STONE))
.transform(pickaxeOnly()) .transform(pickaxeOnly())
.tag(AllBlockTags.SAFE_NBT.tag) .tag(AllBlockTags.SAFE_NBT.tag)
.clientExtension(() -> ReducedDestroyEffects::new)
.onRegister(movementBehaviour(FunnelMovementBehaviour.andesite())) .onRegister(movementBehaviour(FunnelMovementBehaviour.andesite()))
.blockstate(new FunnelGenerator("andesite", false)::generate) .blockstate(new FunnelGenerator("andesite", false)::generate)
.item(FunnelItem::new) .item(FunnelItem::new)
@ -1742,6 +1752,7 @@ public class AllBlocks {
.properties(p -> p.mapColor(MapColor.STONE)) .properties(p -> p.mapColor(MapColor.STONE))
.transform(pickaxeOnly()) .transform(pickaxeOnly())
.tag(AllBlockTags.SAFE_NBT.tag) .tag(AllBlockTags.SAFE_NBT.tag)
.clientExtension(() -> ReducedDestroyEffects::new)
.blockstate(new BeltFunnelGenerator("andesite")::generate) .blockstate(new BeltFunnelGenerator("andesite")::generate)
.loot((p, b) -> p.dropOther(b, ANDESITE_FUNNEL.get())) .loot((p, b) -> p.dropOther(b, ANDESITE_FUNNEL.get()))
.register(); .register();
@ -1753,6 +1764,7 @@ public class AllBlocks {
.properties(p -> p.mapColor(MapColor.TERRACOTTA_YELLOW)) .properties(p -> p.mapColor(MapColor.TERRACOTTA_YELLOW))
.transform(pickaxeOnly()) .transform(pickaxeOnly())
.tag(AllBlockTags.SAFE_NBT.tag) .tag(AllBlockTags.SAFE_NBT.tag)
.clientExtension(() -> ReducedDestroyEffects::new)
.onRegister(movementBehaviour(FunnelMovementBehaviour.brass())) .onRegister(movementBehaviour(FunnelMovementBehaviour.brass()))
.blockstate(new FunnelGenerator("brass", true)::generate) .blockstate(new FunnelGenerator("brass", true)::generate)
.item(FunnelItem::new) .item(FunnelItem::new)
@ -1768,6 +1780,7 @@ public class AllBlocks {
.properties(p -> p.mapColor(MapColor.TERRACOTTA_YELLOW)) .properties(p -> p.mapColor(MapColor.TERRACOTTA_YELLOW))
.transform(pickaxeOnly()) .transform(pickaxeOnly())
.tag(AllBlockTags.SAFE_NBT.tag) .tag(AllBlockTags.SAFE_NBT.tag)
.clientExtension(() -> ReducedDestroyEffects::new)
.blockstate(new BeltFunnelGenerator("brass")::generate) .blockstate(new BeltFunnelGenerator("brass")::generate)
.loot((p, b) -> p.dropOther(b, BRASS_FUNNEL.get())) .loot((p, b) -> p.dropOther(b, BRASS_FUNNEL.get()))
.register(); .register();
@ -1926,9 +1939,9 @@ public class AllBlocks {
.properties(p -> p.mapColor(MapColor.TERRACOTTA_BLUE) .properties(p -> p.mapColor(MapColor.TERRACOTTA_BLUE)
.sound(SoundType.NETHERITE_BLOCK)) .sound(SoundType.NETHERITE_BLOCK))
.transform(pickaxeOnly()) .transform(pickaxeOnly())
.blockstate((c, p) -> p.horizontalFaceBlock(c.get(), AssetLookup.forPowered(c, p))) .blockstate(new PackagerLinkGenerator()::generate)
.item(LogisticallyLinkedBlockItem::new) .item(LogisticallyLinkedBlockItem::new)
.transform(customItemModel("_", "block")) .transform(customItemModel("_", "block_vertical"))
.register(); .register();
public static final BlockEntry<StockTickerBlock> STOCK_TICKER = public static final BlockEntry<StockTickerBlock> STOCK_TICKER =

2
src/main/java/com/simibubi/create/AllBogeyStyles.java
View file

@ -12,7 +12,7 @@ import com.simibubi.create.content.trains.bogey.BogeyStyle.SizeRenderer;
import com.simibubi.create.content.trains.bogey.StandardBogeyRenderer; import com.simibubi.create.content.trains.bogey.StandardBogeyRenderer;
import com.simibubi.create.content.trains.bogey.StandardBogeyVisual; import com.simibubi.create.content.trains.bogey.StandardBogeyVisual;
import net.createmod.catnip.utility.lang.Components; import net.createmod.catnip.lang.Components;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
public class AllBogeyStyles { public class AllBogeyStyles {

2
src/main/java/com/simibubi/create/AllCreativeModeTabs.java
View file

@ -30,7 +30,7 @@ import it.unimi.dsi.fastutil.objects.ReferenceArrayList;
import it.unimi.dsi.fastutil.objects.ReferenceLinkedOpenHashSet; import it.unimi.dsi.fastutil.objects.ReferenceLinkedOpenHashSet;
import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
import net.createmod.catnip.platform.CatnipServices; import net.createmod.catnip.platform.CatnipServices;
import net.createmod.catnip.utility.lang.Components; import net.createmod.catnip.lang.Components;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.client.renderer.entity.ItemRenderer;
import net.minecraft.client.resources.model.BakedModel; import net.minecraft.client.resources.model.BakedModel;

2
src/main/java/com/simibubi/create/AllEntityTypes.java
View file

@ -25,7 +25,7 @@ import com.tterrag.registrate.util.nullness.NonNullConsumer;
import com.tterrag.registrate.util.nullness.NonNullFunction; import com.tterrag.registrate.util.nullness.NonNullFunction;
import com.tterrag.registrate.util.nullness.NonNullSupplier; import com.tterrag.registrate.util.nullness.NonNullSupplier;
import net.createmod.catnip.utility.lang.Lang; import net.createmod.catnip.lang.Lang;
import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRenderer;
import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.EntityRendererProvider;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;

2
src/main/java/com/simibubi/create/AllFluids.java
View file

@ -20,7 +20,7 @@ import com.simibubi.create.infrastructure.config.AllConfigs;
import com.tterrag.registrate.builders.FluidBuilder.FluidTypeFactory; import com.tterrag.registrate.builders.FluidBuilder.FluidTypeFactory;
import com.tterrag.registrate.util.entry.FluidEntry; import com.tterrag.registrate.util.entry.FluidEntry;
import net.createmod.catnip.utility.theme.Color; import net.createmod.catnip.theme.Color;
import net.minecraft.client.Camera; import net.minecraft.client.Camera;
import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.client.renderer.FogRenderer.FogMode; import net.minecraft.client.renderer.FogRenderer.FogMode;

19
src/main/java/com/simibubi/create/AllItems.java
View file

@ -32,15 +32,22 @@ import com.simibubi.create.content.equipment.armor.DivingHelmetItem;
import com.simibubi.create.content.equipment.armor.TrimmableArmorModelGenerator; import com.simibubi.create.content.equipment.armor.TrimmableArmorModelGenerator;
import com.simibubi.create.content.equipment.blueprint.BlueprintItem; import com.simibubi.create.content.equipment.blueprint.BlueprintItem;
import com.simibubi.create.content.equipment.extendoGrip.ExtendoGripItem; import com.simibubi.create.content.equipment.extendoGrip.ExtendoGripItem;
import com.simibubi.create.content.equipment.extendoGrip.ExtendoGripItemRenderer;
import com.simibubi.create.content.equipment.goggles.GogglesItem; import com.simibubi.create.content.equipment.goggles.GogglesItem;
import com.simibubi.create.content.equipment.goggles.GogglesModel; import com.simibubi.create.content.equipment.goggles.GogglesModel;
import com.simibubi.create.content.equipment.potatoCannon.PotatoCannonItem; import com.simibubi.create.content.equipment.potatoCannon.PotatoCannonItem;
import com.simibubi.create.content.equipment.potatoCannon.PotatoCannonItemRenderer;
import com.simibubi.create.content.equipment.sandPaper.SandPaperItem; import com.simibubi.create.content.equipment.sandPaper.SandPaperItem;
import com.simibubi.create.content.equipment.sandPaper.SandPaperItemRenderer;
import com.simibubi.create.content.equipment.symmetryWand.SymmetryWandItem; import com.simibubi.create.content.equipment.symmetryWand.SymmetryWandItem;
import com.simibubi.create.content.equipment.symmetryWand.SymmetryWandItemRenderer;
import com.simibubi.create.content.equipment.tool.AllToolMaterials; import com.simibubi.create.content.equipment.tool.AllToolMaterials;
import com.simibubi.create.content.equipment.tool.CardboardSwordItem; import com.simibubi.create.content.equipment.tool.CardboardSwordItem;
import com.simibubi.create.content.equipment.tool.CardboardSwordItemRenderer;
import com.simibubi.create.content.equipment.wrench.WrenchItem; import com.simibubi.create.content.equipment.wrench.WrenchItem;
import com.simibubi.create.content.equipment.wrench.WrenchItemRenderer;
import com.simibubi.create.content.equipment.zapper.terrainzapper.WorldshaperItem; import com.simibubi.create.content.equipment.zapper.terrainzapper.WorldshaperItem;
import com.simibubi.create.content.equipment.zapper.terrainzapper.WorldshaperItemRenderer;
import com.simibubi.create.content.kinetics.belt.item.BeltConnectorItem; import com.simibubi.create.content.kinetics.belt.item.BeltConnectorItem;
import com.simibubi.create.content.kinetics.gearbox.VerticalGearboxItem; import com.simibubi.create.content.kinetics.gearbox.VerticalGearboxItem;
import com.simibubi.create.content.legacy.ChromaticCompoundColor; import com.simibubi.create.content.legacy.ChromaticCompoundColor;
@ -56,6 +63,7 @@ import com.simibubi.create.content.materials.ExperienceNuggetItem;
import com.simibubi.create.content.processing.burner.BlazeBurnerBlockItem; import com.simibubi.create.content.processing.burner.BlazeBurnerBlockItem;
import com.simibubi.create.content.processing.sequenced.SequencedAssemblyItem; import com.simibubi.create.content.processing.sequenced.SequencedAssemblyItem;
import com.simibubi.create.content.redstone.link.controller.LinkedControllerItem; import com.simibubi.create.content.redstone.link.controller.LinkedControllerItem;
import com.simibubi.create.content.redstone.link.controller.LinkedControllerItemRenderer;
import com.simibubi.create.content.schematics.SchematicAndQuillItem; import com.simibubi.create.content.schematics.SchematicAndQuillItem;
import com.simibubi.create.content.schematics.SchematicItem; import com.simibubi.create.content.schematics.SchematicItem;
import com.simibubi.create.content.trains.schedule.ScheduleItem; import com.simibubi.create.content.trains.schedule.ScheduleItem;
@ -66,6 +74,7 @@ import com.simibubi.create.foundation.data.recipe.CompatMetals;
import com.simibubi.create.foundation.item.CombustibleItem; import com.simibubi.create.foundation.item.CombustibleItem;
import com.simibubi.create.foundation.item.ItemDescription; import com.simibubi.create.foundation.item.ItemDescription;
import com.simibubi.create.foundation.item.TagDependentIngredientItem; import com.simibubi.create.foundation.item.TagDependentIngredientItem;
import com.simibubi.create.foundation.item.render.SimpleCustomRenderer;
import com.tterrag.registrate.builders.ItemBuilder; import com.tterrag.registrate.builders.ItemBuilder;
import com.tterrag.registrate.providers.ProviderType; import com.tterrag.registrate.providers.ProviderType;
import com.tterrag.registrate.util.entry.ItemEntry; import com.tterrag.registrate.util.entry.ItemEntry;
@ -80,6 +89,7 @@ import net.minecraft.world.item.ArmorMaterials;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Rarity;
import net.minecraft.world.item.SwordItem; import net.minecraft.world.item.SwordItem;
import net.neoforged.neoforge.common.Tags; import net.neoforged.neoforge.common.Tags;
public class AllItems { public class AllItems {
@ -162,6 +172,7 @@ public class AllItems {
REGISTRATE.item("cardboard_sword", CardboardSwordItem::new) REGISTRATE.item("cardboard_sword", CardboardSwordItem::new)
.properties(p -> p.stacksTo(1)) .properties(p -> p.stacksTo(1))
.properties(p -> p.attributes(SwordItem.createAttributes(AllToolMaterials.CARDBOARD, 3, 1))) .properties(p -> p.attributes(SwordItem.createAttributes(AllToolMaterials.CARDBOARD, 3, 1)))
.clientExtension(i -> () -> () -> SimpleCustomRenderer.create(i, new CardboardSwordItemRenderer()))
.model(AssetLookup.itemModelWithPartials()) .model(AssetLookup.itemModelWithPartials())
.register(); .register();
@ -354,15 +365,18 @@ public class AllItems {
public static final ItemEntry<SandPaperItem> SAND_PAPER = REGISTRATE.item("sand_paper", SandPaperItem::new) public static final ItemEntry<SandPaperItem> SAND_PAPER = REGISTRATE.item("sand_paper", SandPaperItem::new)
.tag(AllTags.AllItemTags.SANDPAPER.tag) .tag(AllTags.AllItemTags.SANDPAPER.tag)
.clientExtension(i -> () -> () -> SimpleCustomRenderer.create(i, new SandPaperItemRenderer()))
.register(); .register();
public static final ItemEntry<SandPaperItem> RED_SAND_PAPER = REGISTRATE.item("red_sand_paper", SandPaperItem::new) public static final ItemEntry<SandPaperItem> RED_SAND_PAPER = REGISTRATE.item("red_sand_paper", SandPaperItem::new)
.tag(AllTags.AllItemTags.SANDPAPER.tag) .tag(AllTags.AllItemTags.SANDPAPER.tag)
.onRegister(s -> ItemDescription.referKey(s, SAND_PAPER)) .onRegister(s -> ItemDescription.referKey(s, SAND_PAPER))
.clientExtension(i -> () -> () -> SimpleCustomRenderer.create(i, new SandPaperItemRenderer()))
.register(); .register();
public static final ItemEntry<WrenchItem> WRENCH = REGISTRATE.item("wrench", WrenchItem::new) public static final ItemEntry<WrenchItem> WRENCH = REGISTRATE.item("wrench", WrenchItem::new)
.properties(p -> p.stacksTo(1)) .properties(p -> p.stacksTo(1))
.clientExtension(i -> () -> () -> SimpleCustomRenderer.create(i, new WrenchItemRenderer()))
.model(AssetLookup.itemModelWithPartials()) .model(AssetLookup.itemModelWithPartials())
.tag(AllItemTags.WRENCH.tag) .tag(AllItemTags.WRENCH.tag)
.register(); .register();
@ -384,17 +398,20 @@ public class AllItems {
public static final ItemEntry<LinkedControllerItem> LINKED_CONTROLLER = public static final ItemEntry<LinkedControllerItem> LINKED_CONTROLLER =
REGISTRATE.item("linked_controller", LinkedControllerItem::new) REGISTRATE.item("linked_controller", LinkedControllerItem::new)
.properties(p -> p.stacksTo(1)) .properties(p -> p.stacksTo(1))
.clientExtension(i -> () -> () -> SimpleCustomRenderer.create(i, new LinkedControllerItemRenderer()))
.model(AssetLookup.itemModelWithPartials()) .model(AssetLookup.itemModelWithPartials())
.register(); .register();
public static final ItemEntry<PotatoCannonItem> POTATO_CANNON = public static final ItemEntry<PotatoCannonItem> POTATO_CANNON =
REGISTRATE.item("potato_cannon", PotatoCannonItem::new) REGISTRATE.item("potato_cannon", PotatoCannonItem::new)
.model(AssetLookup.itemModelWithPartials()) .model(AssetLookup.itemModelWithPartials())
.clientExtension(i -> () -> () -> SimpleCustomRenderer.create(i, new PotatoCannonItemRenderer()))
.tag(Tags.Items.ENCHANTABLES) .tag(Tags.Items.ENCHANTABLES)
.register(); .register();
public static final ItemEntry<ExtendoGripItem> EXTENDO_GRIP = REGISTRATE.item("extendo_grip", ExtendoGripItem::new) public static final ItemEntry<ExtendoGripItem> EXTENDO_GRIP = REGISTRATE.item("extendo_grip", ExtendoGripItem::new)
.properties(p -> p.rarity(Rarity.UNCOMMON)) .properties(p -> p.rarity(Rarity.UNCOMMON))
.clientExtension(i -> () -> () -> SimpleCustomRenderer.create(i, new ExtendoGripItemRenderer()))
.model(AssetLookup.itemModelWithPartials()) .model(AssetLookup.itemModelWithPartials())
.register(); .register();
@ -402,6 +419,7 @@ public class AllItems {
REGISTRATE.item("wand_of_symmetry", SymmetryWandItem::new) REGISTRATE.item("wand_of_symmetry", SymmetryWandItem::new)
.properties(p -> p.stacksTo(1) .properties(p -> p.stacksTo(1)
.rarity(Rarity.UNCOMMON)) .rarity(Rarity.UNCOMMON))
.clientExtension(i -> () -> () -> SimpleCustomRenderer.create(i, new SymmetryWandItemRenderer()))
.model(AssetLookup.itemModelWithPartials()) .model(AssetLookup.itemModelWithPartials())
.register(); .register();
@ -409,6 +427,7 @@ public class AllItems {
REGISTRATE.item("handheld_worldshaper", WorldshaperItem::new) REGISTRATE.item("handheld_worldshaper", WorldshaperItem::new)
.properties(p -> p.rarity(Rarity.EPIC)) .properties(p -> p.rarity(Rarity.EPIC))
.lang("Creative Worldshaper") .lang("Creative Worldshaper")
.clientExtension(i -> () -> () -> SimpleCustomRenderer.create(i, new WorldshaperItemRenderer()))
.model(AssetLookup.itemModelWithPartials()) .model(AssetLookup.itemModelWithPartials())
.register(); .register();

4
src/main/java/com/simibubi/create/AllPackets.java
View file

@ -64,7 +64,7 @@ import com.simibubi.create.content.logistics.filter.FilterScreenPacket;
import com.simibubi.create.content.logistics.funnel.FunnelFlapPacket; import com.simibubi.create.content.logistics.funnel.FunnelFlapPacket;
import com.simibubi.create.content.logistics.packagePort.PackagePortConfigurationPacket; import com.simibubi.create.content.logistics.packagePort.PackagePortConfigurationPacket;
import com.simibubi.create.content.logistics.packagePort.PackagePortPlacementPacket; import com.simibubi.create.content.logistics.packagePort.PackagePortPlacementPacket;
import com.simibubi.create.content.logistics.packagerLink.PackagerLinkEffectPacket; import com.simibubi.create.content.logistics.packagerLink.WiFiEffectPacket;
import com.simibubi.create.content.logistics.redstoneRequester.RedstoneRequesterConfigurationPacket; import com.simibubi.create.content.logistics.redstoneRequester.RedstoneRequesterConfigurationPacket;
import com.simibubi.create.content.logistics.redstoneRequester.RedstoneRequesterEffectPacket; import com.simibubi.create.content.logistics.redstoneRequester.RedstoneRequesterEffectPacket;
import com.simibubi.create.content.logistics.stockTicker.LogisticalStockRequestPacket; import com.simibubi.create.content.logistics.stockTicker.LogisticalStockRequestPacket;
@ -234,7 +234,7 @@ public enum AllPackets implements BasePacketPayload.PacketTypeProvider {
PACKAGE_DESTROYED(PackageDestroyPacket.class, PackageDestroyPacket.STREAM_CODEC), PACKAGE_DESTROYED(PackageDestroyPacket.class, PackageDestroyPacket.STREAM_CODEC),
LOGISTICS_STOCK_RESPONSE(LogisticalStockResponsePacket.class, LogisticalStockResponsePacket.STREAM_CODEC), LOGISTICS_STOCK_RESPONSE(LogisticalStockResponsePacket.class, LogisticalStockResponsePacket.STREAM_CODEC),
FACTORY_PANEL_EFFECT(FactoryPanelEffectPacket.class, FactoryPanelEffectPacket.STREAM_CODEC), FACTORY_PANEL_EFFECT(FactoryPanelEffectPacket.class, FactoryPanelEffectPacket.STREAM_CODEC),
PACKAGER_LINK_EFFECT(PackagerLinkEffectPacket.class, PackagerLinkEffectPacket.STREAM_CODEC), PACKAGER_LINK_EFFECT(WiFiEffectPacket.class, WiFiEffectPacket.STREAM_CODEC),
REDSTONE_REQUESTER_EFFECT(RedstoneRequesterEffectPacket.class, RedstoneRequesterEffectPacket.STREAM_CODEC), REDSTONE_REQUESTER_EFFECT(RedstoneRequesterEffectPacket.class, RedstoneRequesterEffectPacket.STREAM_CODEC),
KNOCKBACK(KnockbackPacket.class, KnockbackPacket.STREAM_CODEC), KNOCKBACK(KnockbackPacket.class, KnockbackPacket.STREAM_CODEC),
TRAIN_MAP_SYNC(TrainMapSyncPacket.class, TrainMapSyncPacket.STREAM_CODEC), TRAIN_MAP_SYNC(TrainMapSyncPacket.class, TrainMapSyncPacket.STREAM_CODEC),

6
src/main/java/com/simibubi/create/AllPartialModels.java
View file

@ -12,9 +12,9 @@ import com.simibubi.create.content.logistics.box.PackageStyles;
import com.simibubi.create.content.logistics.box.PackageStyles.PackageStyle; import com.simibubi.create.content.logistics.box.PackageStyles.PackageStyle;
import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.model.baked.PartialModel;
import net.createmod.catnip.utility.Couple; import net.createmod.catnip.data.Couple;
import net.createmod.catnip.utility.Iterate; import net.createmod.catnip.data.Iterate;
import net.createmod.catnip.utility.lang.Lang; import net.createmod.catnip.lang.Lang;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.DyeColor;

4
src/main/java/com/simibubi/create/AllParticleTypes.java
View file

@ -8,11 +8,12 @@ import com.simibubi.create.content.fluids.particle.FluidParticleData;
import com.simibubi.create.content.kinetics.base.RotationIndicatorParticleData; import com.simibubi.create.content.kinetics.base.RotationIndicatorParticleData;
import com.simibubi.create.content.kinetics.fan.AirFlowParticleData; import com.simibubi.create.content.kinetics.fan.AirFlowParticleData;
import com.simibubi.create.content.kinetics.steamEngine.SteamJetParticleData; import com.simibubi.create.content.kinetics.steamEngine.SteamJetParticleData;
import com.simibubi.create.content.logistics.packagerLink.WiFiParticle;
import com.simibubi.create.content.trains.CubeParticleData; import com.simibubi.create.content.trains.CubeParticleData;
import com.simibubi.create.foundation.particle.AirParticleData; import com.simibubi.create.foundation.particle.AirParticleData;
import com.simibubi.create.foundation.particle.ICustomParticleData; import com.simibubi.create.foundation.particle.ICustomParticleData;
import net.createmod.catnip.utility.lang.Lang; import net.createmod.catnip.lang.Lang;
import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleOptions;
import net.minecraft.core.particles.ParticleType; import net.minecraft.core.particles.ParticleType;
import net.minecraft.core.registries.Registries; import net.minecraft.core.registries.Registries;
@ -32,6 +33,7 @@ public enum AllParticleTypes {
FLUID_PARTICLE(FluidParticleData::new), FLUID_PARTICLE(FluidParticleData::new),
BASIN_FLUID(FluidParticleData::new), BASIN_FLUID(FluidParticleData::new),
FLUID_DRIP(FluidParticleData::new), FLUID_DRIP(FluidParticleData::new),
WIFI(WiFiParticle.Data::new),
SOUL(SoulParticle.Data::new), SOUL(SoulParticle.Data::new),
SOUL_BASE(SoulBaseParticle.Data::new), SOUL_BASE(SoulBaseParticle.Data::new),
SOUL_PERIMETER(SoulParticle.PerimeterData::new), SOUL_PERIMETER(SoulParticle.PerimeterData::new),

2
src/main/java/com/simibubi/create/AllRecipeTypes.java
View file

@ -33,7 +33,7 @@ import com.simibubi.create.content.processing.recipe.ProcessingRecipeSerializer;
import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipeSerializer; import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipeSerializer;
import com.simibubi.create.foundation.recipe.IRecipeTypeInfo; import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
import net.createmod.catnip.utility.lang.Lang; import net.createmod.catnip.lang.Lang;
import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries; import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;

6
src/main/java/com/simibubi/create/AllShapes.java
View file

@ -10,7 +10,7 @@ import java.util.function.BiFunction;
import com.simibubi.create.content.logistics.chute.ChuteShapes; import com.simibubi.create.content.logistics.chute.ChuteShapes;
import com.simibubi.create.content.trains.track.TrackVoxelShapes; import com.simibubi.create.content.trains.track.TrackVoxelShapes;
import net.createmod.catnip.utility.VoxelShaper; import net.createmod.catnip.math.VoxelShaper;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.core.Direction.Axis; import net.minecraft.core.Direction.Axis;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
@ -151,7 +151,7 @@ public class AllShapes {
DATA_GATHERER = shape(1, 0, 1, 15, 6, 15).add(3, 5, 3, 13, 9, 13) DATA_GATHERER = shape(1, 0, 1, 15, 6, 15).add(3, 5, 3, 13, 9, 13)
.forDirectional(), .forDirectional(),
STOCK_LINK = shape(1, 0, 1, 15, 6, 15).forDirectional(), STOCK_LINK = shape(1, 0, 1, 15, 5, 15).forDirectional(),
STEAM_ENGINE = shape(1, 0, 1, 15, 3, 15).add(3, 0, 3, 13, 15, 13) STEAM_ENGINE = shape(1, 0, 1, 15, 3, 15).add(3, 0, 3, 13, 15, 13)
.add(1, 5, 4, 15, 13, 12) .add(1, 5, 4, 15, 13, 12)
@ -180,7 +180,7 @@ public class AllShapes {
WHISTLE_BASE = shape(1, 0, 1, 15, 3, 15).add(5, 0, 5, 11, 8, 11) WHISTLE_BASE = shape(1, 0, 1, 15, 3, 15).add(5, 0, 5, 11, 8, 11)
.forDirectional(UP), .forDirectional(UP),
DESK_BELL = shape(3, 0, 3, 13, 3, 13).add(4, 0, 4, 12, 9, 12) DESK_BELL = shape(3, 0, 3, 13, 3, 13).add(4, 0, 4, 12, 9, 12)
.forDirectional(UP), .forDirectional(UP),

8
src/main/java/com/simibubi/create/AllSpriteShifts.java
View file

@ -12,8 +12,8 @@ import com.simibubi.create.foundation.block.connected.CTType;
import net.createmod.catnip.render.SpriteShiftEntry; import net.createmod.catnip.render.SpriteShiftEntry;
import net.createmod.catnip.render.SpriteShifter; import net.createmod.catnip.render.SpriteShifter;
import net.createmod.catnip.utility.Couple; import net.createmod.catnip.data.Couple;
import net.createmod.catnip.utility.lang.Lang; import net.createmod.catnip.lang.Lang;
import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.DyeColor;
import net.minecraft.world.level.block.WeatheringCopper.WeatherState; import net.minecraft.world.level.block.WeatheringCopper.WeatherState;
import net.minecraft.world.level.block.state.properties.WoodType; import net.minecraft.world.level.block.state.properties.WoodType;
@ -46,7 +46,7 @@ public class AllSpriteShifts {
VERTICAL_FRAMED_GLASS = getCT(AllCTTypes.VERTICAL, "palettes/framed_glass", "palettes/vertical_framed_glass"), VERTICAL_FRAMED_GLASS = getCT(AllCTTypes.VERTICAL, "palettes/framed_glass", "palettes/vertical_framed_glass"),
ORNATE_IRON_WINDOW = vertical("palettes/ornate_iron_window"), ORNATE_IRON_WINDOW = vertical("palettes/ornate_iron_window"),
INDUSTRIAL_IRON_WINDOW = getCT(AllCTTypes.RECTANGLE, "palettes/industrial_iron_window"), INDUSTRIAL_IRON_WINDOW = getCT(AllCTTypes.RECTANGLE, "palettes/industrial_iron_window"),
OLD_FACTORY_WINDOW_1 = getCT(AllCTTypes.RECTANGLE, "palettes/weathered_iron_window", "palettes/weathered_iron_window_1"), OLD_FACTORY_WINDOW_1 = getCT(AllCTTypes.RECTANGLE, "palettes/weathered_iron_window", "palettes/weathered_iron_window_1"),
OLD_FACTORY_WINDOW_2 = getCT(AllCTTypes.RECTANGLE, "palettes/weathered_iron_window", "palettes/weathered_iron_window_2"), OLD_FACTORY_WINDOW_2 = getCT(AllCTTypes.RECTANGLE, "palettes/weathered_iron_window", "palettes/weathered_iron_window_2"),
OLD_FACTORY_WINDOW_3 = getCT(AllCTTypes.RECTANGLE, "palettes/weathered_iron_window", "palettes/weathered_iron_window_3"), OLD_FACTORY_WINDOW_3 = getCT(AllCTTypes.RECTANGLE, "palettes/weathered_iron_window", "palettes/weathered_iron_window_3"),
@ -160,5 +160,5 @@ public class AllSpriteShifts {
public static CTSpriteShiftEntry getWoodenWindow(WoodType woodType) { public static CTSpriteShiftEntry getWoodenWindow(WoodType woodType) {
return WOODEN_WINDOWS.get(woodType); return WOODEN_WINDOWS.get(woodType);
} }
} }

2
src/main/java/com/simibubi/create/AllTags.java
View file

@ -6,7 +6,7 @@ import static com.simibubi.create.AllTags.NameSpace.MOD;
import static com.simibubi.create.AllTags.NameSpace.QUARK; import static com.simibubi.create.AllTags.NameSpace.QUARK;
import static com.simibubi.create.AllTags.NameSpace.TIC; import static com.simibubi.create.AllTags.NameSpace.TIC;
import net.createmod.catnip.utility.lang.Lang; import net.createmod.catnip.lang.Lang;
import net.minecraft.core.Registry; import net.minecraft.core.Registry;
import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.BuiltInRegistries;

4
src/main/java/com/simibubi/create/Create.java
View file

@ -42,8 +42,8 @@ import com.simibubi.create.infrastructure.data.CreateDatagen;
import com.simibubi.create.infrastructure.worldgen.AllFeatures; import com.simibubi.create.infrastructure.worldgen.AllFeatures;
import com.simibubi.create.infrastructure.worldgen.AllPlacementModifiers; import com.simibubi.create.infrastructure.worldgen.AllPlacementModifiers;
import net.createmod.catnip.utility.FontHelper; import net.createmod.catnip.lang.FontHelper;
import net.createmod.catnip.utility.lang.LangBuilder; import net.createmod.catnip.lang.LangBuilder;
import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;

2
src/main/java/com/simibubi/create/CreateClient.java
View file

@ -30,7 +30,7 @@ import net.createmod.catnip.config.ui.BaseConfigScreen;
import net.createmod.catnip.config.ui.ConfigScreen; import net.createmod.catnip.config.ui.ConfigScreen;
import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.CachedBuffers;
import net.createmod.catnip.render.SuperByteBufferCache; import net.createmod.catnip.render.SuperByteBufferCache;
import net.createmod.catnip.utility.lang.Components; import net.createmod.catnip.lang.Components;
import net.createmod.ponder.foundation.PonderIndex; import net.createmod.ponder.foundation.PonderIndex;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.client.GraphicsStatus; import net.minecraft.client.GraphicsStatus;

3
src/main/java/com/simibubi/create/api/connectivity/ConnectivityHandler.java
View file

@ -16,13 +16,14 @@ import org.apache.commons.lang3.tuple.Pair;
import com.simibubi.create.content.fluids.tank.CreativeFluidTankBlockEntity; import com.simibubi.create.content.fluids.tank.CreativeFluidTankBlockEntity;
import com.simibubi.create.foundation.blockEntity.IMultiBlockEntityContainer; import com.simibubi.create.foundation.blockEntity.IMultiBlockEntityContainer;
import net.createmod.catnip.utility.Iterate; import net.createmod.catnip.data.Iterate;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.BlockEntityType;
import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.FluidStack;
import net.neoforged.neoforge.fluids.IFluidTank; import net.neoforged.neoforge.fluids.IFluidTank;
import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.fluids.capability.IFluidHandler;

5
src/main/java/com/simibubi/create/compat/Mods.java
View file

@ -3,13 +3,14 @@ package com.simibubi.create.compat;
import java.util.Optional; import java.util.Optional;
import java.util.function.Supplier; import java.util.function.Supplier;
import net.createmod.catnip.utility.RegisteredObjectsHelper; import net.createmod.catnip.lang.Lang;
import net.createmod.catnip.utility.lang.Lang; import net.createmod.catnip.registry.RegisteredObjectsHelper;
import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.ItemLike;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.neoforged.fml.ModList; import net.neoforged.fml.ModList;
/** /**

2
src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/StationPeripheral.java
View file

@ -18,7 +18,7 @@ import com.simibubi.create.foundation.utility.StringHelper;
import dan200.computercraft.api.lua.IArguments; import dan200.computercraft.api.lua.IArguments;
import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.lua.LuaException;
import dan200.computercraft.api.lua.LuaFunction; import dan200.computercraft.api.lua.LuaFunction;
import net.createmod.catnip.utility.lang.Components; import net.createmod.catnip.lang.Components;
import net.minecraft.nbt.ByteTag; import net.minecraft.nbt.ByteTag;
import net.minecraft.nbt.CollectionTag; import net.minecraft.nbt.CollectionTag;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;

15
src/main/java/com/simibubi/create/compat/jei/category/BasinCategory.java
View file

@ -1,5 +1,12 @@
package com.simibubi.create.compat.jei.category; package com.simibubi.create.compat.jei.category;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.commons.lang3.mutable.MutableInt;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllItems; import com.simibubi.create.AllItems;
import com.simibubi.create.content.processing.basin.BasinRecipe; import com.simibubi.create.content.processing.basin.BasinRecipe;
@ -16,17 +23,13 @@ import mezz.jei.api.gui.ingredient.IRecipeSlotsView;
import mezz.jei.api.neoforge.NeoForgeTypes; import mezz.jei.api.neoforge.NeoForgeTypes;
import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.IFocusGroup;
import mezz.jei.api.recipe.RecipeIngredientRole; import mezz.jei.api.recipe.RecipeIngredientRole;
import net.createmod.catnip.utility.Pair; import net.createmod.catnip.data.Pair;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.Ingredient;
import net.neoforged.neoforge.fluids.FluidStack;
import org.apache.commons.lang3.mutable.MutableInt;
import javax.annotation.ParametersAreNonnullByDefault; import net.neoforged.neoforge.fluids.FluidStack;
import java.util.ArrayList;
import java.util.List;
@ParametersAreNonnullByDefault @ParametersAreNonnullByDefault
public class BasinCategory extends CreateRecipeCategory<BasinRecipe> { public class BasinCategory extends CreateRecipeCategory<BasinRecipe> {

21
src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java
View file

@ -1,5 +1,15 @@
package com.simibubi.create.compat.jei.category; package com.simibubi.create.compat.jei.category;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import javax.annotation.ParametersAreNonnullByDefault;
import org.jetbrains.annotations.NotNull;
import com.simibubi.create.AllFluids; import com.simibubi.create.AllFluids;
import com.simibubi.create.content.fluids.potion.PotionFluidHandler; import com.simibubi.create.content.fluids.potion.PotionFluidHandler;
import com.simibubi.create.content.processing.recipe.ProcessingOutput; import com.simibubi.create.content.processing.recipe.ProcessingOutput;
@ -13,7 +23,7 @@ import mezz.jei.api.recipe.RecipeType;
import mezz.jei.api.recipe.category.IRecipeCategory; import mezz.jei.api.recipe.category.IRecipeCategory;
import mezz.jei.api.registration.IRecipeCatalystRegistration; import mezz.jei.api.registration.IRecipeCatalystRegistration;
import mezz.jei.api.registration.IRecipeRegistration; import mezz.jei.api.registration.IRecipeRegistration;
import net.createmod.catnip.utility.lang.Components; import net.createmod.catnip.lang.Components;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
@ -22,16 +32,9 @@ import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.Recipe;
import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.RecipeHolder;
import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.FluidStack;
import org.jetbrains.annotations.NotNull;
import javax.annotation.ParametersAreNonnullByDefault;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.function.Supplier;
import java.util.stream.Collectors;
@ParametersAreNonnullByDefault @ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault @MethodsReturnNonnullByDefault

12
src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java
View file

@ -1,21 +1,23 @@
package com.simibubi.create.compat.jei.category; package com.simibubi.create.compat.jei.category;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.ParametersAreNonnullByDefault;
import com.simibubi.create.compat.jei.category.animations.AnimatedCrushingWheels; import com.simibubi.create.compat.jei.category.animations.AnimatedCrushingWheels;
import com.simibubi.create.content.kinetics.crusher.AbstractCrushingRecipe; import com.simibubi.create.content.kinetics.crusher.AbstractCrushingRecipe;
import com.simibubi.create.content.processing.recipe.ProcessingOutput; import com.simibubi.create.content.processing.recipe.ProcessingOutput;
import com.simibubi.create.content.processing.recipe.ProcessingRecipe; import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.AllGuiTextures;
import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.gui.ingredient.IRecipeSlotsView;
import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.IFocusGroup;
import mezz.jei.api.recipe.RecipeIngredientRole; import mezz.jei.api.recipe.RecipeIngredientRole;
import net.createmod.catnip.utility.layout.LayoutHelper; import net.createmod.catnip.layout.LayoutHelper;
import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.GuiGraphics;
import javax.annotation.ParametersAreNonnullByDefault;
import java.util.ArrayList;
import java.util.List;
@ParametersAreNonnullByDefault @ParametersAreNonnullByDefault
public class CrushingCategory extends CreateRecipeCategory<AbstractCrushingRecipe> { public class CrushingCategory extends CreateRecipeCategory<AbstractCrushingRecipe> {

2
src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java
View file

@ -18,7 +18,7 @@ import mezz.jei.api.neoforge.NeoForgeTypes;
import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.IFocusGroup;
import mezz.jei.api.recipe.RecipeIngredientRole; import mezz.jei.api.recipe.RecipeIngredientRole;
import mezz.jei.api.runtime.IIngredientManager; import mezz.jei.api.runtime.IIngredientManager;
import net.createmod.catnip.utility.RegisteredObjectsHelper; import net.createmod.catnip.registry.RegisteredObjectsHelper;
import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;

2
src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java
View file

@ -22,7 +22,7 @@ import mezz.jei.api.gui.ingredient.IRecipeSlotsView;
import mezz.jei.api.ingredients.IIngredientRenderer; import mezz.jei.api.ingredients.IIngredientRenderer;
import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.IFocusGroup;
import mezz.jei.api.recipe.RecipeIngredientRole; import mezz.jei.api.recipe.RecipeIngredientRole;
import net.createmod.catnip.utility.lang.Components; import net.createmod.catnip.lang.Components;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font; import net.minecraft.client.gui.Font;

4
src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java
View file

@ -21,8 +21,8 @@ import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.gui.ingredient.IRecipeSlotsView;
import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.IFocusGroup;
import mezz.jei.api.recipe.RecipeIngredientRole; import mezz.jei.api.recipe.RecipeIngredientRole;
import net.createmod.catnip.utility.RegisteredObjectsHelper; import net.createmod.catnip.lang.Components;
import net.createmod.catnip.utility.lang.Components; import net.createmod.catnip.registry.RegisteredObjectsHelper;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font; import net.minecraft.client.gui.Font;

2
src/main/java/com/simibubi/create/compat/jei/category/SpoutCategory.java
View file

@ -22,7 +22,7 @@ import mezz.jei.api.neoforge.NeoForgeTypes;
import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.IFocusGroup;
import mezz.jei.api.recipe.RecipeIngredientRole; import mezz.jei.api.recipe.RecipeIngredientRole;
import mezz.jei.api.runtime.IIngredientManager; import mezz.jei.api.runtime.IIngredientManager;
import net.createmod.catnip.utility.RegisteredObjectsHelper; import net.createmod.catnip.registry.RegisteredObjectsHelper;
import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;

5
src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedBlazeBurner.java
View file

@ -8,10 +8,9 @@ import com.simibubi.create.AllSpriteShifts;
import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel; import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel;
import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.model.baked.PartialModel;
import net.createmod.catnip.animation.AnimationTickHolder;
import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.CachedBuffers;
import net.createmod.catnip.render.SpriteShiftEntry; import net.createmod.catnip.render.SpriteShiftEntry;
import net.createmod.catnip.utility.AnimationTickHolder;
import net.createmod.ponder.utility.LevelTickHolder;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.LightTexture;
@ -72,7 +71,7 @@ public class AnimatedBlazeBurner extends AnimatedKinetics {
- spriteShift.getTarget() - spriteShift.getTarget()
.getV0(); .getV0();
float time = LevelTickHolder.getRenderTime(Minecraft.getInstance().level); float time = AnimationTickHolder.getRenderTime(Minecraft.getInstance().level);
float speed = 1 / 32f + 1 / 64f * heatLevel.ordinal(); float speed = 1 / 32f + 1 / 64f * heatLevel.ordinal();
double vScroll = speed * time; double vScroll = speed * time;

3
src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedDeployer.java
View file

@ -5,7 +5,8 @@ import com.mojang.math.Axis;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllPartialModels; import com.simibubi.create.AllPartialModels;
import com.simibubi.create.content.kinetics.deployer.DeployerBlock; import com.simibubi.create.content.kinetics.deployer.DeployerBlock;
import net.createmod.catnip.utility.AnimationTickHolder;
import net.createmod.catnip.animation.AnimationTickHolder;
import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;

2
src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedItemDrain.java
View file

@ -35,7 +35,7 @@ public class AnimatedItemDrain extends AnimatedKinetics {
matrixStack.scale(scale, scale, scale); matrixStack.scale(scale, scale, scale);
float from = 2/16f; float from = 2/16f;
float to = 1f - from; float to = 1f - from;
FluidRenderer.renderFluidBox(fluid.getFluid(), fluid.getAmount(), from, from, from, to, 3/4f, to, graphics.bufferSource(), matrixStack, LightTexture.FULL_BRIGHT, false, true, fluid.getComponents()); FluidRenderer.renderFluidBox(fluid.getFluid(), fluid.getAmount(), from, from, from, to, 3/4f, to, graphics.bufferSource(), matrixStack, LightTexture.FULL_BRIGHT, false, true, fluid.getComponentsPatch());
graphics.flush(); graphics.flush();
matrixStack.popPose(); matrixStack.popPose();

2
src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedKinetics.java
View file

@ -6,9 +6,9 @@ import com.simibubi.create.foundation.gui.CustomLightingSettings;
import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.model.baked.PartialModel;
import mezz.jei.api.gui.drawable.IDrawable; import mezz.jei.api.gui.drawable.IDrawable;
import net.createmod.catnip.animation.AnimationTickHolder;
import net.createmod.catnip.gui.ILightingSettings; import net.createmod.catnip.gui.ILightingSettings;
import net.createmod.catnip.gui.element.GuiGameElement; import net.createmod.catnip.gui.element.GuiGameElement;
import net.createmod.catnip.utility.AnimationTickHolder;
import net.minecraft.core.Direction.Axis; import net.minecraft.core.Direction.Axis;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BlockStateProperties;

3
src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMixer.java
View file

@ -4,7 +4,8 @@ import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Axis; import com.mojang.math.Axis;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllPartialModels; import com.simibubi.create.AllPartialModels;
import net.createmod.catnip.utility.AnimationTickHolder;
import net.createmod.catnip.animation.AnimationTickHolder;
import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;

3
src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedPress.java
View file

@ -4,7 +4,8 @@ import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Axis; import com.mojang.math.Axis;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllPartialModels; import com.simibubi.create.AllPartialModels;
import net.createmod.catnip.utility.AnimationTickHolder;
import net.createmod.catnip.animation.AnimationTickHolder;
import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;

6
src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSpout.java
View file

@ -9,8 +9,8 @@ import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllPartialModels; import com.simibubi.create.AllPartialModels;
import com.simibubi.create.foundation.fluid.FluidRenderer; import com.simibubi.create.foundation.fluid.FluidRenderer;
import net.createmod.catnip.animation.AnimationTickHolder;
import net.createmod.catnip.gui.UIRenderHelper; import net.createmod.catnip.gui.UIRenderHelper;
import net.createmod.catnip.utility.AnimationTickHolder;
import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.LightTexture;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
@ -72,7 +72,7 @@ public class AnimatedSpout extends AnimatedKinetics {
float from = 3f / 16f; float from = 3f / 16f;
float to = 17f / 16f; float to = 17f / 16f;
FluidStack fluidStack = fluids.get(0); FluidStack fluidStack = fluids.get(0);
FluidRenderer.renderFluidBox(fluidStack.getFluid(), fluidStack.getAmount(), from, from, from, to, to, to, graphics.bufferSource(), matrixStack, LightTexture.FULL_BRIGHT, false, true, fluidStack.getComponents()); FluidRenderer.renderFluidBox(fluidStack.getFluid(), fluidStack.getAmount(), from, from, from, to, to, to, graphics.bufferSource(), matrixStack, LightTexture.FULL_BRIGHT, false, true, fluidStack.getComponentsPatch());
matrixStack.popPose(); matrixStack.popPose();
float width = 1 / 128f * squeeze; float width = 1 / 128f * squeeze;
@ -82,7 +82,7 @@ public class AnimatedSpout extends AnimatedKinetics {
matrixStack.translate(-0.5f, 0, -0.5f); matrixStack.translate(-0.5f, 0, -0.5f);
from = -width / 2 + 0.5f; from = -width / 2 + 0.5f;
to = width / 2 + 0.5f; to = width / 2 + 0.5f;
FluidRenderer.renderFluidBox(fluidStack.getFluid(), fluidStack.getAmount(), from, 0, from, to, 2, to, graphics.bufferSource(), matrixStack, LightTexture.FULL_BRIGHT, false, true, fluidStack.getComponents()); FluidRenderer.renderFluidBox(fluidStack.getFluid(), fluidStack.getAmount(), from, 0, from, to, 2, to, graphics.bufferSource(), matrixStack, LightTexture.FULL_BRIGHT, false, true, fluidStack.getComponentsPatch());
graphics.flush(); graphics.flush();
Lighting.setupFor3DItems(); Lighting.setupFor3DItems();

2
src/main/java/com/simibubi/create/compat/tconstruct/SpoutCasting.java
View file

@ -6,7 +6,7 @@ import com.simibubi.create.content.fluids.spout.SpoutBlockEntity;
import com.simibubi.create.foundation.fluid.FluidHelper; import com.simibubi.create.foundation.fluid.FluidHelper;
import com.simibubi.create.infrastructure.config.AllConfigs; import com.simibubi.create.infrastructure.config.AllConfigs;
import net.createmod.catnip.utility.RegisteredObjectsHelper; import net.createmod.catnip.registry.RegisteredObjectsHelper;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;

2
src/main/java/com/simibubi/create/compat/thresholdSwitch/FunctionalStorage.java
View file

@ -2,7 +2,7 @@ package com.simibubi.create.compat.thresholdSwitch;
import com.simibubi.create.compat.Mods; import com.simibubi.create.compat.Mods;
import net.createmod.catnip.utility.RegisteredObjectsHelper; import net.createmod.catnip.registry.RegisteredObjectsHelper;
import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntity;
import net.neoforged.neoforge.items.IItemHandler; import net.neoforged.neoforge.items.IItemHandler;

2
src/main/java/com/simibubi/create/compat/thresholdSwitch/SophisticatedStorage.java
View file

@ -2,7 +2,7 @@ package com.simibubi.create.compat.thresholdSwitch;
import com.simibubi.create.compat.Mods; import com.simibubi.create.compat.Mods;
import net.createmod.catnip.utility.RegisteredObjectsHelper; import net.createmod.catnip.registry.RegisteredObjectsHelper;
import net.minecraft.core.component.DataComponents; import net.minecraft.core.component.DataComponents;
import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntity;
import net.neoforged.neoforge.items.IItemHandler; import net.neoforged.neoforge.items.IItemHandler;

2
src/main/java/com/simibubi/create/compat/thresholdSwitch/StorageDrawers.java
View file

@ -2,7 +2,7 @@ package com.simibubi.create.compat.thresholdSwitch;
import com.simibubi.create.compat.Mods; import com.simibubi.create.compat.Mods;
import net.createmod.catnip.utility.RegisteredObjectsHelper; import net.createmod.catnip.registry.RegisteredObjectsHelper;
import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntity;
import net.neoforged.neoforge.items.IItemHandler; import net.neoforged.neoforge.items.IItemHandler;

10
src/main/java/com/simibubi/create/compat/trainmap/TrainMapManager.java
View file

@ -29,11 +29,11 @@ import com.simibubi.create.infrastructure.config.AllConfigs;
import com.simibubi.create.infrastructure.config.CClient; import com.simibubi.create.infrastructure.config.CClient;
import it.unimi.dsi.fastutil.objects.ObjectArrayList; import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import net.createmod.catnip.utility.AnimationTickHolder; import net.createmod.catnip.animation.AnimationTickHolder;
import net.createmod.catnip.utility.Couple; import net.createmod.catnip.data.Couple;
import net.createmod.catnip.utility.Iterate; import net.createmod.catnip.data.Iterate;
import net.createmod.catnip.utility.Pair; import net.createmod.catnip.data.Pair;
import net.createmod.catnip.utility.lang.Components; import net.createmod.catnip.lang.Components;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.renderer.Rect2i; import net.minecraft.client.renderer.Rect2i;

2
src/main/java/com/simibubi/create/compat/trainmap/TrainMapRenderer.java
View file

@ -13,7 +13,7 @@ import com.simibubi.create.infrastructure.config.CClient;
import it.unimi.dsi.fastutil.objects.Object2ObjectMap; import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import net.createmod.catnip.utility.Couple; import net.createmod.catnip.data.Couple;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.LightTexture;

3
src/main/java/com/simibubi/create/compat/trainmap/TrainMapSync.java
View file

@ -24,7 +24,7 @@ import io.netty.buffer.ByteBuf;
import net.createmod.catnip.codecs.stream.CatnipLargerStreamCodecs; import net.createmod.catnip.codecs.stream.CatnipLargerStreamCodecs;
import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders;
import net.createmod.catnip.platform.CatnipServices; import net.createmod.catnip.platform.CatnipServices;
import net.createmod.catnip.utility.Pair; import net.createmod.catnip.data.Pair;
import net.minecraft.core.UUIDUtil; import net.minecraft.core.UUIDUtil;
import net.minecraft.core.registries.Registries; import net.minecraft.core.registries.Registries;
import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.FriendlyByteBuf;
@ -36,6 +36,7 @@ import net.minecraft.server.level.ServerPlayer;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
import net.neoforged.neoforge.event.tick.ServerTickEvent; import net.neoforged.neoforge.event.tick.ServerTickEvent;
public class TrainMapSync { public class TrainMapSync {

4
src/main/java/com/simibubi/create/compat/trainmap/TrainMapSyncClient.java
View file

@ -9,8 +9,8 @@ import java.util.UUID;
import com.simibubi.create.compat.trainmap.TrainMapSync.TrainMapSyncEntry; import com.simibubi.create.compat.trainmap.TrainMapSync.TrainMapSyncEntry;
import net.createmod.catnip.platform.CatnipServices; import net.createmod.catnip.platform.CatnipServices;
import net.createmod.catnip.utility.AnimationTickHolder; import net.createmod.catnip.animation.AnimationTickHolder;
import net.createmod.catnip.utility.Pair; import net.createmod.catnip.data.Pair;
public class TrainMapSyncClient { public class TrainMapSyncClient {

3
src/main/java/com/simibubi/create/compat/trainmap/TrainMapSyncPacket.java
View file

@ -11,8 +11,9 @@ import net.createmod.catnip.net.base.ClientboundPacketPayload;
import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders;
import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.player.LocalPlayer;
import net.minecraft.core.UUIDUtil; import net.minecraft.core.UUIDUtil;
import net.createmod.catnip.utility.Pair; import net.createmod.catnip.data.Pair;
import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.ByteBufCodecs;
import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.codec.StreamCodec;

5
src/main/java/com/simibubi/create/content/contraptions/AbstractContraptionEntity.java
View file

@ -41,8 +41,8 @@ import net.createmod.catnip.platform.CatnipServices;
import dev.engine_room.flywheel.api.backend.BackendManager; import dev.engine_room.flywheel.api.backend.BackendManager;
import io.netty.handler.codec.DecoderException; import io.netty.handler.codec.DecoderException;
import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.math.AngleHelper;
import net.createmod.catnip.utility.math.AngleHelper; import net.createmod.catnip.math.VecHelper;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
@ -75,6 +75,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemp
import net.minecraft.world.level.material.PushReaction; import net.minecraft.world.level.material.PushReaction;
import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.api.distmarker.OnlyIn;
import net.neoforged.neoforge.entity.IEntityWithComplexSpawn; import net.neoforged.neoforge.entity.IEntityWithComplexSpawn;

17
src/main/java/com/simibubi/create/content/contraptions/Contraption.java
View file

@ -75,12 +75,12 @@ import com.simibubi.create.foundation.utility.BlockHelper;
import com.simibubi.create.foundation.utility.ICoordinate; import com.simibubi.create.foundation.utility.ICoordinate;
import com.simibubi.create.infrastructure.config.AllConfigs; import com.simibubi.create.infrastructure.config.AllConfigs;
import net.createmod.catnip.utility.BBHelper; import net.createmod.catnip.data.Iterate;
import net.createmod.catnip.utility.BlockFace; import net.createmod.catnip.data.UniqueLinkedList;
import net.createmod.catnip.utility.Iterate; import net.createmod.catnip.math.BBHelper;
import net.createmod.catnip.utility.NBTHelper; import net.createmod.catnip.math.BlockFace;
import net.createmod.catnip.utility.NBTProcessors; import net.createmod.catnip.nbt.NBTHelper;
import net.createmod.catnip.utility.UniqueLinkedList; import net.createmod.catnip.nbt.NBTProcessors;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.core.Direction.Axis; import net.minecraft.core.Direction.Axis;
@ -123,6 +123,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;
import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraft.world.phys.shapes.VoxelShape;
import net.neoforged.neoforge.client.model.data.ModelData; import net.neoforged.neoforge.client.model.data.ModelData;
import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.FluidStack;
import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.fluids.capability.IFluidHandler;
@ -1467,7 +1468,7 @@ public abstract class Contraption {
public IFluidHandler getSharedFluidTanks() { public IFluidHandler getSharedFluidTanks() {
return storage.getFluids(); return storage.getFluids();
} }
public MountedStorageManager getStorageManager() { public MountedStorageManager getStorageManager() {
return storage; return storage;
} }
@ -1497,7 +1498,7 @@ public abstract class Contraption {
public void handleContraptionFluidPacket(BlockPos localPos, FluidStack containedFluid) { public void handleContraptionFluidPacket(BlockPos localPos, FluidStack containedFluid) {
storage.updateContainedFluid(localPos, containedFluid); storage.updateContainedFluid(localPos, containedFluid);
} }
public void handleContraptionItemPacket(BlockPos localPos, List<ItemStack> containedItems) { public void handleContraptionItemPacket(BlockPos localPos, List<ItemStack> containedItems) {
storage.updateContainedItem(localPos, containedItems); storage.updateContainedItem(localPos, containedItems);
} }

5
src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java
View file

@ -34,8 +34,8 @@ import com.simibubi.create.foundation.utility.BlockHelper;
import com.simibubi.create.infrastructure.config.AllConfigs; import com.simibubi.create.infrastructure.config.AllConfigs;
import net.createmod.catnip.platform.CatnipServices; import net.createmod.catnip.platform.CatnipServices;
import net.createmod.catnip.utility.Iterate; import net.createmod.catnip.data.Iterate;
import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.math.VecHelper;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.client.multiplayer.ClientPacketListener;
@ -64,6 +64,7 @@ import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraft.world.phys.shapes.VoxelShape;
import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.api.distmarker.OnlyIn;

4
src/main/java/com/simibubi/create/content/contraptions/ContraptionHandler.java
View file

@ -9,8 +9,8 @@ import java.util.Map;
import it.unimi.dsi.fastutil.objects.ObjectArrayList; import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import it.unimi.dsi.fastutil.objects.ObjectLists; import it.unimi.dsi.fastutil.objects.ObjectLists;
import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.data.WorldAttached;
import net.createmod.catnip.utility.WorldAttached; import net.createmod.catnip.math.VecHelper;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.Tag; import net.minecraft.nbt.Tag;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;

10
src/main/java/com/simibubi/create/content/contraptions/ContraptionHandlerClient.java
View file

@ -5,6 +5,8 @@ import java.util.Collection;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import net.neoforged.neoforge.event.tick.PlayerTickEvent;
import org.apache.commons.lang3.mutable.MutableObject; import org.apache.commons.lang3.mutable.MutableObject;
import com.simibubi.create.AllItems; import com.simibubi.create.AllItems;
@ -15,9 +17,9 @@ import com.simibubi.create.foundation.utility.RaycastHelper;
import com.simibubi.create.foundation.utility.RaycastHelper.PredicateTraceResult; import com.simibubi.create.foundation.utility.RaycastHelper.PredicateTraceResult;
import net.createmod.catnip.platform.CatnipServices; import net.createmod.catnip.platform.CatnipServices;
import net.createmod.catnip.utility.Couple; import net.createmod.catnip.data.Couple;
import net.createmod.catnip.utility.Iterate; import net.createmod.catnip.data.Iterate;
import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.math.VecHelper;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.player.LocalPlayer;
import net.minecraft.client.player.RemotePlayer; import net.minecraft.client.player.RemotePlayer;
@ -32,12 +34,12 @@ import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraft.world.phys.shapes.VoxelShape;
import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.api.distmarker.OnlyIn;
import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.neoforge.client.event.InputEvent; import net.neoforged.neoforge.client.event.InputEvent;
import net.neoforged.neoforge.event.tick.PlayerTickEvent;
@EventBusSubscriber(Dist.CLIENT) @EventBusSubscriber(Dist.CLIENT)
public class ContraptionHandlerClient { public class ContraptionHandlerClient {

2
src/main/java/com/simibubi/create/content/contraptions/ContraptionWorld.java
View file

@ -1,6 +1,6 @@
package com.simibubi.create.content.contraptions; package com.simibubi.create.content.contraptions;
import net.createmod.catnip.utility.levelWrappers.WrappedLevel; import net.createmod.catnip.levelWrappers.WrappedLevel;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundSource; import net.minecraft.sounds.SoundSource;

7
src/main/java/com/simibubi/create/content/contraptions/ControlledContraptionEntity.java
View file

@ -7,9 +7,9 @@ import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
import com.simibubi.create.content.contraptions.behaviour.MovementContext; import com.simibubi.create.content.contraptions.behaviour.MovementContext;
import dev.engine_room.flywheel.lib.transform.TransformStack; import dev.engine_room.flywheel.lib.transform.TransformStack;
import net.createmod.catnip.utility.NBTHelper; import net.createmod.catnip.math.AngleHelper;
import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.math.VecHelper;
import net.createmod.catnip.utility.math.AngleHelper; import net.createmod.catnip.nbt.NBTHelper;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.core.Direction.Axis; import net.minecraft.core.Direction.Axis;
@ -22,6 +22,7 @@ import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate.StructureBlockInfo; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate.StructureBlockInfo;
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.api.distmarker.OnlyIn;

2
src/main/java/com/simibubi/create/content/contraptions/DirectionalExtenderScrollOptionSlot.java
View file

@ -6,7 +6,7 @@ import com.mojang.blaze3d.vertex.PoseStack;
import com.simibubi.create.foundation.blockEntity.behaviour.CenteredSideValueBoxTransform; import com.simibubi.create.foundation.blockEntity.behaviour.CenteredSideValueBoxTransform;
import dev.engine_room.flywheel.lib.transform.TransformStack; import dev.engine_room.flywheel.lib.transform.TransformStack;
import net.createmod.catnip.utility.math.AngleHelper; import net.createmod.catnip.math.AngleHelper;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.LevelAccessor;

2
src/main/java/com/simibubi/create/content/contraptions/IControlContraption.java
View file

@ -3,7 +3,7 @@ package com.simibubi.create.content.contraptions;
import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.INamedIconOptions; import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.INamedIconOptions;
import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.gui.AllIcons;
import net.createmod.catnip.utility.lang.Lang; import net.createmod.catnip.lang.Lang;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
public interface IControlContraption { public interface IControlContraption {

4
src/main/java/com/simibubi/create/content/contraptions/IDisplayAssemblyExceptions.java
View file

@ -6,8 +6,8 @@ import java.util.List;
import com.simibubi.create.foundation.item.TooltipHelper; import com.simibubi.create.foundation.item.TooltipHelper;
import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.foundation.utility.CreateLang;
import net.createmod.catnip.utility.FontHelper.Palette; import net.createmod.catnip.lang.Components;
import net.createmod.catnip.utility.lang.Components; import net.createmod.catnip.lang.FontHelper.Palette;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;

8
src/main/java/com/simibubi/create/content/contraptions/MountedFluidStorage.java
View file

@ -5,15 +5,17 @@ import com.simibubi.create.content.fluids.tank.CreativeFluidTankBlockEntity;
import com.simibubi.create.content.fluids.tank.CreativeFluidTankBlockEntity.CreativeSmartFluidTank; import com.simibubi.create.content.fluids.tank.CreativeFluidTankBlockEntity.CreativeSmartFluidTank;
import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity;
import com.simibubi.create.foundation.fluid.SmartFluidTank; import com.simibubi.create.foundation.fluid.SmartFluidTank;
import net.createmod.catnip.platform.CatnipServices; import net.createmod.catnip.platform.CatnipServices;
import net.createmod.catnip.utility.NBTHelper; import net.createmod.catnip.animation.LerpedFloat;
import net.createmod.catnip.utility.animation.LerpedFloat; import net.createmod.catnip.animation.LerpedFloat.Chaser;
import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; import net.createmod.catnip.nbt.NBTHelper;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup; import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntity;
import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.capabilities.Capabilities;
import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.FluidStack;
import net.neoforged.neoforge.fluids.IFluidTank; import net.neoforged.neoforge.fluids.IFluidTank;

3
src/main/java/com/simibubi/create/content/contraptions/MountedStorage.java
View file

@ -15,7 +15,7 @@ import com.simibubi.create.content.logistics.vault.ItemVaultBlockEntity;
import com.simibubi.create.content.processing.recipe.ProcessingInventory; import com.simibubi.create.content.processing.recipe.ProcessingInventory;
import net.createmod.catnip.platform.CatnipServices; import net.createmod.catnip.platform.CatnipServices;
import net.createmod.catnip.utility.NBTHelper; import net.createmod.catnip.nbt.NBTHelper;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup; import net.minecraft.core.HolderLookup;
import net.minecraft.core.NonNullList; import net.minecraft.core.NonNullList;
@ -115,7 +115,6 @@ public class MountedStorage {
} }
RegistryAccess registryAccess = level.registryAccess(); RegistryAccess registryAccess = level.registryAccess();
if (blockEntity instanceof ChestBlockEntity) { if (blockEntity instanceof ChestBlockEntity) {
CompoundTag tag = blockEntity.saveWithFullMetadata(registryAccess); CompoundTag tag = blockEntity.saveWithFullMetadata(registryAccess);
if (tag.contains("LootTable", 8)) if (tag.contains("LootTable", 8))

5
src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java
View file

@ -15,8 +15,8 @@ import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity;
import com.simibubi.create.content.logistics.depot.DepotBlockEntity; import com.simibubi.create.content.logistics.depot.DepotBlockEntity;
import com.simibubi.create.foundation.fluid.CombinedTankWrapper; import com.simibubi.create.foundation.fluid.CombinedTankWrapper;
import net.createmod.catnip.utility.NBTHelper; import net.createmod.catnip.lang.Components;
import net.createmod.catnip.utility.lang.Components; import net.createmod.catnip.nbt.NBTHelper;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.core.HolderLookup; import net.minecraft.core.HolderLookup;
@ -34,6 +34,7 @@ import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.properties.ChestType; import net.minecraft.world.level.block.state.properties.ChestType;
import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate.StructureBlockInfo; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate.StructureBlockInfo;
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.FluidStack;
import net.neoforged.neoforge.fluids.IFluidTank; import net.neoforged.neoforge.fluids.IFluidTank;
import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.fluids.capability.IFluidHandler;

11
src/main/java/com/simibubi/create/content/contraptions/OrientedContraptionEntity.java
View file

@ -1,6 +1,6 @@
package com.simibubi.create.content.contraptions; package com.simibubi.create.content.contraptions;
import static net.createmod.catnip.utility.math.AngleHelper.angleLerp; import static net.createmod.catnip.math.AngleHelper.angleLerp;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
@ -19,10 +19,10 @@ import com.simibubi.create.content.contraptions.mounted.MountedContraption;
import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.item.ItemHelper;
import dev.engine_room.flywheel.lib.transform.TransformStack; import dev.engine_room.flywheel.lib.transform.TransformStack;
import net.createmod.catnip.utility.Couple; import net.createmod.catnip.data.Couple;
import net.createmod.catnip.utility.NBTHelper; import net.createmod.catnip.math.AngleHelper;
import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.math.VecHelper;
import net.createmod.catnip.utility.math.AngleHelper; import net.createmod.catnip.nbt.NBTHelper;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
@ -47,6 +47,7 @@ import net.minecraft.world.level.block.BaseRailBlock;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.RailShape; import net.minecraft.world.level.block.state.properties.RailShape;
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.api.distmarker.OnlyIn;

2
src/main/java/com/simibubi/create/content/contraptions/StructureTransform.java
View file

@ -14,7 +14,7 @@ import com.simibubi.create.impl.contraption.transformable.ContraptionTransformab
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders;
import net.createmod.catnip.codecs.stream.CatnipStreamCodecs; import net.createmod.catnip.codecs.stream.CatnipStreamCodecs;
import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.math.VecHelper;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.core.Direction.Axis; import net.minecraft.core.Direction.Axis;

8
src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsBlockEntity.java
View file

@ -13,10 +13,10 @@ import com.simibubi.create.foundation.utility.CreateLang;
import com.simibubi.create.foundation.utility.DyeHelper; import com.simibubi.create.foundation.utility.DyeHelper;
import dev.engine_room.flywheel.lib.transform.TransformStack; import dev.engine_room.flywheel.lib.transform.TransformStack;
import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.animation.LerpedFloat;
import net.createmod.catnip.utility.animation.LerpedFloat; import net.createmod.catnip.animation.LerpedFloat.Chaser;
import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; import net.createmod.catnip.math.AngleHelper;
import net.createmod.catnip.utility.math.AngleHelper; import net.createmod.catnip.math.VecHelper;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.core.Direction.Axis; import net.minecraft.core.Direction.Axis;

9
src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsMovement.java
View file

@ -8,14 +8,15 @@ import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.foundation.utility.CreateLang;
import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld; import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld;
import net.createmod.catnip.utility.Couple; import net.createmod.catnip.animation.LerpedFloat;
import net.createmod.catnip.utility.IntAttached; import net.createmod.catnip.animation.LerpedFloat.Chaser;
import net.createmod.catnip.utility.animation.LerpedFloat; import net.createmod.catnip.data.Couple;
import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; import net.createmod.catnip.data.IntAttached;
import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.api.distmarker.OnlyIn;

12
src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsRenderer.java
View file

@ -15,12 +15,12 @@ import com.simibubi.create.foundation.utility.DyeHelper;
import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld; import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld;
import dev.engine_room.flywheel.lib.transform.TransformStack; import dev.engine_room.flywheel.lib.transform.TransformStack;
import net.createmod.catnip.animation.AnimationTickHolder;
import net.createmod.catnip.data.Couple;
import net.createmod.catnip.math.AngleHelper;
import net.createmod.catnip.math.VecHelper;
import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.CachedBuffers;
import net.createmod.catnip.utility.Couple; import net.createmod.catnip.theme.Color;
import net.createmod.catnip.utility.VecHelper;
import net.createmod.catnip.utility.math.AngleHelper;
import net.createmod.catnip.utility.theme.Color;
import net.createmod.ponder.utility.LevelTickHolder;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font; import net.minecraft.client.gui.Font;
import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.MultiBufferSource;
@ -104,7 +104,7 @@ public class ContraptionControlsRenderer extends SmartBlockEntityRenderer<Contra
float buttondepth = -.25f; float buttondepth = -.25f;
if (ctx.contraption.presentBlockEntities.get(ctx.localPos) instanceof ContraptionControlsBlockEntity cbe) if (ctx.contraption.presentBlockEntities.get(ctx.localPos) instanceof ContraptionControlsBlockEntity cbe)
buttondepth += -1 / 24f * cbe.button.getValue(LevelTickHolder.getPartialTicks(renderWorld)); buttondepth += -1 / 24f * cbe.button.getValue(AnimationTickHolder.getPartialTicks(renderWorld));
if (!text.isBlank() && playerDistance < 100) { if (!text.isBlank() && playerDistance < 100) {
int actualWidth = fontRenderer.width(text); int actualWidth = fontRenderer.width(text);

6
src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterActorVisual.java
View file

@ -10,9 +10,9 @@ import dev.engine_room.flywheel.lib.instance.InstanceTypes;
import dev.engine_room.flywheel.lib.instance.TransformedInstance; import dev.engine_room.flywheel.lib.instance.TransformedInstance;
import dev.engine_room.flywheel.lib.model.Models; import dev.engine_room.flywheel.lib.model.Models;
import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.model.baked.PartialModel;
import net.createmod.catnip.utility.AnimationTickHolder; import net.createmod.catnip.animation.AnimationTickHolder;
import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.math.AngleHelper;
import net.createmod.catnip.utility.math.AngleHelper; import net.createmod.catnip.math.VecHelper;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BlockStateProperties;

2
src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterMovementBehaviour.java
View file

@ -17,7 +17,7 @@ import com.simibubi.create.infrastructure.config.AllConfigs;
import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.api.visualization.VisualizationContext;
import dev.engine_room.flywheel.api.visualization.VisualizationManager; import dev.engine_room.flywheel.api.visualization.VisualizationManager;
import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.math.VecHelper;
import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.tags.BlockTags; import net.minecraft.tags.BlockTags;

8
src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterRenderer.java
View file

@ -9,11 +9,11 @@ import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld; import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld;
import net.createmod.catnip.animation.AnimationTickHolder;
import net.createmod.catnip.math.AngleHelper;
import net.createmod.catnip.math.VecHelper;
import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.CachedBuffers;
import net.createmod.catnip.render.SuperByteBuffer; import net.createmod.catnip.render.SuperByteBuffer;
import net.createmod.catnip.utility.VecHelper;
import net.createmod.catnip.utility.math.AngleHelper;
import net.createmod.ponder.utility.LevelTickHolder;
import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.LevelRenderer;
import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderType;
@ -61,7 +61,7 @@ public class HarvesterRenderer extends SafeBlockEntityRenderer<HarvesterBlockEnt
public static void transform(Level world, Direction facing, SuperByteBuffer superBuffer, float speed, Vec3 pivot) { public static void transform(Level world, Direction facing, SuperByteBuffer superBuffer, float speed, Vec3 pivot) {
float originOffset = 1 / 16f; float originOffset = 1 / 16f;
Vec3 rotOffset = new Vec3(0, pivot.y * originOffset, pivot.z * originOffset); Vec3 rotOffset = new Vec3(0, pivot.y * originOffset, pivot.z * originOffset);
float time = LevelTickHolder.getRenderTime(world) / 20; float time = AnimationTickHolder.getRenderTime(world) / 20;
float angle = (time * speed) % 360; float angle = (time * speed) % 360;
superBuffer.rotateCentered(AngleHelper.rad(AngleHelper.horizontalAngle(facing)), Direction.UP) superBuffer.rotateCentered(AngleHelper.rad(AngleHelper.horizontalAngle(facing)), Direction.UP)

3
src/main/java/com/simibubi/create/content/contraptions/actors/plough/PloughMovementBehaviour.java
View file

@ -6,7 +6,8 @@ import com.simibubi.create.content.kinetics.base.BlockBreakingMovementBehaviour;
import com.simibubi.create.content.trains.track.FakeTrackBlock; import com.simibubi.create.content.trains.track.FakeTrackBlock;
import com.simibubi.create.content.trains.track.ITrackBlock; import com.simibubi.create.content.trains.track.ITrackBlock;
import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.advancement.AllAdvancements;
import net.createmod.catnip.utility.VecHelper;
import net.createmod.catnip.math.VecHelper;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;

2
src/main/java/com/simibubi/create/content/contraptions/actors/psi/PIInstance.java
View file

@ -7,7 +7,7 @@ import dev.engine_room.flywheel.api.instance.InstancerProvider;
import dev.engine_room.flywheel.lib.instance.InstanceTypes; import dev.engine_room.flywheel.lib.instance.InstanceTypes;
import dev.engine_room.flywheel.lib.instance.TransformedInstance; import dev.engine_room.flywheel.lib.instance.TransformedInstance;
import dev.engine_room.flywheel.lib.model.Models; import dev.engine_room.flywheel.lib.model.Models;
import net.createmod.catnip.utility.math.AngleHelper; import net.createmod.catnip.math.AngleHelper;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;

4
src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIActorVisual.java
View file

@ -5,8 +5,8 @@ import com.simibubi.create.content.contraptions.render.ActorVisual;
import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld; import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld;
import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.api.visualization.VisualizationContext;
import net.createmod.catnip.utility.AnimationTickHolder; import net.createmod.catnip.animation.AnimationTickHolder;
import net.createmod.catnip.utility.animation.LerpedFloat; import net.createmod.catnip.animation.LerpedFloat;
public class PSIActorVisual extends ActorVisual { public class PSIActorVisual extends ActorVisual {

2
src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceBlockEntity.java
View file

@ -9,7 +9,7 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
import com.simibubi.create.infrastructure.config.AllConfigs; import com.simibubi.create.infrastructure.config.AllConfigs;
import net.createmod.catnip.utility.animation.LerpedFloat; import net.createmod.catnip.animation.LerpedFloat;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup; import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;

7
src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceMovement.java
View file

@ -13,9 +13,9 @@ import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld;
import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.api.visualization.VisualizationContext;
import dev.engine_room.flywheel.api.visualization.VisualizationManager; import dev.engine_room.flywheel.api.visualization.VisualizationManager;
import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.animation.LerpedFloat;
import net.createmod.catnip.utility.animation.LerpedFloat; import net.createmod.catnip.animation.LerpedFloat.Chaser;
import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; import net.createmod.catnip.math.VecHelper;
import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
@ -24,6 +24,7 @@ import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.api.distmarker.OnlyIn;

7
src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceRenderer.java
View file

@ -13,12 +13,11 @@ import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld;
import dev.engine_room.flywheel.api.visualization.VisualizationManager; import dev.engine_room.flywheel.api.visualization.VisualizationManager;
import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.model.baked.PartialModel;
import net.createmod.catnip.animation.AnimationTickHolder;
import net.createmod.catnip.animation.LerpedFloat;
import net.createmod.catnip.math.AngleHelper;
import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.CachedBuffers;
import net.createmod.catnip.render.SuperByteBuffer; import net.createmod.catnip.render.SuperByteBuffer;
import net.createmod.catnip.utility.AnimationTickHolder;
import net.createmod.catnip.utility.NBTHelper;
import net.createmod.catnip.utility.animation.LerpedFloat;
import net.createmod.catnip.utility.math.AngleHelper;
import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.LevelRenderer;
import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderType;

2
src/main/java/com/simibubi/create/content/contraptions/actors/roller/PaveTask.java
View file

@ -4,7 +4,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import net.createmod.catnip.utility.Couple; import net.createmod.catnip.data.Couple;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
public class PaveTask { public class PaveTask {

4
src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerBlock.java
View file

@ -9,8 +9,8 @@ import com.simibubi.create.content.contraptions.actors.AttachedActorBlock;
import com.simibubi.create.foundation.block.IBE; import com.simibubi.create.foundation.block.IBE;
import com.simibubi.create.foundation.placement.PoleHelper; import com.simibubi.create.foundation.placement.PoleHelper;
import net.createmod.catnip.utility.placement.IPlacementHelper; import net.createmod.catnip.placement.IPlacementHelper;
import net.createmod.catnip.utility.placement.PlacementHelpers; import net.createmod.catnip.placement.PlacementHelpers;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;

8
src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerBlockEntity.java
View file

@ -13,10 +13,10 @@ import com.simibubi.create.foundation.gui.AllIcons;
import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.foundation.utility.CreateLang;
import dev.engine_room.flywheel.lib.transform.TransformStack; import dev.engine_room.flywheel.lib.transform.TransformStack;
import net.createmod.catnip.utility.Iterate; import net.createmod.catnip.data.Iterate;
import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.lang.Lang;
import net.createmod.catnip.utility.lang.Lang; import net.createmod.catnip.math.AngleHelper;
import net.createmod.catnip.utility.math.AngleHelper; import net.createmod.catnip.math.VecHelper;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.core.Direction.Axis; import net.minecraft.core.Direction.Axis;

9
src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java
View file

@ -35,11 +35,10 @@ import com.simibubi.create.infrastructure.config.AllConfigs;
import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.api.visualization.VisualizationContext;
import dev.engine_room.flywheel.api.visualization.VisualizationManager; import dev.engine_room.flywheel.api.visualization.VisualizationManager;
import net.createmod.catnip.utility.Couple; import net.createmod.catnip.data.Couple;
import net.createmod.catnip.utility.Iterate; import net.createmod.catnip.data.Iterate;
import net.createmod.catnip.utility.NBTHelper; import net.createmod.catnip.data.Pair;
import net.createmod.catnip.utility.Pair; import net.createmod.catnip.math.VecHelper;
import net.createmod.catnip.utility.VecHelper;
import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;

4
src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerRenderer.java
View file

@ -11,10 +11,10 @@ import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer; import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld; import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld;
import net.createmod.catnip.math.AngleHelper;
import net.createmod.catnip.math.VecHelper;
import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.CachedBuffers;
import net.createmod.catnip.render.SuperByteBuffer; import net.createmod.catnip.render.SuperByteBuffer;
import net.createmod.catnip.utility.VecHelper;
import net.createmod.catnip.utility.math.AngleHelper;
import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.LevelRenderer;
import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderType;

6
src/main/java/com/simibubi/create/content/contraptions/actors/roller/TrackPaverV2.java
View file

@ -10,9 +10,9 @@ import com.simibubi.create.content.trains.graph.TrackEdge;
import com.simibubi.create.content.trains.graph.TrackGraph; import com.simibubi.create.content.trains.graph.TrackGraph;
import com.simibubi.create.content.trains.track.BezierConnection; import com.simibubi.create.content.trains.track.BezierConnection;
import net.createmod.catnip.utility.Iterate; import net.createmod.catnip.data.Iterate;
import net.createmod.catnip.utility.Pair; import net.createmod.catnip.data.Pair;
import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.math.VecHelper;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.AABB;

4
src/main/java/com/simibubi/create/content/contraptions/actors/seat/ContraptionPlayerPassengerRotation.java
View file

@ -5,8 +5,8 @@ import com.simibubi.create.content.contraptions.AbstractContraptionEntity.Contra
import com.simibubi.create.content.trains.entity.CarriageContraptionEntity; import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
import com.simibubi.create.infrastructure.config.AllConfigs; import com.simibubi.create.infrastructure.config.AllConfigs;
import net.createmod.catnip.utility.AnimationTickHolder; import net.createmod.catnip.animation.AnimationTickHolder;
import net.createmod.catnip.utility.math.AngleHelper; import net.createmod.catnip.math.AngleHelper;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;

2
src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatMovementBehaviour.java
View file

@ -7,7 +7,7 @@ import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour; import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
import com.simibubi.create.content.contraptions.behaviour.MovementContext; import com.simibubi.create.content.contraptions.behaviour.MovementContext;
import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.math.VecHelper;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.level.block.SlabBlock; import net.minecraft.world.level.block.SlabBlock;

9
src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsMovementBehaviour.java
View file

@ -9,13 +9,14 @@ import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
import com.simibubi.create.content.trains.entity.CarriageContraptionEntity; import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld; import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld;
import net.createmod.catnip.utility.animation.LerpedFloat; import net.createmod.catnip.animation.AnimationTickHolder;
import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; import net.createmod.catnip.animation.LerpedFloat;
import net.createmod.ponder.utility.LevelTickHolder; import net.createmod.catnip.animation.LerpedFloat.Chaser;
import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate.StructureBlockInfo; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate.StructureBlockInfo;
import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.api.distmarker.OnlyIn;
@ -86,7 +87,7 @@ public class ControlsMovementBehaviour implements MovementBehaviour {
angles.speed.chase(0, 0, Chaser.EXP); angles.speed.chase(0, 0, Chaser.EXP);
} }
float pt = LevelTickHolder.getPartialTicks(context.world); float pt = AnimationTickHolder.getPartialTicks(context.world);
ControlsRenderer.render(context, renderWorld, matrices, buffer, angles.equipAnimation.getValue(pt), ControlsRenderer.render(context, renderWorld, matrices, buffer, angles.equipAnimation.getValue(pt),
angles.speed.getValue(pt), angles.steering.getValue(pt)); angles.speed.getValue(pt), angles.steering.getValue(pt));
} }

4
src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsRenderer.java
View file

@ -7,10 +7,10 @@ import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld; import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld;
import dev.engine_room.flywheel.lib.transform.TransformStack; import dev.engine_room.flywheel.lib.transform.TransformStack;
import net.createmod.catnip.data.Iterate;
import net.createmod.catnip.math.AngleHelper;
import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.CachedBuffers;
import net.createmod.catnip.render.SuperByteBuffer; import net.createmod.catnip.render.SuperByteBuffer;
import net.createmod.catnip.utility.Iterate;
import net.createmod.catnip.utility.math.AngleHelper;
import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.LevelRenderer;
import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderType;

4
src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsServerHandler.java
View file

@ -10,8 +10,8 @@ import java.util.UUID;
import com.simibubi.create.content.contraptions.AbstractContraptionEntity; import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
import net.createmod.catnip.utility.IntAttached; import net.createmod.catnip.data.IntAttached;
import net.createmod.catnip.utility.WorldAttached; import net.createmod.catnip.data.WorldAttached;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.LevelAccessor;

2
src/main/java/com/simibubi/create/content/contraptions/bearing/BearingRenderer.java
View file

@ -7,9 +7,9 @@ import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
import dev.engine_room.flywheel.api.visualization.VisualizationManager; import dev.engine_room.flywheel.api.visualization.VisualizationManager;
import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.model.baked.PartialModel;
import net.createmod.catnip.math.AngleHelper;
import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.CachedBuffers;
import net.createmod.catnip.render.SuperByteBuffer; import net.createmod.catnip.render.SuperByteBuffer;
import net.createmod.catnip.utility.math.AngleHelper;
import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;

2
src/main/java/com/simibubi/create/content/contraptions/bearing/BearingVisual.java
View file

@ -17,7 +17,7 @@ import dev.engine_room.flywheel.lib.instance.OrientedInstance;
import dev.engine_room.flywheel.lib.model.Models; import dev.engine_room.flywheel.lib.model.Models;
import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.model.baked.PartialModel;
import dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual; import dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual;
import net.createmod.catnip.utility.math.AngleHelper; import net.createmod.catnip.math.AngleHelper;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BlockStateProperties;

4
src/main/java/com/simibubi/create/content/contraptions/bearing/ClockworkBearingBlockEntity.java
View file

@ -20,8 +20,8 @@ import com.simibubi.create.foundation.gui.AllIcons;
import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.foundation.utility.CreateLang;
import com.simibubi.create.foundation.utility.ServerSpeedProvider; import com.simibubi.create.foundation.utility.ServerSpeedProvider;
import net.createmod.catnip.utility.lang.Lang; import net.createmod.catnip.lang.Lang;
import net.createmod.catnip.utility.math.AngleHelper; import net.createmod.catnip.math.AngleHelper;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.core.Direction.Axis; import net.minecraft.core.Direction.Axis;

2
src/main/java/com/simibubi/create/content/contraptions/bearing/ClockworkContraption.java
View file

@ -12,7 +12,7 @@ import com.simibubi.create.content.contraptions.AssemblyException;
import com.simibubi.create.content.contraptions.Contraption; import com.simibubi.create.content.contraptions.Contraption;
import com.simibubi.create.content.contraptions.ContraptionType; import com.simibubi.create.content.contraptions.ContraptionType;
import net.createmod.catnip.utility.NBTHelper; import net.createmod.catnip.nbt.NBTHelper;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;

2
src/main/java/com/simibubi/create/content/contraptions/bearing/MechanicalBearingBlockEntity.java
View file

@ -16,7 +16,7 @@ import com.simibubi.create.foundation.item.TooltipHelper;
import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.foundation.utility.CreateLang;
import com.simibubi.create.foundation.utility.ServerSpeedProvider; import com.simibubi.create.foundation.utility.ServerSpeedProvider;
import net.createmod.catnip.utility.math.AngleHelper; import net.createmod.catnip.math.AngleHelper;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.core.HolderLookup; import net.minecraft.core.HolderLookup;

8
src/main/java/com/simibubi/create/content/contraptions/bearing/SailBlock.java
View file

@ -13,10 +13,10 @@ import com.simibubi.create.AllShapes;
import com.simibubi.create.foundation.block.WrenchableDirectionalBlock; import com.simibubi.create.foundation.block.WrenchableDirectionalBlock;
import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.BlockHelper;
import net.createmod.catnip.utility.Iterate; import net.createmod.catnip.data.Iterate;
import net.createmod.catnip.utility.placement.IPlacementHelper; import net.createmod.catnip.placement.IPlacementHelper;
import net.createmod.catnip.utility.placement.PlacementHelpers; import net.createmod.catnip.placement.PlacementHelpers;
import net.createmod.catnip.utility.placement.PlacementOffset; import net.createmod.catnip.placement.PlacementOffset;
import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;

3
src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingMovementBehaviour.java
View file

@ -18,15 +18,16 @@ import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld;
import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.api.visualization.VisualizationContext;
import dev.engine_room.flywheel.api.visualization.VisualizationManager; import dev.engine_room.flywheel.api.visualization.VisualizationManager;
import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.model.baked.PartialModel;
import net.createmod.catnip.animation.AnimationTickHolder;
import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.CachedBuffers;
import net.createmod.catnip.render.SuperByteBuffer; import net.createmod.catnip.render.SuperByteBuffer;
import net.createmod.catnip.utility.AnimationTickHolder;
import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.LevelRenderer;
import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderType;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.api.distmarker.OnlyIn;

2
src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingVisual.java
View file

@ -15,7 +15,7 @@ import dev.engine_room.flywheel.api.visualization.VisualizationContext;
import dev.engine_room.flywheel.lib.instance.InstanceTypes; import dev.engine_room.flywheel.lib.instance.InstanceTypes;
import dev.engine_room.flywheel.lib.instance.OrientedInstance; import dev.engine_room.flywheel.lib.instance.OrientedInstance;
import dev.engine_room.flywheel.lib.model.Models; import dev.engine_room.flywheel.lib.model.Models;
import net.createmod.catnip.utility.AnimationTickHolder; import net.createmod.catnip.animation.AnimationTickHolder;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BlockStateProperties;

2
src/main/java/com/simibubi/create/content/contraptions/bearing/WindmillBearingBlock.java
View file

@ -3,7 +3,7 @@ package com.simibubi.create.content.contraptions.bearing;
import com.simibubi.create.AllBlockEntityTypes; import com.simibubi.create.AllBlockEntityTypes;
import com.simibubi.create.foundation.block.IBE; import com.simibubi.create.foundation.block.IBE;
import net.createmod.catnip.utility.Couple; import net.createmod.catnip.data.Couple;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult; import net.minecraft.world.InteractionResult;

2
src/main/java/com/simibubi/create/content/contraptions/bearing/WindmillBearingBlockEntity.java
View file

@ -10,7 +10,7 @@ import com.simibubi.create.foundation.gui.AllIcons;
import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.foundation.utility.CreateLang;
import com.simibubi.create.infrastructure.config.AllConfigs; import com.simibubi.create.infrastructure.config.AllConfigs;
import net.createmod.catnip.utility.lang.Lang; import net.createmod.catnip.lang.Lang;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup; import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;

2
src/main/java/com/simibubi/create/content/contraptions/behaviour/MovementContext.java
View file

@ -5,7 +5,7 @@ import java.util.function.UnaryOperator;
import com.simibubi.create.content.contraptions.Contraption; import com.simibubi.create.content.contraptions.Contraption;
import com.simibubi.create.content.logistics.filter.FilterItemStack; import com.simibubi.create.content.logistics.filter.FilterItemStack;
import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.math.VecHelper;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.Tag; import net.minecraft.nbt.Tag;

4
src/main/java/com/simibubi/create/content/contraptions/chassis/AbstractChassisBlock.java
View file

@ -7,7 +7,8 @@ import com.simibubi.create.api.contraption.transformable.ITransformableBlock;
import com.simibubi.create.content.contraptions.StructureTransform; import com.simibubi.create.content.contraptions.StructureTransform;
import com.simibubi.create.content.equipment.wrench.IWrenchable; import com.simibubi.create.content.equipment.wrench.IWrenchable;
import com.simibubi.create.foundation.block.IBE; import com.simibubi.create.foundation.block.IBE;
import net.createmod.catnip.utility.Iterate;
import net.createmod.catnip.data.Iterate;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.core.particles.ParticleTypes; import net.minecraft.core.particles.ParticleTypes;
@ -25,6 +26,7 @@ import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
import net.neoforged.neoforge.common.Tags; import net.neoforged.neoforge.common.Tags;
public abstract class AbstractChassisBlock extends RotatedPillarBlock implements IWrenchable, IBE<ChassisBlockEntity>, ITransformableBlock { public abstract class AbstractChassisBlock extends RotatedPillarBlock implements IWrenchable, IBE<ChassisBlockEntity>, ITransformableBlock {

3
src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisBlockEntity.java
View file

@ -25,7 +25,7 @@ import com.simibubi.create.foundation.utility.CreateLang;
import com.simibubi.create.infrastructure.config.AllConfigs; import com.simibubi.create.infrastructure.config.AllConfigs;
import net.createmod.catnip.platform.CatnipServices; import net.createmod.catnip.platform.CatnipServices;
import net.createmod.catnip.utility.Iterate; import net.createmod.catnip.data.Iterate;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.core.Direction.Axis; import net.minecraft.core.Direction.Axis;
@ -39,6 +39,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.BlockHitResult;
import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.api.distmarker.OnlyIn;

Some files were not shown because too many files have changed in this diff Show more