diff --git a/build.gradle b/build.gradle index 22fcca5910..606f4326db 100644 --- a/build.gradle +++ b/build.gradle @@ -24,19 +24,14 @@ base { } boolean inMultiModWorkspace = rootProject.hasProperty('multiModWorkspace.enabled') -boolean catnipInWorkspace = rootProject.hasProperty('multiModWorkspace.catnip') boolean ponderInWorkspace = rootProject.hasProperty('multiModWorkspace.ponder') -if (catnipInWorkspace) { - evaluationDependsOn(":catnip:NeoForge") -} - if (ponderInWorkspace) { evaluationDependsOn(":ponder:NeoForge") } 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'}" @@ -62,13 +57,6 @@ neoForge { sourceSet(sourceSets.main) } - if (catnipInWorkspace) { - catnip { - sourceSet(project(":catnip:Common").sourceSets.main) - sourceSet(project(":catnip:NeoForge").sourceSets.main) - } - } - if (ponderInWorkspace) { ponder { sourceSet(project(":ponder:Common").sourceSets.main) @@ -159,13 +147,6 @@ dependencies { 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}")) - if (catnipInWorkspace) { - implementation(project(":catnip:Common")) - implementation(project(":catnip:NeoForge")) - } else { - implementation("net.createmod.catnip:Catnip-NeoForge-${minecraft_version}:${catnip_version}") - } - if (ponderInWorkspace) { implementation(project(":ponder:Common")) implementation(project(":ponder:NeoForge")) @@ -173,7 +154,6 @@ dependencies { 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}") //compileOnly("mezz.jei:jei-${jei_minecraft_version}-common-api:${jei_version}") diff --git a/gradle.properties b/gradle.properties index 07cc6270f1..e0cb56cd8a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,8 +33,7 @@ jei_minecraft_version = 1.21 jei_version = 19.5.0.33 curios_minecraft_version = 1.21.1 curios_version = 9.2.2 -catnip_version = 0.8.53 -ponder_version = 0.8.7 +ponder_version = 0.9.12 catnip_and_ponder_mc_ver = 1.21.1 cc_tweaked_enable = true diff --git a/src/generated/resources/.cache/3055aa55530438925fbff1670d3e8dc6cc209bf3 b/src/generated/resources/.cache/3055aa55530438925fbff1670d3e8dc6cc209bf3 index 386a902547..9c0109753c 100644 --- a/src/generated/resources/.cache/3055aa55530438925fbff1670d3e8dc6cc209bf3 +++ b/src/generated/resources/.cache/3055aa55530438925fbff1670d3e8dc6cc209bf3 @@ -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 6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.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 bed0534e618105184bc877b104230403ca85bb58 assets/create/blockstates/sticky_mechanical_piston.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 a70c025de5d85180f371ff05bbdc531d8bdfaab1 assets/create/blockstates/stressometer.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 e819e93fdcbe9fd9c050a052d2718ff3b3539365 assets/create/blockstates/zinc_block.json 64121dcb216381c83b4fe28aa361ea07c24c9ad0 assets/create/blockstates/zinc_ore.json -7c975eddc8318d59bb77fa5667d4358f1bd168c5 assets/create/lang/en_ud.json -5bb378436e68d5a1428ac801c3bc5a4443f8b657 assets/create/lang/en_us.json +1c24597f2b10409d8b8cf6819dd8dfe41f2861f2 assets/create/lang/en_ud.json +575042f88772cd1553c19a924aa1d95d38cd93ba assets/create/lang/en_us.json a97e1060e00ae701a02e39cd4ef8054cf345fac4 assets/create/models/block/acacia_window.json 103e032c0b1a0a6a27c67da8c91179a564bd281c assets/create/models/block/acacia_window_pane_noside.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 0f88de164439640cc175ceef2017f7416b5a7018 assets/create/models/item/sticky_mechanical_piston.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 6ee792277b9fd980c40e18e841afa63fc500ed0b assets/create/models/item/stressometer.json 8d4ce1ccf180016506292f63188c10d0dabe0ee3 assets/create/models/item/sturdy_sheet.json diff --git a/src/generated/resources/assets/create/blockstates/stock_link.json b/src/generated/resources/assets/create/blockstates/stock_link.json index 8b1c44ce75..d256e0a8f1 100644 --- a/src/generated/resources/assets/create/blockstates/stock_link.json +++ b/src/generated/resources/assets/create/blockstates/stock_link.json @@ -1,216 +1,200 @@ { "variants": { "face=ceiling,facing=east,powered=false,waterlogged=false": { - "model": "create:block/stock_link/block", + "model": "create:block/stock_link/block_vertical", "x": 180, "y": 270 }, "face=ceiling,facing=east,powered=false,waterlogged=true": { - "model": "create:block/stock_link/block", + "model": "create:block/stock_link/block_vertical", "x": 180, "y": 270 }, "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, "y": 270 }, "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, "y": 270 }, "face=ceiling,facing=north,powered=false,waterlogged=false": { - "model": "create:block/stock_link/block", + "model": "create:block/stock_link/block_vertical", "x": 180, "y": 180 }, "face=ceiling,facing=north,powered=false,waterlogged=true": { - "model": "create:block/stock_link/block", + "model": "create:block/stock_link/block_vertical", "x": 180, "y": 180 }, "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, "y": 180 }, "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, "y": 180 }, "face=ceiling,facing=south,powered=false,waterlogged=false": { - "model": "create:block/stock_link/block", + "model": "create:block/stock_link/block_vertical", "x": 180 }, "face=ceiling,facing=south,powered=false,waterlogged=true": { - "model": "create:block/stock_link/block", + "model": "create:block/stock_link/block_vertical", "x": 180 }, "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 }, "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 }, "face=ceiling,facing=west,powered=false,waterlogged=false": { - "model": "create:block/stock_link/block", + "model": "create:block/stock_link/block_vertical", "x": 180, "y": 90 }, "face=ceiling,facing=west,powered=false,waterlogged=true": { - "model": "create:block/stock_link/block", + "model": "create:block/stock_link/block_vertical", "x": 180, "y": 90 }, "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, "y": 90 }, "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, "y": 90 }, "face=floor,facing=east,powered=false,waterlogged=false": { - "model": "create:block/stock_link/block", - "y": 90 + "model": "create:block/stock_link/block_vertical", + "y": 270 }, "face=floor,facing=east,powered=false,waterlogged=true": { - "model": "create:block/stock_link/block", - "y": 90 + "model": "create:block/stock_link/block_vertical", + "y": 270 }, "face=floor,facing=east,powered=true,waterlogged=false": { - "model": "create:block/stock_link/block_powered", - "y": 90 + "model": "create:block/stock_link/block_vertical_powered", + "y": 270 }, "face=floor,facing=east,powered=true,waterlogged=true": { - "model": "create:block/stock_link/block_powered", - "y": 90 + "model": "create:block/stock_link/block_vertical_powered", + "y": 270 }, "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": { - "model": "create:block/stock_link/block" + "model": "create:block/stock_link/block_vertical", + "y": 180 }, "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": { - "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": { - "model": "create:block/stock_link/block", - "y": 180 + "model": "create:block/stock_link/block_vertical" }, "face=floor,facing=south,powered=false,waterlogged=true": { - "model": "create:block/stock_link/block", - "y": 180 + "model": "create:block/stock_link/block_vertical" }, "face=floor,facing=south,powered=true,waterlogged=false": { - "model": "create:block/stock_link/block_powered", - "y": 180 + "model": "create:block/stock_link/block_vertical_powered" }, "face=floor,facing=south,powered=true,waterlogged=true": { - "model": "create:block/stock_link/block_powered", - "y": 180 + "model": "create:block/stock_link/block_vertical_powered" }, "face=floor,facing=west,powered=false,waterlogged=false": { - "model": "create:block/stock_link/block", - "y": 270 + "model": "create:block/stock_link/block_vertical", + "y": 90 }, "face=floor,facing=west,powered=false,waterlogged=true": { - "model": "create:block/stock_link/block", - "y": 270 + "model": "create:block/stock_link/block_vertical", + "y": 90 }, "face=floor,facing=west,powered=true,waterlogged=false": { - "model": "create:block/stock_link/block_powered", - "y": 270 + "model": "create:block/stock_link/block_vertical_powered", + "y": 90 }, "face=floor,facing=west,powered=true,waterlogged=true": { - "model": "create:block/stock_link/block_powered", - "y": 270 + "model": "create:block/stock_link/block_vertical_powered", + "y": 90 }, "face=wall,facing=east,powered=false,waterlogged=false": { - "model": "create:block/stock_link/block", - "x": 90, - "y": 90 + "model": "create:block/stock_link/block_horizontal", + "y": 270 }, "face=wall,facing=east,powered=false,waterlogged=true": { - "model": "create:block/stock_link/block", - "x": 90, - "y": 90 + "model": "create:block/stock_link/block_horizontal", + "y": 270 }, "face=wall,facing=east,powered=true,waterlogged=false": { - "model": "create:block/stock_link/block_powered", - "x": 90, - "y": 90 + "model": "create:block/stock_link/block_horizontal_powered", + "y": 270 }, "face=wall,facing=east,powered=true,waterlogged=true": { - "model": "create:block/stock_link/block_powered", - "x": 90, - "y": 90 + "model": "create:block/stock_link/block_horizontal_powered", + "y": 270 }, "face=wall,facing=north,powered=false,waterlogged=false": { - "model": "create:block/stock_link/block", - "x": 90 + "model": "create:block/stock_link/block_horizontal", + "y": 180 }, "face=wall,facing=north,powered=false,waterlogged=true": { - "model": "create:block/stock_link/block", - "x": 90 + "model": "create:block/stock_link/block_horizontal", + "y": 180 }, "face=wall,facing=north,powered=true,waterlogged=false": { - "model": "create:block/stock_link/block_powered", - "x": 90 + "model": "create:block/stock_link/block_horizontal_powered", + "y": 180 }, "face=wall,facing=north,powered=true,waterlogged=true": { - "model": "create:block/stock_link/block_powered", - "x": 90 + "model": "create:block/stock_link/block_horizontal_powered", + "y": 180 }, "face=wall,facing=south,powered=false,waterlogged=false": { - "model": "create:block/stock_link/block", - "x": 90, - "y": 180 + "model": "create:block/stock_link/block_horizontal" }, "face=wall,facing=south,powered=false,waterlogged=true": { - "model": "create:block/stock_link/block", - "x": 90, - "y": 180 + "model": "create:block/stock_link/block_horizontal" }, "face=wall,facing=south,powered=true,waterlogged=false": { - "model": "create:block/stock_link/block_powered", - "x": 90, - "y": 180 + "model": "create:block/stock_link/block_horizontal_powered" }, "face=wall,facing=south,powered=true,waterlogged=true": { - "model": "create:block/stock_link/block_powered", - "x": 90, - "y": 180 + "model": "create:block/stock_link/block_horizontal_powered" }, "face=wall,facing=west,powered=false,waterlogged=false": { - "model": "create:block/stock_link/block", - "x": 90, - "y": 270 + "model": "create:block/stock_link/block_horizontal", + "y": 90 }, "face=wall,facing=west,powered=false,waterlogged=true": { - "model": "create:block/stock_link/block", - "x": 90, - "y": 270 + "model": "create:block/stock_link/block_horizontal", + "y": 90 }, "face=wall,facing=west,powered=true,waterlogged=false": { - "model": "create:block/stock_link/block_powered", - "x": 90, - "y": 270 + "model": "create:block/stock_link/block_horizontal_powered", + "y": 90 }, "face=wall,facing=west,powered=true,waterlogged=true": { - "model": "create:block/stock_link/block_powered", - "x": 90, - "y": 270 + "model": "create:block/stock_link/block_horizontal_powered", + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index bbf0e09e18..c8e2b2e9a9 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -269,7 +269,6 @@ "block.create.cardboard_block": "pɹɐoqpɹɐƆ ɟo ʞɔoןᗺ", "block.create.cart_assembler": "ɹǝןqɯǝssⱯ ʇɹɐƆ", "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_pane": "ǝuɐԀ ʍopuıM ʎɹɹǝɥƆ", "block.create.chocolate": "ǝʇɐןoɔoɥƆ", @@ -476,11 +475,6 @@ "block.create.exposed_copper_tile_stairs": "sɹıɐʇS ǝןı⟘ ɹǝddoƆ pǝsodxƎ", "block.create.exposed_copper_tiles": "sǝןı⟘ ɹǝddoƆ pǝsodxƎ", "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.fluid_pipe": "ǝdıԀ 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_tiles": "sǝןı⟘ ɹǝddoƆ pǝzıpıxO", "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.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.tooltip.summary": "˙˙˙sʇɔǝɟɟǝ-ǝpıs ǝʌɐɥ ʎɐɯ ‾ǝɹıℲ ןnoS‾ uǝdo ǝʌoqɐ ʇɥbıɹ ʇı buıɔɐןԀ ˙‾ןןǝᗺ ssɐɹᗺ‾ ǝʌıʇɐɹoɔǝp Ɐ", "block.create.pink_nixie_tube": "ǝqn⟘ ǝıxıN ʞuıԀ", @@ -713,7 +704,6 @@ "block.create.pulse_extender": "ɹǝpuǝʇxƎ ǝsןnԀ", "block.create.pulse_repeater": "ɹǝʇɐǝdǝᴚ ǝ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_postbox": "xoqʇsoԀ ǝןdɹnԀ", "block.create.purple_sail": "ןıɐS ǝןdɹnԀ", @@ -734,7 +724,6 @@ "block.create.redstone_contact": "ʇɔɐʇuoƆ ǝuoʇspǝᴚ", "block.create.redstone_link": "ʞuıꞀ ǝ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.repackager": "ɹǝbɐʞɔɐԀ-ǝᴚ", "block.create.rope": "ǝdoᴚ", @@ -833,12 +822,9 @@ "block.create.sticker": "ɹǝʞɔıʇS", "block.create.sticky_mechanical_piston": "uoʇsıԀ ןɐɔıuɐɥɔǝW ʎʞɔıʇ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.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.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_pane": "ǝuɐԀ ssɐן⅁ pǝןı⟘", "block.create.toolbox.tooltip.behaviour1": "˙‾sʇuǝʇuoƆ‾ ʎɹoʇuǝʌuI ‾suıɐʇǝᴚ‾", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 4667e75743..ddb95d5138 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -269,7 +269,6 @@ "block.create.cardboard_block": "Block of Cardboard", "block.create.cart_assembler": "Cart Assembler", "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_pane": "Cherry Window Pane", "block.create.chocolate": "Chocolate", @@ -476,11 +475,6 @@ "block.create.exposed_copper_tile_stairs": "Exposed Copper Tile Stairs", "block.create.exposed_copper_tiles": "Exposed Copper Tiles", "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.fluid_pipe": "Fluid Pipe", "block.create.fluid_tank": "Fluid Tank", @@ -628,10 +622,7 @@ "block.create.oxidized_copper_tile_stairs": "Oxidized Copper Tile Stairs", "block.create.oxidized_copper_tiles": "Oxidized Copper Tiles", "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.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.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", @@ -713,7 +704,6 @@ "block.create.pulse_extender": "Pulse Extender", "block.create.pulse_repeater": "Pulse Repeater", "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_postbox": "Purple Postbox", "block.create.purple_sail": "Purple Sail", @@ -734,7 +724,6 @@ "block.create.redstone_contact": "Redstone Contact", "block.create.redstone_link": "Redstone Link", "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.repackager": "Re-Packager", "block.create.rope": "Rope", @@ -833,12 +822,9 @@ "block.create.sticker": "Sticker", "block.create.sticky_mechanical_piston": "Sticky Mechanical Piston", "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.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.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_pane": "Tiled Glass Pane", "block.create.toolbox.tooltip.behaviour1": "_Retains_ Inventory _Contents_.", diff --git a/src/generated/resources/assets/create/models/item/stock_link.json b/src/generated/resources/assets/create/models/item/stock_link.json index 65fae657f8..498a66c399 100644 --- a/src/generated/resources/assets/create/models/item/stock_link.json +++ b/src/generated/resources/assets/create/models/item/stock_link.json @@ -1,3 +1,3 @@ { - "parent": "create:block/stock_link/block" + "parent": "create:block/stock_link/block_vertical" } \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllBlockEntityTypes.java b/src/main/java/com/simibubi/create/AllBlockEntityTypes.java index 7333b43e45..187b5c0b39 100644 --- a/src/main/java/com/simibubi/create/AllBlockEntityTypes.java +++ b/src/main/java/com/simibubi/create/AllBlockEntityTypes.java @@ -529,10 +529,11 @@ public class AllBlockEntityTypes { .renderer(() -> TableClothRenderer::new) .register(); - public static final BlockEntityEntry PACKAGER_LINK = REGISTRATE - .blockEntity("packager_link", PackagerLinkBlockEntity::new) - .validBlocks(AllBlocks.STOCK_LINK) - .register(); + public static final BlockEntityEntry PACKAGER_LINK = + REGISTRATE.blockEntity("packager_link", PackagerLinkBlockEntity::new) + .validBlocks(AllBlocks.STOCK_LINK) + .renderer(() -> LinkBulbRenderer::new) + .register(); public static final BlockEntityEntry STOCK_TICKER = REGISTRATE .blockEntity("stock_ticker", StockTickerBlockEntity::new) diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index d36c50e253..c7bfe5cc63 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -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.WaterWheelBlock; 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.ChuteGenerator; 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.packagerLink.LogisticallyLinkedBlockItem; 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.RedstoneRequesterBlockItem; 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.ItemUseOverrides; 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.BlockStateGen; 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.entry.BlockEntry; -import net.createmod.catnip.utility.Couple; +import net.createmod.catnip.data.Couple; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.Direction.Axis; 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.LootItemCondition; 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.ModelFile; import net.neoforged.neoforge.common.Tags; @@ -550,6 +554,7 @@ public class AllBlocks { .transform(BlockStressDefaults.setImpact(0)) .onRegister(assignDataBehaviour(new ItemNameDisplaySource(), "combine_item_names")) .onRegister(CreateRegistrate.blockModel(() -> BeltModel::new)) + .clientExtension(() -> BeltBlock.RenderProperties::new) .register(); public static final BlockEntry CHAIN_CONVEYOR = @@ -611,6 +616,7 @@ public class AllBlocks { public static final BlockEntry WATER_WHEEL_STRUCTURAL = REGISTRATE.block("water_wheel_structure", WaterWheelStructuralBlock::new) .initialProperties(SharedProperties::wooden) + .clientExtension(() -> RenderProperties::new) .blockstate((c, p) -> p.getVariantBuilder(c.get()) .forAllStatesExcept(BlockStateGen.mapToAir(p), WaterWheelStructuralBlock.FACING)) .properties(p -> p.noOcclusion() @@ -824,6 +830,7 @@ public class AllBlocks { .isRedstoneConductor((level, pos, state) -> false)) .transform(pickaxeOnly()) .addLayer(() -> RenderType::cutoutMipped) + .clientExtension(() -> ReducedDestroyEffects::new) .blockstate(new ChuteGenerator()::generate) .item(ChuteItem::new) .transform(customItemModel("_", "block")) @@ -837,6 +844,7 @@ public class AllBlocks { .isSuffocating((level, pos, state) -> false) .isRedstoneConductor((level, pos, state) -> false)) .addLayer(() -> RenderType::cutoutMipped) + .clientExtension(() -> ReducedDestroyEffects::new) .transform(pickaxeOnly()) .blockstate((c, p) -> BlockStateGen.simpleBlock(c, p, AssetLookup.forPowered(c, p))) .item() @@ -1619,6 +1627,7 @@ public class AllBlocks { .forceSolidOn()) .addLayer(() -> RenderType::cutoutMipped) .transform(pickaxeOnly()) + .clientExtension(() -> TrackBlock.RenderProperties::new) .onRegister(CreateRegistrate.blockModel(() -> TrackModel::new)) .blockstate(new TrackBlockStateGenerator()::generate) .tag(AllBlockTags.RELOCATION_NOT_SUPPORTED.tag) @@ -1727,6 +1736,7 @@ public class AllBlocks { .properties(p -> p.mapColor(MapColor.STONE)) .transform(pickaxeOnly()) .tag(AllBlockTags.SAFE_NBT.tag) + .clientExtension(() -> ReducedDestroyEffects::new) .onRegister(movementBehaviour(FunnelMovementBehaviour.andesite())) .blockstate(new FunnelGenerator("andesite", false)::generate) .item(FunnelItem::new) @@ -1742,6 +1752,7 @@ public class AllBlocks { .properties(p -> p.mapColor(MapColor.STONE)) .transform(pickaxeOnly()) .tag(AllBlockTags.SAFE_NBT.tag) + .clientExtension(() -> ReducedDestroyEffects::new) .blockstate(new BeltFunnelGenerator("andesite")::generate) .loot((p, b) -> p.dropOther(b, ANDESITE_FUNNEL.get())) .register(); @@ -1753,6 +1764,7 @@ public class AllBlocks { .properties(p -> p.mapColor(MapColor.TERRACOTTA_YELLOW)) .transform(pickaxeOnly()) .tag(AllBlockTags.SAFE_NBT.tag) + .clientExtension(() -> ReducedDestroyEffects::new) .onRegister(movementBehaviour(FunnelMovementBehaviour.brass())) .blockstate(new FunnelGenerator("brass", true)::generate) .item(FunnelItem::new) @@ -1768,6 +1780,7 @@ public class AllBlocks { .properties(p -> p.mapColor(MapColor.TERRACOTTA_YELLOW)) .transform(pickaxeOnly()) .tag(AllBlockTags.SAFE_NBT.tag) + .clientExtension(() -> ReducedDestroyEffects::new) .blockstate(new BeltFunnelGenerator("brass")::generate) .loot((p, b) -> p.dropOther(b, BRASS_FUNNEL.get())) .register(); @@ -1926,9 +1939,9 @@ public class AllBlocks { .properties(p -> p.mapColor(MapColor.TERRACOTTA_BLUE) .sound(SoundType.NETHERITE_BLOCK)) .transform(pickaxeOnly()) - .blockstate((c, p) -> p.horizontalFaceBlock(c.get(), AssetLookup.forPowered(c, p))) + .blockstate(new PackagerLinkGenerator()::generate) .item(LogisticallyLinkedBlockItem::new) - .transform(customItemModel("_", "block")) + .transform(customItemModel("_", "block_vertical")) .register(); public static final BlockEntry STOCK_TICKER = diff --git a/src/main/java/com/simibubi/create/AllBogeyStyles.java b/src/main/java/com/simibubi/create/AllBogeyStyles.java index ee82c4067e..0a927761f7 100644 --- a/src/main/java/com/simibubi/create/AllBogeyStyles.java +++ b/src/main/java/com/simibubi/create/AllBogeyStyles.java @@ -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.StandardBogeyVisual; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.resources.ResourceLocation; public class AllBogeyStyles { diff --git a/src/main/java/com/simibubi/create/AllCreativeModeTabs.java b/src/main/java/com/simibubi/create/AllCreativeModeTabs.java index a1c50a90d5..1a03f6801b 100644 --- a/src/main/java/com/simibubi/create/AllCreativeModeTabs.java +++ b/src/main/java/com/simibubi/create/AllCreativeModeTabs.java @@ -30,7 +30,7 @@ import it.unimi.dsi.fastutil.objects.ReferenceArrayList; import it.unimi.dsi.fastutil.objects.ReferenceLinkedOpenHashSet; import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; 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.renderer.entity.ItemRenderer; import net.minecraft.client.resources.model.BakedModel; diff --git a/src/main/java/com/simibubi/create/AllEntityTypes.java b/src/main/java/com/simibubi/create/AllEntityTypes.java index c0ed5edef1..e8cb15349d 100644 --- a/src/main/java/com/simibubi/create/AllEntityTypes.java +++ b/src/main/java/com/simibubi/create/AllEntityTypes.java @@ -25,7 +25,7 @@ import com.tterrag.registrate.util.nullness.NonNullConsumer; import com.tterrag.registrate.util.nullness.NonNullFunction; 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.EntityRendererProvider; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/simibubi/create/AllFluids.java b/src/main/java/com/simibubi/create/AllFluids.java index 45c9c0571e..2420b7d880 100644 --- a/src/main/java/com/simibubi/create/AllFluids.java +++ b/src/main/java/com/simibubi/create/AllFluids.java @@ -20,7 +20,7 @@ import com.simibubi.create.infrastructure.config.AllConfigs; import com.tterrag.registrate.builders.FluidBuilder.FluidTypeFactory; 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.multiplayer.ClientLevel; import net.minecraft.client.renderer.FogRenderer.FogMode; diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index 4bc9a4e422..a32e98ed3e 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -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.blueprint.BlueprintItem; 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.GogglesModel; 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.SandPaperItemRenderer; 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.CardboardSwordItem; +import com.simibubi.create.content.equipment.tool.CardboardSwordItemRenderer; 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.WorldshaperItemRenderer; import com.simibubi.create.content.kinetics.belt.item.BeltConnectorItem; import com.simibubi.create.content.kinetics.gearbox.VerticalGearboxItem; 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.sequenced.SequencedAssemblyItem; 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.SchematicItem; 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.ItemDescription; 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.providers.ProviderType; 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.Rarity; import net.minecraft.world.item.SwordItem; + import net.neoforged.neoforge.common.Tags; public class AllItems { @@ -162,6 +172,7 @@ public class AllItems { REGISTRATE.item("cardboard_sword", CardboardSwordItem::new) .properties(p -> p.stacksTo(1)) .properties(p -> p.attributes(SwordItem.createAttributes(AllToolMaterials.CARDBOARD, 3, 1))) + .clientExtension(i -> () -> () -> SimpleCustomRenderer.create(i, new CardboardSwordItemRenderer())) .model(AssetLookup.itemModelWithPartials()) .register(); @@ -354,15 +365,18 @@ public class AllItems { public static final ItemEntry SAND_PAPER = REGISTRATE.item("sand_paper", SandPaperItem::new) .tag(AllTags.AllItemTags.SANDPAPER.tag) + .clientExtension(i -> () -> () -> SimpleCustomRenderer.create(i, new SandPaperItemRenderer())) .register(); public static final ItemEntry RED_SAND_PAPER = REGISTRATE.item("red_sand_paper", SandPaperItem::new) .tag(AllTags.AllItemTags.SANDPAPER.tag) .onRegister(s -> ItemDescription.referKey(s, SAND_PAPER)) + .clientExtension(i -> () -> () -> SimpleCustomRenderer.create(i, new SandPaperItemRenderer())) .register(); public static final ItemEntry WRENCH = REGISTRATE.item("wrench", WrenchItem::new) .properties(p -> p.stacksTo(1)) + .clientExtension(i -> () -> () -> SimpleCustomRenderer.create(i, new WrenchItemRenderer())) .model(AssetLookup.itemModelWithPartials()) .tag(AllItemTags.WRENCH.tag) .register(); @@ -384,17 +398,20 @@ public class AllItems { public static final ItemEntry LINKED_CONTROLLER = REGISTRATE.item("linked_controller", LinkedControllerItem::new) .properties(p -> p.stacksTo(1)) + .clientExtension(i -> () -> () -> SimpleCustomRenderer.create(i, new LinkedControllerItemRenderer())) .model(AssetLookup.itemModelWithPartials()) .register(); public static final ItemEntry POTATO_CANNON = REGISTRATE.item("potato_cannon", PotatoCannonItem::new) .model(AssetLookup.itemModelWithPartials()) + .clientExtension(i -> () -> () -> SimpleCustomRenderer.create(i, new PotatoCannonItemRenderer())) .tag(Tags.Items.ENCHANTABLES) .register(); public static final ItemEntry EXTENDO_GRIP = REGISTRATE.item("extendo_grip", ExtendoGripItem::new) .properties(p -> p.rarity(Rarity.UNCOMMON)) + .clientExtension(i -> () -> () -> SimpleCustomRenderer.create(i, new ExtendoGripItemRenderer())) .model(AssetLookup.itemModelWithPartials()) .register(); @@ -402,6 +419,7 @@ public class AllItems { REGISTRATE.item("wand_of_symmetry", SymmetryWandItem::new) .properties(p -> p.stacksTo(1) .rarity(Rarity.UNCOMMON)) + .clientExtension(i -> () -> () -> SimpleCustomRenderer.create(i, new SymmetryWandItemRenderer())) .model(AssetLookup.itemModelWithPartials()) .register(); @@ -409,6 +427,7 @@ public class AllItems { REGISTRATE.item("handheld_worldshaper", WorldshaperItem::new) .properties(p -> p.rarity(Rarity.EPIC)) .lang("Creative Worldshaper") + .clientExtension(i -> () -> () -> SimpleCustomRenderer.create(i, new WorldshaperItemRenderer())) .model(AssetLookup.itemModelWithPartials()) .register(); diff --git a/src/main/java/com/simibubi/create/AllPackets.java b/src/main/java/com/simibubi/create/AllPackets.java index 092673ad31..d39abab4df 100644 --- a/src/main/java/com/simibubi/create/AllPackets.java +++ b/src/main/java/com/simibubi/create/AllPackets.java @@ -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.packagePort.PackagePortConfigurationPacket; 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.RedstoneRequesterEffectPacket; 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), LOGISTICS_STOCK_RESPONSE(LogisticalStockResponsePacket.class, LogisticalStockResponsePacket.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), KNOCKBACK(KnockbackPacket.class, KnockbackPacket.STREAM_CODEC), TRAIN_MAP_SYNC(TrainMapSyncPacket.class, TrainMapSyncPacket.STREAM_CODEC), diff --git a/src/main/java/com/simibubi/create/AllPartialModels.java b/src/main/java/com/simibubi/create/AllPartialModels.java index 6caf89e1df..7f857aec5d 100644 --- a/src/main/java/com/simibubi/create/AllPartialModels.java +++ b/src/main/java/com/simibubi/create/AllPartialModels.java @@ -12,9 +12,9 @@ import com.simibubi.create.content.logistics.box.PackageStyles; import com.simibubi.create.content.logistics.box.PackageStyles.PackageStyle; import dev.engine_room.flywheel.lib.model.baked.PartialModel; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.lang.Lang; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.DyeColor; diff --git a/src/main/java/com/simibubi/create/AllParticleTypes.java b/src/main/java/com/simibubi/create/AllParticleTypes.java index 0b90cfb1a0..3a005f76e7 100644 --- a/src/main/java/com/simibubi/create/AllParticleTypes.java +++ b/src/main/java/com/simibubi/create/AllParticleTypes.java @@ -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.fan.AirFlowParticleData; 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.foundation.particle.AirParticleData; 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.ParticleType; import net.minecraft.core.registries.Registries; @@ -32,6 +33,7 @@ public enum AllParticleTypes { FLUID_PARTICLE(FluidParticleData::new), BASIN_FLUID(FluidParticleData::new), FLUID_DRIP(FluidParticleData::new), + WIFI(WiFiParticle.Data::new), SOUL(SoulParticle.Data::new), SOUL_BASE(SoulBaseParticle.Data::new), SOUL_PERIMETER(SoulParticle.PerimeterData::new), diff --git a/src/main/java/com/simibubi/create/AllRecipeTypes.java b/src/main/java/com/simibubi/create/AllRecipeTypes.java index c77e57aa92..b61ad006be 100644 --- a/src/main/java/com/simibubi/create/AllRecipeTypes.java +++ b/src/main/java/com/simibubi/create/AllRecipeTypes.java @@ -33,7 +33,7 @@ import com.simibubi.create.content.processing.recipe.ProcessingRecipeSerializer; import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipeSerializer; 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.Registries; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/AllShapes.java b/src/main/java/com/simibubi/create/AllShapes.java index 9f7ebdca61..fe4c9c48d3 100644 --- a/src/main/java/com/simibubi/create/AllShapes.java +++ b/src/main/java/com/simibubi/create/AllShapes.java @@ -10,7 +10,7 @@ import java.util.function.BiFunction; import com.simibubi.create.content.logistics.chute.ChuteShapes; 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.Axis; 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) .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) .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) .forDirectional(UP), - + DESK_BELL = shape(3, 0, 3, 13, 3, 13).add(4, 0, 4, 12, 9, 12) .forDirectional(UP), diff --git a/src/main/java/com/simibubi/create/AllSpriteShifts.java b/src/main/java/com/simibubi/create/AllSpriteShifts.java index 30cfc96662..8191d4c6e1 100644 --- a/src/main/java/com/simibubi/create/AllSpriteShifts.java +++ b/src/main/java/com/simibubi/create/AllSpriteShifts.java @@ -12,8 +12,8 @@ import com.simibubi.create.foundation.block.connected.CTType; import net.createmod.catnip.render.SpriteShiftEntry; import net.createmod.catnip.render.SpriteShifter; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.lang.Lang; import net.minecraft.world.item.DyeColor; import net.minecraft.world.level.block.WeatheringCopper.WeatherState; 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"), ORNATE_IRON_WINDOW = vertical("palettes/ornate_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_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"), @@ -160,5 +160,5 @@ public class AllSpriteShifts { public static CTSpriteShiftEntry getWoodenWindow(WoodType woodType) { return WOODEN_WINDOWS.get(woodType); } - + } diff --git a/src/main/java/com/simibubi/create/AllTags.java b/src/main/java/com/simibubi/create/AllTags.java index 8bbeea0e83..f7501aad61 100644 --- a/src/main/java/com/simibubi/create/AllTags.java +++ b/src/main/java/com/simibubi/create/AllTags.java @@ -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.TIC; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java index c40ef3934c..03af610d57 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -42,8 +42,8 @@ import com.simibubi.create.infrastructure.data.CreateDatagen; import com.simibubi.create.infrastructure.worldgen.AllFeatures; import com.simibubi.create.infrastructure.worldgen.AllPlacementModifiers; -import net.createmod.catnip.utility.FontHelper; -import net.createmod.catnip.utility.lang.LangBuilder; +import net.createmod.catnip.lang.FontHelper; +import net.createmod.catnip.lang.LangBuilder; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/CreateClient.java b/src/main/java/com/simibubi/create/CreateClient.java index 2879ad6185..ed598f5e84 100644 --- a/src/main/java/com/simibubi/create/CreateClient.java +++ b/src/main/java/com/simibubi/create/CreateClient.java @@ -30,7 +30,7 @@ import net.createmod.catnip.config.ui.BaseConfigScreen; import net.createmod.catnip.config.ui.ConfigScreen; import net.createmod.catnip.render.CachedBuffers; 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.minecraft.ChatFormatting; import net.minecraft.client.GraphicsStatus; diff --git a/src/main/java/com/simibubi/create/api/connectivity/ConnectivityHandler.java b/src/main/java/com/simibubi/create/api/connectivity/ConnectivityHandler.java index 5413c6866b..178ee2ba71 100644 --- a/src/main/java/com/simibubi/create/api/connectivity/ConnectivityHandler.java +++ b/src/main/java/com/simibubi/create/api/connectivity/ConnectivityHandler.java @@ -16,13 +16,14 @@ import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.content.fluids.tank.CreativeFluidTankBlockEntity; 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.Direction; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; + import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.IFluidTank; import net.neoforged.neoforge.fluids.capability.IFluidHandler; diff --git a/src/main/java/com/simibubi/create/compat/Mods.java b/src/main/java/com/simibubi/create/compat/Mods.java index ae1742311e..9eedc1dcdf 100644 --- a/src/main/java/com/simibubi/create/compat/Mods.java +++ b/src/main/java/com/simibubi/create/compat/Mods.java @@ -3,13 +3,14 @@ package com.simibubi.create.compat; import java.util.Optional; import java.util.function.Supplier; -import net.createmod.catnip.utility.RegisteredObjectsHelper; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Block; + import net.neoforged.fml.ModList; /** diff --git a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/StationPeripheral.java b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/StationPeripheral.java index 37b4e3daf9..2c68e57178 100644 --- a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/StationPeripheral.java +++ b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/StationPeripheral.java @@ -18,7 +18,7 @@ import com.simibubi.create.foundation.utility.StringHelper; import dan200.computercraft.api.lua.IArguments; import dan200.computercraft.api.lua.LuaException; 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.CollectionTag; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/BasinCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/BasinCategory.java index dbfeefe2fa..80c08751ec 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/BasinCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/BasinCategory.java @@ -1,5 +1,12 @@ 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.AllItems; 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.recipe.IFocusGroup; 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.gui.GuiGraphics; import net.minecraft.world.item.ItemStack; 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 java.util.ArrayList; -import java.util.List; +import net.neoforged.neoforge.fluids.FluidStack; @ParametersAreNonnullByDefault public class BasinCategory extends CreateRecipeCategory { diff --git a/src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java index 1a4fccf7e4..d4c6713ab0 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java @@ -1,5 +1,15 @@ 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.content.fluids.potion.PotionFluidHandler; 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.registration.IRecipeCatalystRegistration; 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.MethodsReturnNonnullByDefault; import net.minecraft.client.Minecraft; @@ -22,16 +32,9 @@ import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; + import net.minecraft.world.item.crafting.RecipeHolder; 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 @MethodsReturnNonnullByDefault diff --git a/src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java index 5c9c89e942..4affa69993 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java @@ -1,21 +1,23 @@ 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.content.kinetics.crusher.AbstractCrushingRecipe; import com.simibubi.create.content.processing.recipe.ProcessingOutput; import com.simibubi.create.content.processing.recipe.ProcessingRecipe; import com.simibubi.create.foundation.gui.AllGuiTextures; + import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.recipe.IFocusGroup; 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 javax.annotation.ParametersAreNonnullByDefault; -import java.util.ArrayList; -import java.util.List; - @ParametersAreNonnullByDefault public class CrushingCategory extends CreateRecipeCategory { diff --git a/src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java index 404a5b960a..f122d3f0e4 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java @@ -18,7 +18,7 @@ import mezz.jei.api.neoforge.NeoForgeTypes; import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.RecipeIngredientRole; 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.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java index 8df4ee73b7..349d3416fb 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java @@ -22,7 +22,7 @@ import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.ingredients.IIngredientRenderer; import mezz.jei.api.recipe.IFocusGroup; 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.client.Minecraft; import net.minecraft.client.gui.Font; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java index 8c173cb8bc..cc6f8adb73 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java @@ -21,8 +21,8 @@ import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.RecipeIngredientRole; -import net.createmod.catnip.utility.RegisteredObjectsHelper; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/SpoutCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/SpoutCategory.java index d7423e5258..88b5c417bb 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/SpoutCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/SpoutCategory.java @@ -22,7 +22,7 @@ import mezz.jei.api.neoforge.NeoForgeTypes; import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.RecipeIngredientRole; 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.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedBlazeBurner.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedBlazeBurner.java index 0eac67ea7f..5696e636b6 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedBlazeBurner.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedBlazeBurner.java @@ -8,10 +8,9 @@ import com.simibubi.create.AllSpriteShifts; import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel; 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.SpriteShiftEntry; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.ponder.utility.LevelTickHolder; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.LightTexture; @@ -72,7 +71,7 @@ public class AnimatedBlazeBurner extends AnimatedKinetics { - spriteShift.getTarget() .getV0(); - float time = LevelTickHolder.getRenderTime(Minecraft.getInstance().level); + float time = AnimationTickHolder.getRenderTime(Minecraft.getInstance().level); float speed = 1 / 32f + 1 / 64f * heatLevel.ordinal(); double vScroll = speed * time; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedDeployer.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedDeployer.java index 0cbf27e6be..b0302fb69c 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedDeployer.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedDeployer.java @@ -5,7 +5,8 @@ import com.mojang.math.Axis; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllPartialModels; 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.core.Direction; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedItemDrain.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedItemDrain.java index b20ba3f9af..58c1b4270b 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedItemDrain.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedItemDrain.java @@ -35,7 +35,7 @@ public class AnimatedItemDrain extends AnimatedKinetics { matrixStack.scale(scale, scale, scale); float from = 2/16f; 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(); matrixStack.popPose(); diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedKinetics.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedKinetics.java index 2698035c72..0ad63a95bc 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedKinetics.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedKinetics.java @@ -6,9 +6,9 @@ import com.simibubi.create.foundation.gui.CustomLightingSettings; import dev.engine_room.flywheel.lib.model.baked.PartialModel; import mezz.jei.api.gui.drawable.IDrawable; +import net.createmod.catnip.animation.AnimationTickHolder; import net.createmod.catnip.gui.ILightingSettings; import net.createmod.catnip.gui.element.GuiGameElement; -import net.createmod.catnip.utility.AnimationTickHolder; import net.minecraft.core.Direction.Axis; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMixer.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMixer.java index 4647fbf6ed..b4c3398c62 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMixer.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMixer.java @@ -4,7 +4,8 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import com.simibubi.create.AllBlocks; 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.util.Mth; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedPress.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedPress.java index 011c24d8fa..eac104209f 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedPress.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedPress.java @@ -4,7 +4,8 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import com.simibubi.create.AllBlocks; 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.core.Direction; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSpout.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSpout.java index f52c3417e8..1fcf4e8f7b 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSpout.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSpout.java @@ -9,8 +9,8 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.AllPartialModels; import com.simibubi.create.foundation.fluid.FluidRenderer; +import net.createmod.catnip.animation.AnimationTickHolder; import net.createmod.catnip.gui.UIRenderHelper; -import net.createmod.catnip.utility.AnimationTickHolder; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.LightTexture; import net.minecraft.util.Mth; @@ -72,7 +72,7 @@ public class AnimatedSpout extends AnimatedKinetics { float from = 3f / 16f; float to = 17f / 16f; 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(); float width = 1 / 128f * squeeze; @@ -82,7 +82,7 @@ public class AnimatedSpout extends AnimatedKinetics { matrixStack.translate(-0.5f, 0, -0.5f); from = -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(); Lighting.setupFor3DItems(); diff --git a/src/main/java/com/simibubi/create/compat/tconstruct/SpoutCasting.java b/src/main/java/com/simibubi/create/compat/tconstruct/SpoutCasting.java index 2d7fa25c3c..6d6c3265a4 100644 --- a/src/main/java/com/simibubi/create/compat/tconstruct/SpoutCasting.java +++ b/src/main/java/com/simibubi/create/compat/tconstruct/SpoutCasting.java @@ -6,7 +6,7 @@ import com.simibubi.create.content.fluids.spout.SpoutBlockEntity; import com.simibubi.create.foundation.fluid.FluidHelper; 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.Direction; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/compat/thresholdSwitch/FunctionalStorage.java b/src/main/java/com/simibubi/create/compat/thresholdSwitch/FunctionalStorage.java index f14ac1a4d0..e8c649e054 100644 --- a/src/main/java/com/simibubi/create/compat/thresholdSwitch/FunctionalStorage.java +++ b/src/main/java/com/simibubi/create/compat/thresholdSwitch/FunctionalStorage.java @@ -2,7 +2,7 @@ package com.simibubi.create.compat.thresholdSwitch; 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.neoforged.neoforge.items.IItemHandler; diff --git a/src/main/java/com/simibubi/create/compat/thresholdSwitch/SophisticatedStorage.java b/src/main/java/com/simibubi/create/compat/thresholdSwitch/SophisticatedStorage.java index 4b949d88e1..3875650332 100644 --- a/src/main/java/com/simibubi/create/compat/thresholdSwitch/SophisticatedStorage.java +++ b/src/main/java/com/simibubi/create/compat/thresholdSwitch/SophisticatedStorage.java @@ -2,7 +2,7 @@ package com.simibubi.create.compat.thresholdSwitch; 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.world.level.block.entity.BlockEntity; import net.neoforged.neoforge.items.IItemHandler; diff --git a/src/main/java/com/simibubi/create/compat/thresholdSwitch/StorageDrawers.java b/src/main/java/com/simibubi/create/compat/thresholdSwitch/StorageDrawers.java index 22b8eec494..a801481ab0 100644 --- a/src/main/java/com/simibubi/create/compat/thresholdSwitch/StorageDrawers.java +++ b/src/main/java/com/simibubi/create/compat/thresholdSwitch/StorageDrawers.java @@ -2,7 +2,7 @@ package com.simibubi.create.compat.thresholdSwitch; 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.neoforged.neoforge.items.IItemHandler; diff --git a/src/main/java/com/simibubi/create/compat/trainmap/TrainMapManager.java b/src/main/java/com/simibubi/create/compat/trainmap/TrainMapManager.java index 3ebb3272c8..46e8094c5f 100644 --- a/src/main/java/com/simibubi/create/compat/trainmap/TrainMapManager.java +++ b/src/main/java/com/simibubi/create/compat/trainmap/TrainMapManager.java @@ -29,11 +29,11 @@ import com.simibubi.create.infrastructure.config.AllConfigs; import com.simibubi.create.infrastructure.config.CClient; import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.lang.Components; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.Rect2i; diff --git a/src/main/java/com/simibubi/create/compat/trainmap/TrainMapRenderer.java b/src/main/java/com/simibubi/create/compat/trainmap/TrainMapRenderer.java index 617d75b7ae..cb5c85c188 100644 --- a/src/main/java/com/simibubi/create/compat/trainmap/TrainMapRenderer.java +++ b/src/main/java/com/simibubi/create/compat/trainmap/TrainMapRenderer.java @@ -13,7 +13,7 @@ import com.simibubi.create.infrastructure.config.CClient; import it.unimi.dsi.fastutil.objects.Object2ObjectMap; 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.gui.GuiGraphics; import net.minecraft.client.renderer.LightTexture; diff --git a/src/main/java/com/simibubi/create/compat/trainmap/TrainMapSync.java b/src/main/java/com/simibubi/create/compat/trainmap/TrainMapSync.java index 88c16d07a9..be3027f727 100644 --- a/src/main/java/com/simibubi/create/compat/trainmap/TrainMapSync.java +++ b/src/main/java/com/simibubi/create/compat/trainmap/TrainMapSync.java @@ -24,7 +24,7 @@ import io.netty.buffer.ByteBuf; import net.createmod.catnip.codecs.stream.CatnipLargerStreamCodecs; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; 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.registries.Registries; import net.minecraft.network.FriendlyByteBuf; @@ -36,6 +36,7 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.Mth; import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; + import net.neoforged.neoforge.event.tick.ServerTickEvent; public class TrainMapSync { diff --git a/src/main/java/com/simibubi/create/compat/trainmap/TrainMapSyncClient.java b/src/main/java/com/simibubi/create/compat/trainmap/TrainMapSyncClient.java index d44f936a66..ae51c9a185 100644 --- a/src/main/java/com/simibubi/create/compat/trainmap/TrainMapSyncClient.java +++ b/src/main/java/com/simibubi/create/compat/trainmap/TrainMapSyncClient.java @@ -9,8 +9,8 @@ import java.util.UUID; import com.simibubi.create.compat.trainmap.TrainMapSync.TrainMapSyncEntry; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.data.Pair; public class TrainMapSyncClient { diff --git a/src/main/java/com/simibubi/create/compat/trainmap/TrainMapSyncPacket.java b/src/main/java/com/simibubi/create/compat/trainmap/TrainMapSyncPacket.java index 0143988a12..2f2f9b8039 100644 --- a/src/main/java/com/simibubi/create/compat/trainmap/TrainMapSyncPacket.java +++ b/src/main/java/com/simibubi/create/compat/trainmap/TrainMapSyncPacket.java @@ -11,8 +11,9 @@ import net.createmod.catnip.net.base.ClientboundPacketPayload; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import net.minecraft.client.player.LocalPlayer; 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.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; diff --git a/src/main/java/com/simibubi/create/content/contraptions/AbstractContraptionEntity.java b/src/main/java/com/simibubi/create/content/contraptions/AbstractContraptionEntity.java index d168439e34..694f655045 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/AbstractContraptionEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/AbstractContraptionEntity.java @@ -41,8 +41,8 @@ import net.createmod.catnip.platform.CatnipServices; import dev.engine_room.flywheel.api.backend.BackendManager; import io.netty.handler.codec.DecoderException; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.AngleHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; 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.phys.AABB; import net.minecraft.world.phys.Vec3; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.neoforge.entity.IEntityWithComplexSpawn; diff --git a/src/main/java/com/simibubi/create/content/contraptions/Contraption.java b/src/main/java/com/simibubi/create/content/contraptions/Contraption.java index 452ede5094..b7c7c3ed81 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/Contraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/Contraption.java @@ -75,12 +75,12 @@ import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.ICoordinate; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.BBHelper; -import net.createmod.catnip.utility.BlockFace; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.NBTProcessors; -import net.createmod.catnip.utility.UniqueLinkedList; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.data.UniqueLinkedList; +import net.createmod.catnip.math.BBHelper; +import net.createmod.catnip.math.BlockFace; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.nbt.NBTProcessors; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; 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.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; + import net.neoforged.neoforge.client.model.data.ModelData; import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.capability.IFluidHandler; @@ -1467,7 +1468,7 @@ public abstract class Contraption { public IFluidHandler getSharedFluidTanks() { return storage.getFluids(); } - + public MountedStorageManager getStorageManager() { return storage; } @@ -1497,7 +1498,7 @@ public abstract class Contraption { public void handleContraptionFluidPacket(BlockPos localPos, FluidStack containedFluid) { storage.updateContainedFluid(localPos, containedFluid); } - + public void handleContraptionItemPacket(BlockPos localPos, List containedItems) { storage.updateContainedItem(localPos, containedItems); } diff --git a/src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java index 29706a4447..7fea7dd553 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java +++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java @@ -34,8 +34,8 @@ import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.infrastructure.config.AllConfigs; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; 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.Vec3; import net.minecraft.world.phys.shapes.VoxelShape; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; diff --git a/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandler.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandler.java index 14b6715d36..b909708607 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandler.java @@ -9,8 +9,8 @@ import java.util.Map; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import it.unimi.dsi.fastutil.objects.ObjectLists; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.WorldAttached; +import net.createmod.catnip.data.WorldAttached; +import net.createmod.catnip.math.VecHelper; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandlerClient.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandlerClient.java index 7071583252..25fc0a7171 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandlerClient.java +++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandlerClient.java @@ -5,6 +5,8 @@ import java.util.Collection; import javax.annotation.Nullable; +import net.neoforged.neoforge.event.tick.PlayerTickEvent; + import org.apache.commons.lang3.mutable.MutableObject; 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 net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; 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.Vec3; import net.minecraft.world.phys.shapes.VoxelShape; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.client.event.InputEvent; -import net.neoforged.neoforge.event.tick.PlayerTickEvent; @EventBusSubscriber(Dist.CLIENT) public class ContraptionHandlerClient { diff --git a/src/main/java/com/simibubi/create/content/contraptions/ContraptionWorld.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionWorld.java index 2376ec8e0d..dcd6157a15 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/ContraptionWorld.java +++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionWorld.java @@ -1,6 +1,6 @@ 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.sounds.SoundEvent; import net.minecraft.sounds.SoundSource; diff --git a/src/main/java/com/simibubi/create/content/contraptions/ControlledContraptionEntity.java b/src/main/java/com/simibubi/create/content/contraptions/ControlledContraptionEntity.java index 4ce5bbc3a2..1dae9cf1f9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/ControlledContraptionEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/ControlledContraptionEntity.java @@ -7,9 +7,9 @@ import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour; import com.simibubi.create.content.contraptions.behaviour.MovementContext; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.AngleHelper; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; 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.levelgen.structure.templatesystem.StructureTemplate.StructureBlockInfo; import net.minecraft.world.phys.Vec3; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; diff --git a/src/main/java/com/simibubi/create/content/contraptions/DirectionalExtenderScrollOptionSlot.java b/src/main/java/com/simibubi/create/content/contraptions/DirectionalExtenderScrollOptionSlot.java index 5bfb564f38..60d815a0b3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/DirectionalExtenderScrollOptionSlot.java +++ b/src/main/java/com/simibubi/create/content/contraptions/DirectionalExtenderScrollOptionSlot.java @@ -6,7 +6,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.foundation.blockEntity.behaviour.CenteredSideValueBoxTransform; 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.Direction; import net.minecraft.world.level.LevelAccessor; diff --git a/src/main/java/com/simibubi/create/content/contraptions/IControlContraption.java b/src/main/java/com/simibubi/create/content/contraptions/IControlContraption.java index 042f66b483..2493c5b11c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/IControlContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/IControlContraption.java @@ -3,7 +3,7 @@ package com.simibubi.create.content.contraptions; import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.INamedIconOptions; 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; public interface IControlContraption { diff --git a/src/main/java/com/simibubi/create/content/contraptions/IDisplayAssemblyExceptions.java b/src/main/java/com/simibubi/create/content/contraptions/IDisplayAssemblyExceptions.java index f7ad232d27..ab3983abb1 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/IDisplayAssemblyExceptions.java +++ b/src/main/java/com/simibubi/create/content/contraptions/IDisplayAssemblyExceptions.java @@ -6,8 +6,8 @@ import java.util.List; import com.simibubi.create.foundation.item.TooltipHelper; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.FontHelper.Palette; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.FontHelper.Palette; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/simibubi/create/content/contraptions/MountedFluidStorage.java b/src/main/java/com/simibubi/create/content/contraptions/MountedFluidStorage.java index f9f363b4c4..11a8e88add 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/MountedFluidStorage.java +++ b/src/main/java/com/simibubi/create/content/contraptions/MountedFluidStorage.java @@ -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.FluidTankBlockEntity; import com.simibubi.create.foundation.fluid.SmartFluidTank; + import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.block.entity.BlockEntity; + import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.IFluidTank; diff --git a/src/main/java/com/simibubi/create/content/contraptions/MountedStorage.java b/src/main/java/com/simibubi/create/content/contraptions/MountedStorage.java index 41756dbea7..4ccfdc4ccb 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/MountedStorage.java +++ b/src/main/java/com/simibubi/create/content/contraptions/MountedStorage.java @@ -15,7 +15,7 @@ import com.simibubi.create.content.logistics.vault.ItemVaultBlockEntity; import com.simibubi.create.content.processing.recipe.ProcessingInventory; 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.HolderLookup; import net.minecraft.core.NonNullList; @@ -115,7 +115,6 @@ public class MountedStorage { } RegistryAccess registryAccess = level.registryAccess(); - if (blockEntity instanceof ChestBlockEntity) { CompoundTag tag = blockEntity.saveWithFullMetadata(registryAccess); if (tag.contains("LootTable", 8)) diff --git a/src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java b/src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java index 9bc3253151..38fe611d9f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java +++ b/src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java @@ -15,8 +15,8 @@ import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; import com.simibubi.create.content.logistics.depot.DepotBlockEntity; import com.simibubi.create.foundation.fluid.CombinedTankWrapper; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; 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.levelgen.structure.templatesystem.StructureTemplate.StructureBlockInfo; import net.minecraft.world.phys.Vec3; + import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.IFluidTank; import net.neoforged.neoforge.fluids.capability.IFluidHandler; diff --git a/src/main/java/com/simibubi/create/content/contraptions/OrientedContraptionEntity.java b/src/main/java/com/simibubi/create/content/contraptions/OrientedContraptionEntity.java index 65ad62d8f4..599ea129d2 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/OrientedContraptionEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/OrientedContraptionEntity.java @@ -1,6 +1,6 @@ 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.UUID; @@ -19,10 +19,10 @@ import com.simibubi.create.content.contraptions.mounted.MountedContraption; import com.simibubi.create.foundation.item.ItemHelper; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.math.AngleHelper; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; 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.properties.RailShape; import net.minecraft.world.phys.Vec3; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; diff --git a/src/main/java/com/simibubi/create/content/contraptions/StructureTransform.java b/src/main/java/com/simibubi/create/content/contraptions/StructureTransform.java index 2b703c5749..2dfa1aab9c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/StructureTransform.java +++ b/src/main/java/com/simibubi/create/content/contraptions/StructureTransform.java @@ -14,7 +14,7 @@ import com.simibubi.create.impl.contraption.transformable.ContraptionTransformab import io.netty.buffer.ByteBuf; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; 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.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsBlockEntity.java index e03e53cd57..eb27172422 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsBlockEntity.java @@ -13,10 +13,10 @@ import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.foundation.utility.DyeHelper; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; +import net.createmod.catnip.math.AngleHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsMovement.java b/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsMovement.java index ae8b416f24..62a16556cd 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsMovement.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsMovement.java @@ -8,14 +8,15 @@ import com.simibubi.create.content.contraptions.render.ContraptionMatrices; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.IntAttached; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.IntAttached; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; import net.minecraft.world.item.ItemStack; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsRenderer.java index 6fdd7672b1..0a15a37541 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsRenderer.java @@ -15,12 +15,12 @@ import com.simibubi.create.foundation.utility.DyeHelper; import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld; 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.utility.Couple; -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.createmod.catnip.theme.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.renderer.MultiBufferSource; @@ -104,7 +104,7 @@ public class ContraptionControlsRenderer extends SmartBlockEntityRenderer, ITransformableBlock { diff --git a/src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisBlockEntity.java index c80f71ffed..1a7a1c69c2 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisBlockEntity.java @@ -25,7 +25,7 @@ import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; 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.Direction; 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.properties.BlockStateProperties; import net.minecraft.world.phys.BlockHitResult; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; diff --git a/src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisRangeDisplay.java b/src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisRangeDisplay.java index 3b9c1c23f3..ed18a0a3b7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisRangeDisplay.java +++ b/src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisRangeDisplay.java @@ -14,7 +14,7 @@ import com.simibubi.create.AllItems; import com.simibubi.create.AllKeys; import com.simibubi.create.AllSpecialTextures; -import net.createmod.catnip.CatnipClient; +import net.createmod.catnip.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.player.Player; @@ -35,7 +35,7 @@ public class ChassisRangeDisplay { public Entry(ChassisBlockEntity be) { this.be = be; timer = DISPLAY_TIME; - CatnipClient.OUTLINER.showCluster(getOutlineKey(), createSelection(be)) + Outliner.getInstance().showCluster(getOutlineKey(), createSelection(be)) .colored(0xFFFFFF) .disableLineNormals() .lineWidth(1 / 16f) @@ -97,7 +97,7 @@ public class ChassisRangeDisplay { Entry entry = entries.get(pos); if (tickEntry(entry, hasWrench)) iterator.remove(); - CatnipClient.OUTLINER.keep(entry.getOutlineKey()); + Outliner.getInstance().keep(entry.getOutlineKey()); } for (Iterator iterator = groupEntries.iterator(); iterator.hasNext();) { @@ -107,7 +107,7 @@ public class ChassisRangeDisplay { if (group == lastHoveredGroup) lastHoveredGroup = null; } - CatnipClient.OUTLINER.keep(group.getOutlineKey()); + Outliner.getInstance().keep(group.getOutlineKey()); } if (!hasWrench) @@ -173,9 +173,9 @@ public class ChassisRangeDisplay { GroupEntry hoveredGroup = new GroupEntry(chassis); for (ChassisBlockEntity included : hoveredGroup.includedBEs) - CatnipClient.OUTLINER.remove(Pair.of(included.getBlockPos(), 1)); + Outliner.getInstance().remove(Pair.of(included.getBlockPos(), 1)); - groupEntries.forEach(entry -> CatnipClient.OUTLINER.remove(entry.getOutlineKey())); + groupEntries.forEach(entry -> Outliner.getInstance().remove(entry.getOutlineKey())); groupEntries.clear(); entries.clear(); groupEntries.add(hoveredGroup); @@ -186,7 +186,7 @@ public class ChassisRangeDisplay { BlockPos pos = chassis.getBlockPos(); GroupEntry entry = getExistingGroupForPos(pos); if (entry != null) - CatnipClient.OUTLINER.remove(entry.getOutlineKey()); + Outliner.getInstance().remove(entry.getOutlineKey()); groupEntries.clear(); entries.clear(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerBlockEntity.java index faa98bd20d..637c7fc080 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerBlockEntity.java @@ -11,8 +11,8 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import dev.engine_room.flywheel.lib.visualization.VisualizationHelper; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -20,6 +20,7 @@ import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; diff --git a/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerRenderer.java index a2b41832bf..724446f39c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerRenderer.java @@ -5,10 +5,10 @@ import com.simibubi.create.AllPartialModels; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; import dev.engine_room.flywheel.api.visualization.VisualizationManager; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.math.AngleHelper; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.math.AngleHelper; -import net.createmod.ponder.utility.LevelTickHolder; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -29,7 +29,7 @@ public class StickerRenderer extends SafeBlockEntityRenderer BlockState state = be.getBlockState(); SuperByteBuffer head = CachedBuffers.partial(AllPartialModels.STICKER_HEAD, state); - float offset = be.piston.getValue(LevelTickHolder.getPartialTicks(be.getLevel())); + float offset = be.piston.getValue(AnimationTickHolder.getPartialTicks(be.getLevel())); if (be.getLevel() != Minecraft.getInstance().level && !be.isVirtual()) offset = state.getValue(StickerBlock.EXTENDED) ? 1 : 0; diff --git a/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerVisual.java b/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerVisual.java index dc1433db18..21899a34c1 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerVisual.java +++ b/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerVisual.java @@ -12,7 +12,7 @@ import dev.engine_room.flywheel.lib.instance.TransformedInstance; import dev.engine_room.flywheel.lib.model.Models; import dev.engine_room.flywheel.lib.visual.AbstractBlockEntityVisual; import dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.Minecraft; import net.minecraft.core.Direction; import net.minecraft.util.Mth; diff --git a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorColumn.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorColumn.java index 4e82c27dd3..889eb75d6f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorColumn.java +++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorColumn.java @@ -11,10 +11,10 @@ import javax.annotation.Nullable; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.utility.BlockHelper; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.IntAttached; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.WorldAttached; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.IntAttached; +import net.createmod.catnip.data.WorldAttached; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -116,7 +116,7 @@ public class ElevatorColumn { targetedYLevel = yLevel; targetAvailable = true; } - + public boolean isTargetAvailable() { return targetAvailable; } diff --git a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactBlockEntity.java index 0659b98bb7..c33d92b969 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactBlockEntity.java @@ -8,8 +8,8 @@ import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlock; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactScreen.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactScreen.java index 43b850e87b..b7c904a413 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactScreen.java +++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactScreen.java @@ -1,5 +1,7 @@ package com.simibubi.create.content.contraptions.elevator; +import org.lwjgl.glfw.GLFW; + import com.google.common.collect.ImmutableList; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.decoration.slidingDoor.DoorControl; @@ -11,17 +13,17 @@ import com.simibubi.create.foundation.gui.widget.ScrollInput; import com.simibubi.create.foundation.gui.widget.TooltipArea; import net.createmod.catnip.platform.CatnipServices; import com.simibubi.create.foundation.utility.CreateLang; + +import net.createmod.catnip.data.Pair; import net.createmod.catnip.gui.AbstractSimiScreen; import net.createmod.catnip.gui.element.GuiGameElement; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.MutableComponent; import net.minecraft.util.FormattedCharSequence; -import org.lwjgl.glfw.GLFW; public class ElevatorContactScreen extends AbstractSimiScreen { diff --git a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContraption.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContraption.java index 93fa1bf06e..a24349319a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContraption.java @@ -18,8 +18,8 @@ import com.simibubi.create.content.redstone.contact.RedstoneContactBlock; import net.createmod.catnip.platform.CatnipServices; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.IntAttached; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.IntAttached; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorControlsHandler.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorControlsHandler.java index b90cc08c19..fc5c817657 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorControlsHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorControlsHandler.java @@ -17,7 +17,7 @@ import com.simibubi.create.content.contraptions.actors.contraptionControls.Contr import com.simibubi.create.content.contraptions.actors.contraptionControls.ContraptionControlsMovement.ElevatorFloorSelection; import com.simibubi.create.content.contraptions.behaviour.MovementContext; -import net.createmod.catnip.utility.Couple; +import net.createmod.catnip.data.Couple; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.BlockPos; @@ -28,6 +28,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemp import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; diff --git a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorFloorListPacket.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorFloorListPacket.java index 1bd1a441b8..3acc2c5975 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorFloorListPacket.java +++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorFloorListPacket.java @@ -10,8 +10,9 @@ import net.createmod.catnip.net.base.ServerboundPacketPayload; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import io.netty.buffer.ByteBuf; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.IntAttached; + +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.IntAttached; import net.minecraft.client.player.LocalPlayer; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; @@ -21,10 +22,10 @@ import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; public record ElevatorFloorListPacket(int entityId, List>> floors) implements ClientboundPacketPayload { - public static final StreamCodec STREAM_CODEC = StreamCodec.composite( - ByteBufCodecs.INT, ElevatorFloorListPacket::entityId, - CatnipStreamCodecBuilders.list(IntAttached.streamCodec(Couple.streamCodec(ByteBufCodecs.STRING_UTF8))), ElevatorFloorListPacket::floors, - ElevatorFloorListPacket::new + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.INT, com.simibubi.create.content.contraptions.elevator.ElevatorFloorListPacket::entityId, + CatnipStreamCodecBuilders.list(IntAttached.streamCodec(Couple.streamCodec(ByteBufCodecs.STRING_UTF8))), com.simibubi.create.content.contraptions.elevator.ElevatorFloorListPacket::floors, + com.simibubi.create.content.contraptions.elevator.ElevatorFloorListPacket::new ); public ElevatorFloorListPacket(AbstractContraptionEntity entity, List>> floors) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyRenderer.java index 302e17aeac..b430a52f88 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyRenderer.java @@ -9,10 +9,10 @@ import com.simibubi.create.content.contraptions.pulley.PulleyRenderer; import com.simibubi.create.content.kinetics.base.KineticBlockEntity; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; +import net.createmod.catnip.math.AngleHelper; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SpriteShiftEntry; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.math.AngleHelper; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; diff --git a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyVisual.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyVisual.java index ee76dec47f..ba0605a894 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyVisual.java +++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyVisual.java @@ -23,7 +23,7 @@ import dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual; import dev.engine_room.flywheel.lib.visual.util.InstanceRecycler; import it.unimi.dsi.fastutil.longs.LongArraySet; import it.unimi.dsi.fastutil.longs.LongSet; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.core.SectionPos; import net.minecraft.util.Mth; diff --git a/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageBlock.java b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageBlock.java index ed1682b8b4..01f770aa03 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageBlock.java @@ -7,7 +7,7 @@ import com.simibubi.create.content.kinetics.base.IRotate; import com.simibubi.create.content.kinetics.gantry.GantryShaftBlock; 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.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageRenderer.java index f1071e9348..63af5ff508 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageRenderer.java @@ -6,11 +6,11 @@ import com.simibubi.create.content.kinetics.base.KineticBlockEntity; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; import dev.engine_room.flywheel.api.visualization.VisualizationManager; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.AngleHelper; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.math.AngleHelper; -import net.createmod.ponder.utility.LevelTickHolder; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; @@ -70,7 +70,7 @@ public class GantryCarriageRenderer extends KineticBlockEntityRenderer 0) { if (clusterCooldown == 25) player.displayClientMessage(Components.immutableEmpty(), true); - CatnipClient.OUTLINER.keep(clusterOutlineSlot); + Outliner.getInstance().keep(clusterOutlineSlot); clusterCooldown--; } @@ -97,7 +98,7 @@ public class SuperGlueSelectionHandler { for (SuperGlueEntity glueEntity : glueNearby) { boolean h = clusterCooldown == 0 && glueEntity == selected; AllSpecialTextures faceTex = h ? AllSpecialTextures.GLUE : null; - CatnipClient.OUTLINER.showAABB(glueEntity, glueEntity.getBoundingBox()) + Outliner.getInstance().showAABB(glueEntity, glueEntity.getBoundingBox()) .colored(h ? HIGHLIGHT : PASSIVE) .withFaceTextures(faceTex, faceTex) .disableLineNormals() @@ -152,13 +153,13 @@ public class SuperGlueSelectionHandler { .sendStatus(player); if (currentSelectionBox != null) - CatnipClient.OUTLINER.showAABB(bbOutlineSlot, currentSelectionBox) + Outliner.getInstance().showAABB(bbOutlineSlot, currentSelectionBox) .colored(canReach && canAfford && !cancel ? HIGHLIGHT : FAIL) .withFaceTextures(AllSpecialTextures.GLUE, AllSpecialTextures.GLUE) .disableLineNormals() .lineWidth(1 / 16f); - CatnipClient.OUTLINER.showCluster(clusterOutlineSlot, currentCluster) + Outliner.getInstance().showCluster(clusterOutlineSlot, currentCluster) .colored(0x4D9162) .disableLineNormals() .lineWidth(1 / 64f); @@ -258,7 +259,7 @@ public class SuperGlueSelectionHandler { player.level().playSound(player, hoveredPos, SoundEvents.ITEM_FRAME_ADD_ITEM, SoundSource.BLOCKS, 0.75f, 1); if (currentCluster != null) - CatnipClient.OUTLINER.showCluster(clusterOutlineSlot, currentCluster) + Outliner.getInstance().showCluster(clusterOutlineSlot, currentCluster) .colored(0xB5F2C6) .withFaceTextures(AllSpecialTextures.GLUE, AllSpecialTextures.HIGHLIGHT_CHECKERED) .disableLineNormals() diff --git a/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionHelper.java b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionHelper.java index f94d4ef637..e9d7f3a4ca 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionHelper.java +++ b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionHelper.java @@ -7,7 +7,7 @@ import java.util.Set; import com.simibubi.create.content.contraptions.BlockMovementChecks; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.NonNullList; diff --git a/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingHandler.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingHandler.java index b3c242260b..31e638f2f7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingHandler.java @@ -15,14 +15,15 @@ import com.simibubi.create.content.contraptions.minecart.capability.MinecartCont import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.vehicle.AbstractMinecart; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; + import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.event.entity.EntityMountEvent; diff --git a/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingHandlerClient.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingHandlerClient.java index e746c745f1..8f96ae33cd 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingHandlerClient.java +++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingHandlerClient.java @@ -1,9 +1,12 @@ package com.simibubi.create.content.contraptions.minecart; +import org.joml.Vector3f; + import com.simibubi.create.AllItems; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.VecHelper; + +import net.createmod.catnip.math.VecHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.player.LocalPlayer; @@ -16,7 +19,6 @@ import net.minecraft.world.entity.vehicle.AbstractMinecart; import net.minecraft.world.item.ItemStack; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; -import org.joml.Vector3f; public class CouplingHandlerClient { diff --git a/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingPhysics.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingPhysics.java index 08ac7f67d0..1b82db1f88 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingPhysics.java +++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingPhysics.java @@ -1,9 +1,10 @@ package com.simibubi.create.content.contraptions.minecart; import com.simibubi.create.content.contraptions.minecart.capability.MinecartController; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.VecHelper; + +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.tags.BlockTags; import net.minecraft.util.Mth; diff --git a/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingRenderer.java index 7da8dfb831..2f991b0f6a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingRenderer.java @@ -9,13 +9,13 @@ import com.simibubi.create.content.contraptions.minecart.capability.MinecartCont import com.simibubi.create.content.kinetics.KineticDebugger; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.CatnipClient; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.outliner.Outliner; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.theme.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.LevelRenderer; @@ -227,13 +227,13 @@ public class CouplingRenderer { int color = Color.mixColors(0xabf0e9, 0xee8572, (float) Mth .clamp(Math.abs(first.getCouplingLength(true) - connectedCenter.distanceTo(mainCenter)) * 8, 0, 1)); - CatnipClient.OUTLINER.showLine(mainCart.getId() + "", mainCenter, connectedCenter) + Outliner.getInstance().showLine(mainCart.getId() + "", mainCenter, connectedCenter) .colored(color) .lineWidth(1 / 8f); Vec3 point = mainCart.position() .add(0, yOffset, 0); - CatnipClient.OUTLINER.showLine(mainCart.getId() + "_dot", point, point.add(0, 1 / 128f, 0)) + Outliner.getInstance().showLine(mainCart.getId() + "_dot", point, point.add(0, 1 / 128f, 0)) .colored(0xffffff) .lineWidth(1 / 4f); } diff --git a/src/main/java/com/simibubi/create/content/contraptions/minecart/MinecartCouplingItem.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/MinecartCouplingItem.java index fb9df76669..761e6817f3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/minecart/MinecartCouplingItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/MinecartCouplingItem.java @@ -5,7 +5,7 @@ import com.simibubi.create.AllItems; import com.simibubi.create.content.contraptions.minecart.capability.MinecartController; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; @@ -13,6 +13,7 @@ import net.minecraft.world.entity.vehicle.AbstractMinecart; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.bus.api.EventPriority; diff --git a/src/main/java/com/simibubi/create/content/contraptions/minecart/MinecartSim2020.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/MinecartSim2020.java index c6cd1f3297..6f567f3f39 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/minecart/MinecartSim2020.java +++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/MinecartSim2020.java @@ -1,10 +1,13 @@ package com.simibubi.create.content.contraptions.minecart; +import java.util.Map; + import com.google.common.collect.Maps; import com.mojang.datafixers.util.Pair; import com.simibubi.create.AllAttachmentTypes; import com.simibubi.create.content.contraptions.minecart.capability.MinecartController; -import net.createmod.catnip.utility.VecHelper; + +import net.createmod.catnip.math.VecHelper; import net.minecraft.Util; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -17,8 +20,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.RailShape; import net.minecraft.world.phys.Vec3; -import java.util.Map; - /** * Useful methods for dealing with Minecarts * diff --git a/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/CapabilityMinecartController.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/CapabilityMinecartController.java index 644a3c6e96..020aae1239 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/CapabilityMinecartController.java +++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/CapabilityMinecartController.java @@ -17,14 +17,15 @@ import com.simibubi.create.content.contraptions.minecart.CouplingHandler; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import it.unimi.dsi.fastutil.objects.ObjectLists; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.WorldAttached; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.data.WorldAttached; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.vehicle.AbstractMinecart; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; + import net.neoforged.neoforge.event.entity.EntityEvent; import net.neoforged.neoforge.event.entity.EntityLeaveLevelEvent; import net.neoforged.neoforge.event.entity.player.PlayerEvent; diff --git a/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/MinecartController.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/MinecartController.java index ad49858c83..47bb3f5a2a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/MinecartController.java +++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/MinecartController.java @@ -1,17 +1,28 @@ package com.simibubi.create.content.contraptions.minecart.capability; +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +import javax.annotation.Nullable; + +import org.apache.commons.lang3.mutable.MutableBoolean; +import org.jetbrains.annotations.NotNull; + import com.mojang.serialization.Codec; -import com.simibubi.create.AllPackets; import com.simibubi.create.Create; import com.simibubi.create.content.contraptions.AbstractContraptionEntity; import com.simibubi.create.content.contraptions.OrientedContraptionEntity; import com.simibubi.create.content.contraptions.minecart.CouplingHandler; + +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.lang.Lang; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.nbt.NBTHelper; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.lang.Lang; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; @@ -27,21 +38,11 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.PoweredRailBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; + import net.neoforged.neoforge.attachment.IAttachmentHolder; import net.neoforged.neoforge.attachment.IAttachmentSerializer; - import net.neoforged.neoforge.common.util.INBTSerializable; -import org.apache.commons.lang3.mutable.MutableBoolean; -import org.jetbrains.annotations.NotNull; - -import javax.annotation.Nullable; -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.UUID; - /** * Extended code for Minecarts, this allows for handling stalled carts and * coupled trains diff --git a/src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssembleRailType.java b/src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssembleRailType.java index 291f923bb5..937318652e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssembleRailType.java +++ b/src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssembleRailType.java @@ -5,7 +5,7 @@ import java.util.function.Supplier; import com.simibubi.create.AllBlocks; import com.tterrag.registrate.util.entry.BlockEntry; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.minecraft.util.StringRepresentable; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssemblerBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssemblerBlockEntity.java index 79a462009a..12da6207c1 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssemblerBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssemblerBlockEntity.java @@ -21,10 +21,10 @@ import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOp import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.lang.Lang; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/contraptions/mounted/MinecartContraptionItem.java b/src/main/java/com/simibubi/create/content/contraptions/mounted/MinecartContraptionItem.java index 012b7c534a..60b6f6afc4 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/mounted/MinecartContraptionItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/mounted/MinecartContraptionItem.java @@ -1,5 +1,11 @@ package com.simibubi.create.content.contraptions.mounted; +import java.util.List; + +import javax.annotation.Nullable; + +import org.apache.commons.lang3.tuple.MutablePair; + import com.simibubi.create.AllDataComponents; import com.simibubi.create.AllItems; import com.simibubi.create.AllMovementBehaviours; @@ -14,7 +20,8 @@ import com.simibubi.create.content.kinetics.deployer.DeployerFakePlayer; import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.NBTHelper; + +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -41,16 +48,11 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.RailShape; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate.StructureBlockInfo; import net.minecraft.world.phys.Vec3; + import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; - import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; -import org.apache.commons.lang3.tuple.MutablePair; - -import javax.annotation.Nullable; -import java.util.List; - @EventBusSubscriber public class MinecartContraptionItem extends Item { diff --git a/src/main/java/com/simibubi/create/content/contraptions/mounted/MountedContraption.java b/src/main/java/com/simibubi/create/content/contraptions/mounted/MountedContraption.java index 76b6f0f5c1..f5987118a1 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/mounted/MountedContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/mounted/MountedContraption.java @@ -14,9 +14,9 @@ import com.simibubi.create.content.contraptions.Contraption; import com.simibubi.create.content.contraptions.ContraptionType; import com.simibubi.create.content.contraptions.mounted.CartAssemblerBlockEntity.CartMovementMode; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; @@ -32,6 +32,7 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.RailShape; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate.StructureBlockInfo; import net.minecraft.world.phys.AABB; + import net.neoforged.neoforge.items.wrapper.InvWrapper; public class MountedContraption extends Contraption { diff --git a/src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonBlock.java b/src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonBlock.java index ba4effe7f8..b49b8a6ca9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonBlock.java @@ -8,7 +8,7 @@ import com.simibubi.create.content.kinetics.base.DirectionalAxisKineticBlock; import com.simibubi.create.foundation.block.IBE; 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.Direction; import net.minecraft.core.particles.ParticleTypes; @@ -34,6 +34,7 @@ import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; + import net.neoforged.neoforge.common.Tags; public class MechanicalPistonBlock extends DirectionalAxisKineticBlock implements IBE { diff --git a/src/main/java/com/simibubi/create/content/contraptions/piston/PistonContraption.java b/src/main/java/com/simibubi/create/content/contraptions/piston/PistonContraption.java index fee46b46cd..6bdc960a3a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/piston/PistonContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/piston/PistonContraption.java @@ -24,7 +24,7 @@ import com.simibubi.create.content.contraptions.TranslatingContraption; import com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock.PistonState; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/contraptions/piston/PistonExtensionPoleBlock.java b/src/main/java/com/simibubi/create/content/contraptions/piston/PistonExtensionPoleBlock.java index ed3a87ecd8..9bfb4743a3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/piston/PistonExtensionPoleBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/piston/PistonExtensionPoleBlock.java @@ -13,8 +13,8 @@ import com.simibubi.create.content.equipment.wrench.IWrenchable; import com.simibubi.create.foundation.block.WrenchableDirectionalBlock; import com.simibubi.create.foundation.placement.PoleHelper; -import net.createmod.catnip.utility.placement.IPlacementHelper; -import net.createmod.catnip.utility.placement.PlacementHelpers; +import net.createmod.catnip.placement.IPlacementHelper; +import net.createmod.catnip.placement.PlacementHelpers; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/contraptions/pulley/AbstractPulleyVisual.java b/src/main/java/com/simibubi/create/content/contraptions/pulley/AbstractPulleyVisual.java index e5ea0c911e..f716556001 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/pulley/AbstractPulleyVisual.java +++ b/src/main/java/com/simibubi/create/content/contraptions/pulley/AbstractPulleyVisual.java @@ -22,8 +22,8 @@ import it.unimi.dsi.fastutil.bytes.ByteArrayList; import it.unimi.dsi.fastutil.bytes.ByteList; import it.unimi.dsi.fastutil.longs.LongOpenHashSet; import it.unimi.dsi.fastutil.longs.LongSet; +import net.createmod.catnip.math.AngleHelper; import net.createmod.catnip.render.SpriteShiftEntry; -import net.createmod.catnip.utility.math.AngleHelper; import net.minecraft.client.renderer.LightTexture; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -87,7 +87,7 @@ public abstract class AbstractPulleyVisual extends protected abstract float getOffset(float pt); protected abstract boolean isRunning(); - + protected abstract SpriteShiftEntry getCoilAnimation(); private Instancer magnetInstancer() { diff --git a/src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyBlockEntity.java index 623224bcd4..c89c71d2ae 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyBlockEntity.java @@ -21,8 +21,8 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; @@ -388,23 +388,23 @@ public class PulleyBlockEntity extends LinearActuatorBlockEntity implements Thre public void animateOffset(float forcedOffset) { offset = forcedOffset; } - + public BlockPos getMirrorParent() { return mirrorParent; } // Threshold switch - + @Override public int getCurrentValue() { return worldPosition.getY() - (int) getInterpolatedOffset(.5f); } - + @Override public int getMinValue() { return level.getMinBuildHeight(); } - + @Override public int getMaxValue() { return worldPosition.getY(); @@ -414,5 +414,5 @@ public class PulleyBlockEntity extends LinearActuatorBlockEntity implements Thre public MutableComponent format(int value) { return CreateLang.translateDirect("gui.threshold_switch.pulley_y_level", value); } - + } diff --git a/src/main/java/com/simibubi/create/content/contraptions/pulley/RopePulleyVisual.java b/src/main/java/com/simibubi/create/content/contraptions/pulley/RopePulleyVisual.java index 98ae55a47f..aceb7c5402 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/pulley/RopePulleyVisual.java +++ b/src/main/java/com/simibubi/create/content/contraptions/pulley/RopePulleyVisual.java @@ -13,7 +13,7 @@ import dev.engine_room.flywheel.lib.instance.InstanceTypes; import dev.engine_room.flywheel.lib.instance.TransformedInstance; import dev.engine_room.flywheel.lib.model.Models; import net.createmod.catnip.render.SpriteShiftEntry; -import net.createmod.catnip.render.VirtualRenderHelper; +import net.createmod.ponder.render.VirtualRenderHelper; public class RopePulleyVisual extends AbstractPulleyVisual { public RopePulleyVisual(VisualizationContext context, PulleyBlockEntity blockEntity, float partialTick) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionMatrices.java b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionMatrices.java index 8f16306c71..d6faa3984c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionMatrices.java +++ b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionMatrices.java @@ -5,7 +5,7 @@ import org.joml.Matrix4f; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.content.contraptions.AbstractContraptionEntity; -import net.createmod.catnip.utility.AnimationTickHolder; +import net.createmod.catnip.animation.AnimationTickHolder; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderInfoManager.java b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderInfoManager.java index df53495dd3..ebb630de56 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderInfoManager.java +++ b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderInfoManager.java @@ -5,10 +5,11 @@ import com.simibubi.create.content.contraptions.Contraption; import dev.engine_room.flywheel.api.event.ReloadLevelRendererEvent; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import net.createmod.catnip.utility.WorldAttached; +import net.createmod.catnip.data.WorldAttached; import net.minecraft.client.Minecraft; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; + import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; diff --git a/src/main/java/com/simibubi/create/content/contraptions/sync/ContraptionSeatMappingPacket.java b/src/main/java/com/simibubi/create/content/contraptions/sync/ContraptionSeatMappingPacket.java index 1592bfc221..7b97c25759 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/sync/ContraptionSeatMappingPacket.java +++ b/src/main/java/com/simibubi/create/content/contraptions/sync/ContraptionSeatMappingPacket.java @@ -9,13 +9,14 @@ import com.simibubi.create.content.contraptions.AbstractContraptionEntity; import net.createmod.catnip.net.base.ClientboundPacketPayload; import io.netty.buffer.ByteBuf; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.UUIDUtil; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.world.entity.Entity; import net.minecraft.world.phys.Vec3; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; diff --git a/src/main/java/com/simibubi/create/content/contraptions/wrench/RadialWrenchMenu.java b/src/main/java/com/simibubi/create/content/contraptions/wrench/RadialWrenchMenu.java index 7fb724d6d5..2093334c4b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/wrench/RadialWrenchMenu.java +++ b/src/main/java/com/simibubi/create/content/contraptions/wrench/RadialWrenchMenu.java @@ -32,15 +32,15 @@ import com.simibubi.create.content.redstone.DirectedDirectionalBlock; import com.simibubi.create.foundation.gui.AllIcons; import dev.engine_room.flywheel.lib.transform.TransformStack; +import net.createmod.catnip.animation.AnimationTickHolder; import net.createmod.catnip.gui.AbstractSimiScreen; import net.createmod.catnip.gui.UIRenderHelper; import net.createmod.catnip.gui.element.GuiGameElement; import net.createmod.catnip.gui.element.RenderElement; +import net.createmod.catnip.math.AngleHelper; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.RegisteredObjectsHelper; -import net.createmod.catnip.utility.math.AngleHelper; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.registry.RegisteredObjectsHelper; +import net.createmod.catnip.theme.Color; import net.createmod.ponder.enums.PonderGuiTextures; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/simibubi/create/content/decoration/MetalLadderBlock.java b/src/main/java/com/simibubi/create/content/decoration/MetalLadderBlock.java index 74e22425fd..ca14fac850 100644 --- a/src/main/java/com/simibubi/create/content/decoration/MetalLadderBlock.java +++ b/src/main/java/com/simibubi/create/content/decoration/MetalLadderBlock.java @@ -7,9 +7,9 @@ import com.simibubi.create.content.equipment.extendoGrip.ExtendoGripItem; import com.simibubi.create.content.equipment.wrench.IWrenchable; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.placement.IPlacementHelper; -import net.createmod.catnip.utility.placement.PlacementHelpers; -import net.createmod.catnip.utility.placement.PlacementOffset; +import net.createmod.catnip.placement.IPlacementHelper; +import net.createmod.catnip.placement.PlacementHelpers; +import net.createmod.catnip.placement.PlacementOffset; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -30,6 +30,7 @@ import net.minecraft.world.level.block.LadderBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.VoxelShape; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; diff --git a/src/main/java/com/simibubi/create/content/decoration/RoofBlockCTBehaviour.java b/src/main/java/com/simibubi/create/content/decoration/RoofBlockCTBehaviour.java index 95bd8c1083..6049a1d32f 100644 --- a/src/main/java/com/simibubi/create/content/decoration/RoofBlockCTBehaviour.java +++ b/src/main/java/com/simibubi/create/content/decoration/RoofBlockCTBehaviour.java @@ -7,7 +7,7 @@ import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; import com.simibubi.create.foundation.block.connected.CTType; import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/decoration/bracket/BracketBlock.java b/src/main/java/com/simibubi/create/content/decoration/bracket/BracketBlock.java index 2eaafc0eda..94be0e067e 100644 --- a/src/main/java/com/simibubi/create/content/decoration/bracket/BracketBlock.java +++ b/src/main/java/com/simibubi/create/content/decoration/bracket/BracketBlock.java @@ -9,7 +9,7 @@ import com.simibubi.create.content.kinetics.simpleRelays.AbstractSimpleShaftBloc import com.simibubi.create.content.kinetics.simpleRelays.CogWheelBlock; import com.simibubi.create.foundation.block.WrenchableDirectionalBlock; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.util.StringRepresentable; diff --git a/src/main/java/com/simibubi/create/content/decoration/bracket/BracketedBlockEntityBehaviour.java b/src/main/java/com/simibubi/create/content/decoration/bracket/BracketedBlockEntityBehaviour.java index ea76fac664..15dedc139e 100644 --- a/src/main/java/com/simibubi/create/content/decoration/bracket/BracketedBlockEntityBehaviour.java +++ b/src/main/java/com/simibubi/create/content/decoration/bracket/BracketedBlockEntityBehaviour.java @@ -12,7 +12,7 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtUtils; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatBlockEntity.java b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatBlockEntity.java index eeae833695..e539e514e9 100644 --- a/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatBlockEntity.java @@ -1,16 +1,19 @@ package com.simibubi.create.content.decoration.copycat; +import java.util.List; + import com.simibubi.create.AllBlocks; import com.simibubi.create.api.contraption.transformable.ITransformableBlockEntity; +import com.simibubi.create.api.schematic.nbt.IPartialSafeNBT; +import com.simibubi.create.api.schematic.requirement.ISpecialBlockEntityItemRequirement; import com.simibubi.create.content.contraptions.StructureTransform; import com.simibubi.create.content.redstone.RoseQuartzLampBlock; -import com.simibubi.create.api.schematic.requirement.ISpecialBlockEntityItemRequirement; import com.simibubi.create.content.schematics.requirement.ItemRequirement; import com.simibubi.create.content.schematics.requirement.ItemRequirement.ItemUseType; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import com.simibubi.create.api.schematic.nbt.IPartialSafeNBT; -import net.createmod.catnip.utility.Iterate; + +import net.createmod.catnip.data.Iterate; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; @@ -22,9 +25,8 @@ import net.minecraft.world.level.block.TrapDoorBlock; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.neoforged.neoforge.client.model.data.ModelData; -import java.util.List; +import net.neoforged.neoforge.client.model.data.ModelData; public class CopycatBlockEntity extends SmartBlockEntity implements ISpecialBlockEntityItemRequirement, ITransformableBlockEntity, IPartialSafeNBT { diff --git a/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatModel.java b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatModel.java index 088b92c788..f052cfa477 100644 --- a/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatModel.java +++ b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatModel.java @@ -9,7 +9,7 @@ import javax.annotation.Nullable; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.model.BakedModelWrapperWithData; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -22,6 +22,7 @@ import net.minecraft.util.RandomSource; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; + import net.neoforged.neoforge.client.model.data.ModelData; import net.neoforged.neoforge.client.model.data.ModelData.Builder; import net.neoforged.neoforge.client.model.data.ModelProperty; diff --git a/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelBlock.java b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelBlock.java index a37e819da5..cb6b892d5f 100644 --- a/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelBlock.java +++ b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelBlock.java @@ -1,10 +1,14 @@ package com.simibubi.create.content.decoration.copycat; +import java.util.List; +import java.util.function.Predicate; + import com.simibubi.create.AllBlocks; import com.simibubi.create.AllShapes; -import net.createmod.catnip.utility.placement.IPlacementHelper; -import net.createmod.catnip.utility.placement.PlacementHelpers; -import net.createmod.catnip.utility.placement.PlacementOffset; + +import net.createmod.catnip.placement.IPlacementHelper; +import net.createmod.catnip.placement.PlacementHelpers; +import net.createmod.catnip.placement.PlacementOffset; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -33,9 +37,6 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import java.util.List; -import java.util.function.Predicate; - public class CopycatPanelBlock extends WaterloggedCopycatBlock { public static final DirectionProperty FACING = BlockStateProperties.FACING; diff --git a/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelModel.java b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelModel.java index fac240d120..b4e807f5a8 100644 --- a/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelModel.java +++ b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelModel.java @@ -7,7 +7,7 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.model.BakedModelHelper; import com.simibubi.create.foundation.model.BakedQuadHelper; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.block.BlockRenderDispatcher; @@ -20,6 +20,7 @@ import net.minecraft.world.level.block.DirectionalBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; + import net.neoforged.neoforge.client.model.data.ModelData; public class CopycatPanelModel extends CopycatModel { diff --git a/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatStepBlock.java b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatStepBlock.java index b3b17d2196..1cc2baec33 100644 --- a/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatStepBlock.java +++ b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatStepBlock.java @@ -8,10 +8,10 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.AllShapes; import com.simibubi.create.foundation.placement.PoleHelper; -import net.createmod.catnip.utility.VoxelShaper; -import net.createmod.catnip.utility.placement.IPlacementHelper; -import net.createmod.catnip.utility.placement.PlacementHelpers; -import net.createmod.catnip.utility.placement.PlacementOffset; +import net.createmod.catnip.math.VoxelShaper; +import net.createmod.catnip.placement.IPlacementHelper; +import net.createmod.catnip.placement.PlacementHelpers; +import net.createmod.catnip.placement.PlacementOffset; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatStepModel.java b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatStepModel.java index 552b923647..04759a82e1 100644 --- a/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatStepModel.java +++ b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatStepModel.java @@ -6,7 +6,7 @@ import java.util.List; import com.simibubi.create.foundation.model.BakedModelHelper; import com.simibubi.create.foundation.model.BakedQuadHelper; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.resources.model.BakedModel; @@ -17,6 +17,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.Half; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; + import net.neoforged.neoforge.client.model.data.ModelData; public class CopycatStepModel extends CopycatModel { diff --git a/src/main/java/com/simibubi/create/content/decoration/girder/ConnectedGirderModel.java b/src/main/java/com/simibubi/create/content/decoration/girder/ConnectedGirderModel.java index 286a6378e1..59304c66ef 100644 --- a/src/main/java/com/simibubi/create/content/decoration/girder/ConnectedGirderModel.java +++ b/src/main/java/com/simibubi/create/content/decoration/girder/ConnectedGirderModel.java @@ -7,7 +7,7 @@ import java.util.List; import com.simibubi.create.AllPartialModels; import com.simibubi.create.foundation.block.connected.CTModel; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.resources.model.BakedModel; @@ -16,6 +16,7 @@ import net.minecraft.core.Direction; import net.minecraft.util.RandomSource; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.block.state.BlockState; + import net.neoforged.neoforge.client.model.data.ModelData; import net.neoforged.neoforge.client.model.data.ModelData.Builder; import net.neoforged.neoforge.client.model.data.ModelProperty; diff --git a/src/main/java/com/simibubi/create/content/decoration/girder/GirderBlock.java b/src/main/java/com/simibubi/create/content/decoration/girder/GirderBlock.java index f720d7a44e..f5a7a2b31b 100644 --- a/src/main/java/com/simibubi/create/content/decoration/girder/GirderBlock.java +++ b/src/main/java/com/simibubi/create/content/decoration/girder/GirderBlock.java @@ -19,9 +19,9 @@ import com.simibubi.create.content.trains.track.TrackBlock; import com.simibubi.create.content.trains.track.TrackShape; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.placement.IPlacementHelper; -import net.createmod.catnip.utility.placement.PlacementHelpers; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.placement.IPlacementHelper; +import net.createmod.catnip.placement.PlacementHelpers; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/decoration/girder/GirderBlockStateGenerator.java b/src/main/java/com/simibubi/create/content/decoration/girder/GirderBlockStateGenerator.java index 9f35450c9f..32756d7c1f 100644 --- a/src/main/java/com/simibubi/create/content/decoration/girder/GirderBlockStateGenerator.java +++ b/src/main/java/com/simibubi/create/content/decoration/girder/GirderBlockStateGenerator.java @@ -4,9 +4,10 @@ import com.simibubi.create.foundation.data.AssetLookup; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.core.Direction.Axis; import net.minecraft.world.level.block.Block; + import net.neoforged.neoforge.client.model.generators.MultiPartBlockStateBuilder; public class GirderBlockStateGenerator { diff --git a/src/main/java/com/simibubi/create/content/decoration/girder/GirderPlacementHelper.java b/src/main/java/com/simibubi/create/content/decoration/girder/GirderPlacementHelper.java index 7d0e9b7bdf..ebc13abbcd 100644 --- a/src/main/java/com/simibubi/create/content/decoration/girder/GirderPlacementHelper.java +++ b/src/main/java/com/simibubi/create/content/decoration/girder/GirderPlacementHelper.java @@ -1,11 +1,15 @@ package com.simibubi.create.content.decoration.girder; +import java.util.List; +import java.util.function.Predicate; + import com.google.common.base.Predicates; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.equipment.extendoGrip.ExtendoGripItem; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.placement.IPlacementHelper; -import net.createmod.catnip.utility.placement.PlacementOffset; + +import net.createmod.catnip.placement.IPlacementHelper; +import net.createmod.catnip.placement.PlacementOffset; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; @@ -17,10 +21,8 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; -import net.neoforged.neoforge.common.NeoForgeMod; -import java.util.List; -import java.util.function.Predicate; +import net.neoforged.neoforge.common.NeoForgeMod; public class GirderPlacementHelper implements IPlacementHelper { diff --git a/src/main/java/com/simibubi/create/content/decoration/girder/GirderWrenchBehavior.java b/src/main/java/com/simibubi/create/content/decoration/girder/GirderWrenchBehavior.java index 014e127cd2..182d76df23 100644 --- a/src/main/java/com/simibubi/create/content/decoration/girder/GirderWrenchBehavior.java +++ b/src/main/java/com/simibubi/create/content/decoration/girder/GirderWrenchBehavior.java @@ -9,12 +9,12 @@ import org.jetbrains.annotations.Nullable; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; -import net.createmod.catnip.CatnipClient; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.placement.IPlacementHelper; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.outliner.Outliner; +import net.createmod.catnip.placement.IPlacementHelper; +import net.createmod.catnip.theme.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.BlockPos; @@ -28,6 +28,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; @@ -91,7 +92,7 @@ public class GirderWrenchBehavior { .getNormal()) .scale(0.1 * normalMultiplier)); - CatnipClient.OUTLINER.showAABB("girderWrench", new AABB(corner1, corner2)) + Outliner.getInstance().showAABB("girderWrench", new AABB(corner1, corner2)) .lineWidth(1 / 32f) .colored(new Color(127, 127, 127)); } diff --git a/src/main/java/com/simibubi/create/content/decoration/palettes/AllPaletteStoneTypes.java b/src/main/java/com/simibubi/create/content/decoration/palettes/AllPaletteStoneTypes.java index 8dd49b8bad..ee887c13f2 100644 --- a/src/main/java/com/simibubi/create/content/decoration/palettes/AllPaletteStoneTypes.java +++ b/src/main/java/com/simibubi/create/content/decoration/palettes/AllPaletteStoneTypes.java @@ -1,10 +1,16 @@ package com.simibubi.create.content.decoration.palettes; +import static com.simibubi.create.content.decoration.palettes.PaletteBlockPattern.STANDARD_RANGE; +import static com.simibubi.create.content.decoration.palettes.PaletteBlockPattern.VANILLA_RANGE; + +import java.util.function.Function; + import com.simibubi.create.AllTags; import com.simibubi.create.Create; import com.simibubi.create.foundation.data.CreateRegistrate; import com.tterrag.registrate.util.nullness.NonNullSupplier; -import net.createmod.catnip.utility.lang.Lang; + +import net.createmod.catnip.lang.Lang; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; @@ -12,11 +18,6 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.material.MapColor; -import java.util.function.Function; - -import static com.simibubi.create.content.decoration.palettes.PaletteBlockPattern.STANDARD_RANGE; -import static com.simibubi.create.content.decoration.palettes.PaletteBlockPattern.VANILLA_RANGE; - public enum AllPaletteStoneTypes { GRANITE(VANILLA_RANGE, r -> () -> Blocks.GRANITE), diff --git a/src/main/java/com/simibubi/create/content/decoration/palettes/ConnectedPillarBlock.java b/src/main/java/com/simibubi/create/content/decoration/palettes/ConnectedPillarBlock.java index 1f1be11eb6..a375347278 100644 --- a/src/main/java/com/simibubi/create/content/decoration/palettes/ConnectedPillarBlock.java +++ b/src/main/java/com/simibubi/create/content/decoration/palettes/ConnectedPillarBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.decoration.palettes; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos.MutableBlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/decoration/palettes/PaletteBlockPartial.java b/src/main/java/com/simibubi/create/content/decoration/palettes/PaletteBlockPartial.java index c9b5cc9a72..6c0c77da32 100644 --- a/src/main/java/com/simibubi/create/content/decoration/palettes/PaletteBlockPartial.java +++ b/src/main/java/com/simibubi/create/content/decoration/palettes/PaletteBlockPartial.java @@ -16,7 +16,7 @@ import com.tterrag.registrate.util.DataIngredient; import com.tterrag.registrate.util.entry.BlockEntry; import com.tterrag.registrate.util.nullness.NonnullType; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.data.recipes.ShapelessRecipeBuilder; @@ -31,6 +31,7 @@ import net.minecraft.world.level.block.SlabBlock; import net.minecraft.world.level.block.StairBlock; import net.minecraft.world.level.block.WallBlock; import net.minecraft.world.level.block.state.BlockBehaviour.Properties; + import net.neoforged.neoforge.client.model.generators.ModelFile; public abstract class PaletteBlockPartial { diff --git a/src/main/java/com/simibubi/create/content/decoration/placard/PlacardBlockEntity.java b/src/main/java/com/simibubi/create/content/decoration/placard/PlacardBlockEntity.java index 879680a9ad..599bcff773 100644 --- a/src/main/java/com/simibubi/create/content/decoration/placard/PlacardBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/decoration/placard/PlacardBlockEntity.java @@ -1,9 +1,14 @@ package com.simibubi.create.content.decoration.placard; +import java.util.List; + +import org.joml.Vector3f; + import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import net.createmod.catnip.utility.VecHelper; + +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.core.particles.DustParticleOptions; @@ -12,9 +17,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; -import org.joml.Vector3f; - -import java.util.List; public class PlacardBlockEntity extends SmartBlockEntity { diff --git a/src/main/java/com/simibubi/create/content/decoration/placard/PlacardRenderer.java b/src/main/java/com/simibubi/create/content/decoration/placard/PlacardRenderer.java index 37c74a4f23..ee35f2b16e 100644 --- a/src/main/java/com/simibubi/create/content/decoration/placard/PlacardRenderer.java +++ b/src/main/java/com/simibubi/create/content/decoration/placard/PlacardRenderer.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; diff --git a/src/main/java/com/simibubi/create/content/decoration/slidingDoor/DoorControl.java b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/DoorControl.java index b721fc6fb9..035c2b6059 100644 --- a/src/main/java/com/simibubi/create/content/decoration/slidingDoor/DoorControl.java +++ b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/DoorControl.java @@ -10,13 +10,14 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import io.netty.buffer.ByteBuf; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.lang.Components; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; import net.minecraft.client.Minecraft; import net.minecraft.core.Direction; import net.minecraft.network.codec.StreamCodec; import net.minecraft.world.entity.Entity; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; diff --git a/src/main/java/com/simibubi/create/content/decoration/slidingDoor/DoorControlBehaviour.java b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/DoorControlBehaviour.java index af887c6278..0210ec66a3 100644 --- a/src/main/java/com/simibubi/create/content/decoration/slidingDoor/DoorControlBehaviour.java +++ b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/DoorControlBehaviour.java @@ -4,7 +4,7 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorBlockEntity.java b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorBlockEntity.java index 53d53d071c..3a947a57bc 100644 --- a/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorBlockEntity.java @@ -5,8 +5,8 @@ import java.util.List; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; diff --git a/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorMovementBehaviour.java b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorMovementBehaviour.java index 7563656f80..829e314d7b 100644 --- a/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorMovementBehaviour.java @@ -14,7 +14,7 @@ import com.simibubi.create.content.trains.entity.CarriageContraptionEntity; import com.simibubi.create.content.trains.station.GlobalStation; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; +import net.createmod.catnip.animation.LerpedFloat.Chaser; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.AxisDirection; diff --git a/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorRenderer.java b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorRenderer.java index 6c0b4ddd28..61e6672772 100644 --- a/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorRenderer.java +++ b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorRenderer.java @@ -6,11 +6,11 @@ import com.simibubi.create.AllPartialModels; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; import dev.engine_room.flywheel.lib.model.baked.PartialModel; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.AngleHelper; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.math.AngleHelper; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider.Context; diff --git a/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlock.java b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlock.java index 746eb65b1d..45668ae114 100644 --- a/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlock.java +++ b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlock.java @@ -8,7 +8,8 @@ import com.simibubi.create.content.equipment.wrench.IWrenchable; import com.simibubi.create.content.fluids.tank.FluidTankBlock; import com.simibubi.create.foundation.advancement.AdvancementBehaviour; import com.simibubi.create.foundation.block.IBE; -import net.createmod.catnip.utility.lang.Lang; + +import net.createmod.catnip.lang.Lang; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlockEntity.java b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlockEntity.java index 26a00bb4e8..48bc7adbe0 100644 --- a/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlockEntity.java @@ -16,10 +16,10 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; +import net.createmod.catnip.math.AngleHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -32,6 +32,7 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; diff --git a/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleExtenderBlock.java b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleExtenderBlock.java index 049ce1ae2e..78a499efd1 100644 --- a/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleExtenderBlock.java +++ b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleExtenderBlock.java @@ -5,7 +5,7 @@ import com.simibubi.create.AllShapes; import com.simibubi.create.content.decoration.steamWhistle.WhistleBlock.WhistleSize; import com.simibubi.create.content.equipment.wrench.IWrenchable; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleRenderer.java b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleRenderer.java index 3f2a7c6438..6495b4376e 100644 --- a/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleRenderer.java +++ b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleRenderer.java @@ -6,9 +6,9 @@ import com.simibubi.create.content.decoration.steamWhistle.WhistleBlock.WhistleS import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; import dev.engine_room.flywheel.lib.model.baked.PartialModel; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.math.AngleHelper; import net.createmod.catnip.render.CachedBuffers; -import net.createmod.catnip.utility.math.AngleHelper; -import net.createmod.ponder.utility.LevelTickHolder; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; @@ -35,7 +35,7 @@ public class WhistleRenderer extends SafeBlockEntityRenderer float offset = be.animation.getValue(partialTicks); if (be.animation.getChaseTarget() > 0 && be.animation.getValue() > 0.5f) { - float wiggleProgress = (LevelTickHolder.getTicks(be.getLevel()) + partialTicks) / 8f; + float wiggleProgress = (AnimationTickHolder.getTicks(be.getLevel()) + partialTicks) / 8f; offset -= Math.sin(wiggleProgress * (2 * Mth.PI) * (4 - size.ordinal())) / 16f; } diff --git a/src/main/java/com/simibubi/create/content/equipment/TreeFertilizerItem.java b/src/main/java/com/simibubi/create/content/equipment/TreeFertilizerItem.java index b956631474..2e69ea8d1d 100644 --- a/src/main/java/com/simibubi/create/content/equipment/TreeFertilizerItem.java +++ b/src/main/java/com/simibubi/create/content/equipment/TreeFertilizerItem.java @@ -1,7 +1,7 @@ package com.simibubi.create.content.equipment; -import net.createmod.catnip.utility.levelWrappers.PlacementSimulationServerLevel; +import net.createmod.catnip.levelWrappers.PlacementSimulationServerLevel; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.BlockTags; diff --git a/src/main/java/com/simibubi/create/content/equipment/armor/BacktankArmorLayer.java b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankArmorLayer.java index 5bba27b222..aae9cc37d0 100644 --- a/src/main/java/com/simibubi/create/content/equipment/armor/BacktankArmorLayer.java +++ b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankArmorLayer.java @@ -4,10 +4,10 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.simibubi.create.foundation.mixin.accessor.EntityRenderDispatcherAccessor; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.math.AngleHelper; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.math.AngleHelper; -import net.createmod.ponder.utility.LevelTickHolder; import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.renderer.MultiBufferSource; @@ -70,7 +70,7 @@ public class BacktankArmorLayer .rotateYDegrees(180) .uncenter() .translate(0, 6.5f / 16, 11f / 16) - .rotate(AngleHelper.rad(2 * LevelTickHolder.getRenderTime(entity.level()) % 360), Direction.EAST) + .rotate(AngleHelper.rad(2 * AnimationTickHolder.getRenderTime(entity.level()) % 360), Direction.EAST) .translate(0, -6.5f / 16, -11f / 16); cogs.disableDiffuse() diff --git a/src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlockEntity.java b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlockEntity.java index 994fecd7ee..7ad89a2f2c 100644 --- a/src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlockEntity.java @@ -12,7 +12,7 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import com.simibubi.create.foundation.particle.AirParticleData; import net.createmod.catnip.codecs.CatnipCodecUtils; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction.Axis; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/simibubi/create/content/equipment/armor/BacktankRenderer.java b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankRenderer.java index 2e8b8dc04d..2dce458179 100644 --- a/src/main/java/com/simibubi/create/content/equipment/armor/BacktankRenderer.java +++ b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankRenderer.java @@ -6,10 +6,10 @@ import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; import dev.engine_room.flywheel.lib.model.baked.PartialModel; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.math.AngleHelper; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.math.AngleHelper; -import net.createmod.ponder.utility.LevelTickHolder; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; @@ -32,7 +32,7 @@ public class BacktankRenderer extends KineticBlockEntityRenderer 0) itemStack = itemsMatchingFilter[step % itemsMatchingFilter.length]; diff --git a/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintRenderer.java b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintRenderer.java index 4ea2a7fff9..a77b0ae81e 100644 --- a/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintRenderer.java +++ b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintRenderer.java @@ -10,7 +10,7 @@ import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.transform.TransformStack; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.Couple; +import net.createmod.catnip.data.Couple; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.Sheets; diff --git a/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardEntry.java b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardEntry.java index b2a2a22349..ad9789c390 100644 --- a/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardEntry.java +++ b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardEntry.java @@ -4,9 +4,7 @@ import java.util.ArrayList; import java.util.List; import com.mojang.serialization.Codec; - import com.mojang.serialization.codecs.RecordCodecBuilder; - import com.simibubi.create.AllDataComponents; import net.minecraft.core.RegistryAccess; diff --git a/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardOverrides.java b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardOverrides.java index aa9359ff7b..e3aba3c61b 100644 --- a/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardOverrides.java +++ b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardOverrides.java @@ -8,15 +8,16 @@ import com.simibubi.create.Create; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateItemModelProvider; -import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import io.netty.buffer.ByteBuf; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; +import net.createmod.catnip.lang.Lang; import net.minecraft.client.renderer.item.ItemProperties; import net.minecraft.network.codec.StreamCodec; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.StringRepresentable; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.neoforge.client.model.generators.ItemModelBuilder; diff --git a/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardScreen.java b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardScreen.java index bec8eb13d1..f18f669587 100644 --- a/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardScreen.java +++ b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardScreen.java @@ -32,7 +32,7 @@ import com.simibubi.create.foundation.utility.CreateLang; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; import net.createmod.catnip.gui.AbstractSimiScreen; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.Util; import net.minecraft.client.Minecraft; import net.minecraft.client.StringSplitter; diff --git a/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardValueSettingsHandler.java b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardValueSettingsHandler.java index 9f758043ff..541959d82e 100644 --- a/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardValueSettingsHandler.java +++ b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardValueSettingsHandler.java @@ -14,7 +14,7 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItem.java b/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItem.java index 37d5776120..553de6ed5b 100644 --- a/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItem.java +++ b/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItem.java @@ -1,6 +1,5 @@ package com.simibubi.create.content.equipment.extendoGrip; -import java.util.function.Consumer; import java.util.function.Supplier; import com.google.common.base.Suppliers; @@ -10,11 +9,10 @@ import com.simibubi.create.AllItems; import com.simibubi.create.Create; import com.simibubi.create.content.equipment.armor.BacktankUtil; import com.simibubi.create.foundation.advancement.AllAdvancements; -import com.simibubi.create.foundation.item.render.SimpleCustomRenderer; import com.simibubi.create.infrastructure.config.AllConfigs; +import net.createmod.catnip.animation.AnimationTickHolder; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.AnimationTickHolder; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.Holder; @@ -36,13 +34,13 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.EntityHitResult; import net.minecraft.world.phys.HitResult.Type; import net.minecraft.world.phys.Vec3; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.bus.api.EventPriority; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.client.event.InputEvent; -import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions; import net.neoforged.neoforge.event.entity.living.LivingIncomingDamageEvent; import net.neoforged.neoforge.event.entity.living.LivingKnockBackEvent; import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; @@ -306,10 +304,4 @@ public class ExtendoGripItem extends Item { return holdingGrip; } - @Override - @OnlyIn(Dist.CLIENT) - public void initializeClient(Consumer consumer) { - consumer.accept(SimpleCustomRenderer.create(this, new ExtendoGripItemRenderer())); - } - } diff --git a/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItemRenderer.java b/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItemRenderer.java index ca9ad7e945..7df40ffd41 100644 --- a/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItemRenderer.java +++ b/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItemRenderer.java @@ -9,7 +9,7 @@ import com.simibubi.create.foundation.item.render.PartialItemModelRenderer; import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.AnimationTickHolder; +import net.createmod.catnip.animation.AnimationTickHolder; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.util.Mth; import net.minecraft.world.item.ItemDisplayContext; diff --git a/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripRenderHandler.java b/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripRenderHandler.java index f05a3f056c..8d1f84e460 100644 --- a/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripRenderHandler.java +++ b/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripRenderHandler.java @@ -7,7 +7,7 @@ import com.simibubi.create.AllPartialModels; import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.AnimationTickHolder; +import net.createmod.catnip.animation.AnimationTickHolder; import net.minecraft.client.Minecraft; import net.minecraft.client.player.AbstractClientPlayer; import net.minecraft.client.player.LocalPlayer; diff --git a/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleConfigScreen.java b/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleConfigScreen.java index 310a8b2735..578f8d3811 100644 --- a/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleConfigScreen.java +++ b/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleConfigScreen.java @@ -5,7 +5,7 @@ import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; import net.createmod.catnip.gui.AbstractSimiScreen; import net.createmod.catnip.gui.element.GuiGameElement; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java b/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java index eda05c640e..ebc9bc9604 100644 --- a/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java +++ b/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java @@ -20,14 +20,14 @@ import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; import com.simibubi.create.infrastructure.config.CClient; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.gui.element.BoxElement; import net.createmod.catnip.gui.element.GuiGameElement; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.lang.Components; -import net.createmod.catnip.utility.outliner.Outline; -import net.createmod.catnip.utility.outliner.Outliner.OutlineEntry; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.outliner.Outline; +import net.createmod.catnip.outliner.Outliner; +import net.createmod.catnip.outliner.Outliner.OutlineEntry; +import net.createmod.catnip.theme.Color; import net.minecraft.client.DeltaTracker; import net.minecraft.client.Minecraft; import net.minecraft.client.MouseHandler; @@ -51,7 +51,7 @@ public class GoggleOverlayRenderer { public static final LayeredDraw.Layer OVERLAY = GoggleOverlayRenderer::renderOverlay; - private static final Map outlines = CatnipClient.OUTLINER.getOutlines(); + private static final Map outlines = Outliner.getInstance().getOutlines(); public static int hoverTicks = 0; public static BlockPos lastHovered = null; diff --git a/src/main/java/com/simibubi/create/content/equipment/goggles/IHaveGoggleInformation.java b/src/main/java/com/simibubi/create/content/equipment/goggles/IHaveGoggleInformation.java index cdfc9a2483..9b13be39aa 100644 --- a/src/main/java/com/simibubi/create/content/equipment/goggles/IHaveGoggleInformation.java +++ b/src/main/java/com/simibubi/create/content/equipment/goggles/IHaveGoggleInformation.java @@ -5,7 +5,7 @@ import java.util.Optional; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.lang.LangBuilder; +import net.createmod.catnip.lang.LangBuilder; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/com/simibubi/create/content/equipment/hats/EntityHats.java b/src/main/java/com/simibubi/create/content/equipment/hats/EntityHats.java index fec601d616..65e0203b33 100644 --- a/src/main/java/com/simibubi/create/content/equipment/hats/EntityHats.java +++ b/src/main/java/com/simibubi/create/content/equipment/hats/EntityHats.java @@ -10,8 +10,8 @@ import com.simibubi.create.content.trains.entity.CarriageContraption; import com.simibubi.create.content.trains.entity.CarriageContraptionEntity; import dev.engine_room.flywheel.lib.model.baked.PartialModel; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.entity.EquipmentSlot; diff --git a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/BuiltinPotatoProjectileTypes.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/BuiltinPotatoProjectileTypes.java index ac45a32e98..fe9a0417ab 100644 --- a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/BuiltinPotatoProjectileTypes.java +++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/BuiltinPotatoProjectileTypes.java @@ -5,7 +5,7 @@ import com.mojang.datafixers.util.Pair; import com.simibubi.create.AllItems; import com.simibubi.create.Create; import com.simibubi.create.foundation.mixin.accessor.FallingBlockEntityAccessor; -import net.createmod.catnip.utility.WorldAttached; +import net.createmod.catnip.data.WorldAttached; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Holder; diff --git a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java index e408f8b7fb..9fdbc5139e 100644 --- a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java +++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java @@ -2,7 +2,6 @@ package com.simibubi.create.content.equipment.potatoCannon; import java.util.List; import java.util.Optional; -import java.util.function.Consumer; import java.util.function.Predicate; import org.jetbrains.annotations.Nullable; @@ -14,13 +13,12 @@ import com.simibubi.create.CreateClient; import com.simibubi.create.content.equipment.armor.BacktankUtil; import com.simibubi.create.content.equipment.zapper.ShootableGadgetItemMethods; import com.simibubi.create.foundation.item.CustomArmPoseItem; -import com.simibubi.create.foundation.item.render.SimpleCustomRenderer; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.math.VecHelper; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel.ArmPose; @@ -51,9 +49,9 @@ import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; -import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions; public class PotatoCannonItem extends ProjectileWeaponItem implements CustomArmPoseItem { @@ -304,10 +302,4 @@ public class PotatoCannonItem extends ProjectileWeaponItem implements CustomArmP return 15; } - @Override - @OnlyIn(Dist.CLIENT) - public void initializeClient(Consumer consumer) { - consumer.accept(SimpleCustomRenderer.create(this, new PotatoCannonItemRenderer())); - } - } diff --git a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItemRenderer.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItemRenderer.java index 32f5c3de3b..4a7c89e2b4 100644 --- a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItemRenderer.java +++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItemRenderer.java @@ -10,7 +10,7 @@ import com.simibubi.create.foundation.item.render.PartialItemModelRenderer; import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.AnimationTickHolder; +import net.createmod.catnip.animation.AnimationTickHolder; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonRenderHandler.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonRenderHandler.java index 8c011b8a68..f2211e2964 100644 --- a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonRenderHandler.java +++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonRenderHandler.java @@ -6,7 +6,7 @@ import com.simibubi.create.content.equipment.zapper.ShootableGadgetRenderHandler import com.simibubi.create.foundation.particle.AirParticleData; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.particles.ItemParticleOption; diff --git a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileEntity.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileEntity.java index 7580da5fe3..5d2e11df36 100644 --- a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileEntity.java +++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileEntity.java @@ -8,7 +8,7 @@ import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.damageTypes.CreateDamageSources; import com.simibubi.create.foundation.particle.AirParticleData; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Registry; import net.minecraft.core.particles.ItemParticleOption; diff --git a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileRenderMode.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileRenderMode.java index 54e9fbd13d..4992d441a4 100644 --- a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileRenderMode.java +++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileRenderMode.java @@ -5,7 +5,7 @@ import static com.simibubi.create.content.equipment.potatoCannon.PotatoProjectil import com.mojang.blaze3d.vertex.PoseStack; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.Minecraft; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItem.java b/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItem.java index f898df2c32..ee5215979e 100644 --- a/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItem.java +++ b/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItem.java @@ -1,16 +1,13 @@ package com.simibubi.create.content.equipment.sandPaper; -import java.util.function.Consumer; - import javax.annotation.ParametersAreNonnullByDefault; import com.simibubi.create.AllDataComponents; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.foundation.item.CustomUseEffectsItem; -import com.simibubi.create.foundation.item.render.SimpleCustomRenderer; import com.simibubi.create.foundation.mixin.accessor.LivingEntityAccessor; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ItemParticleOption; @@ -33,9 +30,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.api.distmarker.OnlyIn; -import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions; + import net.neoforged.neoforge.common.ItemAbilities; import net.neoforged.neoforge.common.ItemAbility; import net.neoforged.neoforge.common.util.FakePlayer; @@ -238,11 +233,4 @@ public class SandPaperItem extends Item implements CustomUseEffectsItem { public int getEnchantmentValue() { return 1; } - - @Override - @OnlyIn(Dist.CLIENT) - public void initializeClient(Consumer consumer) { - consumer.accept(SimpleCustomRenderer.create(this, new SandPaperItemRenderer())); - } - } diff --git a/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItemRenderer.java b/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItemRenderer.java index 7f757d0453..5c029997f0 100644 --- a/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItemRenderer.java +++ b/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItemRenderer.java @@ -7,7 +7,7 @@ import com.simibubi.create.foundation.item.render.CustomRenderedItemModel; import com.simibubi.create.foundation.item.render.CustomRenderedItemModelRenderer; import com.simibubi.create.foundation.item.render.PartialItemModelRenderer; -import net.createmod.catnip.utility.AnimationTickHolder; +import net.createmod.catnip.animation.AnimationTickHolder; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryHandler.java b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryHandler.java index 57c7a29130..4a5581e2b6 100644 --- a/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryHandler.java +++ b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryHandler.java @@ -14,7 +14,7 @@ import com.simibubi.create.AllItems; import com.simibubi.create.content.equipment.symmetryWand.mirror.EmptyMirror; import com.simibubi.create.content.equipment.symmetryWand.mirror.SymmetryMirror; -import net.createmod.catnip.utility.AnimationTickHolder; +import net.createmod.catnip.animation.AnimationTickHolder; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; diff --git a/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandItem.java b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandItem.java index 1c2b6153e4..9bb864aa21 100644 --- a/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandItem.java +++ b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandItem.java @@ -4,26 +4,23 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.function.Consumer; import javax.annotation.Nonnull; import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllItems; import com.simibubi.create.AllDataComponents; +import com.simibubi.create.AllItems; import com.simibubi.create.content.contraptions.mounted.CartAssemblerBlock; import com.simibubi.create.content.equipment.symmetryWand.mirror.CrossPlaneMirror; import com.simibubi.create.content.equipment.symmetryWand.mirror.EmptyMirror; import com.simibubi.create.content.equipment.symmetryWand.mirror.PlaneMirror; import com.simibubi.create.content.equipment.symmetryWand.mirror.SymmetryMirror; -import com.simibubi.create.foundation.item.render.SimpleCustomRenderer; -import net.createmod.catnip.platform.CatnipServices; import com.simibubi.create.foundation.utility.BlockHelper; -import com.simibubi.create.foundation.utility.DistExecutor; import com.simibubi.create.infrastructure.config.AllConfigs; +import net.createmod.catnip.data.Iterate; import net.createmod.catnip.gui.ScreenOpener; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.platform.CatnipServices; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; @@ -43,9 +40,9 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.CollisionContext; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; -import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions; import net.neoforged.neoforge.common.util.BlockSnapshot; import net.neoforged.neoforge.event.EventHooks; @@ -303,12 +300,6 @@ public class SymmetryWandItem extends Item { CatnipServices.NETWORK.sendToClientsTrackingAndSelf(player, new SymmetryEffectPacket(to, targets)); } - @Override - @OnlyIn(Dist.CLIENT) - public void initializeClient(Consumer consumer) { - consumer.accept(SimpleCustomRenderer.create(this, new SymmetryWandItemRenderer())); - } - public static boolean presentInHotbar(Player player) { Inventory inv = player.getInventory(); for (int i = 0; i < Inventory.getSelectionSize(); i++) diff --git a/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandItemRenderer.java b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandItemRenderer.java index 4179f6c0c4..eb04c0b9e5 100644 --- a/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandItemRenderer.java +++ b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandItemRenderer.java @@ -8,7 +8,7 @@ import com.simibubi.create.foundation.item.render.CustomRenderedItemModelRendere import com.simibubi.create.foundation.item.render.PartialItemModelRenderer; import dev.engine_room.flywheel.lib.model.baked.PartialModel; -import net.createmod.catnip.utility.AnimationTickHolder; +import net.createmod.catnip.animation.AnimationTickHolder; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.util.Mth; diff --git a/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandScreen.java b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandScreen.java index 038d9f8f04..28e9dcabf2 100644 --- a/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandScreen.java +++ b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandScreen.java @@ -21,7 +21,7 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.gui.AbstractSimiScreen; import net.createmod.catnip.gui.element.GuiGameElement; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; diff --git a/src/main/java/com/simibubi/create/content/equipment/tool/CardboardSwordItem.java b/src/main/java/com/simibubi/create/content/equipment/tool/CardboardSwordItem.java index 8621e9240b..b10325d334 100644 --- a/src/main/java/com/simibubi/create/content/equipment/tool/CardboardSwordItem.java +++ b/src/main/java/com/simibubi/create/content/equipment/tool/CardboardSwordItem.java @@ -1,12 +1,9 @@ package com.simibubi.create.content.equipment.tool; -import java.util.function.Consumer; - import org.jetbrains.annotations.Nullable; import com.simibubi.create.AllItems; import com.simibubi.create.AllSoundEvents; -import com.simibubi.create.foundation.item.render.SimpleCustomRenderer; import net.createmod.catnip.platform.CatnipServices; import net.minecraft.core.Holder; @@ -28,13 +25,11 @@ import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.Enchantments; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.api.distmarker.OnlyIn; + import net.neoforged.bus.api.EventPriority; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.LogicalSide; import net.neoforged.fml.common.EventBusSubscriber; -import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions; import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; @@ -122,11 +117,4 @@ public class CardboardSwordItem extends SwordItem { target.stopRiding(); target.knockback(knockbackStrength * 0.5F, Mth.sin(yRot * Mth.DEG_TO_RAD), -Mth.cos(yRot * Mth.DEG_TO_RAD)); } - - @Override - @OnlyIn(Dist.CLIENT) - public void initializeClient(Consumer consumer) { - consumer.accept(SimpleCustomRenderer.create(this, new CardboardSwordItemRenderer())); - } - } diff --git a/src/main/java/com/simibubi/create/content/equipment/toolbox/RadialToolboxMenu.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/RadialToolboxMenu.java index 208d960ed0..ad889338fd 100644 --- a/src/main/java/com/simibubi/create/content/equipment/toolbox/RadialToolboxMenu.java +++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/RadialToolboxMenu.java @@ -20,9 +20,9 @@ import com.simibubi.create.foundation.utility.CreateLang; import dev.engine_room.flywheel.lib.transform.TransformStack; import net.createmod.catnip.gui.AbstractSimiScreen; import net.createmod.catnip.gui.element.GuiGameElement; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.math.AngleHelper; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.math.AngleHelper; +import net.createmod.catnip.theme.Color; import net.minecraft.ChatFormatting; import net.minecraft.client.KeyMapping; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolBoxVisual.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolBoxVisual.java index c661193f2d..75efd8229b 100644 --- a/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolBoxVisual.java +++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolBoxVisual.java @@ -13,7 +13,7 @@ import dev.engine_room.flywheel.lib.instance.TransformedInstance; import dev.engine_room.flywheel.lib.model.Models; import dev.engine_room.flywheel.lib.visual.AbstractBlockEntityVisual; import dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.core.Direction; public class ToolBoxVisual extends AbstractBlockEntityVisual implements SimpleDynamicVisual { diff --git a/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxBlockEntity.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxBlockEntity.java index 4de9584947..9dd62368ca 100644 --- a/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxBlockEntity.java @@ -18,9 +18,9 @@ import com.simibubi.create.foundation.blockEntity.behaviour.animatedContainer.An import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.utility.ResetableLazy; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.core.component.DataComponents; diff --git a/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxHandler.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxHandler.java index 41f5e505ed..8cc01c924e 100644 --- a/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxHandler.java +++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxHandler.java @@ -8,7 +8,7 @@ import com.simibubi.create.foundation.networking.ISyncPersistentData.PersistentD import com.simibubi.create.infrastructure.config.AllConfigs; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.WorldAttached; +import net.createmod.catnip.data.WorldAttached; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtUtils; diff --git a/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxInventory.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxInventory.java index c477cf71d2..7475a1a23d 100644 --- a/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxInventory.java +++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxInventory.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull; import com.simibubi.create.AllDataComponents; import com.simibubi.create.AllItems; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.HolderLookup; import net.minecraft.core.component.DataComponents; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxRenderer.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxRenderer.java index 137d11beb0..1a61d5bade 100644 --- a/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxRenderer.java +++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxRenderer.java @@ -7,7 +7,7 @@ import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRende import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; diff --git a/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxScreen.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxScreen.java index 3de37be46c..72e8f85797 100644 --- a/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxScreen.java +++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxScreen.java @@ -17,7 +17,7 @@ import com.simibubi.create.foundation.utility.CreateLang; import dev.engine_room.flywheel.lib.transform.TransformStack; import net.createmod.catnip.gui.element.GuiGameElement; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.Rect2i; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/simibubi/create/content/equipment/wrench/IWrenchable.java b/src/main/java/com/simibubi/create/content/equipment/wrench/IWrenchable.java index 261da7083b..69869fa158 100644 --- a/src/main/java/com/simibubi/create/content/equipment/wrench/IWrenchable.java +++ b/src/main/java/com/simibubi/create/content/equipment/wrench/IWrenchable.java @@ -9,7 +9,7 @@ import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock; import com.simibubi.create.content.kinetics.base.KineticBlockEntity; import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock; -import net.createmod.catnip.utility.VoxelShaper; +import net.createmod.catnip.math.VoxelShaper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/com/simibubi/create/content/equipment/wrench/WrenchItem.java b/src/main/java/com/simibubi/create/content/equipment/wrench/WrenchItem.java index 4b0e50e7f7..15fe2ebfb8 100644 --- a/src/main/java/com/simibubi/create/content/equipment/wrench/WrenchItem.java +++ b/src/main/java/com/simibubi/create/content/equipment/wrench/WrenchItem.java @@ -1,14 +1,11 @@ package com.simibubi.create.content.equipment.wrench; -import java.util.function.Consumer; - import javax.annotation.Nonnull; import com.simibubi.create.AllItems; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.AllTags; import com.simibubi.create.Create; -import com.simibubi.create.foundation.item.render.SimpleCustomRenderer; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; @@ -22,9 +19,7 @@ import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.api.distmarker.OnlyIn; -import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions; + import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; public class WrenchItem extends Item { @@ -89,11 +84,4 @@ public class WrenchItem extends Item { AbstractMinecart minecart = (AbstractMinecart) target; minecart.hurt(minecart.damageSources().playerAttack(player), 100); } - - @Override - @OnlyIn(Dist.CLIENT) - public void initializeClient(Consumer consumer) { - consumer.accept(SimpleCustomRenderer.create(this, new WrenchItemRenderer())); - } - } diff --git a/src/main/java/com/simibubi/create/content/equipment/wrench/WrenchItemRenderer.java b/src/main/java/com/simibubi/create/content/equipment/wrench/WrenchItemRenderer.java index 67aff52b40..93561881fa 100644 --- a/src/main/java/com/simibubi/create/content/equipment/wrench/WrenchItemRenderer.java +++ b/src/main/java/com/simibubi/create/content/equipment/wrench/WrenchItemRenderer.java @@ -9,7 +9,7 @@ import com.simibubi.create.foundation.item.render.CustomRenderedItemModelRendere import com.simibubi.create.foundation.item.render.PartialItemModelRenderer; import dev.engine_room.flywheel.lib.model.baked.PartialModel; -import net.createmod.catnip.utility.AnimationTickHolder; +import net.createmod.catnip.animation.AnimationTickHolder; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/content/equipment/zapper/PlacementPatterns.java b/src/main/java/com/simibubi/create/content/equipment/zapper/PlacementPatterns.java index bf30fadbd5..3ea2227bc4 100644 --- a/src/main/java/com/simibubi/create/content/equipment/zapper/PlacementPatterns.java +++ b/src/main/java/com/simibubi/create/content/equipment/zapper/PlacementPatterns.java @@ -9,7 +9,7 @@ import com.mojang.serialization.Codec; import com.simibubi.create.AllDataComponents; import com.simibubi.create.foundation.gui.AllIcons; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperItem.java b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperItem.java index a42a5d2d03..75478d195e 100644 --- a/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperItem.java +++ b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperItem.java @@ -14,8 +14,8 @@ import com.simibubi.create.foundation.item.CustomArmPoseItem; import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.CreateLang; +import net.createmod.catnip.nbt.NBTProcessors; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.NBTProcessors; import net.minecraft.ChatFormatting; import net.minecraft.client.model.HumanoidModel.ArmPose; import net.minecraft.client.player.AbstractClientPlayer; @@ -42,6 +42,7 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; diff --git a/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperRenderHandler.java b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperRenderHandler.java index 118ca2b2dc..43af3b4ff5 100644 --- a/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperRenderHandler.java +++ b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperRenderHandler.java @@ -9,7 +9,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import com.simibubi.create.AllSoundEvents; -import net.createmod.catnip.CatnipClient; +import net.createmod.catnip.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.particles.ParticleTypes; @@ -38,7 +38,7 @@ public class ZapperRenderHandler extends ShootableGadgetRenderHandler { return; cachedBeams.forEach(beam -> { - CatnipClient.OUTLINER.endChasingLine(beam, beam.start, beam.end, 1 - beam.itensity, false) + Outliner.getInstance().endChasingLine(beam, beam.start, beam.end, 1 - beam.itensity, false) .disableLineNormals() .colored(0xffffff) .lineWidth(beam.itensity * 1 / 8f); diff --git a/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperScreen.java b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperScreen.java index 686fb6b244..344746d6af 100644 --- a/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperScreen.java +++ b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperScreen.java @@ -13,8 +13,8 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.gui.AbstractSimiScreen; import net.createmod.catnip.gui.element.GuiGameElement; +import net.createmod.catnip.lang.Components; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.lang.Components; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; diff --git a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/CylinderBrush.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/CylinderBrush.java index 51c5008984..8dfec4faf6 100644 --- a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/CylinderBrush.java +++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/CylinderBrush.java @@ -10,7 +10,7 @@ import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.AxisDirection; diff --git a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/PlacementOptions.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/PlacementOptions.java index ad984dc2ca..3cff69de17 100644 --- a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/PlacementOptions.java +++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/PlacementOptions.java @@ -3,7 +3,7 @@ package com.simibubi.create.content.equipment.zapper.terrainzapper; import com.mojang.serialization.Codec; import com.simibubi.create.foundation.gui.AllIcons; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import com.simibubi.create.infrastructure.codec.CreateStreamCodecs; diff --git a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/SphereBrush.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/SphereBrush.java index 995afd4544..560deb3278 100644 --- a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/SphereBrush.java +++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/SphereBrush.java @@ -7,7 +7,7 @@ import java.util.stream.Collectors; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/TerrainBrushes.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/TerrainBrushes.java index 2f48fe927c..2f48deabad 100644 --- a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/TerrainBrushes.java +++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/TerrainBrushes.java @@ -4,9 +4,9 @@ import org.jetbrains.annotations.NotNull; import com.mojang.serialization.Codec; -import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import io.netty.buffer.ByteBuf; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; +import net.createmod.catnip.lang.Lang; import net.minecraft.network.codec.StreamCodec; import net.minecraft.util.StringRepresentable; diff --git a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/TerrainTools.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/TerrainTools.java index 2987a17a99..2afa3833d6 100644 --- a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/TerrainTools.java +++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/TerrainTools.java @@ -8,7 +8,7 @@ import com.mojang.serialization.Codec; import com.simibubi.create.content.equipment.zapper.ZapperItem; import com.simibubi.create.foundation.gui.AllIcons; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperItem.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperItem.java index 55619abba7..caed52d64b 100644 --- a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperItem.java +++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperItem.java @@ -2,12 +2,10 @@ package com.simibubi.create.content.equipment.zapper.terrainzapper; import java.util.ArrayList; import java.util.List; -import java.util.function.Consumer; import com.simibubi.create.AllDataComponents; import com.simibubi.create.content.equipment.zapper.PlacementPatterns; import com.simibubi.create.content.equipment.zapper.ZapperItem; -import com.simibubi.create.foundation.item.render.SimpleCustomRenderer; import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.gui.ScreenOpener; @@ -20,9 +18,9 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; -import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions; public class WorldshaperItem extends ZapperItem { @@ -89,11 +87,4 @@ public class WorldshaperItem extends ZapperItem { stack.set(AllDataComponents.SHAPER_TOOL, tool); stack.set(AllDataComponents.SHAPER_PLACEMENT_OPTIONS, placement); } - - @Override - @OnlyIn(Dist.CLIENT) - public void initializeClient(Consumer consumer) { - consumer.accept(SimpleCustomRenderer.create(this, new WorldshaperItemRenderer())); - } - } diff --git a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperItemRenderer.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperItemRenderer.java index db63100636..336a3b71c3 100644 --- a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperItemRenderer.java +++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperItemRenderer.java @@ -10,7 +10,7 @@ import com.simibubi.create.foundation.item.render.CustomRenderedItemModel; import com.simibubi.create.foundation.item.render.PartialItemModelRenderer; import dev.engine_room.flywheel.lib.model.baked.PartialModel; -import net.createmod.catnip.utility.AnimationTickHolder; +import net.createmod.catnip.animation.AnimationTickHolder; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.LightTexture; diff --git a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperRenderHandler.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperRenderHandler.java index 8dd5525c73..d3ebcba3b5 100644 --- a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperRenderHandler.java +++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperRenderHandler.java @@ -8,8 +8,8 @@ import com.simibubi.create.AllDataComponents; import com.simibubi.create.AllItems; import com.simibubi.create.AllSpecialTextures; -import net.createmod.catnip.CatnipClient; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.BlockPos; @@ -32,7 +32,7 @@ public class WorldshaperRenderHandler { if (renderedPositions == null) return; - CatnipClient.OUTLINER.showCluster("terrainZapper", renderedPositions.get()) + Outliner.getInstance().showCluster("terrainZapper", renderedPositions.get()) .colored(0xbfbfbf) .disableLineNormals() .lineWidth(1 / 32f) diff --git a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperScreen.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperScreen.java index 9a829d1783..40ab2c5d48 100644 --- a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperScreen.java +++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperScreen.java @@ -16,7 +16,7 @@ import com.simibubi.create.foundation.gui.widget.ScrollInput; import com.simibubi.create.foundation.gui.widget.SelectionScrollInput; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/simibubi/create/content/fluids/FlowSource.java b/src/main/java/com/simibubi/create/content/fluids/FlowSource.java index 8036feefaa..6c2d3a6905 100644 --- a/src/main/java/com/simibubi/create/content/fluids/FlowSource.java +++ b/src/main/java/com/simibubi/create/content/fluids/FlowSource.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable; import com.simibubi.create.foundation.ICapabilityProvider; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import net.createmod.catnip.utility.BlockFace; +import net.createmod.catnip.math.BlockFace; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/com/simibubi/create/content/fluids/FluidBottleItemHook.java b/src/main/java/com/simibubi/create/content/fluids/FluidBottleItemHook.java index e8414ee956..553f4359ca 100644 --- a/src/main/java/com/simibubi/create/content/fluids/FluidBottleItemHook.java +++ b/src/main/java/com/simibubi/create/content/fluids/FluidBottleItemHook.java @@ -2,7 +2,7 @@ package com.simibubi.create.content.fluids; import com.simibubi.create.Create; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.core.BlockPos; import net.minecraft.tags.FluidTags; import net.minecraft.world.InteractionResult; diff --git a/src/main/java/com/simibubi/create/content/fluids/FluidFX.java b/src/main/java/com/simibubi/create/content/fluids/FluidFX.java index 4db7ea57ca..7cc95f941d 100644 --- a/src/main/java/com/simibubi/create/content/fluids/FluidFX.java +++ b/src/main/java/com/simibubi/create/content/fluids/FluidFX.java @@ -4,7 +4,7 @@ import com.simibubi.create.AllParticleTypes; import com.simibubi.create.content.fluids.particle.FluidParticleData; import com.simibubi.create.foundation.fluid.FluidHelper; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/fluids/FluidNetwork.java b/src/main/java/com/simibubi/create/content/fluids/FluidNetwork.java index 965c35418f..f49c7caae2 100644 --- a/src/main/java/com/simibubi/create/content/fluids/FluidNetwork.java +++ b/src/main/java/com/simibubi/create/content/fluids/FluidNetwork.java @@ -19,9 +19,9 @@ import com.simibubi.create.foundation.ICapabilityProvider; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.fluid.FluidHelper; -import net.createmod.catnip.utility.BlockFace; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.math.BlockFace; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.data.Pair; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/simibubi/create/content/fluids/FluidPropagator.java b/src/main/java/com/simibubi/create/content/fluids/FluidPropagator.java index f9e7798a12..f7df776094 100644 --- a/src/main/java/com/simibubi/create/content/fluids/FluidPropagator.java +++ b/src/main/java/com/simibubi/create/content/fluids/FluidPropagator.java @@ -21,8 +21,8 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.data.Pair; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/fluids/FluidTransportBehaviour.java b/src/main/java/com/simibubi/create/content/fluids/FluidTransportBehaviour.java index 2780bca7b1..be66a8ef6d 100644 --- a/src/main/java/com/simibubi/create/content/fluids/FluidTransportBehaviour.java +++ b/src/main/java/com/simibubi/create/content/fluids/FluidTransportBehaviour.java @@ -15,8 +15,8 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.WorldAttached; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.data.WorldAttached; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/simibubi/create/content/fluids/OpenEndedPipe.java b/src/main/java/com/simibubi/create/content/fluids/OpenEndedPipe.java index 6e6cf0e40b..8ac39f12a1 100644 --- a/src/main/java/com/simibubi/create/content/fluids/OpenEndedPipe.java +++ b/src/main/java/com/simibubi/create/content/fluids/OpenEndedPipe.java @@ -17,7 +17,7 @@ import com.simibubi.create.foundation.fluid.FluidHelper; import com.simibubi.create.foundation.mixin.accessor.FlowingFluidAccessor; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.BlockFace; +import net.createmod.catnip.math.BlockFace; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/simibubi/create/content/fluids/PipeAttachmentModel.java b/src/main/java/com/simibubi/create/content/fluids/PipeAttachmentModel.java index 1553c6cc0a..9b2f02c378 100644 --- a/src/main/java/com/simibubi/create/content/fluids/PipeAttachmentModel.java +++ b/src/main/java/com/simibubi/create/content/fluids/PipeAttachmentModel.java @@ -14,7 +14,7 @@ import com.simibubi.create.content.fluids.pipes.FluidPipeBlock; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.model.BakedModelWrapperWithData; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/simibubi/create/content/fluids/PipeConnection.java b/src/main/java/com/simibubi/create/content/fluids/PipeConnection.java index a5792ef7a6..142979dae6 100644 --- a/src/main/java/com/simibubi/create/content/fluids/PipeConnection.java +++ b/src/main/java/com/simibubi/create/content/fluids/PipeConnection.java @@ -9,11 +9,11 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import com.simibubi.create.foundation.utility.DistExecutor; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.BlockFace; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.animation.LerpedFloat; +import net.createmod.catnip.math.BlockFace; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.animation.LerpedFloat; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainBlockEntity.java b/src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainBlockEntity.java index ac08060ba7..46dd68e5dd 100644 --- a/src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainBlockEntity.java @@ -15,9 +15,9 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour; import com.simibubi.create.foundation.utility.BlockHelper; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainRenderer.java b/src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainRenderer.java index 7c2183a42b..b145518a7e 100644 --- a/src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainRenderer.java +++ b/src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainRenderer.java @@ -13,7 +13,7 @@ import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRende import com.simibubi.create.foundation.fluid.FluidRenderer; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; @@ -150,7 +150,7 @@ public class ItemDrainRenderer extends SmartBlockEntityRenderer { FluidRenderer.renderFluidBox(fluidStack.getFluid(), fluidStack.getAmount(), min, min - yOffset, min, max, min, max, - buffer, ms, light, false, true, fluidStack.getComponents()); + buffer, ms, light, false, true, fluidStack.getComponentsPatch()); ms.popPose(); } @@ -69,7 +69,7 @@ public class SpoutRenderer extends SafeBlockEntityRenderer { radius = (float) (Math.pow(((2 * processingProgress) - 1), 2) - 1); AABB bb = new AABB(0.5, .5, 0.5, 0.5, -1.2, 0.5).inflate(radius / 32f); FluidRenderer.renderFluidBox(fluidStack.getFluid(), fluidStack.getAmount(), (float) bb.minX, (float) bb.minY, (float) bb.minZ, - (float) bb.maxX, (float) bb.maxY, (float) bb.maxZ, buffer, ms, light, true, true, fluidStack.getComponents()); + (float) bb.maxX, (float) bb.maxY, (float) bb.maxZ, buffer, ms, light, true, true, fluidStack.getComponentsPatch()); } float squeeze = radius; diff --git a/src/main/java/com/simibubi/create/content/fluids/tank/BoilerData.java b/src/main/java/com/simibubi/create/content/fluids/tank/BoilerData.java index a4f35c2b8f..f645f7f906 100644 --- a/src/main/java/com/simibubi/create/content/fluids/tank/BoilerData.java +++ b/src/main/java/com/simibubi/create/content/fluids/tank/BoilerData.java @@ -20,10 +20,10 @@ import com.simibubi.create.foundation.fluid.FluidHelper; import com.simibubi.create.foundation.utility.CreateLang; import joptsimple.internal.Strings; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlock.java b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlock.java index 53c71b4485..300f3abbd3 100644 --- a/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlock.java +++ b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlock.java @@ -12,7 +12,7 @@ import com.simibubi.create.foundation.blockEntity.ComparatorUtil; import com.simibubi.create.foundation.fluid.FluidHelper; import com.simibubi.create.foundation.fluid.FluidHelper.FluidExchange; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.BlockParticleOption; diff --git a/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlockEntity.java b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlockEntity.java index 0ea3ad996c..09c253b119 100644 --- a/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlockEntity.java @@ -18,9 +18,8 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import com.simibubi.create.foundation.fluid.SmartFluidTank; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; @@ -130,7 +129,7 @@ public class FluidTankBlockEntity extends SmartBlockEntity implements IHaveGoggl if (isController()) boiler.tick(this); } - + @Override public void lazyTick() { super.lazyTick(); diff --git a/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankModel.java b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankModel.java index f18577b0b1..9d9a0fec72 100644 --- a/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankModel.java +++ b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankModel.java @@ -10,7 +10,7 @@ import com.simibubi.create.api.connectivity.ConnectivityHandler; import com.simibubi.create.foundation.block.connected.CTModel; import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.resources.model.BakedModel; diff --git a/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankRenderer.java b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankRenderer.java index 3e52cfbbea..954621fa22 100644 --- a/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankRenderer.java +++ b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankRenderer.java @@ -8,8 +8,8 @@ import com.simibubi.create.foundation.fluid.FluidRenderer; import dev.engine_room.flywheel.lib.transform.TransformStack; import net.createmod.catnip.render.CachedBuffers; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.animation.LerpedFloat; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.animation.LerpedFloat; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; @@ -74,7 +74,7 @@ public class FluidTankRenderer extends SafeBlockEntityRenderer extends Sa } public static float getAngleForBe(KineticBlockEntity be, final BlockPos pos, Axis axis) { - float time = LevelTickHolder.getRenderTime(be.getLevel()); + float time = AnimationTickHolder.getRenderTime(be.getLevel()); float offset = getRotationOffsetForPosition(be, pos, axis); float angle = ((time * be.getSpeed() * 3f / 10 + offset) % 360) / 180 * (float) Math.PI; return angle; diff --git a/src/main/java/com/simibubi/create/content/kinetics/base/KineticEffectHandler.java b/src/main/java/com/simibubi/create/content/kinetics/base/KineticEffectHandler.java index c2e18dc8ae..a6c371153e 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/base/KineticEffectHandler.java +++ b/src/main/java/com/simibubi/create/content/kinetics/base/KineticEffectHandler.java @@ -2,7 +2,7 @@ package com.simibubi.create.content.kinetics.base; import com.simibubi.create.content.kinetics.base.IRotate.SpeedLevel; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction.Axis; import net.minecraft.core.particles.ParticleOptions; diff --git a/src/main/java/com/simibubi/create/content/kinetics/base/RotatedPillarKineticBlock.java b/src/main/java/com/simibubi/create/content/kinetics/base/RotatedPillarKineticBlock.java index 68f0b5c34c..f56a793d85 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/base/RotatedPillarKineticBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/base/RotatedPillarKineticBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.kinetics.base; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.world.item.context.BlockPlaceContext; diff --git a/src/main/java/com/simibubi/create/content/kinetics/base/RotatingInstance.java b/src/main/java/com/simibubi/create/content/kinetics/base/RotatingInstance.java index 3771cc828c..58d88e0ada 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/base/RotatingInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/base/RotatingInstance.java @@ -6,7 +6,7 @@ import org.joml.Vector3f; import dev.engine_room.flywheel.api.instance.InstanceHandle; import dev.engine_room.flywheel.api.instance.InstanceType; import dev.engine_room.flywheel.lib.instance.ColoredLitInstance; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.theme.Color; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.core.Vec3i; diff --git a/src/main/java/com/simibubi/create/content/kinetics/base/RotationIndicatorParticle.java b/src/main/java/com/simibubi/create/content/kinetics/base/RotationIndicatorParticle.java index fb5b894d47..66eeaad9d6 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/base/RotationIndicatorParticle.java +++ b/src/main/java/com/simibubi/create/content/kinetics/base/RotationIndicatorParticle.java @@ -3,9 +3,9 @@ package com.simibubi.create.content.kinetics.base; import com.mojang.blaze3d.vertex.VertexConsumer; import com.simibubi.create.content.equipment.goggles.GogglesItem; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.theme.Color; -import net.createmod.ponder.utility.LevelTickHolder; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.theme.Color; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; @@ -67,7 +67,7 @@ public class RotationIndicatorParticle extends SimpleAnimatedParticle { } public void move(double x, double y, double z) { - float time = LevelTickHolder.getTicks(level); + float time = AnimationTickHolder.getTicks(level); float angle = (float) ((time * speed) % 360) - (speed / 2 * age * (((float) age) / lifetime)); if (speed < 0 && axis.isVertical()) angle += 180; diff --git a/src/main/java/com/simibubi/create/content/kinetics/base/ShaftVisual.java b/src/main/java/com/simibubi/create/content/kinetics/base/ShaftVisual.java index 58f21a5610..1d2c036088 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/base/ShaftVisual.java +++ b/src/main/java/com/simibubi/create/content/kinetics/base/ShaftVisual.java @@ -4,7 +4,6 @@ import com.simibubi.create.AllPartialModels; import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.lib.model.Models; -import net.minecraft.core.Direction; public class ShaftVisual extends SingleAxisRotatingVisual { public ShaftVisual(VisualizationContext context, T blockEntity, float partialTick) { diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlock.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlock.java index 5d3f51c8b9..1bb5dbb4cb 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlock.java @@ -5,7 +5,6 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Set; -import java.util.function.Consumer; import org.apache.commons.lang3.mutable.MutableBoolean; @@ -36,8 +35,8 @@ import com.simibubi.create.foundation.block.render.MultiPosDestructionHandler; import com.simibubi.create.foundation.block.render.ReducedDestroyEffects; import com.simibubi.create.foundation.item.ItemHelper; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -89,10 +88,8 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.EntityCollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.api.distmarker.OnlyIn; + import net.neoforged.neoforge.capabilities.Capabilities; -import net.neoforged.neoforge.client.extensions.common.IClientBlockExtensions; import net.neoforged.neoforge.common.Tags; import net.neoforged.neoforge.items.IItemHandler; @@ -111,11 +108,6 @@ public class BeltBlock extends HorizontalKineticBlock .setValue(WATERLOGGED, false)); } - @OnlyIn(Dist.CLIENT) - public void initializeClient(Consumer consumer) { - consumer.accept(new RenderProperties()); - } - @Override protected boolean areStatesKineticallyEquivalent(BlockState oldState, BlockState newState) { return super.areStatesKineticallyEquivalent(oldState, newState) diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlockEntity.java index d2f7b53dd1..e7fe3ea17a 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlockEntity.java @@ -29,7 +29,7 @@ import com.simibubi.create.content.logistics.tunnel.BrassTunnelBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.inventory.VersionedInventoryTrackerBehaviour; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltHelper.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltHelper.java index 197ff8dfea..afe3c33d70 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltHelper.java +++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltHelper.java @@ -5,7 +5,7 @@ import java.util.Map; import com.simibubi.create.AllTags.AllItemTags; import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Vec3i; import net.minecraft.server.packs.resources.ResourceManagerReloadListener; diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltPart.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltPart.java index d0228742b2..370245ea12 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltPart.java +++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltPart.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.kinetics.belt; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.minecraft.util.StringRepresentable; public enum BeltPart implements StringRepresentable { diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltRenderer.java index d0bf158d92..68c10ce112 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltRenderer.java +++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltRenderer.java @@ -19,13 +19,13 @@ import com.simibubi.create.foundation.render.ShadowRenderHelper; import dev.engine_room.flywheel.api.visualization.VisualizationManager; import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.transform.TransformStack; +import net.createmod.catnip.animation.AnimationTickHolder; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SpriteShiftEntry; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.levelWrappers.WrappedLevel; -import net.createmod.catnip.utility.math.AngleHelper; -import net.createmod.ponder.utility.LevelTickHolder; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.levelWrappers.WrappedLevel; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.MultiBufferSource; @@ -79,7 +79,7 @@ public class BeltRenderer extends SafeBlockEntityRenderer { PoseStack localTransforms = new PoseStack(); var msr = TransformStack.of(localTransforms); VertexConsumer vb = buffer.getBuffer(RenderType.solid()); - float renderTick = LevelTickHolder.getRenderTime(be.getLevel()); + float renderTick = AnimationTickHolder.getRenderTime(be.getLevel()); msr.center() .rotateYDegrees(AngleHelper.horizontalAngle(facing) + (upward ? 180 : 0) + (sideways ? 270 : 0)) diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltShapes.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltShapes.java index 634bef5d80..44b1201c8d 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltShapes.java +++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltShapes.java @@ -7,7 +7,7 @@ import java.util.Map; import com.simibubi.create.AllShapes; -import net.createmod.catnip.utility.VoxelShaper; +import net.createmod.catnip.math.VoxelShaper; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlicer.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlicer.java index f008befdd3..d538519742 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlicer.java +++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlicer.java @@ -15,9 +15,9 @@ import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack; import com.simibubi.create.foundation.block.ProperWaterloggedBlock; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.CatnipClient; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.outliner.Outliner; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; @@ -41,6 +41,7 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; @@ -480,7 +481,7 @@ public class BeltSlicer { mc.player.displayClientMessage(Components.immutableEmpty(), true); if (feedback.bb != null) - CatnipClient.OUTLINER.chaseAABB("BeltSlicer", feedback.bb) + Outliner.getInstance().chaseAABB("BeltSlicer", feedback.bb) .lineWidth(1 / 16f) .colored(feedback.color); } diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlope.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlope.java index 5f60199ca4..bd45112741 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlope.java +++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlope.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.kinetics.belt; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.minecraft.util.StringRepresentable; public enum BeltSlope implements StringRepresentable { diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltVisual.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltVisual.java index 75f8035df8..8acd974f25 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltVisual.java +++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltVisual.java @@ -19,7 +19,7 @@ import dev.engine_room.flywheel.lib.model.Models; import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.transform.TransformStack; import net.createmod.catnip.render.SpriteShiftEntry; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.core.Direction; import net.minecraft.util.Mth; import net.minecraft.world.item.DyeColor; diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/behaviour/TransportedItemStackHandlerBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/belt/behaviour/TransportedItemStackHandlerBehaviour.java index b4bf8ff885..2ca9d68cdb 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/belt/behaviour/TransportedItemStackHandlerBehaviour.java +++ b/src/main/java/com/simibubi/create/content/kinetics/belt/behaviour/TransportedItemStackHandlerBehaviour.java @@ -11,7 +11,7 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.world.item.ItemStack; import net.minecraft.world.phys.Vec3; diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/item/BeltConnectorItem.java b/src/main/java/com/simibubi/create/content/kinetics/belt/item/BeltConnectorItem.java index 309d83460b..ac5265d8e5 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/belt/item/BeltConnectorItem.java +++ b/src/main/java/com/simibubi/create/content/kinetics/belt/item/BeltConnectorItem.java @@ -17,7 +17,7 @@ import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.block.ProperWaterloggedBlock; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltTunnelInteractionHandler.java b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltTunnelInteractionHandler.java index 6c2087f8d6..18335dd536 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltTunnelInteractionHandler.java +++ b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltTunnelInteractionHandler.java @@ -14,7 +14,7 @@ import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlock; import com.simibubi.create.content.redstone.displayLink.source.AccumulatedItemCountDisplaySource; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorBlockEntity.java index b13365a747..790ea7a437 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorBlockEntity.java @@ -30,10 +30,10 @@ import com.simibubi.create.infrastructure.config.AllConfigs; import dev.engine_room.flywheel.api.visualization.VisualizationManager; import net.createmod.catnip.codecs.CatnipCodecUtils; import net.createmod.catnip.codecs.CatnipCodecs; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction.Axis; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorConnectionHandler.java b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorConnectionHandler.java index bc728df4d7..cf5c7df45a 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorConnectionHandler.java +++ b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorConnectionHandler.java @@ -7,9 +7,9 @@ import net.createmod.catnip.platform.CatnipServices; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.CatnipClient; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.outliner.Outliner; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; @@ -31,6 +31,7 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.HitResult.Type; import net.minecraft.world.phys.Vec3; + import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; @@ -190,10 +191,10 @@ public class ChainConveyorConnectionHandler { .normalize() .scale(.875); - CatnipClient.OUTLINER.showLine("chain_connect_line", from.add(normal), to.add(normal)) + Outliner.getInstance().showLine("chain_connect_line", from.add(normal), to.add(normal)) .lineWidth(1 / 16f) .colored(color); - CatnipClient.OUTLINER.showLine("chain_connect_line_1", from.subtract(normal), to.subtract(normal)) + Outliner.getInstance().showLine("chain_connect_line_1", from.subtract(normal), to.subtract(normal)) .lineWidth(1 / 16f) .colored(color); @@ -206,7 +207,7 @@ public class ChainConveyorConnectionHandler { for (int i = 0; i < 8; i++) { Vec3 v = VecHelper.rotate(new Vec3(0, .125 + y * .75, 1.25), 22.5 + i * 45, Axis.Y) .add(Vec3.atBottomCenterOf(pos)); - CatnipClient.OUTLINER.showLine(key + y + i, prevV, v) + Outliner.getInstance().showLine(key + y + i, prevV, v) .lineWidth(1 / 16f) .colored(color); prevV = v; diff --git a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorInteractionHandler.java b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorInteractionHandler.java index 0b175000fa..6ae6e3b191 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorInteractionHandler.java +++ b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorInteractionHandler.java @@ -14,10 +14,10 @@ import com.simibubi.create.content.logistics.packagePort.PackagePortTargetSelect import com.simibubi.create.foundation.utility.RaycastHelper; import com.simibubi.create.foundation.utility.TickBasedCache; -import net.createmod.catnip.CatnipClient; +import net.createmod.catnip.data.WorldAttached; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.WorldAttached; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.outliner.Outliner; +import net.createmod.catnip.theme.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -27,6 +27,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; + import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; @@ -102,7 +103,7 @@ public class ChainConveyorInteractionHandler { selectedBakedPosition = bestShape.getVec(bestLift, selectedChainPosition); if (!isWrench) { - CatnipClient.OUTLINER + Outliner.getInstance() .chaseAABB("ChainPointSelection", new AABB(selectedBakedPosition, selectedBakedPosition)) .colored(Color.WHITE) .lineWidth(1 / 6f) diff --git a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorPackage.java b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorPackage.java index a46fe12a11..741272be10 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorPackage.java +++ b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorPackage.java @@ -7,8 +7,8 @@ import java.util.concurrent.atomic.AtomicInteger; import com.google.common.cache.Cache; import com.simibubi.create.foundation.utility.TickBasedCache; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.WorldAttached; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.data.WorldAttached; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; @@ -25,7 +25,7 @@ public class ChainConveyorPackage { private static final int ticksUntilExpired = 30; public static final WorldAttached> physicsDataCache = new WorldAttached<>($ -> new TickBasedCache<>(ticksUntilExpired, true)); - + public class ChainConveyorPackagePhysicsData { public Vec3 targetPos; public Vec3 prevTargetPos; diff --git a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorRenderer.java index c1497c2c76..8f409d0bdb 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorRenderer.java +++ b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorRenderer.java @@ -3,6 +3,8 @@ package com.simibubi.create.content.kinetics.chainConveyor; import java.util.List; import java.util.Map.Entry; +import net.createmod.catnip.animation.AnimationTickHolder; + import org.joml.Matrix4f; import com.mojang.blaze3d.vertex.PoseStack; @@ -18,9 +20,8 @@ import dev.engine_room.flywheel.api.visualization.VisualizationManager; import dev.engine_room.flywheel.lib.transform.TransformStack; import net.createmod.catnip.render.CachedBuffers; 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.createmod.catnip.math.VecHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; @@ -128,7 +129,7 @@ public class ChainConveyorRenderer extends KineticBlockEntityRenderer 0) speed = Mth.clamp(speed, 80, 64 * 20); diff --git a/src/main/java/com/simibubi/create/content/kinetics/fan/NozzleBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/fan/NozzleBlockEntity.java index 7f3f86bd87..6f2cfca429 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/fan/NozzleBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/fan/NozzleBlockEntity.java @@ -8,7 +8,7 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.core.particles.ParticleTypes; diff --git a/src/main/java/com/simibubi/create/content/kinetics/fan/processing/AllFanProcessingTypes.java b/src/main/java/com/simibubi/create/content/kinetics/fan/processing/AllFanProcessingTypes.java index 8021102e94..2b967150b6 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/fan/processing/AllFanProcessingTypes.java +++ b/src/main/java/com/simibubi/create/content/kinetics/fan/processing/AllFanProcessingTypes.java @@ -19,8 +19,8 @@ import com.simibubi.create.foundation.damageTypes.CreateDamageSources; import com.simibubi.create.foundation.recipe.RecipeApplier; import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.theme.Color; import net.minecraft.core.BlockPos; import net.minecraft.core.RegistryAccess; import net.minecraft.core.component.DataComponents; diff --git a/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelBlockEntity.java index 40698fb99e..14df46f35d 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelBlockEntity.java @@ -2,8 +2,8 @@ package com.simibubi.create.content.kinetics.flywheel; import com.simibubi.create.content.kinetics.base.KineticBlockEntity; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelRenderer.java index ef58578cc1..ba9bfbf2f8 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelRenderer.java +++ b/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelRenderer.java @@ -7,7 +7,7 @@ import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; import dev.engine_room.flywheel.api.visualization.VisualizationManager; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; diff --git a/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelVisual.java b/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelVisual.java index a530402f5b..9a8449f478 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelVisual.java +++ b/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelVisual.java @@ -17,7 +17,7 @@ import dev.engine_room.flywheel.lib.instance.InstanceTypes; import dev.engine_room.flywheel.lib.instance.TransformedInstance; import dev.engine_room.flywheel.lib.model.Models; 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; public class FlywheelVisual extends KineticBlockEntityVisual implements SimpleDynamicVisual { diff --git a/src/main/java/com/simibubi/create/content/kinetics/gantry/GantryShaftBlock.java b/src/main/java/com/simibubi/create/content/kinetics/gantry/GantryShaftBlock.java index 1214abfe7f..44afafce27 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/gantry/GantryShaftBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/gantry/GantryShaftBlock.java @@ -12,11 +12,11 @@ import com.simibubi.create.content.kinetics.base.KineticBlockEntity; import com.simibubi.create.foundation.block.IBE; import com.simibubi.create.foundation.placement.PoleHelper; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.lang.Lang; -import net.createmod.catnip.utility.placement.IPlacementHelper; -import net.createmod.catnip.utility.placement.PlacementHelpers; -import net.createmod.catnip.utility.placement.PlacementOffset; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.lang.Lang; +import net.createmod.catnip.placement.IPlacementHelper; +import net.createmod.catnip.placement.PlacementHelpers; +import net.createmod.catnip.placement.PlacementOffset; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/kinetics/gantry/GantryShaftBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/gantry/GantryShaftBlockEntity.java index b4659fc3e2..25e7619336 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/gantry/GantryShaftBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/gantry/GantryShaftBlockEntity.java @@ -5,7 +5,7 @@ import com.simibubi.create.content.contraptions.gantry.GantryCarriageBlock; import com.simibubi.create.content.contraptions.gantry.GantryCarriageBlockEntity; import com.simibubi.create.content.kinetics.base.KineticBlockEntity; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.util.Mth; diff --git a/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeBlock.java b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeBlock.java index 0241832dd9..61985703b5 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeBlock.java @@ -7,11 +7,11 @@ import com.simibubi.create.content.kinetics.base.DirectionalAxisKineticBlock; import com.simibubi.create.content.kinetics.base.IRotate; import com.simibubi.create.foundation.block.IBE; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.lang.Lang; -import net.createmod.catnip.utility.levelWrappers.WrappedLevel; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.lang.Lang; +import net.createmod.catnip.levelWrappers.WrappedLevel; +import net.createmod.catnip.theme.Color; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeRenderer.java index a936f565da..9d23c235af 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeRenderer.java +++ b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeRenderer.java @@ -10,7 +10,7 @@ import dev.engine_room.flywheel.api.visualization.VisualizationManager; import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; diff --git a/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeShaper.java b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeShaper.java index fab8b9d149..6f9f59520c 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeShaper.java +++ b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeShaper.java @@ -4,7 +4,7 @@ import java.util.Arrays; import com.simibubi.create.AllShapes; -import net.createmod.catnip.utility.VoxelShaper; +import net.createmod.catnip.math.VoxelShaper; import net.minecraft.core.Direction; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.VoxelShape; diff --git a/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeVisual.java b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeVisual.java index ecab9bb5db..ede4ceeb6d 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeVisual.java +++ b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeVisual.java @@ -17,9 +17,9 @@ import dev.engine_room.flywheel.lib.instance.TransformedInstance; import dev.engine_room.flywheel.lib.model.Models; import dev.engine_room.flywheel.lib.transform.TransformStack; import dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; import net.minecraft.core.Direction; import net.minecraft.util.Mth; diff --git a/src/main/java/com/simibubi/create/content/kinetics/gauge/SpeedGaugeBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/gauge/SpeedGaugeBlockEntity.java index e3eaf7c80f..a1c5e06c04 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/gauge/SpeedGaugeBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/gauge/SpeedGaugeBlockEntity.java @@ -12,7 +12,7 @@ import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; import dan200.computercraft.api.peripheral.PeripheralCapability; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.theme.Color; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/simibubi/create/content/kinetics/gauge/StressGaugeBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/gauge/StressGaugeBlockEntity.java index 14f6c5927b..eea7643860 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/gauge/StressGaugeBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/gauge/StressGaugeBlockEntity.java @@ -14,8 +14,8 @@ import net.createmod.catnip.platform.CatnipServices; import com.simibubi.create.foundation.utility.CreateLang; import dan200.computercraft.api.peripheral.PeripheralCapability; -import net.createmod.catnip.utility.lang.LangBuilder; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.lang.LangBuilder; +import net.createmod.catnip.theme.Color; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxRenderer.java index 9909917d91..efb3917ddd 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxRenderer.java +++ b/src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxRenderer.java @@ -5,10 +5,10 @@ import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; import dev.engine_room.flywheel.api.visualization.VisualizationManager; +import net.createmod.catnip.animation.AnimationTickHolder; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.Iterate; -import net.createmod.ponder.utility.LevelTickHolder; +import net.createmod.catnip.data.Iterate; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; @@ -30,7 +30,7 @@ public class GearboxRenderer extends KineticBlockEntityRenderer { boolean rave = be.phase == Phase.DANCING && be.getSpeed() != 0; if (rave) { - float renderTick = LevelTickHolder.getRenderTime(be.getLevel()) + (be.hashCode() % 64); + float renderTick = AnimationTickHolder.getRenderTime(be.getLevel()) + (be.hashCode() % 64); baseAngle = (renderTick * 10) % 360; lowerArmAngle = Mth.lerp((Mth.sin(renderTick / 4) + 1) / 2, -45, 15); upperArmAngle = Mth.lerp((Mth.sin(renderTick / 8) + 1) / 4, -45, 95); diff --git a/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmVisual.java b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmVisual.java index f46c2601c1..01dfc45fc6 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmVisual.java +++ b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmVisual.java @@ -18,9 +18,9 @@ import dev.engine_room.flywheel.lib.model.Models; import dev.engine_room.flywheel.lib.transform.TransformStack; import dev.engine_room.flywheel.lib.util.RecyclingPoseStack; import dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.theme.Color; -import net.createmod.ponder.utility.LevelTickHolder; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.theme.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.core.Direction; @@ -111,7 +111,7 @@ public class ArmVisual extends SingleAxisRotatingVisual implemen } private void animateRave(float partialTick) { - var ticks = LevelTickHolder.getTicks(blockEntity.getLevel()); + var ticks = AnimationTickHolder.getTicks(blockEntity.getLevel()); float renderTick = ticks + partialTick + (blockEntity.hashCode() % 64); float baseAngle = (renderTick * 10) % 360; diff --git a/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneBlock.java b/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneBlock.java index 58bc17f544..935e893184 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneBlock.java @@ -6,7 +6,7 @@ import com.simibubi.create.content.kinetics.base.KineticBlock; import com.simibubi.create.content.kinetics.simpleRelays.ICogWheel; 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.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneBlockEntity.java index 4ce038b965..f2e3365e62 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneBlockEntity.java @@ -13,7 +13,7 @@ import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.sound.SoundScapes; import com.simibubi.create.foundation.sound.SoundScapes.AmbienceGroup; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction.Axis; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/simibubi/create/content/kinetics/mixer/MechanicalMixerBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/mixer/MechanicalMixerBlockEntity.java index 5c69b71363..395c5353b0 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/mixer/MechanicalMixerBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/mixer/MechanicalMixerBlockEntity.java @@ -19,9 +19,9 @@ import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTank import com.simibubi.create.foundation.item.SmartInventory; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction.Axis; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/simibubi/create/content/kinetics/mixer/MechanicalMixerRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/mixer/MechanicalMixerRenderer.java index 66dd0ac436..3234ab5554 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/mixer/MechanicalMixerRenderer.java +++ b/src/main/java/com/simibubi/create/content/kinetics/mixer/MechanicalMixerRenderer.java @@ -6,9 +6,9 @@ import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; import dev.engine_room.flywheel.api.visualization.VisualizationManager; +import net.createmod.catnip.animation.AnimationTickHolder; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.ponder.utility.LevelTickHolder; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; @@ -41,7 +41,7 @@ public class MechanicalMixerRenderer extends KineticBlockEntityRenderer implements SimpleDynamicVisual { diff --git a/src/main/java/com/simibubi/create/content/kinetics/press/PressingBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/press/PressingBehaviour.java index e959ea5c78..9f18f23d3e 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/press/PressingBehaviour.java +++ b/src/main/java/com/simibubi/create/content/kinetics/press/PressingBehaviour.java @@ -11,8 +11,8 @@ import com.simibubi.create.content.processing.basin.BasinBlock; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.core.particles.ItemParticleOption; diff --git a/src/main/java/com/simibubi/create/content/kinetics/saw/SawBlock.java b/src/main/java/com/simibubi/create/content/kinetics/saw/SawBlock.java index 3137a75b77..90ca33a2fd 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/saw/SawBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/saw/SawBlock.java @@ -13,9 +13,9 @@ import com.simibubi.create.content.kinetics.drill.DrillBlock; import com.simibubi.create.foundation.block.IBE; import com.simibubi.create.foundation.damageTypes.CreateDamageSources; -import net.createmod.catnip.utility.placement.IPlacementHelper; -import net.createmod.catnip.utility.placement.PlacementHelpers; -import net.createmod.catnip.utility.placement.PlacementOffset; +import net.createmod.catnip.placement.IPlacementHelper; +import net.createmod.catnip.placement.PlacementHelpers; +import net.createmod.catnip.placement.PlacementOffset; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/kinetics/saw/SawBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/saw/SawBlockEntity.java index 2c932e5bc3..26e7968439 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/saw/SawBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/saw/SawBlockEntity.java @@ -30,7 +30,7 @@ import com.simibubi.create.foundation.utility.AbstractBlockBreakQueue; import com.simibubi.create.foundation.utility.TreeCutter; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/kinetics/saw/SawFilterSlot.java b/src/main/java/com/simibubi/create/content/kinetics/saw/SawFilterSlot.java index a16eeab8bf..8afeb3f0ff 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/saw/SawFilterSlot.java +++ b/src/main/java/com/simibubi/create/content/kinetics/saw/SawFilterSlot.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.LevelAccessor; diff --git a/src/main/java/com/simibubi/create/content/kinetics/saw/SawMovementBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/saw/SawMovementBehaviour.java index bf76740602..30b1957db7 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/saw/SawMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/kinetics/saw/SawMovementBehaviour.java @@ -14,7 +14,7 @@ import com.simibubi.create.foundation.utility.TreeCutter; import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld; import dev.engine_room.flywheel.api.visualization.VisualizationContext; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/kinetics/saw/SawRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/saw/SawRenderer.java index b3029c7568..64bba8a974 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/saw/SawRenderer.java +++ b/src/main/java/com/simibubi/create/content/kinetics/saw/SawRenderer.java @@ -19,8 +19,8 @@ import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.transform.TransformStack; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/simibubi/create/content/kinetics/saw/SawVisual.java b/src/main/java/com/simibubi/create/content/kinetics/saw/SawVisual.java index d8ac3d2099..05618d2c7e 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/saw/SawVisual.java +++ b/src/main/java/com/simibubi/create/content/kinetics/saw/SawVisual.java @@ -12,7 +12,7 @@ import dev.engine_room.flywheel.api.instance.InstancerProvider; import dev.engine_room.flywheel.api.model.Model; import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.lib.model.Models; -import net.createmod.catnip.render.VirtualRenderHelper; +import net.createmod.ponder.render.VirtualRenderHelper; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntityRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntityRenderer.java index 2f035ded91..9b1cd661e2 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntityRenderer.java @@ -8,9 +8,9 @@ import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; import com.simibubi.create.content.kinetics.base.KineticBlockEntityVisual; import dev.engine_room.flywheel.api.visualization.VisualizationManager; +import net.createmod.catnip.animation.AnimationTickHolder; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.ponder.utility.LevelTickHolder; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider.Context; @@ -58,7 +58,7 @@ public class BracketedKineticBlockEntityRenderer extends KineticBlockEntityRende public static float getAngleForLargeCogShaft(SimpleKineticBlockEntity be, Axis axis) { BlockPos pos = be.getBlockPos(); float offset = getShaftAngleOffset(axis, pos); - float time = LevelTickHolder.getRenderTime(be.getLevel()); + float time = AnimationTickHolder.getRenderTime(be.getLevel()); float angle = ((time * be.getSpeed() * 3f / 10 + offset) % 360) / 180 * (float) Math.PI; return angle; } diff --git a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockModel.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockModel.java index 3c2d3c9102..3c2a2eb155 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockModel.java +++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockModel.java @@ -6,7 +6,7 @@ import java.util.List; import com.simibubi.create.content.decoration.bracket.BracketedBlockEntityBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import net.createmod.catnip.render.VirtualRenderHelper; +import net.createmod.ponder.render.VirtualRenderHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -16,6 +16,7 @@ import net.minecraft.core.Direction; import net.minecraft.util.RandomSource; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.block.state.BlockState; + import net.neoforged.neoforge.client.model.BakedModelWrapper; import net.neoforged.neoforge.client.model.data.ModelData; import net.neoforged.neoforge.client.model.data.ModelProperty; diff --git a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/CogWheelBlock.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/CogWheelBlock.java index 0d267b01ae..c3bb8b219f 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/CogWheelBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/CogWheelBlock.java @@ -9,7 +9,7 @@ import com.simibubi.create.content.kinetics.base.IRotate; import com.simibubi.create.content.kinetics.speedController.SpeedControllerBlock; import com.simibubi.create.foundation.advancement.AllAdvancements; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/CogwheelBlockItem.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/CogwheelBlockItem.java index 3df574a3a7..09abca1a46 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/CogwheelBlockItem.java +++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/CogwheelBlockItem.java @@ -11,10 +11,10 @@ import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock; import com.simibubi.create.content.kinetics.base.IRotate; import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.placement.IPlacementHelper; -import net.createmod.catnip.utility.placement.PlacementHelpers; -import net.createmod.catnip.utility.placement.PlacementOffset; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.placement.IPlacementHelper; +import net.createmod.catnip.placement.PlacementHelpers; +import net.createmod.catnip.placement.PlacementOffset; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/ShaftBlock.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/ShaftBlock.java index cb3f532f1a..f686cf0c06 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/ShaftBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/ShaftBlock.java @@ -11,9 +11,9 @@ import com.simibubi.create.content.kinetics.base.KineticBlockEntity; import com.simibubi.create.content.kinetics.steamEngine.PoweredShaftBlock; import com.simibubi.create.foundation.placement.PoleHelper; -import net.createmod.catnip.utility.placement.IPlacementHelper; -import net.createmod.catnip.utility.placement.PlacementHelpers; -import net.createmod.catnip.utility.placement.PlacementOffset; +import net.createmod.catnip.placement.IPlacementHelper; +import net.createmod.catnip.placement.PlacementHelpers; +import net.createmod.catnip.placement.PlacementOffset; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogCTBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogCTBehaviour.java index cfd78d7af0..057f3a9276 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogCTBehaviour.java +++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogCTBehaviour.java @@ -9,7 +9,7 @@ import com.simibubi.create.content.kinetics.base.IRotate; import com.simibubi.create.content.kinetics.simpleRelays.ICogWheel; import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; -import net.createmod.catnip.utility.Couple; +import net.createmod.catnip.data.Couple; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogRenderer.java index 863e134b5c..8a0461aac1 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogRenderer.java +++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogRenderer.java @@ -10,7 +10,7 @@ import com.simibubi.create.content.kinetics.simpleRelays.SimpleKineticBlockEntit import dev.engine_room.flywheel.api.visualization.VisualizationManager; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; diff --git a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogVisual.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogVisual.java index 95b81dfee7..c52605f745 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogVisual.java +++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogVisual.java @@ -20,7 +20,7 @@ import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.lib.model.Models; import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.core.Direction; import net.minecraft.core.Direction.AxisDirection; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogwheelBlock.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogwheelBlock.java index 4e220e20bd..6a8352f9ca 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogwheelBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogwheelBlock.java @@ -18,8 +18,8 @@ import com.simibubi.create.api.schematic.requirement.ISpecialBlockItemRequiremen import com.simibubi.create.content.schematics.requirement.ItemRequirement; import com.simibubi.create.foundation.block.IBE; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.VoxelShaper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VoxelShaper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/kinetics/speedController/SpeedControllerBlock.java b/src/main/java/com/simibubi/create/content/kinetics/speedController/SpeedControllerBlock.java index 05f1750ab7..2c8366df11 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/speedController/SpeedControllerBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/speedController/SpeedControllerBlock.java @@ -12,9 +12,9 @@ import com.simibubi.create.content.kinetics.simpleRelays.CogWheelBlock; import com.simibubi.create.content.kinetics.simpleRelays.ICogWheel; import com.simibubi.create.foundation.block.IBE; -import net.createmod.catnip.utility.placement.IPlacementHelper; -import net.createmod.catnip.utility.placement.PlacementHelpers; -import net.createmod.catnip.utility.placement.PlacementOffset; +import net.createmod.catnip.placement.IPlacementHelper; +import net.createmod.catnip.placement.PlacementHelpers; +import net.createmod.catnip.placement.PlacementOffset; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/kinetics/speedController/SpeedControllerBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/speedController/SpeedControllerBlockEntity.java index 3f9d7cd458..77ea46be16 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/speedController/SpeedControllerBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/speedController/SpeedControllerBlockEntity.java @@ -19,7 +19,7 @@ import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; import dan200.computercraft.api.peripheral.PeripheralCapability; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.block.entity.BlockEntityType; diff --git a/src/main/java/com/simibubi/create/content/kinetics/steamEngine/PoweredShaftBlock.java b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/PoweredShaftBlock.java index 456019c961..6595c29cbc 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/steamEngine/PoweredShaftBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/PoweredShaftBlock.java @@ -7,9 +7,9 @@ import com.simibubi.create.content.kinetics.base.KineticBlockEntity; import com.simibubi.create.content.kinetics.simpleRelays.AbstractShaftBlock; import com.simibubi.create.content.kinetics.simpleRelays.ShaftBlock; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.placement.IPlacementHelper; -import net.createmod.catnip.utility.placement.PlacementHelpers; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.placement.IPlacementHelper; +import net.createmod.catnip.placement.PlacementHelpers; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/com/simibubi/create/content/kinetics/steamEngine/PoweredShaftBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/PoweredShaftBlockEntity.java index 32b3d3f209..22b90fc625 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/steamEngine/PoweredShaftBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/PoweredShaftBlockEntity.java @@ -5,7 +5,7 @@ import java.util.List; import com.simibubi.create.content.kinetics.BlockStressValues; import com.simibubi.create.content.kinetics.base.GeneratingKineticBlockEntity; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction.Axis; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineBlock.java b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineBlock.java index 1efaf5df1b..c7d5a35cc9 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineBlock.java @@ -15,10 +15,10 @@ import com.simibubi.create.foundation.advancement.AdvancementBehaviour; import com.simibubi.create.foundation.block.IBE; import com.simibubi.create.foundation.utility.BlockHelper; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.placement.IPlacementHelper; -import net.createmod.catnip.utility.placement.PlacementHelpers; -import net.createmod.catnip.utility.placement.PlacementOffset; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.placement.IPlacementHelper; +import net.createmod.catnip.placement.PlacementHelpers; +import net.createmod.catnip.placement.PlacementOffset; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineBlockEntity.java index d69f9261d6..2dc33b9fa4 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineBlockEntity.java @@ -19,8 +19,8 @@ import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOp import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineRenderer.java index a27fea56d6..ab1ac420f9 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineRenderer.java +++ b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineRenderer.java @@ -10,7 +10,7 @@ import dev.engine_room.flywheel.api.visualization.VisualizationManager; import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; diff --git a/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineValueBox.java b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineValueBox.java index 40f5fd7e2d..8d6e6f8082 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineValueBox.java +++ b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineValueBox.java @@ -4,9 +4,9 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.Pointing; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.Pointing; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineVisual.java b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineVisual.java index 4e17c05061..8b144a9ec0 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineVisual.java +++ b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineVisual.java @@ -16,7 +16,7 @@ import dev.engine_room.flywheel.lib.instance.TransformedInstance; import dev.engine_room.flywheel.lib.model.Models; import dev.engine_room.flywheel.lib.visual.AbstractBlockEntityVisual; 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.Axis; import net.minecraft.util.Mth; diff --git a/src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftRenderer.java index adaf1e3d99..ede2893f16 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftRenderer.java +++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftRenderer.java @@ -6,10 +6,10 @@ import com.simibubi.create.content.kinetics.base.IRotate; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; import dev.engine_room.flywheel.api.visualization.VisualizationManager; +import net.createmod.catnip.animation.AnimationTickHolder; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.Iterate; -import net.createmod.ponder.utility.LevelTickHolder; +import net.createmod.catnip.data.Iterate; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; @@ -32,7 +32,7 @@ public class SplitShaftRenderer extends KineticBlockEntityRenderer getSpeedRange() { return Couple.create(4, 4); } - + @Override public boolean isFlammable(BlockState state, BlockGetter level, BlockPos pos, Direction direction) { return false; diff --git a/src/main/java/com/simibubi/create/content/kinetics/waterwheel/LargeWaterWheelBlockItem.java b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/LargeWaterWheelBlockItem.java index e3355d976b..81ca1fb011 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/waterwheel/LargeWaterWheelBlockItem.java +++ b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/LargeWaterWheelBlockItem.java @@ -2,9 +2,9 @@ package com.simibubi.create.content.kinetics.waterwheel; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.CatnipClient; +import net.createmod.catnip.data.Pair; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.outliner.Outliner; import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -16,6 +16,7 @@ import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.block.Block; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; @@ -48,7 +49,7 @@ public class LargeWaterWheelBlockItem extends BlockItem { .getNormal()); if (!(context.getPlayer()instanceof LocalPlayer localPlayer)) return; - CatnipClient.OUTLINER.showAABB(Pair.of("waterwheel", pos), new AABB(pos).inflate(1) + Outliner.getInstance().showAABB(Pair.of("waterwheel", pos), new AABB(pos).inflate(1) .deflate(contract.x, contract.y, contract.z)) .colored(0xFF_ff5d6c); CreateLang.translate("large_water_wheel.not_enough_space") diff --git a/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelBlock.java b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelBlock.java index d57e73c838..843129a5c5 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelBlock.java @@ -5,9 +5,9 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock; import com.simibubi.create.foundation.block.IBE; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.levelWrappers.WrappedLevel; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.levelWrappers.WrappedLevel; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; @@ -131,7 +131,7 @@ public class WaterWheelBlock extends DirectionalKineticBlock implements IBE getSpeedRange() { return Couple.create(8, 8); } - + @Override public boolean isFlammable(BlockState state, BlockGetter level, BlockPos pos, Direction direction) { return false; diff --git a/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelBlockEntity.java index 648152022b..a552086a0f 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelBlockEntity.java @@ -12,8 +12,8 @@ import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.fluid.FluidHelper; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelRenderer.java index 2ae85f87ad..57cab3a6f4 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelRenderer.java +++ b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelRenderer.java @@ -17,7 +17,7 @@ import net.createmod.catnip.render.StitchedSprite; import net.createmod.catnip.render.SuperBufferFactory; import net.createmod.catnip.render.SuperByteBuffer; import net.createmod.catnip.render.SuperByteBufferCache; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider.Context; diff --git a/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelStructuralBlock.java b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelStructuralBlock.java index 477a537ae1..c0c4e5b76a 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelStructuralBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelStructuralBlock.java @@ -2,16 +2,11 @@ package com.simibubi.create.content.kinetics.waterwheel; import java.util.HashSet; import java.util.Set; -import java.util.function.Consumer; - -import com.mojang.serialization.MapCodec; - -import net.minecraft.world.ItemInteractionResult; -import net.minecraft.world.level.LevelReader; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.mojang.serialization.MapCodec; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.equipment.goggles.IProxyHoveringInformation; import com.simibubi.create.content.equipment.wrench.IWrenchable; @@ -25,6 +20,7 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.util.RandomSource; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -32,6 +28,7 @@ import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.DirectionalBlock; @@ -41,8 +38,7 @@ import net.minecraft.world.level.block.state.StateDefinition.Builder; import net.minecraft.world.level.material.PushReaction; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.api.distmarker.OnlyIn; + import net.neoforged.neoforge.client.extensions.common.IClientBlockExtensions; public class WaterWheelStructuralBlock extends DirectionalBlock implements IWrenchable, IProxyHoveringInformation { @@ -166,11 +162,6 @@ public class WaterWheelStructuralBlock extends DirectionalBlock implements IWren pLevel.setBlockAndUpdate(pPos, Blocks.AIR.defaultBlockState()); } - @OnlyIn(Dist.CLIENT) - public void initializeClient(Consumer consumer) { - consumer.accept(new RenderProperties()); - } - @Override public boolean addLandingEffects(BlockState state1, ServerLevel level, BlockPos pos, BlockState state2, LivingEntity entity, int numberOfParticles) { diff --git a/src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundColor.java b/src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundColor.java index ef5e35d5ca..47e0a05bcc 100644 --- a/src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundColor.java +++ b/src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundColor.java @@ -1,7 +1,7 @@ package com.simibubi.create.content.legacy; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.theme.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.color.item.ItemColor; import net.minecraft.util.Mth; diff --git a/src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundItem.java b/src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundItem.java index 583a7e59d4..8a7f1e2ee8 100644 --- a/src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundItem.java +++ b/src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundItem.java @@ -12,8 +12,8 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import com.simibubi.create.infrastructure.config.AllConfigs; import com.simibubi.create.infrastructure.config.CRecipes; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.theme.Color; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.ParticleTypes; diff --git a/src/main/java/com/simibubi/create/content/legacy/NoGravMagicalDohickyItem.java b/src/main/java/com/simibubi/create/content/legacy/NoGravMagicalDohickyItem.java index 264bf519b5..82c65b9c75 100644 --- a/src/main/java/com/simibubi/create/content/legacy/NoGravMagicalDohickyItem.java +++ b/src/main/java/com/simibubi/create/content/legacy/NoGravMagicalDohickyItem.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.legacy; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; diff --git a/src/main/java/com/simibubi/create/content/logistics/AddressEditBox.java b/src/main/java/com/simibubi/create/content/logistics/AddressEditBox.java index aec9823226..e2857c19ee 100644 --- a/src/main/java/com/simibubi/create/content/logistics/AddressEditBox.java +++ b/src/main/java/com/simibubi/create/content/logistics/AddressEditBox.java @@ -11,7 +11,7 @@ import com.simibubi.create.content.trains.schedule.DestinationSuggestions; import com.simibubi.create.foundation.gui.widget.ScrollInput; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; diff --git a/src/main/java/com/simibubi/create/content/logistics/AddressEditBoxHelper.java b/src/main/java/com/simibubi/create/content/logistics/AddressEditBoxHelper.java index 1bd4356ae5..8cf84038fe 100644 --- a/src/main/java/com/simibubi/create/content/logistics/AddressEditBoxHelper.java +++ b/src/main/java/com/simibubi/create/content/logistics/AddressEditBoxHelper.java @@ -13,7 +13,7 @@ import com.simibubi.create.content.equipment.clipboard.ClipboardEntry; import com.simibubi.create.content.trains.schedule.DestinationSuggestions; import com.simibubi.create.foundation.utility.TickBasedCache; -import net.createmod.catnip.utility.IntAttached; +import net.createmod.catnip.data.IntAttached; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.screens.Screen; diff --git a/src/main/java/com/simibubi/create/content/logistics/FlapStuffs.java b/src/main/java/com/simibubi/create/content/logistics/FlapStuffs.java index a735e298f1..dce0621803 100644 --- a/src/main/java/com/simibubi/create/content/logistics/FlapStuffs.java +++ b/src/main/java/com/simibubi/create/content/logistics/FlapStuffs.java @@ -16,8 +16,8 @@ import dev.engine_room.flywheel.lib.instance.TransformedInstance; import dev.engine_room.flywheel.lib.transform.TransformStack; import dev.engine_room.flywheel.lib.transform.Translate; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.util.Mth; diff --git a/src/main/java/com/simibubi/create/content/logistics/box/PackageDestroyPacket.java b/src/main/java/com/simibubi/create/content/logistics/box/PackageDestroyPacket.java index a0620b5b50..e2d8efeb7a 100644 --- a/src/main/java/com/simibubi/create/content/logistics/box/PackageDestroyPacket.java +++ b/src/main/java/com/simibubi/create/content/logistics/box/PackageDestroyPacket.java @@ -4,7 +4,7 @@ import com.simibubi.create.AllPackets; import net.createmod.catnip.codecs.stream.CatnipStreamCodecs; import net.createmod.catnip.net.base.ClientboundPacketPayload; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.player.LocalPlayer; diff --git a/src/main/java/com/simibubi/create/content/logistics/box/PackageEntity.java b/src/main/java/com/simibubi/create/content/logistics/box/PackageEntity.java index 13d11ee0fd..1ca26317ce 100644 --- a/src/main/java/com/simibubi/create/content/logistics/box/PackageEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/box/PackageEntity.java @@ -12,8 +12,8 @@ import com.simibubi.create.AllSoundEvents; import com.simibubi.create.content.logistics.chute.ChuteBlock; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.math.AngleHelper; import net.createmod.ponder.api.level.PonderLevel; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -63,7 +63,7 @@ public class PackageEntity extends LivingEntity implements IEntityWithComplexSpa public int insertionDelay; public Vec3 clientPosition, vec2 = Vec3.ZERO, vec3 = Vec3.ZERO; - + public WeakReference tossedBy = new WeakReference<>(null); @SuppressWarnings("unchecked") @@ -272,10 +272,10 @@ public class PackageEntity extends LivingEntity implements IEntityWithComplexSpa @Override public void push(Entity entityIn) { boolean isOtherPackage = entityIn instanceof PackageEntity; - + if (!isOtherPackage && tossedBy.get() != null) tossedBy = new WeakReference(null); // no nudging - + if (isOtherPackage) { if (entityIn.getBoundingBox().minY < this.getBoundingBox().maxY) super.push(entityIn); diff --git a/src/main/java/com/simibubi/create/content/logistics/box/PackageItem.java b/src/main/java/com/simibubi/create/content/logistics/box/PackageItem.java index 76f4fe00ff..2bbd8d03f6 100644 --- a/src/main/java/com/simibubi/create/content/logistics/box/PackageItem.java +++ b/src/main/java/com/simibubi/create/content/logistics/box/PackageItem.java @@ -17,8 +17,8 @@ import com.simibubi.create.foundation.item.ItemHelper; import net.createmod.catnip.codecs.CatnipCodecs; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/logistics/box/PackageRenderer.java b/src/main/java/com/simibubi/create/content/logistics/box/PackageRenderer.java index f7308a4975..84f187ad1e 100644 --- a/src/main/java/com/simibubi/create/content/logistics/box/PackageRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/box/PackageRenderer.java @@ -7,7 +7,7 @@ import com.simibubi.create.AllPartialModels; import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.EntityRenderer; diff --git a/src/main/java/com/simibubi/create/content/logistics/chute/AbstractChuteBlock.java b/src/main/java/com/simibubi/create/content/logistics/chute/AbstractChuteBlock.java index 8015d872af..1d21703101 100644 --- a/src/main/java/com/simibubi/create/content/logistics/chute/AbstractChuteBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/chute/AbstractChuteBlock.java @@ -1,7 +1,5 @@ package com.simibubi.create.content.logistics.chute; -import java.util.function.Consumer; - import javax.annotation.Nullable; import com.simibubi.create.content.equipment.wrench.IWrenchable; @@ -10,17 +8,15 @@ import com.simibubi.create.content.logistics.box.PackageEntity; import com.simibubi.create.foundation.advancement.AdvancementBehaviour; import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.block.IBE; -import com.simibubi.create.foundation.block.render.ReducedDestroyEffects; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.item.ItemHelper; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.RandomSource; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; @@ -36,9 +32,6 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.api.distmarker.OnlyIn; -import net.neoforged.neoforge.client.extensions.common.IClientBlockExtensions; public abstract class AbstractChuteBlock extends Block implements IWrenchable, IBE { @@ -46,11 +39,6 @@ public abstract class AbstractChuteBlock extends Block implements IWrenchable, I super(p_i48440_1_); } - @OnlyIn(Dist.CLIENT) - public void initializeClient(Consumer consumer) { - consumer.accept(new ReducedDestroyEffects()); - } - public static boolean isChute(BlockState state) { return state.getBlock() instanceof AbstractChuteBlock; } diff --git a/src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlock.java b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlock.java index 1fc79db7a8..f29faad7a2 100644 --- a/src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlock.java @@ -8,8 +8,8 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.content.logistics.funnel.FunnelBlock; import com.simibubi.create.foundation.block.ProperWaterloggedBlock; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.lang.Lang; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlockEntity.java index ff65a74068..77a8e87ed2 100644 --- a/src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlockEntity.java @@ -35,10 +35,10 @@ import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/simibubi/create/content/logistics/chute/SmartChuteFilterSlotPositioning.java b/src/main/java/com/simibubi/create/content/logistics/chute/SmartChuteFilterSlotPositioning.java index 016621b943..d63776b695 100644 --- a/src/main/java/com/simibubi/create/content/logistics/chute/SmartChuteFilterSlotPositioning.java +++ b/src/main/java/com/simibubi/create/content/logistics/chute/SmartChuteFilterSlotPositioning.java @@ -2,8 +2,8 @@ package com.simibubi.create.content.logistics.chute; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/logistics/depot/DepotBehaviour.java b/src/main/java/com/simibubi/create/content/logistics/depot/DepotBehaviour.java index 2956102433..fa6708edbe 100644 --- a/src/main/java/com/simibubi/create/content/logistics/depot/DepotBehaviour.java +++ b/src/main/java/com/simibubi/create/content/logistics/depot/DepotBehaviour.java @@ -22,8 +22,8 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.item.ItemHelper; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/simibubi/create/content/logistics/depot/DepotRenderer.java b/src/main/java/com/simibubi/create/content/logistics/depot/DepotRenderer.java index deb82321ce..8e21d77705 100644 --- a/src/main/java/com/simibubi/create/content/logistics/depot/DepotRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/depot/DepotRenderer.java @@ -11,7 +11,7 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; diff --git a/src/main/java/com/simibubi/create/content/logistics/depot/EjectorBlock.java b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorBlock.java index b41fb4d4b9..23ed61c817 100644 --- a/src/main/java/com/simibubi/create/content/logistics/depot/EjectorBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorBlock.java @@ -13,7 +13,7 @@ import com.simibubi.create.foundation.block.ProperWaterloggedBlock; import net.createmod.catnip.platform.CatnipServices; import com.simibubi.create.foundation.item.ItemHelper; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/logistics/depot/EjectorBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorBlockEntity.java index 26e90ad3be..519002d28f 100644 --- a/src/main/java/com/simibubi/create/content/logistics/depot/EjectorBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorBlockEntity.java @@ -23,14 +23,14 @@ import com.simibubi.create.infrastructure.config.AllConfigs; import dev.engine_room.flywheel.lib.transform.TransformStack; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.IntAttached; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.data.IntAttached; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/logistics/depot/EjectorRenderer.java b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorRenderer.java index 1317fe5285..8935d016f1 100644 --- a/src/main/java/com/simibubi/create/content/logistics/depot/EjectorRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorRenderer.java @@ -12,9 +12,9 @@ import dev.engine_room.flywheel.lib.transform.TransformStack; import dev.engine_room.flywheel.lib.transform.Translate; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.IntAttached; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.data.IntAttached; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/simibubi/create/content/logistics/depot/EjectorTargetHandler.java b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorTargetHandler.java index 6a4cb5d2cb..31c481a0f7 100644 --- a/src/main/java/com/simibubi/create/content/logistics/depot/EjectorTargetHandler.java +++ b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorTargetHandler.java @@ -9,10 +9,10 @@ import com.simibubi.create.AllItems; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.CatnipClient; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.outliner.Outliner; +import net.createmod.catnip.theme.Color; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; @@ -34,6 +34,7 @@ import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.HitResult.Type; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.VoxelShape; + import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; @@ -213,7 +214,7 @@ public class EjectorTargetHandler { ClientLevel world = mc.level; AABB bb = new AABB(0, 0, 0, 1, 0, 1).move(currentSelection.offset(-validX, -yDiff, -validZ)); - CatnipClient.OUTLINER.chaseAABB("valid", bb) + Outliner.getInstance().chaseAABB("valid", bb) .colored(intColor) .lineWidth(1 / 16f); @@ -263,7 +264,7 @@ public class EjectorTargetHandler { BlockState state = world.getBlockState(pos); VoxelShape shape = state.getShape(world, pos); AABB boundingBox = shape.isEmpty() ? new AABB(BlockPos.ZERO) : shape.bounds(); - CatnipClient.OUTLINER.showAABB("target", boundingBox.move(pos)) + Outliner.getInstance().showAABB("target", boundingBox.move(pos)) .colored(0xffcb74) .lineWidth(1 / 16f); } diff --git a/src/main/java/com/simibubi/create/content/logistics/depot/EntityLauncher.java b/src/main/java/com/simibubi/create/content/logistics/depot/EntityLauncher.java index f6a98136ee..65df58497b 100644 --- a/src/main/java/com/simibubi/create/content/logistics/depot/EntityLauncher.java +++ b/src/main/java/com/simibubi/create/content/logistics/depot/EntityLauncher.java @@ -1,7 +1,7 @@ package com.simibubi.create.content.logistics.depot; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/logistics/depot/SharedDepotBlockMethods.java b/src/main/java/com/simibubi/create/content/logistics/depot/SharedDepotBlockMethods.java index d520db0735..57dd145163 100644 --- a/src/main/java/com/simibubi/create/content/logistics/depot/SharedDepotBlockMethods.java +++ b/src/main/java/com/simibubi/create/content/logistics/depot/SharedDepotBlockMethods.java @@ -9,7 +9,7 @@ import com.simibubi.create.content.logistics.box.PackageEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.item.ItemHelper; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java index dad8181cf5..c051c64be3 100644 --- a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java +++ b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java @@ -47,10 +47,10 @@ import net.createmod.catnip.codecs.CatnipCodecUtils; import net.createmod.catnip.codecs.CatnipCodecs; import net.createmod.catnip.gui.ScreenOpener; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBlock.java b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBlock.java index cab24da034..1901f79caf 100644 --- a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBlock.java @@ -21,9 +21,9 @@ import com.simibubi.create.foundation.utility.CreateLang; import io.netty.buffer.ByteBuf; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.lang.Lang; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.lang.Lang; +import net.createmod.catnip.math.AngleHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; @@ -61,6 +61,7 @@ import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; + import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.event.level.BlockEvent; diff --git a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBlockEntity.java index aaee710091..c1dc476dea 100644 --- a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBlockEntity.java @@ -15,8 +15,8 @@ import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; @@ -39,7 +39,7 @@ public class FactoryPanelBlockEntity extends SmartBlockEntity { public boolean restocker; private VoxelShape lastShape; - + public AdvancementBehaviour advancements; public FactoryPanelBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { @@ -56,7 +56,7 @@ public class FactoryPanelBlockEntity extends SmartBlockEntity { panels.put(slot, e); behaviours.add(e); } - + behaviours.add(advancements = new AdvancementBehaviour(this, AllAdvancements.FACTORY_GAUGE)); } @@ -105,7 +105,7 @@ public class FactoryPanelBlockEntity extends SmartBlockEntity { result++; return result; } - + @Override public void remove() { for (FactoryPanelBehaviour panelBehaviour : panels.values()) diff --git a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelConnection.java b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelConnection.java index 9903bf345c..a38c0d3cdb 100644 --- a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelConnection.java +++ b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelConnection.java @@ -7,7 +7,7 @@ import java.util.List; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; @@ -109,7 +109,7 @@ public class FactoryPanelConnection { float yRot = Mth.RAD_TO_DEG * FactoryPanelBlock.getYRot(state); int slotDiffx = to.slot().xOffset - from.slot().xOffset; int slotDiffY = to.slot().yOffset - from.slot().yOffset; - + Vec3 diff = Vec3.atLowerCornerOf(to.pos() .subtract(from.pos())); diff = VecHelper.rotate(diff, -yRot, Axis.Y); diff --git a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelConnectionHandler.java b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelConnectionHandler.java index eeef1dda2a..b15132beee 100644 --- a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelConnectionHandler.java +++ b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelConnectionHandler.java @@ -8,10 +8,10 @@ import com.simibubi.create.foundation.block.WrenchableDirectionalBlock; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.CatnipClient; +import net.createmod.catnip.animation.AnimationTickHolder; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.outliner.Outliner; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; @@ -158,7 +158,7 @@ public class FactoryPanelConnectionHandler { return; } - CatnipClient.OUTLINER.showAABB(connectingFrom, connectingFromBox) + Outliner.getInstance().showAABB(connectingFrom, connectingFromBox) .colored(AnimationTickHolder.getTicks() % 16 > 8 ? 0x38b764 : 0xa7f070) .lineWidth(1 / 16f); diff --git a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelModel.java b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelModel.java index f339db6c61..9ef72a7d1e 100644 --- a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelModel.java +++ b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelModel.java @@ -14,7 +14,7 @@ import com.simibubi.create.foundation.model.BakedModelWrapperWithData; import com.simibubi.create.foundation.model.BakedQuadHelper; import dev.engine_room.flywheel.lib.model.baked.PartialModel; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.createmod.ponder.api.level.PonderLevel; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.block.model.BakedQuad; diff --git a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelRenderer.java b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelRenderer.java index b5d6c1f7c8..f9b109431f 100644 --- a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelRenderer.java @@ -13,7 +13,7 @@ import com.simibubi.create.foundation.render.RenderTypes; import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.theme.Color; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelSlotPositioning.java b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelSlotPositioning.java index d788c12798..4bc0d574d2 100644 --- a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelSlotPositioning.java +++ b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelSlotPositioning.java @@ -5,7 +5,7 @@ import com.simibubi.create.content.logistics.factoryBoard.FactoryPanelBlock.Pane import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; @@ -51,4 +51,4 @@ class FactoryPanelSlotPositioning extends ValueBoxTransform { .rotate(-FactoryPanelBlock.getXRot(state), Direction.EAST); } -} \ No newline at end of file +} diff --git a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelSupportBehaviour.java b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelSupportBehaviour.java index beffadd845..31d5cf9d62 100644 --- a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelSupportBehaviour.java +++ b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelSupportBehaviour.java @@ -14,6 +14,7 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import net.createmod.catnip.codecs.CatnipCodecUtils; import net.minecraft.core.HolderLookup; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; public class FactoryPanelSupportBehaviour extends BlockEntityBehaviour { diff --git a/src/main/java/com/simibubi/create/content/logistics/filter/AbstractFilterScreen.java b/src/main/java/com/simibubi/create/content/logistics/filter/AbstractFilterScreen.java index fdca4806f0..8f8e856720 100644 --- a/src/main/java/com/simibubi/create/content/logistics/filter/AbstractFilterScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/filter/AbstractFilterScreen.java @@ -18,7 +18,7 @@ import com.simibubi.create.foundation.item.TooltipHelper; import net.createmod.catnip.platform.CatnipServices; import net.createmod.catnip.gui.element.GuiGameElement; -import net.createmod.catnip.utility.FontHelper.Palette; +import net.createmod.catnip.lang.FontHelper.Palette; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.Rect2i; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterMenu.java b/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterMenu.java index 6ef0224fe0..17e8c83335 100644 --- a/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterMenu.java +++ b/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterMenu.java @@ -7,7 +7,7 @@ import com.simibubi.create.AllDataComponents; import com.simibubi.create.AllMenuTypes; import com.simibubi.create.content.logistics.item.filter.attribute.ItemAttribute; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.core.component.DataComponents; import net.minecraft.network.RegistryFriendlyByteBuf; @@ -18,6 +18,7 @@ import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; + import net.neoforged.neoforge.items.ItemStackHandler; import net.neoforged.neoforge.items.SlotItemHandler; diff --git a/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterScreen.java b/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterScreen.java index 4099faba2b..5a0f931360 100644 --- a/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterScreen.java @@ -19,8 +19,8 @@ import com.simibubi.create.foundation.gui.widget.Label; import com.simibubi.create.foundation.gui.widget.SelectionScrollInput; import com.simibubi.create.foundation.utility.CreateLang; +import net.createmod.catnip.lang.Components; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterWhitelistMode.java b/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterWhitelistMode.java index 1a81f361a4..764d9b56c3 100644 --- a/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterWhitelistMode.java +++ b/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterWhitelistMode.java @@ -4,9 +4,9 @@ import org.jetbrains.annotations.NotNull; import com.mojang.serialization.Codec; -import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import io.netty.buffer.ByteBuf; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; +import net.createmod.catnip.lang.Lang; import net.minecraft.network.codec.StreamCodec; import net.minecraft.util.StringRepresentable; diff --git a/src/main/java/com/simibubi/create/content/logistics/filter/FilterItem.java b/src/main/java/com/simibubi/create/content/logistics/filter/FilterItem.java index 8fb099fe3a..ca6e8e124d 100644 --- a/src/main/java/com/simibubi/create/content/logistics/filter/FilterItem.java +++ b/src/main/java/com/simibubi/create/content/logistics/filter/FilterItem.java @@ -17,7 +17,7 @@ import com.simibubi.create.content.logistics.item.filter.attribute.ItemAttribute import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.core.component.DataComponentType; import net.minecraft.core.component.TypedDataComponent; diff --git a/src/main/java/com/simibubi/create/content/logistics/filter/FilterItemStack.java b/src/main/java/com/simibubi/create/content/logistics/filter/FilterItemStack.java index dd4c70c589..02e9853615 100644 --- a/src/main/java/com/simibubi/create/content/logistics/filter/FilterItemStack.java +++ b/src/main/java/com/simibubi/create/content/logistics/filter/FilterItemStack.java @@ -11,7 +11,7 @@ import com.simibubi.create.content.logistics.item.filter.attribute.ItemAttribute import com.simibubi.create.content.logistics.item.filter.attribute.ItemAttribute; import com.simibubi.create.content.logistics.box.PackageItem; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Pair; import net.minecraft.core.HolderLookup; import net.minecraft.core.component.DataComponents; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/logistics/filter/FilterScreen.java b/src/main/java/com/simibubi/create/content/logistics/filter/FilterScreen.java index 179a2184eb..ffc6609426 100644 --- a/src/main/java/com/simibubi/create/content/logistics/filter/FilterScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/filter/FilterScreen.java @@ -10,7 +10,7 @@ import com.simibubi.create.foundation.gui.widget.IconButton; import com.simibubi.create.foundation.gui.widget.Indicator; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Inventory; diff --git a/src/main/java/com/simibubi/create/content/logistics/funnel/AbstractFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/funnel/AbstractFunnelBlock.java index 683387efcc..0a151baea3 100644 --- a/src/main/java/com/simibubi/create/content/logistics/funnel/AbstractFunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/funnel/AbstractFunnelBlock.java @@ -1,14 +1,11 @@ package com.simibubi.create.content.logistics.funnel; -import java.util.function.Consumer; - import javax.annotation.Nullable; import com.simibubi.create.AllBlockEntityTypes; import com.simibubi.create.content.equipment.wrench.IWrenchable; import com.simibubi.create.foundation.block.IBE; import com.simibubi.create.foundation.block.ProperWaterloggedBlock; -import com.simibubi.create.foundation.block.render.ReducedDestroyEffects; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.inventory.InvManipulationBehaviour; @@ -19,7 +16,6 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.util.RandomSource; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.LevelReader; @@ -32,9 +28,6 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.pathfinder.PathComputationType; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.api.distmarker.OnlyIn; -import net.neoforged.neoforge.client.extensions.common.IClientBlockExtensions; public abstract class AbstractFunnelBlock extends Block implements IBE, IWrenchable, ProperWaterloggedBlock { @@ -47,11 +40,6 @@ public abstract class AbstractFunnelBlock extends Block .setValue(WATERLOGGED, false)); } - @OnlyIn(Dist.CLIENT) - public void initializeClient(Consumer consumer) { - consumer.accept(new ReducedDestroyEffects()); - } - @Override public BlockState getStateForPlacement(BlockPlaceContext context) { return withWater(defaultBlockState().setValue(POWERED, context.getLevel() diff --git a/src/main/java/com/simibubi/create/content/logistics/funnel/BeltFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/funnel/BeltFunnelBlock.java index 8fa16eb783..d9a438781d 100644 --- a/src/main/java/com/simibubi/create/content/logistics/funnel/BeltFunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/funnel/BeltFunnelBlock.java @@ -12,8 +12,8 @@ import com.simibubi.create.foundation.block.ProperWaterloggedBlock; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.tterrag.registrate.util.entry.BlockEntry; -import net.createmod.catnip.utility.VoxelShaper; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.math.VoxelShaper; +import net.createmod.catnip.lang.Lang; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.util.StringRepresentable; diff --git a/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlock.java index cfc66e0b1f..e853499fdc 100644 --- a/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlock.java @@ -8,7 +8,7 @@ import com.simibubi.create.foundation.advancement.AdvancementBehaviour; import com.simibubi.create.foundation.block.ProperWaterloggedBlock; import com.simibubi.create.foundation.item.ItemHelper; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.AxisDirection; diff --git a/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlockEntity.java index acae1eb076..391ef240a9 100644 --- a/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlockEntity.java @@ -30,10 +30,10 @@ import com.simibubi.create.foundation.item.ItemHelper.ExtractionCountMode; import com.simibubi.create.infrastructure.config.AllConfigs; import dev.engine_room.flywheel.lib.visualization.VisualizationHelper; -import net.createmod.catnip.utility.BlockFace; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; +import net.createmod.catnip.math.BlockFace; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelFilterSlotPositioning.java b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelFilterSlotPositioning.java index d9c1acf0c5..53782f5a8b 100644 --- a/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelFilterSlotPositioning.java +++ b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelFilterSlotPositioning.java @@ -5,8 +5,8 @@ import com.simibubi.create.content.logistics.funnel.BeltFunnelBlock.Shape; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/ColorAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/ColorAttribute.java index 0460d06025..51264757b0 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/ColorAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/ColorAttribute.java @@ -15,7 +15,7 @@ import com.simibubi.create.content.logistics.item.filter.attribute.AllItemAttrib import com.simibubi.create.content.logistics.item.filter.attribute.ItemAttribute; import com.simibubi.create.content.logistics.item.filter.attribute.ItemAttributeType; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.client.resources.language.I18n; import net.minecraft.core.component.DataComponents; import net.minecraft.world.item.DyeColor; diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/EnchantAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/EnchantAttribute.java index a6da834303..1cb92f0ab2 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/EnchantAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/EnchantAttribute.java @@ -18,6 +18,8 @@ import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.level.Level; +import javax.annotation.Nullable; + public record EnchantAttribute(@Nullable Holder enchantment) implements ItemAttribute { public static final MapCodec CODEC = Enchantment.CODEC .xmap(EnchantAttribute::new, EnchantAttribute::enchantment) diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/InTagAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/InTagAttribute.java index c87daeaf09..d8fc533de6 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/InTagAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/InTagAttribute.java @@ -3,7 +3,7 @@ package com.simibubi.create.content.logistics.item.filter.attribute.attributes; import java.util.List; import java.util.stream.Collectors; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.nbt.NBTHelper; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/ShulkerFillLevelAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/ShulkerFillLevelAttribute.java index b32cb17e4e..5be203ba44 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/ShulkerFillLevelAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/ShulkerFillLevelAttribute.java @@ -15,7 +15,7 @@ import com.simibubi.create.content.logistics.item.filter.attribute.ItemAttribute import com.simibubi.create.content.logistics.item.filter.attribute.ItemAttributeType; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.minecraft.core.NonNullList; import net.minecraft.core.component.DataComponents; import net.minecraft.util.StringRepresentable; diff --git a/src/main/java/com/simibubi/create/content/logistics/itemHatch/HatchFilterSlot.java b/src/main/java/com/simibubi/create/content/logistics/itemHatch/HatchFilterSlot.java index ac5c55fd5a..e8ea30f5b6 100644 --- a/src/main/java/com/simibubi/create/content/logistics/itemHatch/HatchFilterSlot.java +++ b/src/main/java/com/simibubi/create/content/logistics/itemHatch/HatchFilterSlot.java @@ -4,8 +4,8 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.LevelAccessor; @@ -39,4 +39,4 @@ public class HatchFilterSlot extends ValueBoxTransform { .orElse(Direction.NORTH)); } -} \ No newline at end of file +} diff --git a/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortBlockEntity.java index 3e09cb6f99..751b08b926 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortBlockEntity.java @@ -14,7 +14,7 @@ import com.simibubi.create.foundation.item.SmartInventory; import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.codecs.CatnipCodecUtils; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; @@ -133,7 +133,6 @@ public abstract class PackagePortBlockEntity extends SmartBlockEntity implements return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; if (player instanceof FakePlayer) return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; - ItemStack mainHandItem = player.getMainHandItem(); boolean clipboard = AllBlocks.CLIPBOARD.isIn(mainHandItem); diff --git a/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortScreen.java b/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortScreen.java index 4e31610877..bb0052dd4f 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortScreen.java @@ -17,7 +17,7 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.gui.element.GuiGameElement; import net.createmod.catnip.gui.widget.AbstractSimiWidget; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; diff --git a/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortTarget.java b/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortTarget.java index 6b94659be6..2f539f1b3f 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortTarget.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortTarget.java @@ -19,7 +19,7 @@ import com.simibubi.create.content.trains.station.StationBlockEntity; import io.netty.buffer.ByteBuf; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.minecraft.core.BlockPos; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; diff --git a/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortTargetSelectionHandler.java b/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortTargetSelectionHandler.java index 7ea5307a6a..afd64cbfb3 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortTargetSelectionHandler.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortTargetSelectionHandler.java @@ -6,10 +6,10 @@ import com.simibubi.create.content.trains.station.StationBlockEntity; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.CatnipClient; +import net.createmod.catnip.animation.AnimationTickHolder; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.outliner.Outliner; +import net.createmod.catnip.theme.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.player.LocalPlayer; @@ -74,7 +74,7 @@ public class PackagePortTargetSelectionHandler { LocalPlayer player = mc.player; boolean isPostbox = AllItemTags.POSTBOXES.matches(player.getMainHandItem()); boolean isWrench = AllItemTags.WRENCH.matches(player.getMainHandItem()); - + if (!isWrench) { if (activePackageTarget == null) return; @@ -100,16 +100,16 @@ public class PackagePortTargetSelectionHandler { return; Color color = new Color(0x9ede73); animateConnection(mc, source, target, color); - CatnipClient.OUTLINER.chaseAABB("ChainPointSelected", new AABB(target, target)) + Outliner.getInstance().chaseAABB("ChainPointSelected", new AABB(target, target)) .colored(color) .lineWidth(1 / 5f) .disableLineNormals(); return; } - + Vec3 target = exactPositionOfTarget; if (blockRayTraceResult.getType() == Type.MISS) { - CatnipClient.OUTLINER.chaseAABB("ChainPointSelected", new AABB(target, target)) + Outliner.getInstance().chaseAABB("ChainPointSelected", new AABB(target, target)) .colored(0x9ede73) .lineWidth(1 / 5f) .disableLineNormals(); @@ -130,7 +130,7 @@ public class PackagePortTargetSelectionHandler { .color(color.getRGB()) .sendStatus(player); - CatnipClient.OUTLINER.chaseAABB("ChainPointSelected", new AABB(target, target)) + Outliner.getInstance().chaseAABB("ChainPointSelected", new AABB(target, target)) .colored(color) .lineWidth(1 / 5f) .disableLineNormals(); @@ -139,7 +139,7 @@ public class PackagePortTargetSelectionHandler { .canBeReplaced()) return; - CatnipClient.OUTLINER.chaseAABB("TargetedFrogPos", new AABB(pos).contract(0, 1, 0) + Outliner.getInstance().chaseAABB("TargetedFrogPos", new AABB(pos).contract(0, 1, 0) .deflate(0.125, 0, 0.125)) .colored(color) .lineWidth(1 / 16f) diff --git a/src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportBlock.java b/src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportBlock.java index 7831c79372..4af92b486c 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportBlock.java @@ -11,7 +11,7 @@ import com.simibubi.create.content.equipment.wrench.IWrenchable; import com.simibubi.create.foundation.advancement.AdvancementBehaviour; import com.simibubi.create.foundation.block.IBE; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.util.Mth; import net.minecraft.world.InteractionHand; diff --git a/src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportBlockEntity.java index 2fad1a1216..aebc0267e1 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportBlockEntity.java @@ -15,10 +15,10 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.item.TooltipHelper; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportRenderer.java b/src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportRenderer.java index 0a072afe4f..e75d2a9908 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportRenderer.java @@ -7,7 +7,7 @@ import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRende import dev.engine_room.flywheel.api.visualization.VisualizationManager; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider.Context; diff --git a/src/main/java/com/simibubi/create/content/logistics/packagePort/postbox/PostboxBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/packagePort/postbox/PostboxBlockEntity.java index 7989ee28b0..f011fe95f5 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagePort/postbox/PostboxBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagePort/postbox/PostboxBlockEntity.java @@ -9,9 +9,9 @@ import com.simibubi.create.content.logistics.packagePort.PackagePortBlockEntity; import com.simibubi.create.content.trains.station.GlobalStation; import com.simibubi.create.content.trains.station.GlobalStation.GlobalPackagePort; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/logistics/packagePort/postbox/PostboxRenderer.java b/src/main/java/com/simibubi/create/content/logistics/packagePort/postbox/PostboxRenderer.java index b078d66007..cdd39ec3ea 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagePort/postbox/PostboxRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagePort/postbox/PostboxRenderer.java @@ -8,7 +8,7 @@ import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRende import dev.engine_room.flywheel.lib.transform.Transform; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider.Context; diff --git a/src/main/java/com/simibubi/create/content/logistics/packager/InventorySummary.java b/src/main/java/com/simibubi/create/content/logistics/packager/InventorySummary.java index 9b4246d2f4..c4247dbb4f 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packager/InventorySummary.java +++ b/src/main/java/com/simibubi/create/content/logistics/packager/InventorySummary.java @@ -8,6 +8,8 @@ import java.util.List; import java.util.Map; import java.util.function.Predicate; +import net.createmod.catnip.platform.CatnipServices; + import org.apache.commons.lang3.mutable.MutableInt; import com.google.common.collect.Lists; diff --git a/src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlockEntity.java index 64f48627f6..ccf4860307 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlockEntity.java @@ -25,6 +25,7 @@ import com.simibubi.create.content.logistics.packagerLink.LogisticallyLinkedBeha import com.simibubi.create.content.logistics.packagerLink.PackagerLinkBlock; import com.simibubi.create.content.logistics.packagerLink.PackagerLinkBlockEntity; import com.simibubi.create.content.logistics.packagerLink.RequestPromiseQueue; +import com.simibubi.create.content.logistics.packagerLink.WiFiEffectPacket; import com.simibubi.create.content.logistics.stockTicker.PackageOrder; import com.simibubi.create.content.processing.basin.BasinBlockEntity; import com.simibubi.create.foundation.advancement.AdvancementBehaviour; @@ -36,8 +37,8 @@ import com.simibubi.create.foundation.blockEntity.behaviour.inventory.InvManipul import com.simibubi.create.foundation.blockEntity.behaviour.inventory.VersionedInventoryTrackerBehaviour; import com.simibubi.create.foundation.item.ItemHelper; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; @@ -80,7 +81,7 @@ public class PackagerBlockEntity extends SmartBlockEntity { private InventorySummary availableItems; private VersionedInventoryTrackerBehaviour invVersionTracker; - + private AdvancementBehaviour advancements; // @@ -131,7 +132,7 @@ public class PackagerBlockEntity extends SmartBlockEntity { if (buttonCooldown > 0) buttonCooldown--; - + if (animationTicks == 0) { previouslyUnwrapped = ItemStack.EMPTY; @@ -290,6 +291,18 @@ public class PackagerBlockEntity extends SmartBlockEntity { return false; } + public void flashLink() { + for (Direction d : Iterate.directions) { + BlockState adjacentState = level.getBlockState(worldPosition.relative(d)); + if (!AllBlocks.STOCK_LINK.has(adjacentState)) + continue; + if (PackagerLinkBlock.getConnectedDirection(adjacentState) != d) + continue; + WiFiEffectPacket.send(level, worldPosition.relative(d)); + return; + } + } + public boolean isTooBusyFor(RequestType type) { int queue = queuedExitingPackages.size(); return queue >= switch (type) { @@ -546,7 +559,7 @@ public class PackagerBlockEntity extends SmartBlockEntity { heldBox = createdBox; animationInward = false; animationTicks = CYCLE; - + advancements.awardPlayer(AllAdvancements.PACKAGER); triggerStockCheck(); notifyUpdate(); diff --git a/src/main/java/com/simibubi/create/content/logistics/packager/PackagerRenderer.java b/src/main/java/com/simibubi/create/content/logistics/packager/PackagerRenderer.java index 4c14844816..60a74a558d 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packager/PackagerRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/packager/PackagerRenderer.java @@ -9,7 +9,7 @@ import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.transform.TransformStack; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticallyLinkedBehaviour.java b/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticallyLinkedBehaviour.java index d9a1f13bb7..66dd44e292 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticallyLinkedBehaviour.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticallyLinkedBehaviour.java @@ -25,7 +25,7 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.foundation.utility.TickBasedCache; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Pair; import net.minecraft.ChatFormatting; import net.minecraft.core.GlobalPos; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticallyLinkedClientHandler.java b/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticallyLinkedClientHandler.java index ec4eb83c0b..2a2f1c3a18 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticallyLinkedClientHandler.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticallyLinkedClientHandler.java @@ -6,8 +6,8 @@ import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; -import net.createmod.catnip.CatnipClient; -import net.createmod.catnip.utility.AnimationTickHolder; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.component.DataComponents; @@ -46,7 +46,7 @@ public class LogisticallyLinkedClientHandler { .size(); i++) { AABB aabb = shape.toAabbs() .get(i); - CatnipClient.OUTLINER.showAABB(Pair.of(behaviour, i), aabb.inflate(-1 / 128f) + Outliner.getInstance().showAABB(Pair.of(behaviour, i), aabb.inflate(-1 / 128f) .move(be.getBlockPos()), 2) .lineWidth(1 / 32f) .disableLineNormals() diff --git a/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticsManager.java b/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticsManager.java index 2815a61fff..7562434ced 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticsManager.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticsManager.java @@ -24,7 +24,7 @@ import com.simibubi.create.content.logistics.packagerLink.LogisticallyLinkedBeha import com.simibubi.create.content.logistics.stockTicker.PackageOrder; import com.simibubi.create.foundation.utility.TickBasedCache; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Pair; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.items.IItemHandler; @@ -144,6 +144,8 @@ public class LogisticsManager { ArrayList queuedRequests = new ArrayList<>(entry.getValue()); PackagerBlockEntity packager = entry.getKey(); + if (!queuedRequests.isEmpty()) + packager.flashLink(); for (int i = 0; i < 100; i++) { if (queuedRequests.isEmpty()) break; diff --git a/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticsNetwork.java b/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticsNetwork.java index c31d4f90de..775409cd82 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticsNetwork.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticsNetwork.java @@ -6,7 +6,7 @@ import java.util.UUID; import com.simibubi.create.Create; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.GlobalPos; import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticsNetworkSavedData.java b/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticsNetworkSavedData.java index dc208a2298..9e065c5940 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticsNetworkSavedData.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticsNetworkSavedData.java @@ -6,7 +6,7 @@ import java.util.UUID; import com.simibubi.create.Create; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; diff --git a/src/main/java/com/simibubi/create/content/logistics/packagerLink/PackagerLinkBlock.java b/src/main/java/com/simibubi/create/content/logistics/packagerLink/PackagerLinkBlock.java index 2581b1e31f..e27bcbb0c1 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagerLink/PackagerLinkBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagerLink/PackagerLinkBlock.java @@ -7,7 +7,7 @@ import com.simibubi.create.content.equipment.wrench.IWrenchable; import com.simibubi.create.foundation.block.IBE; import com.simibubi.create.foundation.block.ProperWaterloggedBlock; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.entity.LivingEntity; @@ -49,7 +49,7 @@ public class PackagerLinkBlock extends FaceAttachedHorizontalDirectionalBlock BlockState placed = super.getStateForPlacement(context); if (placed == null) return null; - if (placed.getValue(FACE) == AttachFace.FLOOR) + if (placed.getValue(FACE) == AttachFace.CEILING) placed = placed.setValue(FACING, placed.getValue(FACING) .getOpposite()); return withWater(placed.setValue(POWERED, getPower(placed, context.getLevel(), pos) > 0), context); diff --git a/src/main/java/com/simibubi/create/content/logistics/packagerLink/PackagerLinkBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/packagerLink/PackagerLinkBlockEntity.java index 8be87c53ad..7840dcef8c 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagerLink/PackagerLinkBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagerLink/PackagerLinkBlockEntity.java @@ -1,6 +1,8 @@ package com.simibubi.create.content.logistics.packagerLink; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.UUID; import javax.annotation.Nullable; @@ -13,25 +15,28 @@ import com.simibubi.create.content.logistics.packager.PackagerBlockEntity; import com.simibubi.create.content.logistics.packager.PackagingRequest; import com.simibubi.create.content.logistics.packager.repackager.RepackagerBlockEntity; import com.simibubi.create.content.logistics.stockTicker.PackageOrder; -import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; +import com.simibubi.create.content.redstone.displayLink.LinkWithBulbBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.math.AngleHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; -import net.minecraft.core.particles.VibrationParticleOption; +import net.minecraft.core.Direction; +import net.minecraft.core.Direction.Axis; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.gameevent.BlockPositionSource; +import net.minecraft.world.level.block.state.properties.AttachFace; import net.minecraft.world.phys.Vec3; import net.neoforged.neoforge.items.IItemHandler; -public class PackagerLinkBlockEntity extends SmartBlockEntity { +public class PackagerLinkBlockEntity extends LinkWithBulbBlockEntity { public LogisticallyLinkedBehaviour behaviour; public UUID placedBy; @@ -54,8 +59,24 @@ public class PackagerLinkBlockEntity extends SmartBlockEntity { public void playEffect() { AllSoundEvents.STOCK_LINK.playAt(level, worldPosition, 1.0f, 1.0f, false); Vec3 vec3 = Vec3.atCenterOf(worldPosition); - level.addParticle(new VibrationParticleOption(new BlockPositionSource(worldPosition.above(3)), 6), vec3.x, - vec3.y, vec3.z, 1, 1, 1); + + BlockState state = getBlockState(); + float f = 1; + + AttachFace face = state.getOptionalValue(PackagerLinkBlock.FACE) + .orElse(AttachFace.FLOOR); + if (face != AttachFace.FLOOR) + f = -1; + if (face == AttachFace.WALL) + vec3 = vec3.add(0, 0.25, 0); + + vec3 = vec3.add(Vec3.atLowerCornerOf(state.getOptionalValue(PackagerLinkBlock.FACING) + .orElse(Direction.SOUTH) + .getNormal()) + .scale(f * 0.125)); + + pulse(); + level.addParticle(new WiFiParticle.Data(), vec3.x, vec3.y, vec3.z, 1, face == AttachFace.CEILING ? -1 : 1, 1); } public Pair processRequest(ItemStack stack, int amount, String address, @@ -72,8 +93,6 @@ public class PackagerLinkBlockEntity extends SmartBlockEntity { if (availableCount == 0) return null; int toWithdraw = Math.min(amount, availableCount); - if (toWithdraw != 0 && level instanceof ServerLevel serverLevel) - CatnipServices.NETWORK.sendToClientsAround(serverLevel, worldPosition, 32, new PackagerLinkEffectPacket(worldPosition)); return Pair.of(packager, PackagingRequest.create(stack, toWithdraw, address, linkIndex, finalLink, 0, orderId, orderContext)); } @@ -119,4 +138,27 @@ public class PackagerLinkBlockEntity extends SmartBlockEntity { return packager; } + @Override + public Direction getBulbFacing(BlockState state) { + return PackagerLinkBlock.getConnectedDirection(state); + } + + private static final Map bulbOffsets = new HashMap<>(); + + @Override + public Vec3 getBulbOffset(BlockState state) { + return bulbOffsets.computeIfAbsent(state, s -> { + Vec3 offset = VecHelper.voxelSpace(5, 6, 11); + Vec3 wallOffset = VecHelper.voxelSpace(11, 6, 5); + AttachFace face = s.getValue(PackagerLinkBlock.FACE); + Vec3 vec = face == AttachFace.WALL ? wallOffset : offset; + float angle = AngleHelper.horizontalAngle(s.getValue(PackagerLinkBlock.FACING)); + if (face == AttachFace.CEILING) + angle = -angle; + if (face == AttachFace.WALL) + angle = 0; + return VecHelper.rotateCentered(vec, angle, Axis.Y); + }); + } + } diff --git a/src/main/java/com/simibubi/create/content/logistics/packagerLink/PackagerLinkEffectPacket.java b/src/main/java/com/simibubi/create/content/logistics/packagerLink/PackagerLinkEffectPacket.java deleted file mode 100644 index 903e0fd066..0000000000 --- a/src/main/java/com/simibubi/create/content/logistics/packagerLink/PackagerLinkEffectPacket.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.simibubi.create.content.logistics.packagerLink; - -import com.simibubi.create.AllPackets; - -import io.netty.buffer.ByteBuf; -import net.createmod.catnip.net.base.ClientboundPacketPayload; -import net.minecraft.client.Minecraft; -import net.minecraft.client.player.LocalPlayer; -import net.minecraft.core.BlockPos; -import net.minecraft.network.codec.StreamCodec; - -import net.neoforged.api.distmarker.Dist; -import net.neoforged.api.distmarker.OnlyIn; - -public record PackagerLinkEffectPacket(BlockPos pos) implements ClientboundPacketPayload { - public static StreamCodec STREAM_CODEC = StreamCodec.composite( - BlockPos.STREAM_CODEC, PackagerLinkEffectPacket::pos, - PackagerLinkEffectPacket::new - ); - - @Override - public PacketTypeProvider getTypeProvider() { - return AllPackets.PACKAGER_LINK_EFFECT; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void handle(LocalPlayer player) { - if (Minecraft.getInstance().level.getBlockEntity(pos) instanceof PackagerLinkBlockEntity plbe) - plbe.playEffect(); - } -} diff --git a/src/main/java/com/simibubi/create/content/logistics/packagerLink/PackagerLinkGenerator.java b/src/main/java/com/simibubi/create/content/logistics/packagerLink/PackagerLinkGenerator.java new file mode 100644 index 0000000000..357c79c98a --- /dev/null +++ b/src/main/java/com/simibubi/create/content/logistics/packagerLink/PackagerLinkGenerator.java @@ -0,0 +1,38 @@ +package com.simibubi.create.content.logistics.packagerLink; + +import com.simibubi.create.foundation.data.SpecialBlockStateGen; +import com.tterrag.registrate.providers.DataGenContext; +import com.tterrag.registrate.providers.RegistrateBlockstateProvider; + +import net.minecraft.core.Direction; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.AttachFace; + +import net.neoforged.neoforge.client.model.generators.ModelFile; + +public class PackagerLinkGenerator extends SpecialBlockStateGen { + + @Override + protected int getXRotation(BlockState state) { + return state.getValue(PackagerLinkBlock.FACE) == AttachFace.CEILING ? 180 : 0; + } + + @Override + protected int getYRotation(BlockState state) { + Direction facing = state.getValue(PackagerLinkBlock.FACING); + return horizontalAngle(facing); + } + + @Override + public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, + BlockState state) { + String variant = + state.getValue(PackagerLinkBlock.FACE) == AttachFace.WALL ? "block_horizontal" : "block_vertical"; + if (state.getValue(PackagerLinkBlock.POWERED)) + variant += "_powered"; + return prov.models() + .getExistingFile(prov.modLoc("block/stock_link/" + variant)); + } + +} diff --git a/src/main/java/com/simibubi/create/content/logistics/packagerLink/WiFiEffectPacket.java b/src/main/java/com/simibubi/create/content/logistics/packagerLink/WiFiEffectPacket.java new file mode 100644 index 0000000000..26108d7099 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/logistics/packagerLink/WiFiEffectPacket.java @@ -0,0 +1,45 @@ +package com.simibubi.create.content.logistics.packagerLink; + +import com.simibubi.create.AllPackets; +import com.simibubi.create.content.logistics.stockTicker.StockTickerBlockEntity; + +import io.netty.buffer.ByteBuf; +import net.createmod.catnip.net.base.ClientboundPacketPayload; +import net.createmod.catnip.platform.CatnipServices; +import net.minecraft.client.Minecraft; +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.core.BlockPos; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; + +import net.neoforged.api.distmarker.Dist; +import net.neoforged.api.distmarker.OnlyIn; + +public record WiFiEffectPacket(BlockPos pos) implements ClientboundPacketPayload { + public static StreamCodec STREAM_CODEC = StreamCodec.composite( + BlockPos.STREAM_CODEC, WiFiEffectPacket::pos, + WiFiEffectPacket::new + ); + + @Override + public PacketTypeProvider getTypeProvider() { + return AllPackets.PACKAGER_LINK_EFFECT; + } + + @Override + @OnlyIn(Dist.CLIENT) + public void handle(LocalPlayer player) { + BlockEntity blockEntity = Minecraft.getInstance().level.getBlockEntity(pos); + if (blockEntity instanceof PackagerLinkBlockEntity plbe) + plbe.playEffect(); + if (blockEntity instanceof StockTickerBlockEntity plbe) + plbe.playEffect(); + } + + public static void send(Level level, BlockPos pos) { + if (level instanceof ServerLevel serverLevel) + CatnipServices.NETWORK.sendToClientsAround(serverLevel, pos, 32, new WiFiEffectPacket(pos)); + } +} diff --git a/src/main/java/com/simibubi/create/content/logistics/packagerLink/WiFiParticle.java b/src/main/java/com/simibubi/create/content/logistics/packagerLink/WiFiParticle.java new file mode 100644 index 0000000000..a9f157bf93 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/logistics/packagerLink/WiFiParticle.java @@ -0,0 +1,61 @@ +package com.simibubi.create.content.logistics.packagerLink; + +import org.joml.Quaternionf; + +import com.simibubi.create.AllParticleTypes; +import com.simibubi.create.content.equipment.bell.BasicParticleData; +import com.simibubi.create.content.equipment.bell.CustomRotationParticle; + +import net.minecraft.client.Camera; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.particle.SpriteSet; +import net.minecraft.core.particles.ParticleOptions; +import net.minecraft.core.particles.ParticleType; +import net.minecraft.util.Mth; + +public class WiFiParticle extends CustomRotationParticle { + + private SpriteSet animatedSprite; + private boolean downward; + + public WiFiParticle(ClientLevel worldIn, double x, double y, double z, double vx, double vy, double vz, + SpriteSet spriteSet) { + super(worldIn, x, y + (vy < 0 ? -1 : 1), z, spriteSet, 0); + this.animatedSprite = spriteSet; + this.quadSize = 0.5f; + this.setSize(this.quadSize, this.quadSize); + this.loopLength = 16; + this.lifetime = 16; + this.setSpriteFromAge(spriteSet); + this.stoppedByCollision = true; // disable movement + this.downward = vy < 0; + } + + @Override + public void tick() { + setSpriteFromAge(animatedSprite); + if (age++ >= lifetime) + remove(); + } + + @Override + public Quaternionf getCustomRotation(Camera camera, float partialTicks) { + return new Quaternionf().rotateY(-camera.getYRot() * Mth.DEG_TO_RAD) + .mul(new Quaternionf().rotateZ(downward ? Mth.PI : 0)); + } + + public static class Data extends BasicParticleData implements ParticleOptions { + + @Override + public IBasicParticleFactory getBasicFactory() { + return WiFiParticle::new; + } + + @Override + public ParticleType getType() { + return AllParticleTypes.WIFI.get(); + } + + } + +} diff --git a/src/main/java/com/simibubi/create/content/logistics/redstoneRequester/RedstoneRequesterBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/redstoneRequester/RedstoneRequesterBlockEntity.java index fe4ef9ee1e..c85cb000a8 100644 --- a/src/main/java/com/simibubi/create/content/logistics/redstoneRequester/RedstoneRequesterBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/redstoneRequester/RedstoneRequesterBlockEntity.java @@ -9,7 +9,7 @@ import com.simibubi.create.content.logistics.stockTicker.StockCheckingBlockEntit import net.createmod.catnip.codecs.CatnipCodecUtils; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.core.particles.ParticleTypes; diff --git a/src/main/java/com/simibubi/create/content/logistics/stockTicker/PackageOrderRequestPacket.java b/src/main/java/com/simibubi/create/content/logistics/stockTicker/PackageOrderRequestPacket.java index ff603205d7..4e0e31371e 100644 --- a/src/main/java/com/simibubi/create/content/logistics/stockTicker/PackageOrderRequestPacket.java +++ b/src/main/java/com/simibubi/create/content/logistics/stockTicker/PackageOrderRequestPacket.java @@ -3,6 +3,7 @@ package com.simibubi.create.content.logistics.stockTicker; import com.simibubi.create.AllPackets; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.content.logistics.packagerLink.LogisticallyLinkedBehaviour.RequestType; +import com.simibubi.create.content.logistics.packagerLink.WiFiEffectPacket; import com.simibubi.create.content.logistics.redstoneRequester.RedstoneRequesterBlock; import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.networking.BlockEntityConfigurationPacket; @@ -47,10 +48,11 @@ public class PackageOrderRequestPacket extends BlockEntityConfigurationPacket @@ -121,7 +122,6 @@ public class StockKeeperCategoryScreen extends AbstractSimiContainerScreen implements SimpleDynamicVisual { diff --git a/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlockEntity.java index 90e0ef984d..4138a36a49 100644 --- a/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlockEntity.java @@ -32,11 +32,11 @@ import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.lang.Components; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelFilterSlot.java b/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelFilterSlot.java index d06b5a0086..a51b307344 100644 --- a/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelFilterSlot.java +++ b/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelFilterSlot.java @@ -2,7 +2,7 @@ package com.simibubi.create.content.logistics.tunnel; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.world.phys.Vec3; public class BrassTunnelFilterSlot extends ValueBoxTransform.Sided { diff --git a/src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultItem.java b/src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultItem.java index 109502de90..51de16e1cf 100644 --- a/src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultItem.java +++ b/src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultItem.java @@ -6,7 +6,7 @@ import com.simibubi.create.content.equipment.symmetryWand.SymmetryWandItem; import com.simibubi.create.foundation.block.IBE; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/materials/ExperienceBlock.java b/src/main/java/com/simibubi/create/content/materials/ExperienceBlock.java index 8dac29ea64..857cc1e098 100644 --- a/src/main/java/com/simibubi/create/content/materials/ExperienceBlock.java +++ b/src/main/java/com/simibubi/create/content/materials/ExperienceBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.materials; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.util.RandomSource; diff --git a/src/main/java/com/simibubi/create/content/materials/ExperienceNuggetItem.java b/src/main/java/com/simibubi/create/content/materials/ExperienceNuggetItem.java index 6f6d9ffe0c..7deb022ed5 100644 --- a/src/main/java/com/simibubi/create/content/materials/ExperienceNuggetItem.java +++ b/src/main/java/com/simibubi/create/content/materials/ExperienceNuggetItem.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.materials; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.Direction.Axis; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; diff --git a/src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java b/src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java index 21cf796d44..500da4b5b5 100644 --- a/src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java @@ -30,16 +30,16 @@ import com.simibubi.create.foundation.item.SmartInventory; import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.IntAttached; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; -import net.createmod.catnip.utility.lang.Components; -import net.createmod.catnip.utility.lang.LangBuilder; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.IntAttached; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.LangBuilder; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java b/src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java index 02b8ce093a..43b6c493c5 100644 --- a/src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java +++ b/src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java @@ -20,7 +20,7 @@ import com.simibubi.create.foundation.item.SmartInventory; import com.simibubi.create.foundation.recipe.DummyCraftingContainer; import com.simibubi.create.foundation.recipe.IRecipeTypeInfo; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.client.Minecraft; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.CraftingRecipe; diff --git a/src/main/java/com/simibubi/create/content/processing/basin/BasinRenderer.java b/src/main/java/com/simibubi/create/content/processing/basin/BasinRenderer.java index 72930e66a2..a5726348a2 100644 --- a/src/main/java/com/simibubi/create/content/processing/basin/BasinRenderer.java +++ b/src/main/java/com/simibubi/create/content/processing/basin/BasinRenderer.java @@ -7,10 +7,10 @@ import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRende import com.simibubi.create.foundation.fluid.FluidRenderer; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.IntAttached; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.math.AngleHelper; -import net.createmod.ponder.utility.LevelTickHolder; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.data.IntAttached; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; @@ -75,7 +75,7 @@ public class BasinRenderer extends SmartBlockEntityRenderer { if (fluidLevel > 0) { ms.translate(0, (Mth.sin( - LevelTickHolder.getRenderTime(basin.getLevel()) / 12f + anglePartition * itemCount) + 1.5f) + AnimationTickHolder.getRenderTime(basin.getLevel()) / 12f + anglePartition * itemCount) + 1.5f) * 1 / 32f, 0); } @@ -175,7 +175,7 @@ public class BasinRenderer extends SmartBlockEntityRenderer { float partial = Mth.clamp(units / totalUnits, 0, 1); xMax += partial * 12 / 16f; FluidRenderer.renderFluidBox(renderedFluid.getFluid(), renderedFluid.getAmount(), xMin, yMin, zMin, xMax, yMax, zMax, buffer, ms, light, - false, false, renderedFluid.getComponents()); + false, false, renderedFluid.getComponentsPatch()); xMin = xMax; } diff --git a/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlock.java b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlock.java index a602161c36..c4a465fa7c 100644 --- a/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlock.java +++ b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlock.java @@ -17,7 +17,7 @@ import com.simibubi.create.content.logistics.stockTicker.StockTickerInteractionH import com.simibubi.create.content.processing.basin.BasinBlockEntity; import com.simibubi.create.foundation.block.IBE; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.advancements.critereon.StatePropertiesPredicate; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlockEntity.java b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlockEntity.java index cc8631956d..4958b0ef2c 100644 --- a/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlockEntity.java @@ -16,11 +16,11 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import dev.engine_room.flywheel.api.backend.BackendManager; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.BlockPos; @@ -121,7 +121,7 @@ public class BlazeBurnerBlockEntity extends SmartBlockEntity { super.lazyTick(); stockKeeper = getStockTicker(level, worldPosition) != null; } - + @Nullable public static StockTickerBlockEntity getStockTicker(LevelAccessor level, BlockPos pos) { for (Direction direction : Iterate.horizontalDirections) { @@ -207,7 +207,7 @@ public class BlazeBurnerBlockEntity extends SmartBlockEntity { public BlazeBurnerBlock.HeatLevel getHeatLevelFromBlock() { return BlazeBurnerBlock.getHeatLevelOf(getBlockState()); } - + public BlazeBurnerBlock.HeatLevel getHeatLevelForRender() { HeatLevel heatLevel = getHeatLevelFromBlock(); if (!heatLevel.isAtLeast(HeatLevel.FADING) && stockKeeper) diff --git a/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlockItem.java b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlockItem.java index 30ca0decce..09158fe034 100644 --- a/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlockItem.java +++ b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlockItem.java @@ -10,8 +10,8 @@ import javax.annotation.ParametersAreNonnullByDefault; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTags.AllEntityTags; -import net.createmod.catnip.utility.RegisteredObjectsHelper; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; diff --git a/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerInteractionBehaviour.java b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerInteractionBehaviour.java index a4d798e9f7..8f370cdb1b 100644 --- a/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerInteractionBehaviour.java +++ b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerInteractionBehaviour.java @@ -14,7 +14,7 @@ import com.simibubi.create.content.trains.schedule.ScheduleItem; import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerMovementBehaviour.java b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerMovementBehaviour.java index 7e166aa7d3..9294d06a33 100644 --- a/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerMovementBehaviour.java @@ -9,11 +9,11 @@ import com.simibubi.create.content.trains.entity.CarriageContraption; import com.simibubi.create.content.trains.entity.CarriageContraptionEntity; import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerRenderer.java b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerRenderer.java index 361bc718f7..5d2892b1c6 100644 --- a/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerRenderer.java +++ b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerRenderer.java @@ -13,12 +13,12 @@ import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRender import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld; 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.SpriteShiftEntry; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.math.AngleHelper; -import net.createmod.ponder.utility.LevelTickHolder; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -64,7 +64,7 @@ public class BlazeBurnerRenderer extends SafeBlockEntityRenderer 0.125f; - float time = LevelTickHolder.getRenderTime(level); + float time = AnimationTickHolder.getRenderTime(level); float renderTick = time + (hashCode % 13) * 16f; float offsetMult = heatLevel.isAtLeast(HeatLevel.FADING) ? 64 : 16; float offset = Mth.sin((float) ((renderTick / 16f) % (2 * Math.PI))) / offsetMult; diff --git a/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerVisual.java b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerVisual.java index 63656ff96d..2077f20bac 100644 --- a/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerVisual.java +++ b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerVisual.java @@ -2,11 +2,11 @@ package com.simibubi.create.content.processing.burner; import java.util.function.Consumer; +import net.createmod.catnip.animation.AnimationTickHolder; import org.jetbrains.annotations.Nullable; import com.simibubi.create.AllPartialModels; import com.simibubi.create.AllSpriteShifts; -import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel; import com.simibubi.create.foundation.render.AllInstanceTypes; import dev.engine_room.flywheel.api.instance.Instance; @@ -22,8 +22,7 @@ import dev.engine_room.flywheel.lib.visual.AbstractBlockEntityVisual; import dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual; import dev.engine_room.flywheel.lib.visual.SimpleTickableVisual; import net.createmod.catnip.render.SpriteShiftEntry; -import net.createmod.catnip.utility.math.AngleHelper; -import net.createmod.ponder.utility.LevelTickHolder; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.renderer.LightTexture; import net.minecraft.core.Direction; import net.minecraft.util.Mth; @@ -140,7 +139,7 @@ public class BlazeBurnerVisual extends AbstractBlockEntityVisual { diff --git a/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeScrollSlot.java b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeScrollSlot.java index e88ffbedb6..8992b8f528 100644 --- a/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeScrollSlot.java +++ b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeScrollSlot.java @@ -4,8 +4,8 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.core.BlockPos; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeScrollValueBehaviour.java b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeScrollValueBehaviour.java index 20d99c40da..7c853d1106 100644 --- a/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeScrollValueBehaviour.java +++ b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeScrollValueBehaviour.java @@ -7,7 +7,7 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsFormatt import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; diff --git a/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeVisual.java b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeVisual.java index 78843dddd5..bbcfa8a1dc 100644 --- a/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeVisual.java +++ b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeVisual.java @@ -12,7 +12,7 @@ import dev.engine_room.flywheel.lib.instance.TransformedInstance; import dev.engine_room.flywheel.lib.model.Models; import dev.engine_room.flywheel.lib.visual.AbstractBlockEntityVisual; import dev.engine_room.flywheel.lib.visual.SimpleTickableVisual; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.theme.Color; public class BrassDiodeVisual extends AbstractBlockEntityVisual implements SimpleTickableVisual { diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/AllDisplayBehaviours.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/AllDisplayBehaviours.java index 9668547ef7..2b5e0596aa 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/AllDisplayBehaviours.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/AllDisplayBehaviours.java @@ -22,7 +22,7 @@ import com.simibubi.create.content.redstone.displayLink.target.SignDisplayTarget import com.simibubi.create.foundation.utility.AttachedRegistry; import com.tterrag.registrate.util.nullness.NonNullConsumer; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/ClickToLinkBlockItem.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/ClickToLinkBlockItem.java index ef6a9bc77b..1e9e38761e 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/ClickToLinkBlockItem.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/ClickToLinkBlockItem.java @@ -8,8 +8,8 @@ import com.simibubi.create.foundation.block.IBE; import com.simibubi.create.foundation.utility.CreateLang; import io.netty.buffer.ByteBuf; -import net.createmod.catnip.CatnipClient; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.outliner.Outliner; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; @@ -31,6 +31,7 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.shapes.VoxelShape; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.bus.api.SubscribeEvent; @@ -164,7 +165,7 @@ public abstract class ClickToLinkBlockItem extends BlockItem { lastShownPos = selectedPos; } - CatnipClient.OUTLINER.showAABB("target", lastShownAABB) + Outliner.getInstance().showAABB("target", lastShownAABB) .colored(0xffcb74) .lineWidth(1 / 16f); } diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlock.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlock.java index 15e89e43fe..9f9638edb8 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlock.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlock.java @@ -18,7 +18,7 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.gui.ScreenOpener; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlockEntity.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlockEntity.java index 1d5347369b..afbe0fe245 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlockEntity.java @@ -13,6 +13,7 @@ import com.simibubi.create.content.redstone.displayLink.target.DisplayTarget; import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; +import net.createmod.catnip.math.VecHelper; import dan200.computercraft.api.peripheral.PeripheralCapability; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -22,6 +23,7 @@ import net.minecraft.nbt.NbtUtils; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.Vec3; import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; public class DisplayLinkBlockEntity extends LinkWithBulbBlockEntity { @@ -210,4 +212,11 @@ public class DisplayLinkBlockEntity extends LinkWithBulbBlockEntity { return worldPosition.offset(targetOffset); } + private static final Vec3 bulbOffset = VecHelper.voxelSpace(11, 7, 5); + + @Override + public Vec3 getBulbOffset(BlockState state) { + return bulbOffset; + } + } diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkScreen.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkScreen.java index f71fe12a6a..8b6c8f9fa8 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkScreen.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkScreen.java @@ -26,8 +26,8 @@ import net.createmod.catnip.gui.ScreenOpener; import net.createmod.catnip.gui.element.GuiGameElement; import net.createmod.catnip.gui.widget.AbstractSimiWidget; import net.createmod.catnip.gui.widget.ElementWidget; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.lang.Components; import net.createmod.ponder.foundation.ui.PonderTagScreen; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/LinkBulbRenderer.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/LinkBulbRenderer.java index 84d6392b77..268c392bb1 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/LinkBulbRenderer.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/LinkBulbRenderer.java @@ -7,7 +7,7 @@ import com.simibubi.create.foundation.render.RenderTypes; import dev.engine_room.flywheel.lib.transform.TransformStack; import net.createmod.catnip.render.CachedBuffers; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -35,25 +35,22 @@ public class LinkBulbRenderer extends SafeBlockEntityRenderer consumer) { - consumer.accept(SimpleCustomRenderer.create(this, new LinkedControllerItemRenderer())); - } - } diff --git a/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerItemRenderer.java b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerItemRenderer.java index 72a82f7bdd..0ca8f6d55d 100644 --- a/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerItemRenderer.java +++ b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerItemRenderer.java @@ -13,9 +13,9 @@ import com.simibubi.create.foundation.item.render.PartialItemModelRenderer; import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.resources.model.BakedModel; diff --git a/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerServerHandler.java b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerServerHandler.java index 9d01047742..6729912cbd 100644 --- a/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerServerHandler.java +++ b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerServerHandler.java @@ -15,9 +15,9 @@ import com.simibubi.create.content.redstone.link.LinkBehaviour; import com.simibubi.create.content.redstone.link.RedstoneLinkNetworkHandler.Frequency; import com.simibubi.create.foundation.advancement.AllAdvancements; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.IntAttached; -import net.createmod.catnip.utility.WorldAttached; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.IntAttached; +import net.createmod.catnip.data.WorldAttached; import net.minecraft.core.BlockPos; import net.minecraft.world.level.LevelAccessor; diff --git a/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlock.java b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlock.java index c3203a8ab5..ba2a9e42ca 100644 --- a/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlock.java +++ b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlock.java @@ -15,7 +15,7 @@ import com.simibubi.create.content.schematics.requirement.ItemRequirement; import com.simibubi.create.content.schematics.requirement.ItemRequirement.ItemUseType; 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.Direction; import net.minecraft.core.component.DataComponents; diff --git a/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlockEntity.java b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlockEntity.java index 91ac99037c..3b43f5c278 100644 --- a/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlockEntity.java @@ -11,8 +11,8 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.utility.DynamicComponent; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.lang.Components; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeRenderer.java b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeRenderer.java index a59150b684..c7cef022bf 100644 --- a/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeRenderer.java +++ b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeRenderer.java @@ -10,12 +10,12 @@ import com.simibubi.create.foundation.render.RenderTypes; import com.simibubi.create.foundation.utility.DyeHelper; import dev.engine_room.flywheel.lib.transform.TransformStack; +import net.createmod.catnip.animation.AnimationTickHolder; import net.createmod.catnip.render.CachedBuffers; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.math.AngleHelper; -import net.createmod.catnip.utility.theme.Color; -import net.createmod.ponder.utility.LevelTickHolder; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.AngleHelper; +import net.createmod.catnip.theme.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.font.glyphs.BakedGlyph; @@ -143,7 +143,7 @@ public class NixieTubeRenderer extends SafeBlockEntityRenderer { diff --git a/src/main/java/com/simibubi/create/content/trains/entity/CarriageCouplingRenderer.java b/src/main/java/com/simibubi/create/content/trains/entity/CarriageCouplingRenderer.java index 9640311fad..2299495cbd 100644 --- a/src/main/java/com/simibubi/create/content/trains/entity/CarriageCouplingRenderer.java +++ b/src/main/java/com/simibubi/create/content/trains/entity/CarriageCouplingRenderer.java @@ -9,8 +9,8 @@ import com.simibubi.create.AllPartialModels; import com.simibubi.create.CreateClient; import net.createmod.catnip.render.CachedBuffers; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/simibubi/create/content/trains/entity/CarriageParticles.java b/src/main/java/com/simibubi/create/content/trains/entity/CarriageParticles.java index 515cf1b8d6..ae91071c10 100644 --- a/src/main/java/com/simibubi/create/content/trains/entity/CarriageParticles.java +++ b/src/main/java/com/simibubi/create/content/trains/entity/CarriageParticles.java @@ -2,10 +2,10 @@ package com.simibubi.create.content.trains.entity; import com.simibubi.create.content.trains.entity.Carriage.DimensionalCarriageEntity; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; import net.minecraft.client.Minecraft; import net.minecraft.core.Direction.Axis; import net.minecraft.util.RandomSource; diff --git a/src/main/java/com/simibubi/create/content/trains/entity/CarriageSounds.java b/src/main/java/com/simibubi/create/content/trains/entity/CarriageSounds.java index 79f73ff747..ee2a60d950 100644 --- a/src/main/java/com/simibubi/create/content/trains/entity/CarriageSounds.java +++ b/src/main/java/com/simibubi/create/content/trains/entity/CarriageSounds.java @@ -4,9 +4,9 @@ import com.simibubi.create.AllSoundEvents; import com.simibubi.create.AllSoundEvents.SoundEntry; import com.simibubi.create.content.trains.entity.Carriage.DimensionalCarriageEntity; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.sounds.AbstractTickableSoundInstance; import net.minecraft.client.resources.sounds.SoundInstance; diff --git a/src/main/java/com/simibubi/create/content/trains/entity/CarriageSyncData.java b/src/main/java/com/simibubi/create/content/trains/entity/CarriageSyncData.java index ec360961d0..2ddab22bc2 100644 --- a/src/main/java/com/simibubi/create/content/trains/entity/CarriageSyncData.java +++ b/src/main/java/com/simibubi/create/content/trains/entity/CarriageSyncData.java @@ -19,10 +19,10 @@ import com.simibubi.create.content.trains.graph.TrackGraph; import com.simibubi.create.content.trains.graph.TrackNode; import com.simibubi.create.foundation.utility.ServerSpeedProvider; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.math.VecHelper; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.util.Mth; import net.minecraft.world.phys.Vec3; diff --git a/src/main/java/com/simibubi/create/content/trains/entity/Navigation.java b/src/main/java/com/simibubi/create/content/trains/entity/Navigation.java index 273bfc0b26..40c351f51d 100644 --- a/src/main/java/com/simibubi/create/content/trains/entity/Navigation.java +++ b/src/main/java/com/simibubi/create/content/trains/entity/Navigation.java @@ -36,10 +36,10 @@ import com.simibubi.create.content.trains.station.GlobalStation; import com.simibubi.create.content.trains.track.BezierConnection; import com.simibubi.create.content.trains.track.TrackMaterial; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.data.Pair; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; import net.minecraft.util.Mth; @@ -265,7 +265,7 @@ public class Navigation { if (targetDistance < 10) { double maxApproachSpeed = topSpeed * ((targetDistance) / 10); double speedRelativeToStation = train.speed * speedMod; - + if (speedRelativeToStation > maxApproachSpeed) { train.speed += (maxApproachSpeed - Math.abs(train.speed)) * .5f * speedMod; return; diff --git a/src/main/java/com/simibubi/create/content/trains/entity/Train.java b/src/main/java/com/simibubi/create/content/trains/entity/Train.java index 9a1c7de5bb..d749129c6a 100644 --- a/src/main/java/com/simibubi/create/content/trains/entity/Train.java +++ b/src/main/java/com/simibubi/create/content/trains/entity/Train.java @@ -51,11 +51,11 @@ import com.simibubi.create.infrastructure.config.AllConfigs; import net.createmod.catnip.codecs.stream.CatnipLargerStreamCodecs; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/trains/entity/TrainMigration.java b/src/main/java/com/simibubi/create/content/trains/entity/TrainMigration.java index 9e34d426d2..e2f442fdb7 100644 --- a/src/main/java/com/simibubi/create/content/trains/entity/TrainMigration.java +++ b/src/main/java/com/simibubi/create/content/trains/entity/TrainMigration.java @@ -9,8 +9,8 @@ import com.simibubi.create.content.trains.graph.TrackGraphLocation; import com.simibubi.create.content.trains.graph.TrackNode; import com.simibubi.create.content.trains.graph.TrackNodeLocation; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.math.VecHelper; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; import net.minecraft.util.Mth; diff --git a/src/main/java/com/simibubi/create/content/trains/entity/TrainRelocationPacket.java b/src/main/java/com/simibubi/create/content/trains/entity/TrainRelocationPacket.java index 6d7180d203..5098791a16 100644 --- a/src/main/java/com/simibubi/create/content/trains/entity/TrainRelocationPacket.java +++ b/src/main/java/com/simibubi/create/content/trains/entity/TrainRelocationPacket.java @@ -9,9 +9,9 @@ import com.simibubi.create.content.trains.track.BezierTrackPointLocation; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; +import io.netty.buffer.ByteBuf; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import net.createmod.catnip.codecs.stream.CatnipStreamCodecs; -import io.netty.buffer.ByteBuf; import net.createmod.catnip.net.base.ServerboundPacketPayload; import net.createmod.catnip.platform.CatnipServices; import net.minecraft.ChatFormatting; diff --git a/src/main/java/com/simibubi/create/content/trains/entity/TrainRelocator.java b/src/main/java/com/simibubi/create/content/trains/entity/TrainRelocator.java index e22ecaf0bf..ec42143c0b 100644 --- a/src/main/java/com/simibubi/create/content/trains/entity/TrainRelocator.java +++ b/src/main/java/com/simibubi/create/content/trains/entity/TrainRelocator.java @@ -32,10 +32,10 @@ import com.simibubi.create.content.trains.track.TrackBlockOutline.BezierPointSel import com.simibubi.create.foundation.item.TooltipHelper; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.CatnipClient; +import net.createmod.catnip.data.Couple; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.outliner.Outliner; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; @@ -50,6 +50,7 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.neoforge.client.event.InputEvent; @@ -122,7 +123,7 @@ public class TrainRelocator { for (int i = 0; i < toVisualise.size() - 1; i++) { Vec3 vec1 = toVisualise.get(i).add(offset); Vec3 vec2 = toVisualise.get(i + 1).add(offset); - CatnipClient.OUTLINER.showLine(Pair.of(relocating, i), vec1.add(0, -.925f, 0), vec2.add(0, -.925f, 0)) + Outliner.getInstance().showLine(Pair.of(relocating, i), vec1.add(0, -.925f, 0), vec2.add(0, -.925f, 0)) .colored(lastHoveredResult || i != toVisualise.size() - 2 ? 0x95CD41 : 0xEA5C2B) .disableLineNormals() .lineWidth(i % 2 == 1 ? 1 / 6f : 1 / 4f); @@ -270,7 +271,7 @@ public class TrainRelocator { @OnlyIn(Dist.CLIENT) public static void visualise(Train train, int i, Vec3 v1, Vec3 v2, boolean valid) { - CatnipClient.OUTLINER.showLine(Pair.of(train, i), v1.add(0, -.825f, 0), v2.add(0, -.825f, 0)) + Outliner.getInstance().showLine(Pair.of(train, i), v1.add(0, -.825f, 0), v2.add(0, -.825f, 0)) .colored(valid ? 0x95CD41 : 0xEA5C2B) .disableLineNormals() .lineWidth(i % 2 == 1 ? 1 / 6f : 1 / 4f); diff --git a/src/main/java/com/simibubi/create/content/trains/entity/TrainStatus.java b/src/main/java/com/simibubi/create/content/trains/entity/TrainStatus.java index ee8f7c120b..92e7d2335a 100644 --- a/src/main/java/com/simibubi/create/content/trains/entity/TrainStatus.java +++ b/src/main/java/com/simibubi/create/content/trains/entity/TrainStatus.java @@ -8,7 +8,7 @@ import java.util.stream.Stream; import com.google.common.collect.Streams; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -44,7 +44,7 @@ public class TrainStatus { displayInformation("no_match", false, filter); navigation = true; } - + public void failedPackageNoTarget(String address) { if (navigation) return; diff --git a/src/main/java/com/simibubi/create/content/trains/entity/TravellingPoint.java b/src/main/java/com/simibubi/create/content/trains/entity/TravellingPoint.java index caf5ccd7e9..a2e2976c7c 100644 --- a/src/main/java/com/simibubi/create/content/trains/entity/TravellingPoint.java +++ b/src/main/java/com/simibubi/create/content/trains/entity/TravellingPoint.java @@ -24,8 +24,8 @@ import com.simibubi.create.content.trains.graph.TrackNode; import com.simibubi.create.content.trains.graph.TrackNodeLocation; import com.simibubi.create.content.trains.signal.TrackEdgePoint; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Pair; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; import net.minecraft.util.Mth; diff --git a/src/main/java/com/simibubi/create/content/trains/graph/DimensionPalette.java b/src/main/java/com/simibubi/create/content/trains/graph/DimensionPalette.java index 2361061e54..2dba18c28c 100644 --- a/src/main/java/com/simibubi/create/content/trains/graph/DimensionPalette.java +++ b/src/main/java/com/simibubi/create/content/trains/graph/DimensionPalette.java @@ -3,7 +3,7 @@ package com.simibubi.create.content.trains.graph; import java.util.ArrayList; import java.util.List; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.nbt.NBTHelper; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/com/simibubi/create/content/trains/graph/DiscoveredPath.java b/src/main/java/com/simibubi/create/content/trains/graph/DiscoveredPath.java index 6c5634c090..77dafc7735 100644 --- a/src/main/java/com/simibubi/create/content/trains/graph/DiscoveredPath.java +++ b/src/main/java/com/simibubi/create/content/trains/graph/DiscoveredPath.java @@ -4,7 +4,7 @@ import java.util.List; import com.simibubi.create.content.trains.station.GlobalStation; -import net.createmod.catnip.utility.Couple; +import net.createmod.catnip.data.Couple; public class DiscoveredPath { public List> path; diff --git a/src/main/java/com/simibubi/create/content/trains/graph/EdgeData.java b/src/main/java/com/simibubi/create/content/trains/graph/EdgeData.java index 16147fd907..2485bd7ba9 100644 --- a/src/main/java/com/simibubi/create/content/trains/graph/EdgeData.java +++ b/src/main/java/com/simibubi/create/content/trains/graph/EdgeData.java @@ -14,8 +14,8 @@ import com.simibubi.create.content.trains.signal.SignalBoundary; import com.simibubi.create.content.trains.signal.SignalEdgeGroup; import com.simibubi.create.content.trains.signal.TrackEdgePoint; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/content/trains/graph/EdgePointManager.java b/src/main/java/com/simibubi/create/content/trains/graph/EdgePointManager.java index 0644542bfd..ce559457a4 100644 --- a/src/main/java/com/simibubi/create/content/trains/graph/EdgePointManager.java +++ b/src/main/java/com/simibubi/create/content/trains/graph/EdgePointManager.java @@ -3,8 +3,8 @@ package com.simibubi.create.content.trains.graph; import com.simibubi.create.Create; import com.simibubi.create.content.trains.signal.TrackEdgePoint; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; public class EdgePointManager { diff --git a/src/main/java/com/simibubi/create/content/trains/graph/EdgePointStorage.java b/src/main/java/com/simibubi/create/content/trains/graph/EdgePointStorage.java index 5ea88d4c2c..f1cc2d008a 100644 --- a/src/main/java/com/simibubi/create/content/trains/graph/EdgePointStorage.java +++ b/src/main/java/com/simibubi/create/content/trains/graph/EdgePointStorage.java @@ -9,7 +9,7 @@ import java.util.UUID; import com.simibubi.create.Create; import com.simibubi.create.content.trains.signal.TrackEdgePoint; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; diff --git a/src/main/java/com/simibubi/create/content/trains/graph/TrackEdge.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackEdge.java index c664b5f743..1208163396 100644 --- a/src/main/java/com/simibubi/create/content/trains/graph/TrackEdge.java +++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackEdge.java @@ -10,7 +10,7 @@ import com.google.common.collect.ImmutableList; import com.simibubi.create.content.trains.track.BezierConnection; import com.simibubi.create.content.trains.track.TrackMaterial; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction.Axis; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/trains/graph/TrackEdgeIntersection.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackEdgeIntersection.java index 1c5bfb64f6..ec9059dd01 100644 --- a/src/main/java/com/simibubi/create/content/trains/graph/TrackEdgeIntersection.java +++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackEdgeIntersection.java @@ -2,7 +2,7 @@ package com.simibubi.create.content.trains.graph; import java.util.UUID; -import net.createmod.catnip.utility.Couple; +import net.createmod.catnip.data.Couple; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; diff --git a/src/main/java/com/simibubi/create/content/trains/graph/TrackGraph.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraph.java index 3ddd34c877..1945773129 100644 --- a/src/main/java/com/simibubi/create/content/trains/graph/TrackGraph.java +++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraph.java @@ -26,11 +26,11 @@ import com.simibubi.create.content.trains.signal.TrackEdgePoint; import com.simibubi.create.content.trains.track.BezierConnection; import com.simibubi.create.content.trains.track.TrackMaterial; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.theme.Color; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; diff --git a/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphHelper.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphHelper.java index 1343277df9..6edac3aed1 100644 --- a/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphHelper.java +++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphHelper.java @@ -13,7 +13,7 @@ import com.simibubi.create.content.trains.track.BezierTrackPointLocation; import com.simibubi.create.content.trains.track.ITrackBlock; import com.simibubi.create.content.trains.track.TrackBlockEntity; -import net.createmod.catnip.utility.Couple; +import net.createmod.catnip.data.Couple; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction.AxisDirection; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphLocation.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphLocation.java index 8cd441d186..a43223735f 100644 --- a/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphLocation.java +++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphLocation.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.trains.graph; -import net.createmod.catnip.utility.Couple; +import net.createmod.catnip.data.Couple; public class TrackGraphLocation { diff --git a/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphSync.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphSync.java index 44aa8da12c..34970b03c4 100644 --- a/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphSync.java +++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphSync.java @@ -15,8 +15,8 @@ import com.simibubi.create.content.trains.signal.SignalEdgeGroupPacket; import com.simibubi.create.content.trains.signal.TrackEdgePoint; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Pair; import net.minecraft.server.level.ServerPlayer; public class TrackGraphSync { diff --git a/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphSyncPacket.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphSyncPacket.java index d25b9e0a31..5c682db431 100644 --- a/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphSyncPacket.java +++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphSyncPacket.java @@ -15,9 +15,9 @@ import com.simibubi.create.content.trains.signal.TrackEdgePoint; import com.simibubi.create.content.trains.track.BezierConnection; import com.simibubi.create.content.trains.track.TrackMaterial; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.math.VecHelper; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.world.phys.Vec3; @@ -175,7 +175,7 @@ public class TrackGraphSyncPacket extends TrackGraphPacket { @Override protected void handle(GlobalRailwayManager manager, TrackGraph graph) { manager.version++; - + if (packetDeletesGraph) { manager.removeGraph(graph); return; diff --git a/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphVisualizer.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphVisualizer.java index d72f986b91..214c83b47e 100644 --- a/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphVisualizer.java +++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphVisualizer.java @@ -14,10 +14,9 @@ import com.simibubi.create.content.trains.signal.SignalEdgeGroup; import com.simibubi.create.content.trains.signal.TrackEdgePoint; import com.simibubi.create.content.trains.track.BezierConnection; -import net.createmod.catnip.CatnipClient; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.outliner.Outliner; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.outliner.Outliner; +import net.createmod.catnip.theme.Color; import net.minecraft.client.Minecraft; import net.minecraft.world.entity.Entity; import net.minecraft.world.phys.AABB; @@ -36,7 +35,7 @@ public class TrackGraphVisualizer { return; Vec3 camera = cameraEntity.getEyePosition(); - Outliner outliner = CatnipClient.OUTLINER; + Outliner outliner = Outliner.getInstance(); Map allGroups = Create.RAILWAYS.sided(null).signalEdgeGroups; float width = 1 / 8f; @@ -239,7 +238,7 @@ public class TrackGraphVisualizer { Vec3 yOffset = new Vec3(0, 3 / 16f, 0); Vec3 v1 = location.add(yOffset); Vec3 v2 = v1.add(node.normal.scale(3 / 16f)); - CatnipClient.OUTLINER.showLine(Integer.valueOf(node.netId), v1, v2) + Outliner.getInstance().showLine(Integer.valueOf(node.netId), v1, v2) .colored(Color.mixColors(Color.WHITE, graph.color, 1)) .lineWidth(1 / 8f); @@ -255,7 +254,7 @@ public class TrackGraphVisualizer { if (!edge.node1.location.dimension.equals(edge.node2.location.dimension)) { v1 = location.add(yOffset); v2 = v1.add(node.normal.scale(3 / 16f)); - CatnipClient.OUTLINER.showLine(Integer.valueOf(node.netId), v1, v2) + Outliner.getInstance().showLine(Integer.valueOf(node.netId), v1, v2) .colored(Color.mixColors(Color.WHITE, graph.color, 1)) .lineWidth(1 / 4f); continue; @@ -268,15 +267,15 @@ public class TrackGraphVisualizer { if (extended) { Vec3 materialPos = edge.getPosition(graph, 0.5) .add(0, 1, 0); - CatnipClient.OUTLINER.showItem(Pair.of(edge, edge.edgeData), materialPos, + Outliner.getInstance().showItem(Pair.of(edge, edge.edgeData), materialPos, edge.getTrackMaterial() .asStack()); - CatnipClient.OUTLINER.showAABB(edge.edgeData, AABB.ofSize(materialPos, .25, 0, .25) + Outliner.getInstance().showAABB(edge.edgeData, AABB.ofSize(materialPos, .25, 0, .25) .move(0, -0.5, 0)) .lineWidth(1 / 16f) .colored(graph.color); } - CatnipClient.OUTLINER.showLine(edge, edge.getPosition(graph, 0) + Outliner.getInstance().showLine(edge, edge.getPosition(graph, 0) .add(yOffset), edge.getPosition(graph, 1) .add(yOffset)) @@ -290,9 +289,9 @@ public class TrackGraphVisualizer { if (extended) { Vec3 materialPos = edge.getPosition(graph, 0.5) .add(0, 1, 0); - CatnipClient.OUTLINER.showItem(Pair.of(edge, edge.edgeData), materialPos, edge.getTrackMaterial() + Outliner.getInstance().showItem(Pair.of(edge, edge.edgeData), materialPos, edge.getTrackMaterial() .asStack()); - CatnipClient.OUTLINER.showAABB(edge.edgeData, AABB.ofSize(materialPos, .25, 0, .25) + Outliner.getInstance().showAABB(edge.edgeData, AABB.ofSize(materialPos, .25, 0, .25) .move(0, -0.5, 0)) .lineWidth(1 / 16f) .colored(graph.color); @@ -300,7 +299,7 @@ public class TrackGraphVisualizer { for (int i = 0; i <= turn.getSegmentCount(); i++) { Vec3 current = edge.getPosition(graph, i * 1f / turn.getSegmentCount()); if (previous != null) - CatnipClient.OUTLINER + Outliner.getInstance() .showLine(Pair.of(edge, previous), previous.add(yOffset), current.add(yOffset)) .colored(graph.color) .lineWidth(1 / 16f); diff --git a/src/main/java/com/simibubi/create/content/trains/graph/TrackNodeLocation.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackNodeLocation.java index 8c78f795ce..2ded474dd2 100644 --- a/src/main/java/com/simibubi/create/content/trains/graph/TrackNodeLocation.java +++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackNodeLocation.java @@ -7,8 +7,8 @@ import java.util.Set; import com.simibubi.create.content.trains.track.BezierConnection; import com.simibubi.create.content.trains.track.TrackMaterial; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; + +import net.createmod.catnip.data.Iterate; import net.minecraft.core.BlockPos; import net.minecraft.core.Vec3i; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/DestinationSuggestions.java b/src/main/java/com/simibubi/create/content/trains/schedule/DestinationSuggestions.java index fb71e940d5..495055f246 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/DestinationSuggestions.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/DestinationSuggestions.java @@ -6,7 +6,7 @@ import java.util.List; import com.mojang.brigadier.context.StringRange; import com.mojang.brigadier.suggestion.Suggestion; -import net.createmod.catnip.utility.IntAttached; +import net.createmod.catnip.data.IntAttached; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.components.CommandSuggestions; @@ -81,7 +81,7 @@ public class DestinationSuggestions extends CommandSuggestions { int x = Mth.clamp(textBox.getScreenX(0), 0, textBox.getScreenX(0) + textBox.getInnerWidth() - width); suggestions = new CommandSuggestions.SuggestionsList(x, 72 + yOffset, width, currentSuggestions, false); } - + public boolean isEmpty() { return viableStations.isEmpty(); } diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/IScheduleInput.java b/src/main/java/com/simibubi/create/content/trains/schedule/IScheduleInput.java index 26f97ab966..70ecd8328a 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/IScheduleInput.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/IScheduleInput.java @@ -7,8 +7,8 @@ import javax.annotation.Nullable; import com.google.common.collect.ImmutableList; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.lang.Components; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/Schedule.java b/src/main/java/com/simibubi/create/content/trains/schedule/Schedule.java index 574885f11c..39565a0300 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/Schedule.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/Schedule.java @@ -22,9 +22,9 @@ import com.simibubi.create.content.trains.schedule.destination.DestinationInstru import com.simibubi.create.content.trains.schedule.destination.FetchPackagesInstruction; import com.simibubi.create.content.trains.schedule.destination.ScheduleInstruction; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.lang.Components; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleEntry.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleEntry.java index d05f7d3d20..8e2d52e1c8 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleEntry.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleEntry.java @@ -6,7 +6,7 @@ import java.util.List; import com.simibubi.create.content.trains.schedule.condition.ScheduleWaitCondition; import com.simibubi.create.content.trains.schedule.destination.ScheduleInstruction; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.nbt.NBTHelper; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItem.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItem.java index 31e4a656ee..61536e039d 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItem.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItem.java @@ -13,8 +13,8 @@ import com.simibubi.create.content.trains.schedule.destination.DestinationInstru import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItemEntityInteraction.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItemEntityInteraction.java index d91a7eaf16..46ce6aee2a 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItemEntityInteraction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItemEntityInteraction.java @@ -8,7 +8,7 @@ import com.simibubi.create.content.trains.entity.CarriageContraptionEntity; import com.simibubi.create.content.trains.entity.Train; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Couple; +import net.createmod.catnip.data.Couple; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java index 4590ea5dbd..556b074860 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java @@ -18,8 +18,8 @@ import com.simibubi.create.content.trains.schedule.destination.DestinationInstru import com.simibubi.create.content.trains.schedule.destination.ScheduleInstruction; import com.simibubi.create.content.trains.station.GlobalStation; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.lang.Components; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; @@ -45,7 +45,7 @@ public class ScheduleRuntime { public boolean completed; public int currentEntry; public State state; - + public List conditionProgress; public List conditionContext; public String currentTitle; @@ -54,7 +54,7 @@ public class ScheduleRuntime { public List predictionTicks; public boolean displayLinkUpdateRequested; - + private static final int INTERVAL = 40; private int cooldown; @@ -62,7 +62,7 @@ public class ScheduleRuntime { this.train = train; reset(); } - + public void startCooldown() { cooldown = INTERVAL; } @@ -148,13 +148,13 @@ public class ScheduleRuntime { public void tickConditions(Level level) { ScheduleEntry entry = schedule.entries.get(currentEntry); List> conditions = entry.conditions; - + if (!entry.instruction.supportsConditions()) { state = State.PRE_TRANSIT; currentEntry++; return; } - + for (int i = 0; i < conditions.size(); i++) { List list = conditions.get(i); int progress = conditionProgress.get(i); diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleScreen.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleScreen.java index 202afe7063..63704df5d1 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleScreen.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleScreen.java @@ -42,11 +42,11 @@ import dev.engine_room.flywheel.lib.transform.TransformStack; import net.createmod.catnip.gui.UIRenderHelper; import net.createmod.catnip.gui.element.GuiGameElement; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.IntAttached; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.IntAttached; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/CargoThresholdCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/CargoThresholdCondition.java index ab1a155fe0..30becd704f 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/CargoThresholdCondition.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/CargoThresholdCondition.java @@ -9,9 +9,9 @@ import com.simibubi.create.content.trains.entity.Train; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.lang.Components; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/FluidThresholdCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/FluidThresholdCondition.java index 26b8e9fccd..9090350382 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/FluidThresholdCondition.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/FluidThresholdCondition.java @@ -10,8 +10,8 @@ import com.simibubi.create.content.trains.entity.Train; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.lang.Components; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/IdleCargoCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/IdleCargoCondition.java index f582eb1d7d..0ed6eef95a 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/IdleCargoCondition.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/IdleCargoCondition.java @@ -5,7 +5,7 @@ import com.simibubi.create.content.trains.entity.Carriage; import com.simibubi.create.content.trains.entity.Train; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Pair; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/ItemThresholdCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/ItemThresholdCondition.java index 966daae7de..4ab457eee4 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/ItemThresholdCondition.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/ItemThresholdCondition.java @@ -10,8 +10,8 @@ import com.simibubi.create.content.trains.entity.Train; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.lang.Components; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; import net.minecraft.ChatFormatting; import net.minecraft.core.HolderLookup; import net.minecraft.core.component.DataComponents; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/PlayerPassengerCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/PlayerPassengerCondition.java index c74122d79a..47ebb5ea39 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/PlayerPassengerCondition.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/PlayerPassengerCondition.java @@ -9,8 +9,8 @@ import com.simibubi.create.content.trains.entity.Train; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/RedstoneLinkCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/RedstoneLinkCondition.java index bae3ccbc42..069d7d5ca6 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/RedstoneLinkCondition.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/RedstoneLinkCondition.java @@ -10,9 +10,9 @@ import com.simibubi.create.content.trains.entity.Train; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/ScheduleWaitCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/ScheduleWaitCondition.java index 5967f90ded..a5886d1ea9 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/ScheduleWaitCondition.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/ScheduleWaitCondition.java @@ -8,7 +8,7 @@ import com.simibubi.create.content.trains.schedule.Schedule; import com.simibubi.create.content.trains.schedule.ScheduleDataEntry; import com.simibubi.create.infrastructure.codec.CreateStreamCodecs; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Pair; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.RegistryFriendlyByteBuf; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/ScheduledDelay.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/ScheduledDelay.java index 1246f273e3..8d26748e7b 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/ScheduledDelay.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/ScheduledDelay.java @@ -4,7 +4,7 @@ import com.simibubi.create.Create; import com.simibubi.create.content.trains.entity.Train; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Pair; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/StationPoweredCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/StationPoweredCondition.java index 195590edf0..fecc4627ca 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/StationPoweredCondition.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/StationPoweredCondition.java @@ -5,7 +5,7 @@ import com.simibubi.create.content.trains.entity.Train; import com.simibubi.create.content.trains.station.GlobalStation; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Pair; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/StationUnloadedCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/StationUnloadedCondition.java index b1a5b8f6dd..f0988263d3 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/StationUnloadedCondition.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/StationUnloadedCondition.java @@ -5,7 +5,7 @@ import com.simibubi.create.content.trains.entity.Train; import com.simibubi.create.content.trains.station.GlobalStation; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Pair; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimeOfDayCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimeOfDayCondition.java index d7092e1838..6ae9389e9c 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimeOfDayCondition.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimeOfDayCondition.java @@ -12,8 +12,8 @@ import com.simibubi.create.foundation.gui.widget.Label; import com.simibubi.create.foundation.gui.widget.ScrollInput; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimedWaitCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimedWaitCondition.java index 1eb9f5c193..b57a841734 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimedWaitCondition.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimedWaitCondition.java @@ -7,7 +7,7 @@ import com.simibubi.create.content.trains.entity.Train; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java index 6ade9ae7bd..2c45904463 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java @@ -13,8 +13,8 @@ import com.simibubi.create.content.trains.schedule.ScheduleRuntime.State; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java index efbce32038..4ffe525f75 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java @@ -11,8 +11,8 @@ import com.simibubi.create.content.trains.schedule.ScheduleRuntime; import com.simibubi.create.content.trains.schedule.ScheduleRuntime.State; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/DeliverPackagesInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/DeliverPackagesInstruction.java index 6b26b1ca41..e5df5f26dc 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/DeliverPackagesInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/DeliverPackagesInstruction.java @@ -20,7 +20,7 @@ import com.simibubi.create.content.trains.station.GlobalStation; import com.simibubi.create.content.trains.station.GlobalStation.GlobalPackagePort; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Pair; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java index 8c2a24d560..38faef25f2 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java @@ -18,8 +18,8 @@ import com.simibubi.create.content.trains.schedule.ScheduleRuntime; import com.simibubi.create.content.trains.station.GlobalStation; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.components.EditBox; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/FetchPackagesInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/FetchPackagesInstruction.java index 20341ccd4d..32d30181a5 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/FetchPackagesInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/FetchPackagesInstruction.java @@ -23,8 +23,8 @@ import com.simibubi.create.content.trains.station.GlobalStation; import com.simibubi.create.content.trains.station.GlobalStation.GlobalPackagePort; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.components.EditBox; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ScheduleInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ScheduleInstruction.java index 5dee42fcee..0a6f1675f6 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ScheduleInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ScheduleInstruction.java @@ -10,7 +10,7 @@ import com.simibubi.create.content.trains.schedule.ScheduleDataEntry; import com.simibubi.create.content.trains.schedule.ScheduleRuntime; import com.simibubi.create.infrastructure.codec.CreateStreamCodecs; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Pair; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.RegistryFriendlyByteBuf; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/TextScheduleInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/TextScheduleInstruction.java index ea928f8814..aedb2dbe01 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/TextScheduleInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/TextScheduleInstruction.java @@ -6,7 +6,7 @@ import com.google.common.collect.ImmutableList; import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.components.EditBox; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/simibubi/create/content/trains/signal/EdgeGroupColor.java b/src/main/java/com/simibubi/create/content/trains/signal/EdgeGroupColor.java index 9ba18a913d..61569ee471 100644 --- a/src/main/java/com/simibubi/create/content/trains/signal/EdgeGroupColor.java +++ b/src/main/java/com/simibubi/create/content/trains/signal/EdgeGroupColor.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.trains.signal; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.theme.Color; import com.simibubi.create.infrastructure.codec.CreateStreamCodecs; diff --git a/src/main/java/com/simibubi/create/content/trains/signal/SignalBlock.java b/src/main/java/com/simibubi/create/content/trains/signal/SignalBlock.java index 0a1e109a69..cf76148d16 100644 --- a/src/main/java/com/simibubi/create/content/trains/signal/SignalBlock.java +++ b/src/main/java/com/simibubi/create/content/trains/signal/SignalBlock.java @@ -7,7 +7,7 @@ import com.simibubi.create.content.equipment.wrench.IWrenchable; import com.simibubi.create.foundation.block.IBE; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/com/simibubi/create/content/trains/signal/SignalBlockEntity.java b/src/main/java/com/simibubi/create/content/trains/signal/SignalBlockEntity.java index af8b1b7abc..19d89a63ac 100644 --- a/src/main/java/com/simibubi/create/content/trains/signal/SignalBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/trains/signal/SignalBlockEntity.java @@ -12,7 +12,7 @@ import com.simibubi.create.content.trains.track.TrackTargetingBehaviour; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/trains/signal/SignalBoundary.java b/src/main/java/com/simibubi/create/content/trains/signal/SignalBoundary.java index 85d9a7a69d..a516942a55 100644 --- a/src/main/java/com/simibubi/create/content/trains/signal/SignalBoundary.java +++ b/src/main/java/com/simibubi/create/content/trains/signal/SignalBoundary.java @@ -16,9 +16,9 @@ import com.simibubi.create.content.trains.signal.SignalBlock.SignalType; import com.simibubi.create.content.trains.signal.SignalBlockEntity.OverlayState; import com.simibubi.create.content.trains.signal.SignalBlockEntity.SignalState; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/trains/signal/SignalEdgeGroup.java b/src/main/java/com/simibubi/create/content/trains/signal/SignalEdgeGroup.java index d173e2d891..1f6bb55679 100644 --- a/src/main/java/com/simibubi/create/content/trains/signal/SignalEdgeGroup.java +++ b/src/main/java/com/simibubi/create/content/trains/signal/SignalEdgeGroup.java @@ -14,7 +14,7 @@ import com.google.common.base.Predicates; import com.simibubi.create.Create; import com.simibubi.create.content.trains.entity.Train; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; diff --git a/src/main/java/com/simibubi/create/content/trains/signal/SignalPropagator.java b/src/main/java/com/simibubi/create/content/trains/signal/SignalPropagator.java index bad8a28d5f..751d40849c 100644 --- a/src/main/java/com/simibubi/create/content/trains/signal/SignalPropagator.java +++ b/src/main/java/com/simibubi/create/content/trains/signal/SignalPropagator.java @@ -21,9 +21,9 @@ import com.simibubi.create.content.trains.graph.TrackGraphSync; import com.simibubi.create.content.trains.graph.TrackNode; import com.simibubi.create.content.trains.graph.TrackNodeLocation; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.data.Pair; public class SignalPropagator { diff --git a/src/main/java/com/simibubi/create/content/trains/signal/SignalRenderer.java b/src/main/java/com/simibubi/create/content/trains/signal/SignalRenderer.java index 3b6d10c26e..3e890e271c 100644 --- a/src/main/java/com/simibubi/create/content/trains/signal/SignalRenderer.java +++ b/src/main/java/com/simibubi/create/content/trains/signal/SignalRenderer.java @@ -10,8 +10,8 @@ import com.simibubi.create.content.trains.track.TrackTargetingBehaviour.Rendered import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; import dev.engine_room.flywheel.lib.transform.TransformStack; +import net.createmod.catnip.animation.AnimationTickHolder; import net.createmod.catnip.render.CachedBuffers; -import net.createmod.ponder.utility.LevelTickHolder; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; @@ -31,7 +31,7 @@ public class SignalRenderer extends SafeBlockEntityRenderer { SignalState signalState = be.getState(); OverlayState overlayState = be.getOverlay(); - float renderTime = LevelTickHolder.getRenderTime(be.getLevel()); + float renderTime = AnimationTickHolder.getRenderTime(be.getLevel()); if (signalState.isRedLight(renderTime)) CachedBuffers.partial(AllPartialModels.SIGNAL_ON, blockState) .renderInto(ms, buffer.getBuffer(RenderType.solid())); diff --git a/src/main/java/com/simibubi/create/content/trains/signal/TrackEdgePoint.java b/src/main/java/com/simibubi/create/content/trains/signal/TrackEdgePoint.java index ad7ae8dc43..a805d5731c 100644 --- a/src/main/java/com/simibubi/create/content/trains/signal/TrackEdgePoint.java +++ b/src/main/java/com/simibubi/create/content/trains/signal/TrackEdgePoint.java @@ -12,7 +12,7 @@ import com.simibubi.create.content.trains.graph.TrackNodeLocation; import com.simibubi.create.content.trains.track.TrackTargetingBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import net.createmod.catnip.utility.Couple; +import net.createmod.catnip.data.Couple; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/trains/station/AbstractStationScreen.java b/src/main/java/com/simibubi/create/content/trains/station/AbstractStationScreen.java index 217a5afe42..3293e4b9f5 100644 --- a/src/main/java/com/simibubi/create/content/trains/station/AbstractStationScreen.java +++ b/src/main/java/com/simibubi/create/content/trains/station/AbstractStationScreen.java @@ -17,7 +17,7 @@ import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.transform.TransformStack; import net.createmod.catnip.gui.AbstractSimiScreen; import net.createmod.catnip.gui.element.GuiGameElement; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.world.level.block.state.properties.BlockStateProperties; diff --git a/src/main/java/com/simibubi/create/content/trains/station/GlobalStation.java b/src/main/java/com/simibubi/create/content/trains/station/GlobalStation.java index 4b2dab45b3..3b128ce5d9 100644 --- a/src/main/java/com/simibubi/create/content/trains/station/GlobalStation.java +++ b/src/main/java/com/simibubi/create/content/trains/station/GlobalStation.java @@ -17,7 +17,7 @@ import com.simibubi.create.content.trains.graph.DimensionPalette; import com.simibubi.create.content.trains.graph.TrackNode; import com.simibubi.create.content.trains.signal.SingleBlockEntityEdgePoint; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; @@ -217,7 +217,7 @@ public class GlobalStation extends SingleBlockEntityEdgePoint { box.spawnParticles(); } } - + // Export to station for (int slot = 0; slot < carriageInventory.getSlots(); slot++) { ItemStack stack = carriageInventory.getStackInSlot(slot); diff --git a/src/main/java/com/simibubi/create/content/trains/station/StationBlockEntity.java b/src/main/java/com/simibubi/create/content/trains/station/StationBlockEntity.java index ab5d82c017..a2f61fa731 100644 --- a/src/main/java/com/simibubi/create/content/trains/station/StationBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/trains/station/StationBlockEntity.java @@ -61,12 +61,12 @@ import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; import dan200.computercraft.api.peripheral.PeripheralCapability; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.WorldAttached; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.data.WorldAttached; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos.MutableBlockPos; diff --git a/src/main/java/com/simibubi/create/content/trains/station/StationMarker.java b/src/main/java/com/simibubi/create/content/trains/station/StationMarker.java index b6b2b99d06..9bc33c240d 100644 --- a/src/main/java/com/simibubi/create/content/trains/station/StationMarker.java +++ b/src/main/java/com/simibubi/create/content/trains/station/StationMarker.java @@ -8,8 +8,7 @@ import com.simibubi.create.AllMapDecorationTypes; import com.simibubi.create.content.trains.track.TrackTargetingBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/trains/station/StationScreen.java b/src/main/java/com/simibubi/create/content/trains/station/StationScreen.java index 5bab7c771d..c8306d3798 100644 --- a/src/main/java/com/simibubi/create/content/trains/station/StationScreen.java +++ b/src/main/java/com/simibubi/create/content/trains/station/StationScreen.java @@ -24,10 +24,10 @@ import com.simibubi.create.foundation.utility.CreateLang; import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.createmod.catnip.gui.UIRenderHelper; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; diff --git a/src/main/java/com/simibubi/create/content/trains/station/TrainEditPacket.java b/src/main/java/com/simibubi/create/content/trains/station/TrainEditPacket.java index e26cc1260a..c03fbe8c81 100644 --- a/src/main/java/com/simibubi/create/content/trains/station/TrainEditPacket.java +++ b/src/main/java/com/simibubi/create/content/trains/station/TrainEditPacket.java @@ -11,7 +11,7 @@ import net.createmod.catnip.net.base.ClientboundPacketPayload; import net.createmod.catnip.platform.CatnipServices; import net.createmod.catnip.net.base.ServerboundPacketPayload; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import io.netty.buffer.ByteBuf; import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.UUIDUtil; diff --git a/src/main/java/com/simibubi/create/content/trains/track/AllPortalTracks.java b/src/main/java/com/simibubi/create/content/trains/track/AllPortalTracks.java index 216341f4c3..55b6d6056d 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/AllPortalTracks.java +++ b/src/main/java/com/simibubi/create/content/trains/track/AllPortalTracks.java @@ -6,8 +6,8 @@ import com.simibubi.create.compat.Mods; import com.simibubi.create.content.contraptions.glue.SuperGlueEntity; import com.simibubi.create.foundation.utility.AttachedRegistry; -import net.createmod.catnip.utility.BlockFace; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.math.BlockFace; +import net.createmod.catnip.data.Pair; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.registries.BuiltInRegistries; diff --git a/src/main/java/com/simibubi/create/content/trains/track/BezierConnection.java b/src/main/java/com/simibubi/create/content/trains/track/BezierConnection.java index 0052376d74..976edcb759 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/BezierConnection.java +++ b/src/main/java/com/simibubi/create/content/trains/track/BezierConnection.java @@ -9,11 +9,11 @@ import com.mojang.blaze3d.vertex.PoseStack.Pose; import com.simibubi.create.AllBlocks; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction.Axis; import net.minecraft.core.particles.BlockParticleOption; diff --git a/src/main/java/com/simibubi/create/content/trains/track/CurvedTrackInteraction.java b/src/main/java/com/simibubi/create/content/trains/track/CurvedTrackInteraction.java index 295249a632..b2648ff81a 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/CurvedTrackInteraction.java +++ b/src/main/java/com/simibubi/create/content/trains/track/CurvedTrackInteraction.java @@ -6,7 +6,7 @@ import com.simibubi.create.content.trains.track.TrackBlockOutline.BezierPointSel import net.createmod.catnip.platform.CatnipServices; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; diff --git a/src/main/java/com/simibubi/create/content/trains/track/ITrackBlock.java b/src/main/java/com/simibubi/create/content/trains/track/ITrackBlock.java index f2796acbde..86e7aec22c 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/ITrackBlock.java +++ b/src/main/java/com/simibubi/create/content/trains/track/ITrackBlock.java @@ -14,8 +14,8 @@ import com.simibubi.create.content.trains.graph.TrackNodeLocation.DiscoveredLoca import com.simibubi.create.content.trains.track.TrackTargetingBehaviour.RenderedTrackOverlayType; import dev.engine_room.flywheel.lib.model.baked.PartialModel; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.data.Pair; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.AxisDirection; diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackBlock.java b/src/main/java/com/simibubi/create/content/trains/track/TrackBlock.java index f0f8007d94..715d9b2b0a 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackBlock.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackBlock.java @@ -17,7 +17,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Random; import java.util.Set; -import java.util.function.Consumer; import org.jetbrains.annotations.Nullable; @@ -28,9 +27,9 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.AllPartialModels; import com.simibubi.create.AllShapes; import com.simibubi.create.AllTags; +import com.simibubi.create.api.schematic.requirement.ISpecialBlockItemRequirement; import com.simibubi.create.content.decoration.girder.GirderBlock; import com.simibubi.create.content.equipment.wrench.IWrenchable; -import com.simibubi.create.api.schematic.requirement.ISpecialBlockItemRequirement; import com.simibubi.create.content.schematics.requirement.ItemRequirement; import com.simibubi.create.content.schematics.requirement.ItemRequirement.ItemUseType; import com.simibubi.create.content.trains.CubeParticleData; @@ -49,12 +48,12 @@ import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.transform.TransformStack; import it.unimi.dsi.fastutil.objects.Object2IntArrayMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; -import net.createmod.catnip.utility.BlockFace; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.lang.Components; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.math.AngleHelper; +import net.createmod.catnip.math.BlockFace; +import net.createmod.catnip.math.VecHelper; import net.minecraft.ChatFormatting; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.BlockPos; @@ -100,9 +99,9 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraft.world.ticks.LevelTickAccess; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; -import net.neoforged.neoforge.client.extensions.common.IClientBlockExtensions; public class TrackBlock extends Block implements IBE, IWrenchable, ITrackBlock, ISpecialBlockItemRequirement, ProperWaterloggedBlock, IHaveBigOutline { @@ -136,11 +135,6 @@ public class TrackBlock extends Block return fluidState(state); } - @OnlyIn(Dist.CLIENT) - public void initializeClient(Consumer consumer) { - consumer.accept(new RenderProperties()); - } - @Override public BlockState getStateForPlacement(BlockPlaceContext ctx) { BlockState stateForPlacement = withWater(super.getStateForPlacement(ctx), ctx); diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackBlockEntity.java b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockEntity.java index 49bc2197cc..3c5c85e9ea 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockEntity.java @@ -21,7 +21,7 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import net.createmod.catnip.platform.CatnipServices; import com.simibubi.create.foundation.utility.DistExecutor; import dev.engine_room.flywheel.lib.visualization.VisualizationHelper; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Pair; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction.Axis; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackBlockEntityTilt.java b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockEntityTilt.java index 3459b71d86..201f3844d1 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackBlockEntityTilt.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockEntityTilt.java @@ -7,8 +7,8 @@ import java.util.Optional; import com.simibubi.create.content.trains.graph.TrackNodeLocation; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Pair; import net.minecraft.core.BlockPos; import net.minecraft.util.Mth; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackBlockItem.java b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockItem.java index 71353bb89e..349bf15bfb 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackBlockItem.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockItem.java @@ -8,7 +8,7 @@ import com.simibubi.create.content.trains.track.TrackPlacement.PlacementInfo; import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Pair; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackBlockOutline.java b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockOutline.java index c396dd571e..d872cf9c9e 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackBlockOutline.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockOutline.java @@ -12,11 +12,11 @@ import com.simibubi.create.AllTags; import com.simibubi.create.foundation.utility.RaycastHelper; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.WorldAttached; -import net.createmod.catnip.utility.math.AngleHelper; -import net.createmod.ponder.utility.LevelTickHolder; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.data.WorldAttached; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.MultiBufferSource; @@ -54,7 +54,7 @@ public class TrackBlockOutline { if (mc.level == null) return; - Vec3 origin = player.getEyePosition(LevelTickHolder.getPartialTicks(mc.level)); + Vec3 origin = player.getEyePosition(AnimationTickHolder.getPartialTicks(mc.level)); double maxRange = mc.hitResult == null ? Double.MAX_VALUE : mc.hitResult.getLocation() diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackModel.java b/src/main/java/com/simibubi/create/content/trains/track/TrackModel.java index f93b8c0d70..f664ceb38b 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackModel.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackModel.java @@ -9,7 +9,7 @@ import org.jetbrains.annotations.Nullable; import com.simibubi.create.foundation.model.BakedQuadHelper; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.resources.model.BakedModel; diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackPaver.java b/src/main/java/com/simibubi/create/content/trains/track/TrackPaver.java index a5b99da2c7..8203dab923 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackPaver.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackPaver.java @@ -10,9 +10,9 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.content.decoration.girder.GirderBlock; import com.simibubi.create.foundation.block.ProperWaterloggedBlock; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackPlacement.java b/src/main/java/com/simibubi/create/content/trains/track/TrackPlacement.java index ff74747824..5d4f56f99b 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackPlacement.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackPlacement.java @@ -18,16 +18,16 @@ import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; import io.netty.buffer.ByteBuf; -import net.createmod.catnip.CatnipClient; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; import net.createmod.catnip.codecs.stream.CatnipStreamCodecs; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; -import net.createmod.catnip.utility.math.AngleHelper; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.math.AngleHelper; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.outliner.Outliner; +import net.createmod.catnip.theme.Color; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; @@ -670,11 +670,11 @@ public class TrackPlacement { } if (hints != null && !hints.either(Collection::isEmpty)) { - CatnipClient.OUTLINER.showCluster("track_valid", hints.getFirst()) + Outliner.getInstance().showCluster("track_valid", hints.getFirst()) .withFaceTexture(AllSpecialTextures.THIN_CHECKERED) .colored(0x95CD41) .lineWidth(0); - CatnipClient.OUTLINER.showCluster("track_invalid", hints.getSecond()) + Outliner.getInstance().showCluster("track_invalid", hints.getSecond()) .withFaceTexture(AllSpecialTextures.THIN_CHECKERED) .colored(0xEA5C2B) .lineWidth(0); @@ -754,13 +754,13 @@ public class TrackPlacement { .scale(0.5f); Vec3 middle2 = rail2.add(previous2) .scale(0.5f); - CatnipClient.OUTLINER + Outliner.getInstance() .showLine(Pair.of(key, i * 2), VecHelper.lerp(s, middle1, previous1), VecHelper.lerp(s, middle1, rail1)) .colored(railcolor) .disableLineNormals() .lineWidth(lw); - CatnipClient.OUTLINER + Outliner.getInstance() .showLine(Pair.of(key, i * 2 + 1), VecHelper.lerp(s, middle2, previous2), VecHelper.lerp(s, middle2, rail2)) .colored(railcolor) @@ -773,8 +773,8 @@ public class TrackPlacement { } for (int i = segCount + 1; i <= lastLineCount; i++) { - CatnipClient.OUTLINER.remove(Pair.of(key, i * 2)); - CatnipClient.OUTLINER.remove(Pair.of(key, i * 2 + 1)); + Outliner.getInstance().remove(Pair.of(key, i * 2)); + Outliner.getInstance().remove(Pair.of(key, i * 2 + 1)); } lastLineCount = segCount; @@ -783,7 +783,7 @@ public class TrackPlacement { @OnlyIn(Dist.CLIENT) private static void line(int id, Vec3 v1, Vec3 o1, Vec3 ex) { int color = Color.mixColors(0xEA5C2B, 0x95CD41, animation.getValue()); - CatnipClient.OUTLINER.showLine(Pair.of("start", id), v1.subtract(o1), v1.add(ex)) + Outliner.getInstance().showLine(Pair.of("start", id), v1.subtract(o1), v1.add(ex)) .lineWidth(1 / 8f) .disableLineNormals() .colored(color); diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackPlacementOverlay.java b/src/main/java/com/simibubi/create/content/trains/track/TrackPlacementOverlay.java index 7761475d9d..4059134c02 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackPlacementOverlay.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackPlacementOverlay.java @@ -4,8 +4,8 @@ import com.mojang.blaze3d.platform.Window; import com.simibubi.create.foundation.mixin.accessor.GuiAccessor; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.lang.Components; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.theme.Color; import net.minecraft.ChatFormatting; import net.minecraft.client.DeltaTracker; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackRenderer.java b/src/main/java/com/simibubi/create/content/trains/track/TrackRenderer.java index 36cf8981c3..476047783d 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackRenderer.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackRenderer.java @@ -13,9 +13,9 @@ import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRender import dev.engine_room.flywheel.api.visualization.VisualizationManager; import net.createmod.catnip.render.CachedBuffers; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackShape.java b/src/main/java/com/simibubi/create/content/trains/track/TrackShape.java index 56c8756d88..dfb23cddaf 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackShape.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackShape.java @@ -6,7 +6,7 @@ import java.util.List; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.minecraft.core.Direction; import net.minecraft.util.StringRepresentable; import net.minecraft.world.level.block.Mirror; diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackTargetingBehaviour.java b/src/main/java/com/simibubi/create/content/trains/track/TrackTargetingBehaviour.java index 45889a11bb..37e7469dde 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackTargetingBehaviour.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackTargetingBehaviour.java @@ -24,10 +24,9 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.createmod.catnip.render.CachedBuffers; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.levelWrappers.SchematicLevel; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.levelWrappers.SchematicLevel; import net.createmod.ponder.api.level.PonderLevel; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackTargetingBlockItem.java b/src/main/java/com/simibubi/create/content/trains/track/TrackTargetingBlockItem.java index e51df4dcaf..310ff34d1c 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackTargetingBlockItem.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackTargetingBlockItem.java @@ -3,8 +3,6 @@ package com.simibubi.create.content.trains.track; import java.util.List; import java.util.function.BiConsumer; -import net.createmod.catnip.utility.NBTHelper; - import org.apache.commons.lang3.mutable.MutableObject; import com.simibubi.create.AllDataComponents; @@ -19,11 +17,11 @@ import com.simibubi.create.content.trains.signal.TrackEdgePoint; import com.simibubi.create.content.trains.track.TrackBlockOutline.BezierPointSelection; import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.block.IBE; -import net.createmod.catnip.platform.CatnipServices; import com.simibubi.create.foundation.utility.CreateLang; import com.tterrag.registrate.util.nullness.NonNullBiFunction; -import net.createmod.catnip.utility.Couple; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.platform.CatnipServices; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; @@ -46,6 +44,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackVisual.java b/src/main/java/com/simibubi/create/content/trains/track/TrackVisual.java index d3f7329e6f..6f14ff3342 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackVisual.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackVisual.java @@ -26,8 +26,8 @@ import dev.engine_room.flywheel.lib.transform.TransformStack; import dev.engine_room.flywheel.lib.visual.AbstractBlockEntityVisual; import it.unimi.dsi.fastutil.longs.LongArraySet; import it.unimi.dsi.fastutil.longs.LongSet; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Iterate; import net.minecraft.core.BlockPos; import net.minecraft.core.SectionPos; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/simibubi/create/foundation/advancement/CreateAdvancement.java b/src/main/java/com/simibubi/create/foundation/advancement/CreateAdvancement.java index c3bc0f53d6..c1cde36d39 100644 --- a/src/main/java/com/simibubi/create/foundation/advancement/CreateAdvancement.java +++ b/src/main/java/com/simibubi/create/foundation/advancement/CreateAdvancement.java @@ -9,7 +9,7 @@ import java.util.function.UnaryOperator; import com.simibubi.create.Create; import com.tterrag.registrate.util.entry.ItemProviderEntry; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementHolder; import net.minecraft.advancements.AdvancementType; diff --git a/src/main/java/com/simibubi/create/foundation/block/BigOutlines.java b/src/main/java/com/simibubi/create/foundation/block/BigOutlines.java index 58356669ab..8313ca5c71 100644 --- a/src/main/java/com/simibubi/create/foundation/block/BigOutlines.java +++ b/src/main/java/com/simibubi/create/foundation/block/BigOutlines.java @@ -2,8 +2,8 @@ package com.simibubi.create.foundation.block; import com.simibubi.create.foundation.utility.RaycastHelper; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.ponder.utility.LevelTickHolder; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.math.VecHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.BlockPos; @@ -32,7 +32,7 @@ public class BigOutlines { result = null; - Vec3 origin = player.getEyePosition(LevelTickHolder.getPartialTicks(mc.level)); + Vec3 origin = player.getEyePosition(AnimationTickHolder.getPartialTicks(mc.level)); double maxRange = mc.hitResult == null ? Double.MAX_VALUE : mc.hitResult.getLocation() diff --git a/src/main/java/com/simibubi/create/foundation/block/CopperBlockSet.java b/src/main/java/com/simibubi/create/foundation/block/CopperBlockSet.java index 1586af9e1d..9c429d4ebc 100644 --- a/src/main/java/com/simibubi/create/foundation/block/CopperBlockSet.java +++ b/src/main/java/com/simibubi/create/foundation/block/CopperBlockSet.java @@ -21,9 +21,9 @@ import com.tterrag.registrate.util.entry.BlockEntry; import com.tterrag.registrate.util.nullness.NonNullBiConsumer; import com.tterrag.registrate.util.nullness.NonNullFunction; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.RegisteredObjectsHelper; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.lang.Lang; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.ShapelessRecipeBuilder; import net.minecraft.resources.ResourceLocation; @@ -37,6 +37,7 @@ import net.minecraft.world.level.block.WeatheringCopper.WeatherState; import net.minecraft.world.level.block.WeatheringCopperFullBlock; import net.minecraft.world.level.block.WeatheringCopperSlabBlock; import net.minecraft.world.level.block.state.BlockBehaviour.Properties; + import net.neoforged.neoforge.client.model.generators.ModelProvider; public class CopperBlockSet { @@ -73,7 +74,7 @@ public class CopperBlockSet { public CopperBlockSet(AbstractRegistrate registrate, String name, String endTextureName, Variant[] variants, NonNullBiConsumer, RegistrateRecipeProvider> mainBlockRecipe) { this(registrate, name, endTextureName, variants, mainBlockRecipe, "copper/", NonNullBiConsumer.noop()); } - + public CopperBlockSet(AbstractRegistrate registrate, String name, String endTextureName, Variant[] variants, NonNullBiConsumer, RegistrateRecipeProvider> mainBlockRecipe, NonNullBiConsumer onRegister) { this(registrate, name, endTextureName, variants, mainBlockRecipe, "copper/", onRegister); } @@ -86,7 +87,7 @@ public class CopperBlockSet { this.variants = variants; this.mainBlockRecipe = mainBlockRecipe; this.onRegister = onRegister; - + for (boolean waxed : Iterate.falseAndTrue) { for (Variant variant : this.variants) { BlockEntry[] entries = diff --git a/src/main/java/com/simibubi/create/foundation/block/ItemUseOverrides.java b/src/main/java/com/simibubi/create/foundation/block/ItemUseOverrides.java index 0e448343e0..293e8d767f 100644 --- a/src/main/java/com/simibubi/create/foundation/block/ItemUseOverrides.java +++ b/src/main/java/com/simibubi/create/foundation/block/ItemUseOverrides.java @@ -6,8 +6,8 @@ import java.util.Set; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.utility.BlockHelper; -import net.createmod.catnip.utility.RegisteredObjectsHelper; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/foundation/block/connected/AllCTTypes.java b/src/main/java/com/simibubi/create/foundation/block/connected/AllCTTypes.java index 5bf1fd00ec..b8246c7f5b 100644 --- a/src/main/java/com/simibubi/create/foundation/block/connected/AllCTTypes.java +++ b/src/main/java/com/simibubi/create/foundation/block/connected/AllCTTypes.java @@ -4,7 +4,7 @@ import com.simibubi.create.Create; import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour.CTContext; import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour.ContextRequirement; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.minecraft.resources.ResourceLocation; public enum AllCTTypes implements CTType { @@ -104,7 +104,7 @@ public enum AllCTTypes implements CTType { return context.bottomLeft ? 2 : 5; return 1; } - + if (downDrops) { if (leftDrops) return context.topRight ? 8 : 5; @@ -112,15 +112,15 @@ public enum AllCTTypes implements CTType { return context.topLeft ? 10 : 5; return 9; } - + if (leftDrops) return 4; if (rightDrops) return 6; - + if (!context.up || !context.down || !context.left || !context.right) return 5; - + if (context.bottomLeft && context.topRight) { if (context.topLeft && !context.bottomRight) return 12; @@ -129,7 +129,7 @@ public enum AllCTTypes implements CTType { if (!context.bottomRight && !context.topLeft) return 7; } - + if (context.bottomRight && context.topLeft) { if (context.topRight && !context.bottomLeft) return 13; @@ -138,7 +138,7 @@ public enum AllCTTypes implements CTType { if (!context.bottomLeft && !context.topRight) return 11; } - + return 5; } }, diff --git a/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java b/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java index af5cec1a67..756dd29f9d 100644 --- a/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java +++ b/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java @@ -9,7 +9,7 @@ import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour. import com.simibubi.create.foundation.model.BakedModelWrapperWithData; import com.simibubi.create.foundation.model.BakedQuadHelper; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.resources.model.BakedModel; diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/CenteredSideValueBoxTransform.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/CenteredSideValueBoxTransform.java index bc03190861..8133079fe0 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/CenteredSideValueBoxTransform.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/CenteredSideValueBoxTransform.java @@ -2,7 +2,7 @@ package com.simibubi.create.foundation.blockEntity.behaviour; import java.util.function.BiPredicate; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java index 4cf2205f45..996eabb3fc 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java @@ -9,8 +9,8 @@ import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.INamedIc import com.simibubi.create.foundation.gui.AllIcons; import net.createmod.catnip.render.SuperRenderTypeBuffer; -import net.createmod.catnip.utility.lang.Components; -import net.createmod.catnip.utility.outliner.ChasingAABBOutline; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.outliner.ChasingAABBOutline; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.renderer.LightTexture; diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxTransform.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxTransform.java index 0e3d5d6447..988bafcea0 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxTransform.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxTransform.java @@ -7,8 +7,8 @@ import org.apache.commons.lang3.tuple.Pair; import com.mojang.blaze3d.vertex.PoseStack; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsClient.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsClient.java index f0a5ec6a7a..646b3deceb 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsClient.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsClient.java @@ -6,7 +6,7 @@ import com.simibubi.create.AllBlocks; import net.createmod.catnip.gui.ScreenOpener; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.theme.Color; import net.minecraft.client.DeltaTracker; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsScreen.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsScreen.java index 713bbc2c1f..5e1c179fd4 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsScreen.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsScreen.java @@ -19,8 +19,8 @@ import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.gui.AbstractSimiScreen; import net.createmod.catnip.gui.UIRenderHelper; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.lang.Components; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionHandler.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionHandler.java index 6c15681cd3..7b75515c2f 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionHandler.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionHandler.java @@ -7,7 +7,7 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.RaycastHelper; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Vec3i; diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java index fffc0bfa30..05b900b4dd 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java @@ -11,9 +11,9 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.CatnipClient; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.BlockPos; @@ -80,7 +80,7 @@ public class EdgeInteractionRenderer { ValueBox box = new ValueBox(Components.immutableEmpty(), bb, pos).passive(!hit) .transform(new EdgeValueBoxTransform(offset)) .wideOutline(); - CatnipClient.OUTLINER.showOutline("edge", box) + Outliner.getInstance().showOutline("edge", box) .highlightFace(face); if (!hit) diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringBehaviour.java index 9f3775c31d..f5fae12505 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringBehaviour.java @@ -23,9 +23,9 @@ import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.VecHelper; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringRenderer.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringRenderer.java index fc055722fb..074f931ced 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringRenderer.java @@ -16,10 +16,10 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxRenderer; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform.Sided; -import net.createmod.catnip.CatnipClient; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.MultiBufferSource; @@ -89,7 +89,7 @@ public class FilteringRenderer { ValueBox box = new ItemValueBox(label, bb, pos, filter, behaviour.getCountLabelForValueBox()); box.passive(!hit || behaviour.bypassesInput(mainhandItem)); - CatnipClient.OUTLINER + Outliner.getInstance() .showOutline(Pair.of("filter" + behaviour.netId(), pos), box.transform(behaviour.slotPositioning)) .lineWidth(1 / 64f) .withFaceTexture(hit ? AllSpecialTextures.THIN_CHECKERED : null) diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/SidedFilteringBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/SidedFilteringBehaviour.java index 070e80f94e..d62a92a62e 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/SidedFilteringBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/SidedFilteringBehaviour.java @@ -12,8 +12,8 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform.Sided; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/fluid/SmartFluidTankBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/fluid/SmartFluidTankBehaviour.java index dcc7a707ce..6e27a26e2b 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/fluid/SmartFluidTankBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/fluid/SmartFluidTankBehaviour.java @@ -10,9 +10,9 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import com.simibubi.create.foundation.fluid.CombinedTankWrapper; import com.simibubi.create.foundation.fluid.SmartFluidTank; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/inventory/CapManipulationBehaviourBase.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/inventory/CapManipulationBehaviourBase.java index 4974b9efe4..31cfe4a945 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/inventory/CapManipulationBehaviourBase.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/inventory/CapManipulationBehaviourBase.java @@ -9,7 +9,7 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour; import com.simibubi.create.foundation.item.ItemHelper.ExtractionCountMode; -import net.createmod.catnip.utility.BlockFace; +import net.createmod.catnip.math.BlockFace; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollOptionBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollOptionBehaviour.java index feafc6adb8..42f143471c 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollOptionBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollOptionBehaviour.java @@ -6,7 +6,7 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBoard; import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsFormatter.ScrollOptionSettingsFormatter; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; import net.minecraft.world.phys.BlockHitResult; diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueBehaviour.java index 5626bf5a4d..927b975c88 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueBehaviour.java @@ -12,7 +12,7 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBehavio import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBoard; import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsFormatter; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueHandler.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueHandler.java index 96dd7bf23f..5353634a3d 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueHandler.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueHandler.java @@ -1,7 +1,7 @@ package com.simibubi.create.foundation.blockEntity.behaviour.scrollValue; -import net.createmod.catnip.utility.animation.PhysicalFloat; +import net.createmod.catnip.animation.PhysicalFloat; import net.minecraft.client.Minecraft; import net.minecraft.util.Mth; import net.neoforged.api.distmarker.Dist; diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueRenderer.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueRenderer.java index 7568f35098..f390d0a702 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueRenderer.java @@ -13,8 +13,8 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox.IconValueBo import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox.TextValueBox; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.CatnipClient; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.BlockPos; @@ -50,7 +50,7 @@ public class ScrollValueRenderer { continue; if (!behaviour.isActive()) { - CatnipClient.OUTLINER.remove(behaviour); + Outliner.getInstance().remove(behaviour); continue; } @@ -98,7 +98,7 @@ public class ScrollValueRenderer { box.passive(!highlight) .wideOutline(); - CatnipClient.OUTLINER.showOutline(behaviour, box.transform(behaviour.slotPositioning)) + Outliner.getInstance().showOutline(behaviour, box.transform(behaviour.slotPositioning)) .highlightFace(face); } diff --git a/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java b/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java index 2fc36f942f..3483e63223 100644 --- a/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java @@ -30,8 +30,8 @@ import com.tterrag.registrate.providers.RegistrateBlockstateProvider; import com.tterrag.registrate.util.nullness.NonNullBiConsumer; import com.tterrag.registrate.util.nullness.NonnullType; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.Pointing; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.core.Direction.AxisDirection; diff --git a/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java index b37775aff3..80461f66c3 100644 --- a/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java +++ b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java @@ -59,7 +59,7 @@ import com.tterrag.registrate.util.DataIngredient; import com.tterrag.registrate.util.nullness.NonNullSupplier; import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.Direction.Axis; import net.minecraft.core.Direction.AxisDirection; diff --git a/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java b/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java index 5f4726229d..6be67ffd5c 100644 --- a/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java +++ b/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java @@ -33,7 +33,7 @@ import com.tterrag.registrate.util.nullness.NonNullFunction; import com.tterrag.registrate.util.nullness.NonNullSupplier; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.Registry; import net.minecraft.core.registries.Registries; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CompatMetals.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CompatMetals.java index 575f7d63ea..7f2d27cc53 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CompatMetals.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CompatMetals.java @@ -8,7 +8,7 @@ import static com.simibubi.create.foundation.data.recipe.Mods.MEK; import static com.simibubi.create.foundation.data.recipe.Mods.OREGANIZED; import static com.simibubi.create.foundation.data.recipe.Mods.TH; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; public enum CompatMetals { ALUMINUM(IE, IC2), @@ -32,7 +32,7 @@ public enum CompatMetals { public String getName() { return name; } - + public String getName(Mods mod) { if (this == ALUMINUM && mod == IC2) // include in mods.builder if this happens again return "aluminium"; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java index 03323bced8..bb0997ec9b 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java @@ -22,7 +22,7 @@ import com.simibubi.create.content.decoration.palettes.AllPaletteStoneTypes; import com.simibubi.create.content.processing.recipe.ProcessingRecipe; import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.PackOutput; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/HauntingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/HauntingRecipeGen.java index 7acd7acf99..949666b34f 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/HauntingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/HauntingRecipeGen.java @@ -7,7 +7,7 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.Create; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.tags.ItemTags; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/LogStrippingFakeRecipes.java b/src/main/java/com/simibubi/create/foundation/data/recipe/LogStrippingFakeRecipes.java index ef38757f1b..a96ea728e2 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/LogStrippingFakeRecipes.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/LogStrippingFakeRecipes.java @@ -8,7 +8,7 @@ import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.core.component.DataComponents; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeBuilder.java b/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeBuilder.java index 54c836dc60..68c6c02a13 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeBuilder.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeBuilder.java @@ -10,7 +10,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.simibubi.create.content.kinetics.crafter.MechanicalCraftingRecipe; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeGen.java index e72bb84973..55f1eb4286 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeGen.java @@ -8,7 +8,7 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; import com.simibubi.create.Create; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/ProcessingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/ProcessingRecipeGen.java index 90060e067f..c7d1f2c237 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/ProcessingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/ProcessingRecipeGen.java @@ -12,7 +12,7 @@ import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; import com.simibubi.create.content.processing.recipe.ProcessingRecipeSerializer; import com.simibubi.create.foundation.recipe.IRecipeTypeInfo; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.core.HolderLookup; import net.minecraft.data.CachedOutput; import net.minecraft.data.DataGenerator; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java index 08a56a2286..39f5a184e1 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java @@ -18,7 +18,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import java.util.function.UnaryOperator; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/simibubi/create/foundation/events/ClientEvents.java b/src/main/java/com/simibubi/create/foundation/events/ClientEvents.java index 2adcfcb9bb..954f4d191c 100644 --- a/src/main/java/com/simibubi/create/foundation/events/ClientEvents.java +++ b/src/main/java/com/simibubi/create/foundation/events/ClientEvents.java @@ -76,8 +76,8 @@ import com.simibubi.create.infrastructure.config.AllConfigs; import net.createmod.catnip.config.ui.BaseConfigScreen; import net.createmod.catnip.render.DefaultSuperRenderTypeBuffer; import net.createmod.catnip.render.SuperRenderTypeBuffer; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.levelWrappers.WrappedClientLevel; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.levelWrappers.WrappedClientLevel; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; diff --git a/src/main/java/com/simibubi/create/foundation/events/CommonEvents.java b/src/main/java/com/simibubi/create/foundation/events/CommonEvents.java index 68d7d9eecf..58d7556bed 100644 --- a/src/main/java/com/simibubi/create/foundation/events/CommonEvents.java +++ b/src/main/java/com/simibubi/create/foundation/events/CommonEvents.java @@ -61,8 +61,8 @@ import com.simibubi.create.foundation.utility.ServerSpeedProvider; import com.simibubi.create.foundation.utility.TickBasedCache; import com.simibubi.create.infrastructure.command.AllCommands; -import net.createmod.catnip.utility.WorldAttached; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.WorldAttached; +import net.createmod.catnip.lang.Components; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.packs.PackLocationInfo; import net.minecraft.server.packs.PackSelectionConfig; diff --git a/src/main/java/com/simibubi/create/foundation/fluid/CombinedTankWrapper.java b/src/main/java/com/simibubi/create/foundation/fluid/CombinedTankWrapper.java index f527eb07b5..5c6f18b4ce 100644 --- a/src/main/java/com/simibubi/create/foundation/fluid/CombinedTankWrapper.java +++ b/src/main/java/com/simibubi/create/foundation/fluid/CombinedTankWrapper.java @@ -1,6 +1,6 @@ package com.simibubi.create.foundation.fluid; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.fluids.capability.templates.EmptyFluidHandler; diff --git a/src/main/java/com/simibubi/create/foundation/fluid/FluidHelper.java b/src/main/java/com/simibubi/create/foundation/fluid/FluidHelper.java index 40e64d883f..8bb77cd0dc 100644 --- a/src/main/java/com/simibubi/create/foundation/fluid/FluidHelper.java +++ b/src/main/java/com/simibubi/create/foundation/fluid/FluidHelper.java @@ -7,7 +7,7 @@ import com.simibubi.create.content.fluids.transfer.GenericItemEmptying; import com.simibubi.create.content.fluids.transfer.GenericItemFilling; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Pair; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; import net.minecraft.tags.FluidTags; diff --git a/src/main/java/com/simibubi/create/foundation/fluid/FluidIngredient.java b/src/main/java/com/simibubi/create/foundation/fluid/FluidIngredient.java index 83e9d98aac..18c923b40f 100644 --- a/src/main/java/com/simibubi/create/foundation/fluid/FluidIngredient.java +++ b/src/main/java/com/simibubi/create/foundation/fluid/FluidIngredient.java @@ -17,7 +17,7 @@ import com.mojang.serialization.codecs.RecordCodecBuilder; import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders; import net.createmod.catnip.codecs.stream.CatnipStreamCodecs; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.minecraft.core.Holder; import net.minecraft.core.component.DataComponentPatch; import net.minecraft.core.component.DataComponentType; @@ -32,6 +32,7 @@ import net.minecraft.util.StringRepresentable; import net.minecraft.world.level.material.FlowingFluid; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.Fluids; + import net.neoforged.neoforge.fluids.FluidStack; // If anymore fluid ingredient "types" are added then you must update FluidIngredient.Type diff --git a/src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java b/src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java index ebfcc062b6..9c50e4e2a9 100644 --- a/src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java @@ -6,8 +6,8 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.utility.BasicFluidRenderer; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.render.BasicFluidRenderer; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.texture.TextureAtlasSprite; diff --git a/src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java b/src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java index fb0d76de0e..0d178cbc85 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java +++ b/src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java @@ -5,7 +5,7 @@ import com.simibubi.create.Create; import net.createmod.catnip.gui.TextureSheetSegment; import net.createmod.catnip.gui.UIRenderHelper; import net.createmod.catnip.gui.element.ScreenElement; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.theme.Color; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.resources.ResourceLocation; import net.neoforged.api.distmarker.Dist; diff --git a/src/main/java/com/simibubi/create/foundation/gui/AllIcons.java b/src/main/java/com/simibubi/create/foundation/gui/AllIcons.java index 227372c1ef..6c3b42664c 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/AllIcons.java +++ b/src/main/java/com/simibubi/create/foundation/gui/AllIcons.java @@ -9,7 +9,7 @@ import com.simibubi.create.Create; import net.createmod.catnip.gui.element.DelegatedStencilElement; import net.createmod.catnip.gui.element.ScreenElement; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.theme.Color; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; @@ -162,7 +162,7 @@ public class AllIcons implements ScreenElement { I_FX_FIELD_ON = next(), I_FX_BLEND = next(), I_FX_BLEND_OFF = next(), - + I_SEND_ONLY = newRow(), I_SEND_AND_RECEIVE = next(), I_PARTIAL_REQUESTS = next(), diff --git a/src/main/java/com/simibubi/create/foundation/gui/ModularGuiLine.java b/src/main/java/com/simibubi/create/foundation/gui/ModularGuiLine.java index 16652fdbc4..825e4e337b 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/ModularGuiLine.java +++ b/src/main/java/com/simibubi/create/foundation/gui/ModularGuiLine.java @@ -8,8 +8,8 @@ import com.simibubi.create.foundation.gui.widget.ScrollInput; import com.simibubi.create.foundation.gui.widget.TooltipArea; import net.createmod.catnip.gui.UIRenderHelper; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Pair; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.EditBox; diff --git a/src/main/java/com/simibubi/create/foundation/gui/ModularGuiLineBuilder.java b/src/main/java/com/simibubi/create/foundation/gui/ModularGuiLineBuilder.java index 9b3b7268cd..f6645fe046 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/ModularGuiLineBuilder.java +++ b/src/main/java/com/simibubi/create/foundation/gui/ModularGuiLineBuilder.java @@ -7,9 +7,9 @@ import com.simibubi.create.foundation.gui.widget.ScrollInput; import com.simibubi.create.foundation.gui.widget.SelectionScrollInput; import com.simibubi.create.foundation.gui.widget.TooltipArea; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Pair; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.data.Pair; +import net.createmod.catnip.lang.Components; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.components.EditBox; diff --git a/src/main/java/com/simibubi/create/foundation/gui/widget/Label.java b/src/main/java/com/simibubi/create/foundation/gui/widget/Label.java index a1dd3a0c59..99023ebc74 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/widget/Label.java +++ b/src/main/java/com/simibubi/create/foundation/gui/widget/Label.java @@ -5,7 +5,7 @@ import javax.annotation.Nonnull; import com.mojang.blaze3d.systems.RenderSystem; import net.createmod.catnip.gui.widget.AbstractSimiWidget; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/simibubi/create/foundation/gui/widget/ScrollInput.java b/src/main/java/com/simibubi/create/foundation/gui/widget/ScrollInput.java index 8169d2724f..cf8ae063a2 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/widget/ScrollInput.java +++ b/src/main/java/com/simibubi/create/foundation/gui/widget/ScrollInput.java @@ -9,7 +9,7 @@ import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollVa import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.gui.widget.AbstractSimiWidget; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.sounds.SimpleSoundInstance; diff --git a/src/main/java/com/simibubi/create/foundation/gui/widget/SelectionScrollInput.java b/src/main/java/com/simibubi/create/foundation/gui/widget/SelectionScrollInput.java index dafbb7fefa..105e2bea01 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/widget/SelectionScrollInput.java +++ b/src/main/java/com/simibubi/create/foundation/gui/widget/SelectionScrollInput.java @@ -5,7 +5,7 @@ import java.util.List; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; diff --git a/src/main/java/com/simibubi/create/foundation/item/CountedItemStackList.java b/src/main/java/com/simibubi/create/foundation/item/CountedItemStackList.java index a1e238834f..6922fb8f58 100644 --- a/src/main/java/com/simibubi/create/foundation/item/CountedItemStackList.java +++ b/src/main/java/com/simibubi/create/foundation/item/CountedItemStackList.java @@ -9,7 +9,7 @@ import java.util.stream.Stream; import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour; -import net.createmod.catnip.utility.IntAttached; +import net.createmod.catnip.data.IntAttached; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java b/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java index 9be2a8801c..5ea57a4f05 100644 --- a/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java +++ b/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java @@ -17,8 +17,8 @@ import org.jetbrains.annotations.Nullable; import com.google.common.collect.ImmutableList; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.FontHelper.Palette; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.FontHelper.Palette; +import net.createmod.catnip.lang.Components; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.resources.language.I18n; diff --git a/src/main/java/com/simibubi/create/foundation/item/ItemHelper.java b/src/main/java/com/simibubi/create/foundation/item/ItemHelper.java index 4a96b18bbf..459b4045de 100644 --- a/src/main/java/com/simibubi/create/foundation/item/ItemHelper.java +++ b/src/main/java/com/simibubi/create/foundation/item/ItemHelper.java @@ -12,7 +12,7 @@ import org.apache.commons.lang3.mutable.MutableInt; import com.simibubi.create.foundation.mixin.accessor.ItemStackHandlerAccessor; import com.simibubi.create.content.logistics.box.PackageEntity; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.data.Pair; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.core.component.DataComponents; diff --git a/src/main/java/com/simibubi/create/foundation/item/KineticStats.java b/src/main/java/com/simibubi/create/foundation/item/KineticStats.java index 3c21961371..f8792643bc 100644 --- a/src/main/java/com/simibubi/create/foundation/item/KineticStats.java +++ b/src/main/java/com/simibubi/create/foundation/item/KineticStats.java @@ -19,10 +19,10 @@ import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; import com.simibubi.create.infrastructure.config.CKinetics; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.lang.Components; -import net.createmod.catnip.utility.lang.Lang; -import net.createmod.catnip.utility.lang.LangBuilder; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; +import net.createmod.catnip.lang.LangBuilder; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.BlockItem; diff --git a/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java b/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java index e11b1b6748..12f359a2e1 100644 --- a/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java +++ b/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java @@ -8,9 +8,9 @@ import java.util.List; import com.google.common.base.Strings; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.FontHelper; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.lang.FontHelper; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; diff --git a/src/main/java/com/simibubi/create/foundation/item/render/PartialItemModelRenderer.java b/src/main/java/com/simibubi/create/foundation/item/render/PartialItemModelRenderer.java index 51273e47e0..ba4bf6e930 100644 --- a/src/main/java/com/simibubi/create/foundation/item/render/PartialItemModelRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/item/render/PartialItemModelRenderer.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.simibubi.create.foundation.render.RenderTypes; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/simibubi/create/foundation/mixin/client/ModelDataRefreshMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/client/ModelDataRefreshMixin.java index 95c75ebc87..acd4d680df 100644 --- a/src/main/java/com/simibubi/create/foundation/mixin/client/ModelDataRefreshMixin.java +++ b/src/main/java/com/simibubi/create/foundation/mixin/client/ModelDataRefreshMixin.java @@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import net.createmod.catnip.utility.levelWrappers.SchematicLevel; +import net.createmod.catnip.levelWrappers.SchematicLevel; import net.minecraft.client.Minecraft; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/com/simibubi/create/foundation/model/BakedModelHelper.java b/src/main/java/com/simibubi/create/foundation/model/BakedModelHelper.java index 4466a35965..081facce86 100644 --- a/src/main/java/com/simibubi/create/foundation/model/BakedModelHelper.java +++ b/src/main/java/com/simibubi/create/foundation/model/BakedModelHelper.java @@ -10,8 +10,8 @@ import java.util.List; import java.util.Map; import java.util.function.UnaryOperator; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemOverrides; diff --git a/src/main/java/com/simibubi/create/foundation/particle/AirParticle.java b/src/main/java/com/simibubi/create/foundation/particle/AirParticle.java index 890eabbb68..70e6fd0548 100644 --- a/src/main/java/com/simibubi/create/foundation/particle/AirParticle.java +++ b/src/main/java/com/simibubi/create/foundation/particle/AirParticle.java @@ -2,7 +2,7 @@ package com.simibubi.create.foundation.particle; import com.simibubi.create.Create; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.VecHelper; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.ParticleProvider; diff --git a/src/main/java/com/simibubi/create/foundation/placement/PoleHelper.java b/src/main/java/com/simibubi/create/foundation/placement/PoleHelper.java index 8ed6504592..6d70208ad1 100644 --- a/src/main/java/com/simibubi/create/foundation/placement/PoleHelper.java +++ b/src/main/java/com/simibubi/create/foundation/placement/PoleHelper.java @@ -7,8 +7,8 @@ import java.util.function.Predicate; import com.simibubi.create.content.equipment.extendoGrip.ExtendoGripItem; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.placement.IPlacementHelper; -import net.createmod.catnip.utility.placement.PlacementOffset; +import net.createmod.catnip.placement.IPlacementHelper; +import net.createmod.catnip.placement.PlacementOffset; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/foundation/ponder/CreateSceneBuilder.java b/src/main/java/com/simibubi/create/foundation/ponder/CreateSceneBuilder.java index a7f71986b6..2c34712aad 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/CreateSceneBuilder.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/CreateSceneBuilder.java @@ -28,9 +28,9 @@ import com.simibubi.create.foundation.ponder.element.BeltItemElement; import com.simibubi.create.foundation.ponder.element.ExpandedParrotElement; import com.simibubi.create.foundation.ponder.instruction.AnimateBlockEntityInstruction; -import net.createmod.catnip.utility.FunctionalHelper; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.data.FunctionalHelper; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.math.VecHelper; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.ParrotElement; import net.createmod.ponder.api.element.ParrotPose; diff --git a/src/main/java/com/simibubi/create/foundation/render/BlockEntityRenderHelper.java b/src/main/java/com/simibubi/create/foundation/render/BlockEntityRenderHelper.java index ee3bce55f4..5dfd98d801 100644 --- a/src/main/java/com/simibubi/create/foundation/render/BlockEntityRenderHelper.java +++ b/src/main/java/com/simibubi/create/foundation/render/BlockEntityRenderHelper.java @@ -16,8 +16,8 @@ import dev.engine_room.flywheel.api.visualization.VisualizationManager; import dev.engine_room.flywheel.lib.transform.TransformStack; import dev.engine_room.flywheel.lib.visualization.VisualizationHelper; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/simibubi/create/foundation/render/PlayerSkyhookRenderer.java b/src/main/java/com/simibubi/create/foundation/render/PlayerSkyhookRenderer.java index 78f650ddc5..8055ad529c 100644 --- a/src/main/java/com/simibubi/create/foundation/render/PlayerSkyhookRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/render/PlayerSkyhookRenderer.java @@ -5,8 +5,8 @@ import java.util.HashSet; import java.util.Set; import java.util.UUID; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.model.HumanoidModel; import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/com/simibubi/create/foundation/sound/RepeatingSound.java b/src/main/java/com/simibubi/create/foundation/sound/RepeatingSound.java index bb9815a55b..4ecc193391 100644 --- a/src/main/java/com/simibubi/create/foundation/sound/RepeatingSound.java +++ b/src/main/java/com/simibubi/create/foundation/sound/RepeatingSound.java @@ -1,6 +1,6 @@ package com.simibubi.create.foundation.sound; -import net.createmod.catnip.utility.AnimationTickHolder; +import net.createmod.catnip.animation.AnimationTickHolder; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.sounds.SoundEvent; diff --git a/src/main/java/com/simibubi/create/foundation/sound/SoundScape.java b/src/main/java/com/simibubi/create/foundation/sound/SoundScape.java index 40ff8f26df..a3d14eb25e 100644 --- a/src/main/java/com/simibubi/create/foundation/sound/SoundScape.java +++ b/src/main/java/com/simibubi/create/foundation/sound/SoundScape.java @@ -7,8 +7,8 @@ import com.simibubi.create.foundation.sound.SoundScapes.AmbienceGroup; import com.simibubi.create.foundation.sound.SoundScapes.PitchGroup; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.math.VecHelper; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvent; diff --git a/src/main/java/com/simibubi/create/foundation/sound/SoundScapes.java b/src/main/java/com/simibubi/create/foundation/sound/SoundScapes.java index 6d7b246a3a..8e57dc1ee1 100644 --- a/src/main/java/com/simibubi/create/foundation/sound/SoundScapes.java +++ b/src/main/java/com/simibubi/create/foundation/sound/SoundScapes.java @@ -13,8 +13,8 @@ import java.util.function.BiFunction; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.AnimationTickHolder; -import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.animation.AnimationTickHolder; +import net.createmod.catnip.data.Pair; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java b/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java index d129cffe3a..4ca8092403 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java @@ -18,7 +18,7 @@ import com.simibubi.create.foundation.blockEntity.IMergeableBE; import com.simibubi.create.foundation.blockEntity.IMultiBlockEntityContainer; import com.simibubi.create.impl.schematic.nbt.SchematicSafeNBTRegistryImpl; -import net.createmod.catnip.utility.NBTProcessors; +import net.createmod.catnip.nbt.NBTProcessors; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Registry; diff --git a/src/main/java/com/simibubi/create/foundation/utility/CameraAngleAnimationService.java b/src/main/java/com/simibubi/create/foundation/utility/CameraAngleAnimationService.java index de84d21b9b..3234776216 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/CameraAngleAnimationService.java +++ b/src/main/java/com/simibubi/create/foundation/utility/CameraAngleAnimationService.java @@ -1,7 +1,7 @@ package com.simibubi.create.foundation.utility; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.math.AngleHelper; import net.minecraft.client.Minecraft; import net.minecraft.util.Mth; diff --git a/src/main/java/com/simibubi/create/foundation/utility/CreateLang.java b/src/main/java/com/simibubi/create/foundation/utility/CreateLang.java index f8348aaf4d..c054c33090 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/CreateLang.java +++ b/src/main/java/com/simibubi/create/foundation/utility/CreateLang.java @@ -5,10 +5,10 @@ import java.util.List; import com.simibubi.create.Create; -import net.createmod.catnip.utility.lang.Components; -import net.createmod.catnip.utility.lang.Lang; -import net.createmod.catnip.utility.lang.LangBuilder; -import net.createmod.catnip.utility.lang.LangNumberFormat; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.lang.Lang; +import net.createmod.catnip.lang.LangBuilder; +import net.createmod.catnip.lang.LangNumberFormat; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/foundation/utility/CreateNBTProcessors.java b/src/main/java/com/simibubi/create/foundation/utility/CreateNBTProcessors.java index 2d3f36e8fd..c55e66907d 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/CreateNBTProcessors.java +++ b/src/main/java/com/simibubi/create/foundation/utility/CreateNBTProcessors.java @@ -4,8 +4,8 @@ import java.util.List; import com.simibubi.create.AllBlockEntityTypes; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.NBTProcessors; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.nbt.NBTProcessors; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; diff --git a/src/main/java/com/simibubi/create/foundation/utility/Debug.java b/src/main/java/com/simibubi/create/foundation/utility/Debug.java index 3f12f16fd5..6da5dbc8d0 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/Debug.java +++ b/src/main/java/com/simibubi/create/foundation/utility/Debug.java @@ -2,7 +2,7 @@ package com.simibubi.create.foundation.utility; import com.simibubi.create.Create; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/simibubi/create/foundation/utility/DyeHelper.java b/src/main/java/com/simibubi/create/foundation/utility/DyeHelper.java index b11d41796c..52566edc92 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/DyeHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/DyeHelper.java @@ -4,7 +4,7 @@ import java.util.Map; import com.google.common.collect.ImmutableMap; -import net.createmod.catnip.utility.Couple; +import net.createmod.catnip.data.Couple; import net.minecraft.world.item.DyeColor; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Blocks; diff --git a/src/main/java/com/simibubi/create/foundation/utility/DynamicComponent.java b/src/main/java/com/simibubi/create/foundation/utility/DynamicComponent.java index b1947ec6a8..deccc7195c 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/DynamicComponent.java +++ b/src/main/java/com/simibubi/create/foundation/utility/DynamicComponent.java @@ -6,7 +6,7 @@ import com.google.gson.JsonParser; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.simibubi.create.Create; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/simibubi/create/foundation/utility/FilesHelper.java b/src/main/java/com/simibubi/create/foundation/utility/FilesHelper.java index 560f38833a..18f7c54b6f 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/FilesHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/FilesHelper.java @@ -16,7 +16,7 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import com.simibubi.create.Create; -import net.createmod.catnip.utility.lang.Lang; +import net.createmod.catnip.lang.Lang; import net.minecraft.nbt.CompoundTag; public class FilesHelper { diff --git a/src/main/java/com/simibubi/create/foundation/utility/FluidFormatter.java b/src/main/java/com/simibubi/create/foundation/utility/FluidFormatter.java index 117d7c706d..c29d7777dc 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/FluidFormatter.java +++ b/src/main/java/com/simibubi/create/foundation/utility/FluidFormatter.java @@ -1,7 +1,7 @@ package com.simibubi.create.foundation.utility; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.lang.Components; import net.minecraft.network.chat.MutableComponent; public class FluidFormatter { diff --git a/src/main/java/com/simibubi/create/foundation/utility/ModelSwapper.java b/src/main/java/com/simibubi/create/foundation/utility/ModelSwapper.java index 9503383484..54c8762ca9 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/ModelSwapper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/ModelSwapper.java @@ -10,7 +10,7 @@ import com.simibubi.create.foundation.item.render.CustomItemModels; import com.simibubi.create.foundation.item.render.CustomRenderedItemModel; import com.simibubi.create.foundation.item.render.CustomRenderedItems; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.client.renderer.block.BlockModelShaper; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.client.resources.model.ModelResourceLocation; diff --git a/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java b/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java index a0e04fd4bc..a854b0d2a3 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java @@ -57,7 +57,7 @@ import com.simibubi.create.AllBlockEntityTypes; import com.simibubi.create.Create; import com.simibubi.create.foundation.data.recipe.CompatMetals; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.core.Registry; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/foundation/utility/ServerSpeedProvider.java b/src/main/java/com/simibubi/create/foundation/utility/ServerSpeedProvider.java index aa8248806d..68176f2765 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/ServerSpeedProvider.java +++ b/src/main/java/com/simibubi/create/foundation/utility/ServerSpeedProvider.java @@ -5,8 +5,8 @@ import net.createmod.catnip.net.base.ClientboundPacketPayload; import net.createmod.catnip.platform.CatnipServices; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.utility.animation.LerpedFloat; -import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.animation.LerpedFloat.Chaser; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; diff --git a/src/main/java/com/simibubi/create/foundation/utility/TreeCutter.java b/src/main/java/com/simibubi/create/foundation/utility/TreeCutter.java index 7422940357..aa03c5a7f5 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/TreeCutter.java +++ b/src/main/java/com/simibubi/create/foundation/utility/TreeCutter.java @@ -19,7 +19,7 @@ import com.simibubi.create.AllTags.AllBlockTags; import com.simibubi.create.compat.Mods; import com.simibubi.create.compat.dynamictrees.DynamicTree; -import net.createmod.catnip.utility.Iterate; +import net.createmod.catnip.data.Iterate; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.tags.BlockTags; diff --git a/src/main/java/com/simibubi/create/infrastructure/command/ClearBufferCacheCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/ClearBufferCacheCommand.java index c3ed4db9e3..f3e74a4614 100644 --- a/src/main/java/com/simibubi/create/infrastructure/command/ClearBufferCacheCommand.java +++ b/src/main/java/com/simibubi/create/infrastructure/command/ClearBufferCacheCommand.java @@ -3,11 +3,12 @@ package com.simibubi.create.infrastructure.command; import com.mojang.brigadier.builder.ArgumentBuilder; import com.simibubi.create.CreateClient; -import net.createmod.catnip.CatnipClient; +import net.createmod.catnip.lang.Components; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.ponder.PonderClient; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; @@ -26,7 +27,7 @@ public class ClearBufferCacheCommand { @OnlyIn(Dist.CLIENT) private static void execute() { - CatnipClient.invalidateRenderers(); + PonderClient.invalidateRenderers(); CreateClient.invalidateRenderers(); } } diff --git a/src/main/java/com/simibubi/create/infrastructure/command/CloneCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/CloneCommand.java index b18bce47bc..e0e9e8f609 100644 --- a/src/main/java/com/simibubi/create/infrastructure/command/CloneCommand.java +++ b/src/main/java/com/simibubi/create/infrastructure/command/CloneCommand.java @@ -9,7 +9,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType; import com.simibubi.create.content.contraptions.glue.SuperGlueEntity; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraft.commands.arguments.coordinates.BlockPosArgument; diff --git a/src/main/java/com/simibubi/create/infrastructure/command/CouplingCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/CouplingCommand.java index 0152af19d8..aeb2e62205 100644 --- a/src/main/java/com/simibubi/create/infrastructure/command/CouplingCommand.java +++ b/src/main/java/com/simibubi/create/infrastructure/command/CouplingCommand.java @@ -14,8 +14,8 @@ import com.simibubi.create.content.contraptions.minecart.CouplingHandler; import com.simibubi.create.content.contraptions.minecart.capability.CapabilityMinecartController; import com.simibubi.create.content.contraptions.minecart.capability.MinecartController; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.lang.Components; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraft.commands.arguments.EntityArgument; diff --git a/src/main/java/com/simibubi/create/infrastructure/command/CreateTestCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/CreateTestCommand.java index 62181cba0b..5f215e4e3d 100644 --- a/src/main/java/com/simibubi/create/infrastructure/command/CreateTestCommand.java +++ b/src/main/java/com/simibubi/create/infrastructure/command/CreateTestCommand.java @@ -20,7 +20,7 @@ import com.simibubi.create.content.schematics.SchematicExport; import com.simibubi.create.content.schematics.SchematicExport.SchematicExportResult; import com.simibubi.create.content.schematics.client.SchematicAndQuillHandler; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/com/simibubi/create/infrastructure/command/DebugValueCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/DebugValueCommand.java index d6c2667658..c35646a18e 100644 --- a/src/main/java/com/simibubi/create/infrastructure/command/DebugValueCommand.java +++ b/src/main/java/com/simibubi/create/infrastructure/command/DebugValueCommand.java @@ -3,7 +3,7 @@ package com.simibubi.create.infrastructure.command; import com.mojang.brigadier.arguments.FloatArgumentType; import com.mojang.brigadier.builder.ArgumentBuilder; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; diff --git a/src/main/java/com/simibubi/create/infrastructure/command/DumpRailwaysCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/DumpRailwaysCommand.java index 9be001c436..95adee274f 100644 --- a/src/main/java/com/simibubi/create/infrastructure/command/DumpRailwaysCommand.java +++ b/src/main/java/com/simibubi/create/infrastructure/command/DumpRailwaysCommand.java @@ -15,7 +15,7 @@ import com.simibubi.create.content.trains.schedule.ScheduleRuntime; import com.simibubi.create.content.trains.signal.SignalBoundary; import com.simibubi.create.content.trains.station.GlobalStation; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; diff --git a/src/main/java/com/simibubi/create/infrastructure/command/FixLightingCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/FixLightingCommand.java index ef6f288e95..c8c5c6d29a 100644 --- a/src/main/java/com/simibubi/create/infrastructure/command/FixLightingCommand.java +++ b/src/main/java/com/simibubi/create/infrastructure/command/FixLightingCommand.java @@ -3,7 +3,7 @@ package com.simibubi.create.infrastructure.command; import com.mojang.brigadier.builder.ArgumentBuilder; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/com/simibubi/create/infrastructure/command/HighlightCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/HighlightCommand.java index 748c7cdada..8f3244d46c 100644 --- a/src/main/java/com/simibubi/create/infrastructure/command/HighlightCommand.java +++ b/src/main/java/com/simibubi/create/infrastructure/command/HighlightCommand.java @@ -9,7 +9,7 @@ import com.simibubi.create.content.contraptions.IDisplayAssemblyExceptions; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraft.commands.arguments.EntityArgument; diff --git a/src/main/java/com/simibubi/create/infrastructure/command/HighlightPacket.java b/src/main/java/com/simibubi/create/infrastructure/command/HighlightPacket.java index 6ef99d73d0..fa37eb27bb 100644 --- a/src/main/java/com/simibubi/create/infrastructure/command/HighlightPacket.java +++ b/src/main/java/com/simibubi/create/infrastructure/command/HighlightPacket.java @@ -5,11 +5,12 @@ import com.simibubi.create.AllSpecialTextures; import net.createmod.catnip.net.base.ClientboundPacketPayload; import io.netty.buffer.ByteBuf; -import net.createmod.catnip.CatnipClient; +import net.createmod.catnip.outliner.Outliner; import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.BlockPos; import net.minecraft.network.codec.StreamCodec; import net.minecraft.world.phys.shapes.Shapes; + import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; @@ -23,7 +24,7 @@ public record HighlightPacket(BlockPos pos) implements ClientboundPacketPayload return; } - CatnipClient.OUTLINER.showAABB("highlightCommand", Shapes.block() + Outliner.getInstance().showAABB("highlightCommand", Shapes.block() .bounds() .move(pos), 200) .lineWidth(1 / 32f) diff --git a/src/main/java/com/simibubi/create/infrastructure/command/OverlayConfigCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/OverlayConfigCommand.java index 431a2cbc2c..50ffbc88cc 100644 --- a/src/main/java/com/simibubi/create/infrastructure/command/OverlayConfigCommand.java +++ b/src/main/java/com/simibubi/create/infrastructure/command/OverlayConfigCommand.java @@ -4,7 +4,7 @@ import com.mojang.brigadier.Command; import com.mojang.brigadier.builder.ArgumentBuilder; import net.createmod.catnip.platform.CatnipServices; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/com/simibubi/create/infrastructure/command/ReplaceInCommandBlocksCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/ReplaceInCommandBlocksCommand.java index b492f0da5e..c304d34de3 100644 --- a/src/main/java/com/simibubi/create/infrastructure/command/ReplaceInCommandBlocksCommand.java +++ b/src/main/java/com/simibubi/create/infrastructure/command/ReplaceInCommandBlocksCommand.java @@ -5,7 +5,7 @@ import org.apache.commons.lang3.mutable.MutableInt; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.ArgumentBuilder; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraft.commands.arguments.coordinates.BlockPosArgument; diff --git a/src/main/java/com/simibubi/create/infrastructure/command/SimpleCreateActions.java b/src/main/java/com/simibubi/create/infrastructure/command/SimpleCreateActions.java index dd609ee44b..56ec91af9a 100644 --- a/src/main/java/com/simibubi/create/infrastructure/command/SimpleCreateActions.java +++ b/src/main/java/com/simibubi/create/infrastructure/command/SimpleCreateActions.java @@ -7,7 +7,7 @@ import com.simibubi.create.foundation.utility.CameraAngleAnimationService; import com.simibubi.create.infrastructure.config.AllConfigs; import net.createmod.catnip.gui.ScreenOpener; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; diff --git a/src/main/java/com/simibubi/create/infrastructure/command/TrainCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/TrainCommand.java index a474586001..61094b472a 100644 --- a/src/main/java/com/simibubi/create/infrastructure/command/TrainCommand.java +++ b/src/main/java/com/simibubi/create/infrastructure/command/TrainCommand.java @@ -10,7 +10,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.simibubi.create.Create; import com.simibubi.create.content.trains.entity.Train; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraft.commands.arguments.UuidArgument; diff --git a/src/main/java/com/simibubi/create/infrastructure/config/CStress.java b/src/main/java/com/simibubi/create/infrastructure/config/CStress.java index 50d03850f1..0bc198dc1f 100644 --- a/src/main/java/com/simibubi/create/infrastructure/config/CStress.java +++ b/src/main/java/com/simibubi/create/infrastructure/config/CStress.java @@ -9,10 +9,11 @@ import com.simibubi.create.content.kinetics.BlockStressDefaults; import com.simibubi.create.content.kinetics.BlockStressValues.IStressValueProvider; import net.createmod.catnip.config.ConfigBase; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; + import net.neoforged.neoforge.common.ModConfigSpec.Builder; import net.neoforged.neoforge.common.ModConfigSpec.ConfigValue; diff --git a/src/main/java/com/simibubi/create/infrastructure/gametest/CreateGameTestHelper.java b/src/main/java/com/simibubi/create/infrastructure/gametest/CreateGameTestHelper.java index c37fb81dbd..b73cac0185 100644 --- a/src/main/java/com/simibubi/create/infrastructure/gametest/CreateGameTestHelper.java +++ b/src/main/java/com/simibubi/create/infrastructure/gametest/CreateGameTestHelper.java @@ -27,7 +27,7 @@ import com.simibubi.create.foundation.mixin.accessor.GameTestHelperAccessor; import it.unimi.dsi.fastutil.objects.Object2LongArrayMap; import it.unimi.dsi.fastutil.objects.Object2LongMap; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.registries.BuiltInRegistries; diff --git a/src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestItems.java b/src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestItems.java index 62fc4a98c4..cc6c112ad5 100644 --- a/src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestItems.java +++ b/src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestItems.java @@ -18,7 +18,7 @@ import com.simibubi.create.infrastructure.gametest.CreateGameTestHelper; import com.simibubi.create.infrastructure.gametest.GameTestGroup; import it.unimi.dsi.fastutil.objects.Object2LongMap; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.Util; import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; diff --git a/src/main/java/com/simibubi/create/infrastructure/gui/CreateMainMenuScreen.java b/src/main/java/com/simibubi/create/infrastructure/gui/CreateMainMenuScreen.java index c535244baf..61f84cbdeb 100644 --- a/src/main/java/com/simibubi/create/infrastructure/gui/CreateMainMenuScreen.java +++ b/src/main/java/com/simibubi/create/infrastructure/gui/CreateMainMenuScreen.java @@ -15,11 +15,11 @@ import net.createmod.catnip.gui.AbstractSimiScreen; import net.createmod.catnip.gui.ScreenOpener; import net.createmod.catnip.gui.element.BoxElement; import net.createmod.catnip.gui.element.GuiGameElement; -import net.createmod.catnip.utility.FontHelper; -import net.createmod.catnip.utility.FontHelper.Palette; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.lang.Components; -import net.createmod.catnip.utility.theme.Color; +import net.createmod.catnip.lang.FontHelper; +import net.createmod.catnip.lang.FontHelper.Palette; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.lang.Components; +import net.createmod.catnip.theme.Color; import net.createmod.ponder.foundation.ui.PonderTagIndexScreen; import net.minecraft.ChatFormatting; import net.minecraft.Util; diff --git a/src/main/java/com/simibubi/create/infrastructure/gui/OpenCreateMenuButton.java b/src/main/java/com/simibubi/create/infrastructure/gui/OpenCreateMenuButton.java index 2d3bdb644a..26e4f4e42e 100644 --- a/src/main/java/com/simibubi/create/infrastructure/gui/OpenCreateMenuButton.java +++ b/src/main/java/com/simibubi/create/infrastructure/gui/OpenCreateMenuButton.java @@ -10,7 +10,7 @@ import com.simibubi.create.AllItems; import com.simibubi.create.infrastructure.config.AllConfigs; import net.createmod.catnip.gui.ScreenOpener; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.lang.Components; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/AllCreatePonderTags.java b/src/main/java/com/simibubi/create/infrastructure/ponder/AllCreatePonderTags.java index 24a8506cfa..8ebdb833d7 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/AllCreatePonderTags.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/AllCreatePonderTags.java @@ -6,7 +6,7 @@ import com.simibubi.create.Create; import com.simibubi.create.compat.Mods; import com.tterrag.registrate.util.entry.RegistryEntry; -import net.createmod.catnip.utility.RegisteredObjectsHelper; +import net.createmod.catnip.registry.RegisteredObjectsHelper; import net.createmod.ponder.api.registration.PonderTagRegistrationHelper; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; @@ -85,7 +85,7 @@ public class AllCreatePonderTags { .title("Item Transportation") .description("Components which help moving items around") .register(); - + helper.registerTag(HIGH_LOGISTICS) .addToIndex() .item(AllBlocks.STOCK_TICKER.get()) @@ -365,7 +365,7 @@ public class AllCreatePonderTags { .add(AllBlocks.FACTORY_GAUGE) .add(AllBlocks.REPACKAGER) .add(AllItems.PACKAGE_FILTER); - + HELPER.addToTag(CONTRAPTION_ACTOR) .add(AllBlocks.MECHANICAL_HARVESTER) .add(AllBlocks.MECHANICAL_PLOUGH) diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ArmScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ArmScenes.java index 0dcdf97e72..92ed388cb2 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ArmScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ArmScenes.java @@ -7,7 +7,7 @@ import com.simibubi.create.content.kinetics.mechanicalArm.ArmBlockEntity.Phase; import com.simibubi.create.content.logistics.funnel.FunnelBlockEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BearingScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BearingScenes.java index 8826126d59..a7e7bc1324 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BearingScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BearingScenes.java @@ -7,8 +7,8 @@ import com.simibubi.create.content.contraptions.bearing.SailBlock; import com.simibubi.create.content.contraptions.glue.SuperGlueEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BeltScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BeltScenes.java index 97e73d9432..7ae49e27e8 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BeltScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BeltScenes.java @@ -16,8 +16,8 @@ import com.simibubi.create.content.kinetics.press.PressingBehaviour.Mode; import com.simibubi.create.content.kinetics.simpleRelays.ShaftBlock; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.EntityElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/CartAssemblerScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/CartAssemblerScenes.java index 79dcb784cc..00da8ea3f4 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/CartAssemblerScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/CartAssemblerScenes.java @@ -6,7 +6,7 @@ import com.simibubi.create.content.contraptions.mounted.CartAssembleRailType; import com.simibubi.create.content.contraptions.mounted.CartAssemblerBlock; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.ParticleEmitter; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChainDriveScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChainDriveScenes.java index 45fcb27292..bdeb4d3a99 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChainDriveScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChainDriveScenes.java @@ -5,7 +5,7 @@ import com.simibubi.create.content.kinetics.chainDrive.ChainDriveBlock; import com.simibubi.create.content.redstone.analogLever.AnalogLeverBlockEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.TextElementBuilder; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChassisScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChassisScenes.java index 0db35ab9dc..0f7d0057a7 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChassisScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChassisScenes.java @@ -7,7 +7,7 @@ import com.simibubi.create.content.contraptions.chassis.LinearChassisBlock; import com.simibubi.create.content.contraptions.chassis.RadialChassisBlock; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChuteScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChuteScenes.java index 91104d6c79..a59545546d 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChuteScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChuteScenes.java @@ -9,7 +9,7 @@ import com.simibubi.create.content.logistics.chute.ChuteBlock.Shape; import com.simibubi.create.content.logistics.chute.SmartChuteBlockEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.EntityElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/CrafterScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/CrafterScenes.java index 88222d81ae..bfab1b848e 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/CrafterScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/CrafterScenes.java @@ -8,8 +8,8 @@ import com.simibubi.create.content.kinetics.crafter.MechanicalCrafterBlock; import com.simibubi.create.content.kinetics.crafter.MechanicalCrafterBlockEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Couple; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.data.Couple; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.EntityElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DeployerScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DeployerScenes.java index 3f06185c71..b2a940da46 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DeployerScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DeployerScenes.java @@ -7,7 +7,7 @@ import com.simibubi.create.content.kinetics.deployer.DeployerBlockEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; import com.simibubi.create.foundation.ponder.element.BeltItemElement; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.EntityElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DetectorScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DetectorScenes.java index d4828efd09..f3b20941cf 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DetectorScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DetectorScenes.java @@ -4,7 +4,7 @@ import com.simibubi.create.content.redstone.smartObserver.SmartObserverBlockEnti import com.simibubi.create.content.redstone.thresholdSwitch.ThresholdSwitchBlock; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DisplayScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DisplayScenes.java index 29a475e6a7..ea80ec8bd5 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DisplayScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DisplayScenes.java @@ -7,8 +7,8 @@ import com.simibubi.create.content.equipment.clipboard.ClipboardOverrides.Clipbo import com.simibubi.create.foundation.ponder.CreateSceneBuilder; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.utility.Pointing; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.math.Pointing; +import net.createmod.catnip.lang.Components; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/EjectorScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/EjectorScenes.java index 443830a745..66744fe265 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/EjectorScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/EjectorScenes.java @@ -5,8 +5,8 @@ import com.simibubi.create.content.logistics.depot.EjectorBlockEntity; import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.ParrotElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ElevatorScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ElevatorScenes.java index c97e24c85a..260c165678 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ElevatorScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ElevatorScenes.java @@ -8,8 +8,8 @@ import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlock; import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlockEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.math.Pointing; +import net.createmod.catnip.lang.Components; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/FanScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/FanScenes.java index d60c9d3096..b0d19bef82 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/FanScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/FanScenes.java @@ -5,7 +5,7 @@ import com.simibubi.create.content.logistics.depot.DepotBlockEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; import com.simibubi.create.foundation.ponder.element.BeltItemElement; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.EntityElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/FunnelScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/FunnelScenes.java index 93c21ab908..54192875bc 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/FunnelScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/FunnelScenes.java @@ -7,7 +7,7 @@ import com.simibubi.create.content.logistics.funnel.FunnelBlock; import com.simibubi.create.content.logistics.funnel.FunnelBlockEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.EntityElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/GantryScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/GantryScenes.java index 2f1464cfc9..43d51a1848 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/GantryScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/GantryScenes.java @@ -3,8 +3,8 @@ package com.simibubi.create.infrastructure.ponder.scenes; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ItemVaultScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ItemVaultScenes.java index 8eeb84ba0c..7e459f60ba 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ItemVaultScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ItemVaultScenes.java @@ -4,7 +4,7 @@ import com.simibubi.create.AllItems; import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/KineticsScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/KineticsScenes.java index 6490e0ea59..b765ca4a35 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/KineticsScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/KineticsScenes.java @@ -17,7 +17,7 @@ import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlockEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; import com.tterrag.registrate.util.entry.BlockEntry; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MechanicalDrillScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MechanicalDrillScenes.java index 74ebd73dff..40cb1cfb3a 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MechanicalDrillScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MechanicalDrillScenes.java @@ -2,7 +2,7 @@ package com.simibubi.create.infrastructure.ponder.scenes; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.EntityElement; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MechanicalSawScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MechanicalSawScenes.java index 1a0cefd8e3..66d400cae4 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MechanicalSawScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MechanicalSawScenes.java @@ -5,7 +5,7 @@ import com.simibubi.create.content.kinetics.saw.SawBlockEntity; import com.simibubi.create.content.kinetics.simpleRelays.ShaftBlock; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.EntityElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MovementActorScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MovementActorScenes.java index 100875d897..7b48e560f4 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MovementActorScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MovementActorScenes.java @@ -8,7 +8,7 @@ import com.simibubi.create.content.contraptions.actors.psi.PortableStorageInterf import com.simibubi.create.content.contraptions.chassis.LinearChassisBlock; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.EntityElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/PistonScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/PistonScenes.java index 5ff861952c..4ba9990d33 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/PistonScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/PistonScenes.java @@ -4,7 +4,7 @@ import com.simibubi.create.AllItems; import com.simibubi.create.content.contraptions.piston.MechanicalPistonHeadBlock; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.ParrotElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ProcessingScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ProcessingScenes.java index e901de44f4..27ec995d06 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ProcessingScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ProcessingScenes.java @@ -16,10 +16,10 @@ import com.simibubi.create.content.processing.burner.LitBlazeBurnerBlock; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; import com.simibubi.create.foundation.ponder.element.BeltItemElement; -import net.createmod.catnip.utility.IntAttached; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.data.IntAttached; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.ParticleEmitter; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/PulleyScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/PulleyScenes.java index 4435fd99fb..ad804cdc94 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/PulleyScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/PulleyScenes.java @@ -3,7 +3,7 @@ package com.simibubi.create.infrastructure.ponder.scenes; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RedstoneScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RedstoneScenes.java index 27d05d92f2..6684902db4 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RedstoneScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RedstoneScenes.java @@ -18,8 +18,8 @@ import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlock; import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlockEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; -import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.math.Pointing; +import net.createmod.catnip.lang.Components; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.ParrotPose; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RedstoneScenes2.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RedstoneScenes2.java index 1fd3bd01b3..d808247fec 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RedstoneScenes2.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RedstoneScenes2.java @@ -8,7 +8,7 @@ import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlockEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; import com.simibubi.create.foundation.ponder.CreateSceneBuilder.WorldInstructions; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; import net.createmod.ponder.api.scene.SceneBuilder; @@ -360,9 +360,9 @@ public class RedstoneScenes2 { scene.idle(1); world.toggleRedstonePower(select.position(0, 1, 2)); scene.idle(10); - + scene.markAsFinished(); - + scene.idle(86); world.cycleBlockProperty(circuitPos, BrassDiodeBlock.POWERING); world.toggleRedstonePower(select.fromTo(1, 1, 2, 0, 1, 2)); diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RollerScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RollerScenes.java index 7b04545e6c..0f83016cc2 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RollerScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RollerScenes.java @@ -5,7 +5,7 @@ import com.simibubi.create.content.trains.station.StationBlock; import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.ParrotElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/SteamScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/SteamScenes.java index 37aba99e73..6399c305d3 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/SteamScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/SteamScenes.java @@ -10,8 +10,8 @@ import com.simibubi.create.content.processing.burner.BlazeBurnerBlock; import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/TunnelScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/TunnelScenes.java index 9f686b9639..9f1b38534b 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/TunnelScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/TunnelScenes.java @@ -12,10 +12,10 @@ import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOp import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Iterate; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.Pointing; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.nbt.NBTHelper; +import net.createmod.catnip.math.Pointing; +import net.createmod.catnip.math.VecHelper; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/DrainScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/DrainScenes.java index 15ae0ec865..f4438c410b 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/DrainScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/DrainScenes.java @@ -4,7 +4,7 @@ import com.simibubi.create.content.fluids.drain.ItemDrainBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; import net.createmod.ponder.api.scene.SceneBuilder; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/FluidMovementActorScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/FluidMovementActorScenes.java index b72028a284..0c110c253a 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/FluidMovementActorScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/FluidMovementActorScenes.java @@ -7,7 +7,7 @@ import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; import com.simibubi.create.foundation.fluid.FluidHelper; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/FluidTankScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/FluidTankScenes.java index d8a453552b..de2b647129 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/FluidTankScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/FluidTankScenes.java @@ -15,8 +15,8 @@ import com.simibubi.create.foundation.fluid.FluidHelper; import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.Pointing; +import net.createmod.catnip.math.VecHelper; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/PipeScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/PipeScenes.java index 14fcec3569..34af528059 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/PipeScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/PipeScenes.java @@ -17,7 +17,7 @@ import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTank import com.simibubi.create.foundation.fluid.FluidHelper; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/PumpScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/PumpScenes.java index 4d394dc9da..72c24d8c27 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/PumpScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/PumpScenes.java @@ -9,7 +9,7 @@ import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; import com.simibubi.create.content.kinetics.simpleRelays.CogWheelBlock; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/SpoutScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/SpoutScenes.java index b91015556b..5ff8729f9b 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/SpoutScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/SpoutScenes.java @@ -9,8 +9,8 @@ import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; import com.simibubi.create.foundation.ponder.element.BeltItemElement; -import net.createmod.catnip.utility.Pointing; -import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.math.Pointing; +import net.createmod.catnip.math.VecHelper; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FactoryGaugeScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FactoryGaugeScenes.java index 48e8e90b1a..44c75cbc01 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FactoryGaugeScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FactoryGaugeScenes.java @@ -19,9 +19,9 @@ import com.simibubi.create.content.redstone.link.RedstoneLinkBlock; import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.IntAttached; -import net.createmod.catnip.utility.NBTHelper; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.data.IntAttached; +import net.createmod.catnip.math.Pointing; +import net.createmod.catnip.nbt.NBTHelper; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FrogAndConveyorScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FrogAndConveyorScenes.java index 30f25bd262..4c002bfe4c 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FrogAndConveyorScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/FrogAndConveyorScenes.java @@ -15,8 +15,8 @@ import com.simibubi.create.content.logistics.packagePort.frogport.FrogportBlockE import com.simibubi.create.content.logistics.packager.PackagerBlockEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; -import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.math.Pointing; +import net.createmod.catnip.math.AngleHelper; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.ParrotElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/PackagerScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/PackagerScenes.java index 4d50a250a7..996827af57 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/PackagerScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/PackagerScenes.java @@ -7,7 +7,7 @@ import com.simibubi.create.content.logistics.box.PackageItem; import com.simibubi.create.content.logistics.box.PackageStyles; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/PonderHilo.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/PonderHilo.java index 23675323e4..bf83dd25d5 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/PonderHilo.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/PonderHilo.java @@ -2,6 +2,7 @@ package com.simibubi.create.infrastructure.ponder.scenes.highLogistics; import com.simibubi.create.content.logistics.box.PackageEntity; import com.simibubi.create.content.logistics.packager.PackagerBlockEntity; +import com.simibubi.create.content.logistics.packagerLink.WiFiParticle; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; import net.createmod.ponder.api.element.ElementLink; @@ -9,9 +10,7 @@ import net.createmod.ponder.api.element.EntityElement; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.core.particles.VibrationParticleOption; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.gameevent.BlockPositionSource; import net.minecraft.world.phys.Vec3; public class PonderHilo { @@ -54,11 +53,12 @@ public class PonderHilo { } public static void linkEffect(CreateSceneBuilder scene, BlockPos pos) { + scene.world() + .flashDisplayLink(pos); scene.addInstruction(s -> { Vec3 vec3 = Vec3.atCenterOf(pos); s.getWorld() - .addParticle(new VibrationParticleOption(new BlockPositionSource(pos.above(3)), 6), vec3.x, vec3.y, - vec3.z, 1, 1, 1); + .addParticle(new WiFiParticle.Data(), vec3.x, vec3.y, vec3.z, 1, 1, 1); }); } diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/PostboxScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/PostboxScenes.java index ae1f07507a..709a4fb774 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/PostboxScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/PostboxScenes.java @@ -8,7 +8,7 @@ import com.simibubi.create.content.logistics.box.PackageStyles; import com.simibubi.create.content.logistics.packagePort.postbox.PostboxBlockEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.ParrotElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/RepackagerScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/RepackagerScenes.java index 07033f002f..b8618b28f5 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/RepackagerScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/RepackagerScenes.java @@ -6,7 +6,7 @@ import com.simibubi.create.content.kinetics.crafter.MechanicalCrafterBlockEntity import com.simibubi.create.content.logistics.box.PackageItem; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.scene.SceneBuilder; import net.createmod.ponder.api.scene.SceneBuildingUtil; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/RequesterAndShopScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/RequesterAndShopScenes.java index 424a2482ab..419a32743a 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/RequesterAndShopScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/RequesterAndShopScenes.java @@ -7,7 +7,7 @@ import com.simibubi.create.content.logistics.box.PackageItem; import com.simibubi.create.content.logistics.packager.PackagerBlock; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.ParrotPose.FacePointOfInterestPose; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/StockLinkScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/StockLinkScenes.java index 9a9998c5a9..90c0ea8ce7 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/StockLinkScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/StockLinkScenes.java @@ -8,7 +8,7 @@ import com.simibubi.create.content.logistics.packager.PackagerBlock; import com.simibubi.create.content.redstone.analogLever.AnalogLeverBlockEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.ParrotPose.FacePointOfInterestPose; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/StockTickerScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/StockTickerScenes.java index 266a03698f..b48a45f3a9 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/StockTickerScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/StockTickerScenes.java @@ -8,7 +8,7 @@ import com.simibubi.create.content.logistics.box.PackageItem; import com.simibubi.create.content.logistics.packager.PackagerBlock; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.ParrotPose.FacePointOfInterestPose; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/TableClothScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/TableClothScenes.java index d95afedb5c..537da1c477 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/TableClothScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/highLogistics/TableClothScenes.java @@ -12,7 +12,7 @@ import com.simibubi.create.content.logistics.tableCloth.TableClothBlock; import com.simibubi.create.content.logistics.tableCloth.TableClothBlockEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ParrotPose.FacePointOfInterestPose; import net.createmod.ponder.api.scene.SceneBuilder; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrackObserverScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrackObserverScenes.java index c5c9f56135..013d05bc01 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrackObserverScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrackObserverScenes.java @@ -4,7 +4,7 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.content.trains.observer.TrackObserverBlockEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.ParrotElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrackScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrackScenes.java index a862eb35d1..759e5eed07 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrackScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrackScenes.java @@ -6,7 +6,7 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.content.processing.burner.BlazeBurnerBlock; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.ParrotElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainScenes.java index efeff69d6e..252f77e6c8 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainScenes.java @@ -5,7 +5,7 @@ import com.simibubi.create.content.processing.burner.BlazeBurnerBlock; import com.simibubi.create.content.trains.station.StationBlock; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.ParrotElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainSignalScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainSignalScenes.java index 1a6f94cea8..29de797462 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainSignalScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainSignalScenes.java @@ -6,7 +6,7 @@ import com.simibubi.create.content.trains.signal.SignalBlock; import com.simibubi.create.content.trains.signal.SignalBlockEntity.SignalState; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.ParrotElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainStationScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainStationScenes.java index 5aff486fe7..6ca1649e6c 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainStationScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainStationScenes.java @@ -5,7 +5,7 @@ import com.simibubi.create.AllItems; import com.simibubi.create.content.trains.station.StationBlock; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import net.createmod.catnip.utility.Pointing; +import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.ParrotElement; diff --git a/src/main/java/com/simibubi/create/infrastructure/worldgen/LayerPattern.java b/src/main/java/com/simibubi/create/infrastructure/worldgen/LayerPattern.java index a9f5dc9baf..1ddbf555ae 100644 --- a/src/main/java/com/simibubi/create/infrastructure/worldgen/LayerPattern.java +++ b/src/main/java/com/simibubi/create/infrastructure/worldgen/LayerPattern.java @@ -11,7 +11,7 @@ import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import com.tterrag.registrate.util.nullness.NonNullSupplier; -import net.createmod.catnip.utility.Couple; +import net.createmod.catnip.data.Couple; import net.minecraft.tags.BlockTags; import net.minecraft.util.RandomSource; import net.minecraft.world.level.block.Block; diff --git a/src/main/resources/assets/create/lang/default/tooltips.json b/src/main/resources/assets/create/lang/default/tooltips.json index 7afe86eac8..bc7f0f71be 100644 --- a/src/main/resources/assets/create/lang/default/tooltips.json +++ b/src/main/resources/assets/create/lang/default/tooltips.json @@ -205,23 +205,6 @@ "block.create.item_hatch.tooltip.condition1": "When R-Clicked", "block.create.item_hatch.tooltip.behaviour1": "_Deposits_ your items into the _container_ it is placed on. _Hotbar items_ and items _with contents_ will _not_ be transferred.", - - - "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.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.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.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.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.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.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.factory_gauge.tooltip.condition1": "When attached to Packager", - "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.condition2": "When not attached to Packager", - "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.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.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.clipboard.tooltip.summary": "_Keeps your notes_ and makes you look more professional.", "block.create.clipboard.tooltip.condition1": "When R-Clicked", "block.create.clipboard.tooltip.behaviour1": "Opens the _Interface_. _Sneak-Click_ to _place_ it on a surface.", diff --git a/src/main/resources/assets/create/models/block/display_link/block.json b/src/main/resources/assets/create/models/block/display_link/block.json index 9c8f680556..41a5a48823 100644 --- a/src/main/resources/assets/create/models/block/display_link/block.json +++ b/src/main/resources/assets/create/models/block/display_link/block.json @@ -7,93 +7,80 @@ }, "children": { "base": { - "render_type": "minecraft:solid", + "render_type": "minecraft:cutout_mipped", "textures": { - "0": "create:block/display_link", - "3": "create:block/display_link_side" + "0": "create:block/link_base_unpowered", + "1": "create:block/link_details" }, "elements": [ - { - "from": [9, 6, 3.5], - "to": [13, 9, 12.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, - "faces": { - "north": {"uv": [14.5, 0, 12.5, 1.5], "texture": "#0"}, - "east": {"uv": [14.5, 6, 16, 1.5], "rotation": 90, "texture": "#0"}, - "south": {"uv": [12.5, 0, 14.5, 1.5], "texture": "#0"}, - "west": {"uv": [14.5, 6, 16, 1.5], "rotation": 90, "texture": "#0"}, - "up": {"uv": [14.5, 1.5, 12.5, 6], "rotation": 180, "texture": "#0"} - } - }, { "from": [1, 1, 1], - "to": [15, 6, 15], + "to": [15, 5, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 1, 1]}, "faces": { - "north": {"uv": [0, 0, 14, 5], "texture": "#3"}, - "east": {"uv": [7.5, 9, 10, 16], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 0, 14, 5], "texture": "#3"}, - "west": {"uv": [7.5, 9, 10, 16], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 9, 7, 16], "texture": "#0"}, - "down": {"uv": [0, 1.5, 7, 8.5], "texture": "#0"} + "north": {"uv": [15.5, 8.5, 8.5, 10.5], "texture": "#0"}, + "east": {"uv": [8.5, 11, 15.5, 13], "texture": "#0"}, + "south": {"uv": [8.5, 8.5, 15.5, 10.5], "texture": "#0"}, + "west": {"uv": [8.5, 11, 15.5, 13], "texture": "#0"}, + "up": {"uv": [0.5, 8.5, 7.5, 15.5], "texture": "#0"}, + "down": {"uv": [0.5, 8.5, 7.5, 15.5], "texture": "#0"} } }, { "from": [2, -1, 2], "to": [14, 1, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, -1, 2]}, "faces": { - "north": {"uv": [0.5, 0, 6.5, 1], "texture": "#0"}, - "east": {"uv": [0.5, 0, 6.5, 1], "texture": "#0"}, - "south": {"uv": [0.5, 0, 6.5, 1], "texture": "#0"}, - "west": {"uv": [0.5, 0, 6.5, 1], "texture": "#0"}, - "down": {"uv": [0.5, 2, 6.5, 8], "texture": "#0"} + "north": {"uv": [9, 13, 15, 14], "texture": "#0"}, + "east": {"uv": [9, 13, 15, 14], "texture": "#0"}, + "south": {"uv": [9, 13, 15, 14], "texture": "#0"}, + "west": {"uv": [9, 13, 15, 14], "texture": "#0"}, + "down": {"uv": [1, 9, 7, 15], "texture": "#1"} } }, { - "from": [3, 5, 3], - "to": [7, 7, 7], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, + "from": [3, 5, 3.5], + "to": [7, 8, 12.5], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 5, 3]}, "faces": { - "north": {"uv": [13.5, 10, 11.5, 11], "texture": "#0"}, - "east": {"uv": [13.5, 10, 11.5, 11], "texture": "#0"}, - "south": {"uv": [13.5, 10, 11.5, 11], "texture": "#0"}, - "west": {"uv": [13.5, 10, 11.5, 11], "texture": "#0"}, - "up": {"uv": [13.5, 8, 11.5, 10], "texture": "#0"} + "north": {"uv": [8, 0, 10, 1.5], "texture": "#1"}, + "east": {"uv": [10, 1.5, 11.5, 6], "rotation": 90, "texture": "#1"}, + "south": {"uv": [8, 0, 10, 1.5], "texture": "#1"}, + "west": {"uv": [10, 1.5, 11.5, 6], "rotation": 90, "texture": "#1"}, + "up": {"uv": [8, 1.5, 10, 6], "texture": "#1"} } }, { - "from": [3, 6, 8], - "to": [7, 8, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, + "from": [9, 5, 3], + "to": [13, 7, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 5, 3]}, "faces": { - "north": {"uv": [13.5, 8, 11.5, 9], "texture": "#0"}, - "east": {"uv": [13.5, 8, 11.5, 9], "texture": "#0"}, - "south": {"uv": [13.5, 8, 11.5, 9], "texture": "#0"}, - "west": {"uv": [13.5, 8, 11.5, 9], "texture": "#0"}, - "up": {"uv": [13.5, 6, 11.5, 8], "texture": "#0"} - } - } - ] - }, - "bulb_inner": { - "render_type": "minecraft:cutout", - "textures": { - "0": "create:block/display_link" - }, - "elements": [ - { - "from": [2.5, 8, 9], - "to": [7.5, 13, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 7.5, 19]}, - "faces": { - "south": {"uv": [16, 13.5, 13.5, 16], "texture": "#0"} + "north": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "east": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "south": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "west": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "up": {"uv": [6, 0, 8, 2], "texture": "#1"} } }, { - "from": [2.5, 8, 10], - "to": [7.5, 13, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, + "from": [9, 5, 9], + "to": [13, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 5, 9]}, "faces": { - "north": {"uv": [16, 13.5, 13.5, 16], "texture": "#0"} + "north": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "east": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "south": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "west": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "up": {"uv": [6, 2.5, 8, 4.5], "texture": "#1"} + } + }, + { + "from": [9.5, 7, 5], + "to": [12.5, 11, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 7, 5]}, + "faces": { + "north": {"uv": [11.5, 6, 13, 8], "texture": "#1"}, + "south": {"uv": [11.5, 6, 13, 8], "texture": "#1"} } } ] @@ -101,23 +88,55 @@ "bulb": { "render_type": "minecraft:translucent", "textures": { - "0": "create:block/display_link" + "1": "create:block/link_details" }, "elements": [ { - "from": [2.5, 8, 7.5], - "to": [7.5, 13, 12.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, + "from": [8.5, 7, 2.5], + "to": [13.5, 12, 7.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 7, 2]}, "faces": { - "north": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"}, - "east": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"}, - "south": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"}, - "west": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"}, - "up": {"uv": [16, 6, 13.5, 8.5], "texture": "#0"}, - "down": {"uv": [16, 11, 13.5, 13.5], "texture": "#0"} + "north": {"uv": [16, 2.5, 13.5, 5], "texture": "#1"}, + "east": {"uv": [16, 2.5, 13.5, 5], "texture": "#1"}, + "south": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"}, + "west": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"}, + "up": {"uv": [13.5, 0, 16, 2.5], "texture": "#1"}, + "down": {"uv": [13.5, 5, 16, 7.5], "texture": "#1"} } } ] } + }, + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [0, 1.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } } } diff --git a/src/main/resources/assets/create/models/block/display_link/block_powered.json b/src/main/resources/assets/create/models/block/display_link/block_powered.json index 2ed181b530..43022a34ee 100644 --- a/src/main/resources/assets/create/models/block/display_link/block_powered.json +++ b/src/main/resources/assets/create/models/block/display_link/block_powered.json @@ -7,93 +7,80 @@ }, "children": { "base": { - "render_type": "minecraft:solid", + "render_type": "minecraft:cutout_mipped", "textures": { - "0": "create:block/display_link", - "3": "create:block/display_link_side_powered" + "0": "create:block/link_base_powered", + "1": "create:block/link_details" }, "elements": [ - { - "from": [9, 6, 3.5], - "to": [13, 9, 12.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, - "faces": { - "north": {"uv": [14.5, 0, 12.5, 1.5], "texture": "#0"}, - "east": {"uv": [14.5, 6, 16, 1.5], "rotation": 90, "texture": "#0"}, - "south": {"uv": [12.5, 0, 14.5, 1.5], "texture": "#0"}, - "west": {"uv": [14.5, 6, 16, 1.5], "rotation": 90, "texture": "#0"}, - "up": {"uv": [14.5, 1.5, 12.5, 6], "rotation": 180, "texture": "#0"} - } - }, { "from": [1, 1, 1], - "to": [15, 6, 15], + "to": [15, 5, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 1, 1]}, "faces": { - "north": {"uv": [0, 0, 14, 5], "texture": "#3"}, - "east": {"uv": [7.5, 9, 10, 16], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 0, 14, 5], "texture": "#3"}, - "west": {"uv": [7.5, 9, 10, 16], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 9, 7, 16], "texture": "#0"}, - "down": {"uv": [0, 1.5, 7, 8.5], "texture": "#0"} + "north": {"uv": [15.5, 8.5, 8.5, 10.5], "texture": "#0"}, + "east": {"uv": [8.5, 11, 15.5, 13], "texture": "#0"}, + "south": {"uv": [8.5, 8.5, 15.5, 10.5], "texture": "#0"}, + "west": {"uv": [8.5, 11, 15.5, 13], "texture": "#0"}, + "up": {"uv": [0.5, 8.5, 7.5, 15.5], "texture": "#0"}, + "down": {"uv": [0.5, 8.5, 7.5, 15.5], "texture": "#0"} } }, { "from": [2, -1, 2], "to": [14, 1, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, -1, 2]}, "faces": { - "north": {"uv": [0.5, 0, 6.5, 1], "texture": "#0"}, - "east": {"uv": [0.5, 0, 6.5, 1], "texture": "#0"}, - "south": {"uv": [0.5, 0, 6.5, 1], "texture": "#0"}, - "west": {"uv": [0.5, 0, 6.5, 1], "texture": "#0"}, - "down": {"uv": [0.5, 2, 6.5, 8], "texture": "#0"} + "north": {"uv": [9, 13, 15, 14], "texture": "#0"}, + "east": {"uv": [9, 13, 15, 14], "texture": "#0"}, + "south": {"uv": [9, 13, 15, 14], "texture": "#0"}, + "west": {"uv": [9, 13, 15, 14], "texture": "#0"}, + "down": {"uv": [1, 9, 7, 15], "texture": "#1"} } }, { - "from": [3, 5, 3], - "to": [7, 7, 7], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, + "from": [3, 5, 3.5], + "to": [7, 8, 12.5], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 5, 3]}, "faces": { - "north": {"uv": [13.5, 10, 11.5, 11], "texture": "#0"}, - "east": {"uv": [13.5, 10, 11.5, 11], "texture": "#0"}, - "south": {"uv": [13.5, 10, 11.5, 11], "texture": "#0"}, - "west": {"uv": [13.5, 10, 11.5, 11], "texture": "#0"}, - "up": {"uv": [13.5, 8, 11.5, 10], "texture": "#0"} + "north": {"uv": [8, 0, 10, 1.5], "texture": "#1"}, + "east": {"uv": [10, 1.5, 11.5, 6], "rotation": 90, "texture": "#1"}, + "south": {"uv": [8, 0, 10, 1.5], "texture": "#1"}, + "west": {"uv": [10, 1.5, 11.5, 6], "rotation": 90, "texture": "#1"}, + "up": {"uv": [8, 1.5, 10, 6], "texture": "#1"} } }, { - "from": [3, 6, 8], - "to": [7, 8, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, + "from": [9, 5, 3], + "to": [13, 7, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 5, 3]}, "faces": { - "north": {"uv": [13.5, 8, 11.5, 9], "texture": "#0"}, - "east": {"uv": [13.5, 8, 11.5, 9], "texture": "#0"}, - "south": {"uv": [13.5, 8, 11.5, 9], "texture": "#0"}, - "west": {"uv": [13.5, 8, 11.5, 9], "texture": "#0"}, - "up": {"uv": [13.5, 6, 11.5, 8], "texture": "#0"} - } - } - ] - }, - "bulb_inner": { - "render_type": "minecraft:cutout", - "textures": { - "0": "create:block/display_link" - }, - "elements": [ - { - "from": [2.5, 8, 9], - "to": [7.5, 13, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 7.5, 19]}, - "faces": { - "south": {"uv": [16, 13.5, 13.5, 16], "texture": "#0"} + "north": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "east": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "south": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "west": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "up": {"uv": [6, 0, 8, 2], "texture": "#1"} } }, { - "from": [2.5, 8, 10], - "to": [7.5, 13, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, + "from": [9, 5, 9], + "to": [13, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 5, 9]}, "faces": { - "north": {"uv": [16, 13.5, 13.5, 16], "texture": "#0"} + "north": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "east": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "south": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "west": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "up": {"uv": [6, 2.5, 8, 4.5], "texture": "#1"} + } + }, + { + "from": [9.5, 7, 5], + "to": [12.5, 11, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 7, 5]}, + "faces": { + "north": {"uv": [11.5, 6, 13, 8], "texture": "#1"}, + "south": {"uv": [11.5, 6, 13, 8], "texture": "#1"} } } ] @@ -101,23 +88,23 @@ "bulb": { "render_type": "minecraft:translucent", "textures": { - "0": "create:block/display_link" + "1": "create:block/link_details" }, "elements": [ { - "from": [2.5, 8, 7.5], - "to": [7.5, 13, 12.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, + "from": [8.5, 7, 2.5], + "to": [13.5, 12, 7.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 7, 2]}, "faces": { - "north": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"}, - "east": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"}, - "south": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"}, - "west": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"}, - "up": {"uv": [16, 6, 13.5, 8.5], "texture": "#0"}, - "down": {"uv": [16, 11, 13.5, 13.5], "texture": "#0"} + "north": {"uv": [16, 2.5, 13.5, 5], "texture": "#1"}, + "east": {"uv": [16, 2.5, 13.5, 5], "texture": "#1"}, + "south": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"}, + "west": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"}, + "up": {"uv": [13.5, 0, 16, 2.5], "texture": "#1"}, + "down": {"uv": [13.5, 5, 16, 7.5], "texture": "#1"} } } ] } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/display_link/glow.json b/src/main/resources/assets/create/models/block/display_link/glow.json index c862cf2242..3fa6a60534 100644 --- a/src/main/resources/assets/create/models/block/display_link/glow.json +++ b/src/main/resources/assets/create/models/block/display_link/glow.json @@ -1,46 +1,30 @@ { "credit": "Made with Blockbench", - "parent": "block/block", "textures": { - "0": "create:block/display_link" + "1": "create:block/link_details", + "particle": "create:block/brass_casing" }, "elements": [ { - "from": [2, 7.5, 7], - "to": [8, 13.5, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, + "from": [-3, -0.5, -3], + "to": [3, 5.5, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 7, 2]}, "faces": { - "north": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"}, - "east": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"}, - "south": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"}, - "west": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"}, - "up": {"uv": [16, 6, 13.5, 8.5], "texture": "#0"}, - "down": {"uv": [16, 11, 13.5, 13.5], "texture": "#0"} - } - }, - { - "from": [2.5, 8, 9], - "to": [7.5, 13, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 7.5, 19]}, - "faces": { - "south": {"uv": [16, 13.5, 13.5, 16], "texture": "#0"} - } - }, - { - "from": [2.5, 8, 10], - "to": [7.5, 13, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, - "faces": { - "north": {"uv": [16, 13.5, 13.5, 16], "texture": "#0"} + "north": {"uv": [16, 2.5, 13.5, 5], "texture": "#1"}, + "east": {"uv": [16, 2.5, 13.5, 5], "texture": "#1"}, + "south": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"}, + "west": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"}, + "up": {"uv": [13.5, 0, 16, 2.5], "texture": "#1"}, + "down": {"uv": [13.5, 5, 16, 7.5], "texture": "#1"} } } ], "groups": [ { - "name": "group", - "origin": [16, 0, 0], + "name": "bulb", + "origin": [8, 8, 8], "color": 0, - "children": [0, 1, 2] + "children": [0] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/display_link/model_for_editing.json b/src/main/resources/assets/create/models/block/display_link/model_for_editing.json new file mode 100644 index 0000000000..de480e81e4 --- /dev/null +++ b/src/main/resources/assets/create/models/block/display_link/model_for_editing.json @@ -0,0 +1,113 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "create:block/link_base_unpowered", + "1": "create:block/link_details", + "particle": "create:block/brass_casing" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 5, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 1, 1]}, + "faces": { + "north": {"uv": [15.5, 8.5, 8.5, 10.5], "texture": "#0"}, + "east": {"uv": [8.5, 11, 15.5, 13], "texture": "#0"}, + "south": {"uv": [8.5, 8.5, 15.5, 10.5], "texture": "#0"}, + "west": {"uv": [8.5, 11, 15.5, 13], "texture": "#0"}, + "up": {"uv": [0.5, 8.5, 7.5, 15.5], "texture": "#0"}, + "down": {"uv": [0.5, 8.5, 7.5, 15.5], "texture": "#0"} + } + }, + { + "from": [2, -1, 2], + "to": [14, 1, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, -1, 2]}, + "faces": { + "north": {"uv": [9, 13, 15, 14], "texture": "#0"}, + "east": {"uv": [9, 13, 15, 14], "texture": "#0"}, + "south": {"uv": [9, 13, 15, 14], "texture": "#0"}, + "west": {"uv": [9, 13, 15, 14], "texture": "#0"}, + "down": {"uv": [1, 9, 7, 15], "texture": "#1"} + } + }, + { + "from": [3, 5, 3.5], + "to": [7, 8, 12.5], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 5, 3]}, + "faces": { + "north": {"uv": [8, 0, 10, 1.5], "texture": "#1"}, + "east": {"uv": [10, 1.5, 11.5, 6], "rotation": 90, "texture": "#1"}, + "south": {"uv": [8, 0, 10, 1.5], "texture": "#1"}, + "west": {"uv": [10, 1.5, 11.5, 6], "rotation": 90, "texture": "#1"}, + "up": {"uv": [8, 1.5, 10, 6], "texture": "#1"} + } + }, + { + "from": [9, 5, 3], + "to": [13, 7, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 5, 3]}, + "faces": { + "north": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "east": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "south": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "west": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "up": {"uv": [6, 0, 8, 2], "texture": "#1"} + } + }, + { + "from": [9, 5, 9], + "to": [13, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 5, 9]}, + "faces": { + "north": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "east": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "south": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "west": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "up": {"uv": [6, 2.5, 8, 4.5], "texture": "#1"} + } + }, + { + "from": [9.5, 7, 5], + "to": [12.5, 11, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 7, 5]}, + "faces": { + "north": {"uv": [11.5, 6, 13, 8], "texture": "#1"}, + "south": {"uv": [11.5, 6, 13, 8], "texture": "#1"} + } + }, + { + "from": [8.5, 7, 2.5], + "to": [13.5, 12, 7.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 7, 2]}, + "faces": { + "north": {"uv": [16, 2.5, 13.5, 5], "texture": "#1"}, + "east": {"uv": [16, 2.5, 13.5, 5], "texture": "#1"}, + "south": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"}, + "west": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"}, + "up": {"uv": [13.5, 0, 16, 2.5], "texture": "#1"}, + "down": {"uv": [13.5, 5, 16, 7.5], "texture": "#1"} + } + } + ], + "groups": [ + { + "name": "base", + "origin": [2, -1, 2], + "color": 0, + "children": [0, 1] + }, + { + "name": "details", + "origin": [10, 7, 5], + "color": 0, + "children": [2, 3, 4, 5] + }, + { + "name": "bulb", + "origin": [8, 8, 8], + "color": 0, + "children": [6] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/display_link/tube.json b/src/main/resources/assets/create/models/block/display_link/tube.json index 8f54a51373..182500e339 100644 --- a/src/main/resources/assets/create/models/block/display_link/tube.json +++ b/src/main/resources/assets/create/models/block/display_link/tube.json @@ -1,46 +1,30 @@ { "credit": "Made with Blockbench", - "parent": "block/block", "textures": { - "0": "create:block/display_link" + "1": "create:block/link_details", + "particle": "create:block/brass_casing" }, "elements": [ { - "from": [2.5, 8, 7.5], - "to": [7.5, 13, 12.5], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, + "from": [-2.5, 0, -2.5], + "to": [2.5, 5, 2.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 7, 2]}, "faces": { - "north": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"}, - "east": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"}, - "south": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"}, - "west": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"}, - "up": {"uv": [16, 6, 13.5, 8.5], "texture": "#0"}, - "down": {"uv": [16, 11, 13.5, 13.5], "texture": "#0"} - } - }, - { - "from": [2.5, 8, 9], - "to": [7.5, 13, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 7.5, 19]}, - "faces": { - "south": {"uv": [16, 13.5, 13.5, 16], "texture": "#0"} - } - }, - { - "from": [2.5, 8, 10], - "to": [7.5, 13, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, - "faces": { - "north": {"uv": [16, 13.5, 13.5, 16], "texture": "#0"} + "north": {"uv": [16, 2.5, 13.5, 5], "texture": "#1"}, + "east": {"uv": [16, 2.5, 13.5, 5], "texture": "#1"}, + "south": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"}, + "west": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"}, + "up": {"uv": [13.5, 0, 16, 2.5], "texture": "#1"}, + "down": {"uv": [13.5, 5, 16, 7.5], "texture": "#1"} } } ], "groups": [ { - "name": "group", - "origin": [16, 0, 0], + "name": "bulb", + "origin": [8, 8, 8], "color": 0, - "children": [0, 1, 2] + "children": [0] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/factory_gauge/item.json b/src/main/resources/assets/create/models/block/factory_gauge/item.json index e905a4f160..6dd16b6606 100644 --- a/src/main/resources/assets/create/models/block/factory_gauge/item.json +++ b/src/main/resources/assets/create/models/block/factory_gauge/item.json @@ -2,7 +2,6 @@ "credit": "Made with Blockbench", "textures": { "0": "create:block/factory_panel", - "2": "create:block/display_link", "particle": "create:block/factory_panel" }, "elements": [ @@ -11,12 +10,12 @@ "to": [6, 3, 12], "rotation": {"angle": 0, "axis": "y", "origin": [4, 1, 10]}, "faces": { - "north": {"uv": [13.5, 7, 14.5, 8], "texture": "#2"}, - "east": {"uv": [13.5, 7, 14.5, 8], "texture": "#2"}, - "south": {"uv": [15, 7, 16, 8], "texture": "#2"}, - "west": {"uv": [15, 7, 16, 8], "texture": "#2"}, - "up": {"uv": [14.5, 7, 15.5, 8], "texture": "#2"}, - "down": {"uv": [14, 6.5, 15, 7.5], "texture": "#2"} + "north": {"uv": [9, 8, 11, 10], "texture": "#0"}, + "east": {"uv": [9, 8, 11, 10], "rotation": 90, "texture": "#0"}, + "south": {"uv": [9, 8, 11, 10], "rotation": 270, "texture": "#0"}, + "west": {"uv": [9, 8, 11, 10], "texture": "#0"}, + "up": {"uv": [9, 8, 11, 10], "rotation": 180, "texture": "#0"}, + "down": {"uv": [9, 8, 11, 10], "texture": "#0"} } }, { diff --git a/src/main/resources/assets/create/models/block/redstone_link/transmitter.json b/src/main/resources/assets/create/models/block/redstone_link/transmitter.json index bb95e3d9e0..ef6d72fb41 100644 --- a/src/main/resources/assets/create/models/block/redstone_link/transmitter.json +++ b/src/main/resources/assets/create/models/block/redstone_link/transmitter.json @@ -95,7 +95,7 @@ }, "gui": { "rotation": [30, 225, 0], - "translation": [0, 2.5, 0], + "translation": [0, 1.5, 0], "scale": [0.625, 0.625, 0.625] }, "fixed": { diff --git a/src/main/resources/assets/create/models/block/stock_link/block.json b/src/main/resources/assets/create/models/block/stock_link/block.json deleted file mode 100644 index 1c4ad6780a..0000000000 --- a/src/main/resources/assets/create/models/block/stock_link/block.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "create:block/stock_link", - "2": "create:block/stock_link_unpowered", - "particle": "create:block/vault/vault_front_small" - }, - "elements": [ - { - "from": [2, -1, 2], - "to": [14, 1, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [9, 8.5, 15, 9.5], "texture": "#0"}, - "east": {"uv": [9, 8.5, 15, 9.5], "texture": "#0"}, - "south": {"uv": [9, 8.5, 15, 9.5], "texture": "#0"}, - "west": {"uv": [9, 8.5, 15, 9.5], "texture": "#0"}, - "down": {"uv": [1, 9, 7, 15], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [1, 1, 1], - "to": [15, 6, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [8.5, 5.5, 15.5, 3], "texture": "#0"}, - "east": {"uv": [1, 1, 6, 15], "rotation": 90, "texture": "#2"}, - "south": {"uv": [8.5, 2.5, 15.5, 0], "texture": "#0"}, - "west": {"uv": [1, 1, 6, 15], "rotation": 90, "texture": "#2"}, - "up": {"uv": [0.5, 0.5, 7.5, 7.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0.5, 8.5, 7.5, 15.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [4, 2, 0], - "to": [12, 6, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [10, 6, 14, 8], "texture": "#0"}, - "east": {"uv": [9.5, 6, 10, 8], "texture": "#0"}, - "west": {"uv": [9.5, 6, 10, 8], "texture": "#0"}, - "up": {"uv": [2, 7.5, 6, 8], "rotation": 180, "texture": "#0"}, - "down": {"uv": [2, 7.5, 6, 8], "rotation": 180, "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/stock_link/block_horizontal.json b/src/main/resources/assets/create/models/block/stock_link/block_horizontal.json new file mode 100644 index 0000000000..7e4d4b349d --- /dev/null +++ b/src/main/resources/assets/create/models/block/stock_link/block_horizontal.json @@ -0,0 +1,120 @@ +{ + "credit": "Made with Blockbench", + "loader": "forge:composite", + "parent": "block/block", + "textures": { + "particle": "create:block/brass_casing" + }, + "children": { + "base": { + "render_type": "minecraft:cutout_mipped", + "textures": { + "0": "create:block/link_base_unpowered", + "1": "create:block/link_details", + "particle": "create:block/vault/vault_front_small" + }, + "elements": [ + { + "from": [1.95, 1.95, -1.05], + "to": [14.05, 14.05, 1.05], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [9, 9, 15, 15], "rotation": 180, "texture": "#1"}, + "east": {"uv": [9, 4, 15, 5], "rotation": 270, "texture": "#0"}, + "west": {"uv": [9, 4, 15, 5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9, 5, 15, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [9, 5, 15, 6], "texture": "#0"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [8.5, 8.5, 15.5, 15.5], "rotation": 180, "texture": "#1"}, + "east": {"uv": [8.5, 2.5, 15.5, 4], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0.5, 0.5, 7.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 2.5, 15.5, 4], "rotation": 90, "texture": "#0"}, + "up": {"uv": [15.5, 0.5, 8.5, 2], "rotation": 180, "texture": "#0"}, + "down": {"uv": [8.5, 0.5, 15.5, 2], "texture": "#0"} + } + }, + { + "from": [3, 3, 4], + "to": [7, 7, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [6, 7, 8, 8], "rotation": 270, "texture": "#1"}, + "south": {"uv": [6, 0, 8, 2], "texture": "#1"}, + "west": {"uv": [6, 7, 8, 8], "rotation": 90, "texture": "#1"}, + "up": {"uv": [6, 7, 8, 8], "rotation": 180, "texture": "#1"}, + "down": {"uv": [6, 7, 8, 8], "texture": "#1"} + } + }, + { + "from": [9, 3, 4], + "to": [13, 7, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [6, 7, 8, 8], "rotation": 270, "texture": "#1"}, + "south": {"uv": [6, 5, 8, 7], "texture": "#1"}, + "west": {"uv": [6, 7, 8, 8], "rotation": 90, "texture": "#1"}, + "up": {"uv": [6, 7, 8, 8], "rotation": 180, "texture": "#1"}, + "down": {"uv": [6, 7, 8, 8], "texture": "#1"} + } + }, + { + "from": [3.5, 5, 6], + "to": [6.5, 5, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "up": {"uv": [11.5, 6, 13, 8], "rotation": 180, "texture": "#1"}, + "down": {"uv": [11.5, 6, 13, 8], "texture": "#1"} + } + }, + { + "from": [5, 8, 4], + "to": [11, 12, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 5]}, + "faces": { + "east": {"uv": [1, 0, 0, 2], "texture": "#1"}, + "south": {"uv": [1, 0, 4, 2], "texture": "#1"}, + "west": {"uv": [1, 2, 0, 0], "rotation": 180, "texture": "#1"}, + "up": {"uv": [1, 2, 4, 3], "rotation": 180, "texture": "#1"}, + "down": {"uv": [1, 2, 4, 3], "texture": "#1"} + } + }, + { + "from": [3, 12, 5], + "to": [13, 22, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 5]}, + "faces": { + "north": {"uv": [0, 8, 5, 3], "rotation": 180, "texture": "#1"}, + "south": {"uv": [0, 3, 5, 8], "texture": "#1"} + } + } + ] + }, + "bulb": { + "render_type": "minecraft:translucent", + "textures": { + "1": "create:block/link_details" + }, + "elements": [ + { + "from": [2.5, 2.5, 6], + "to": [7.5, 7.5, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [13.5, 5, 16, 7.5], "rotation": 180, "texture": "#1"}, + "east": {"uv": [16, 2.5, 13.5, 5], "rotation": 270, "texture": "#1"}, + "south": {"uv": [13.5, 0, 16, 2.5], "texture": "#1"}, + "west": {"uv": [13.5, 2.5, 16, 5], "rotation": 90, "texture": "#1"}, + "up": {"uv": [16, 2.5, 13.5, 5], "rotation": 180, "texture": "#1"}, + "down": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"} + } + } + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/stock_link/block_horizontal_powered.json b/src/main/resources/assets/create/models/block/stock_link/block_horizontal_powered.json new file mode 100644 index 0000000000..7070e115ae --- /dev/null +++ b/src/main/resources/assets/create/models/block/stock_link/block_horizontal_powered.json @@ -0,0 +1,120 @@ +{ + "credit": "Made with Blockbench", + "loader": "forge:composite", + "parent": "block/block", + "textures": { + "particle": "create:block/brass_casing" + }, + "children": { + "base": { + "render_type": "minecraft:cutout_mipped", + "textures": { + "0": "create:block/link_base_powered", + "1": "create:block/link_details", + "particle": "create:block/vault/vault_front_small" + }, + "elements": [ + { + "from": [1.95, 1.95, -1.05], + "to": [14.05, 14.05, 1.05], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [9, 9, 15, 15], "rotation": 180, "texture": "#1"}, + "east": {"uv": [9, 4, 15, 5], "rotation": 270, "texture": "#0"}, + "west": {"uv": [9, 4, 15, 5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9, 5, 15, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [9, 5, 15, 6], "texture": "#0"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [8.5, 8.5, 15.5, 15.5], "rotation": 180, "texture": "#1"}, + "east": {"uv": [8.5, 2.5, 15.5, 4], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0.5, 0.5, 7.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 2.5, 15.5, 4], "rotation": 90, "texture": "#0"}, + "up": {"uv": [15.5, 0.5, 8.5, 2], "rotation": 180, "texture": "#0"}, + "down": {"uv": [8.5, 0.5, 15.5, 2], "texture": "#0"} + } + }, + { + "from": [3, 3, 4], + "to": [7, 7, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [6, 7, 8, 8], "rotation": 270, "texture": "#1"}, + "south": {"uv": [6, 0, 8, 2], "texture": "#1"}, + "west": {"uv": [6, 7, 8, 8], "rotation": 90, "texture": "#1"}, + "up": {"uv": [6, 7, 8, 8], "rotation": 180, "texture": "#1"}, + "down": {"uv": [6, 7, 8, 8], "texture": "#1"} + } + }, + { + "from": [9, 3, 4], + "to": [13, 7, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [6, 7, 8, 8], "rotation": 270, "texture": "#1"}, + "south": {"uv": [6, 5, 8, 7], "texture": "#1"}, + "west": {"uv": [6, 7, 8, 8], "rotation": 90, "texture": "#1"}, + "up": {"uv": [6, 7, 8, 8], "rotation": 180, "texture": "#1"}, + "down": {"uv": [6, 7, 8, 8], "texture": "#1"} + } + }, + { + "from": [3.5, 5, 6], + "to": [6.5, 5, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "up": {"uv": [11.5, 6, 13, 8], "rotation": 180, "texture": "#1"}, + "down": {"uv": [11.5, 6, 13, 8], "texture": "#1"} + } + }, + { + "from": [5, 8, 4], + "to": [11, 12, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 5]}, + "faces": { + "east": {"uv": [1, 0, 0, 2], "texture": "#1"}, + "south": {"uv": [1, 0, 4, 2], "texture": "#1"}, + "west": {"uv": [1, 2, 0, 0], "rotation": 180, "texture": "#1"}, + "up": {"uv": [1, 2, 4, 3], "rotation": 180, "texture": "#1"}, + "down": {"uv": [1, 2, 4, 3], "texture": "#1"} + } + }, + { + "from": [3, 12, 5], + "to": [13, 22, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 5]}, + "faces": { + "north": {"uv": [0, 8, 5, 3], "rotation": 180, "texture": "#1"}, + "south": {"uv": [0, 3, 5, 8], "texture": "#1"} + } + } + ] + }, + "bulb": { + "render_type": "minecraft:translucent", + "textures": { + "1": "create:block/link_details" + }, + "elements": [ + { + "from": [2.5, 2.5, 6], + "to": [7.5, 7.5, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [13.5, 5, 16, 7.5], "rotation": 180, "texture": "#1"}, + "east": {"uv": [16, 2.5, 13.5, 5], "rotation": 270, "texture": "#1"}, + "south": {"uv": [13.5, 0, 16, 2.5], "texture": "#1"}, + "west": {"uv": [13.5, 2.5, 16, 5], "rotation": 90, "texture": "#1"}, + "up": {"uv": [16, 2.5, 13.5, 5], "rotation": 180, "texture": "#1"}, + "down": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"} + } + } + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/stock_link/block_powered.json b/src/main/resources/assets/create/models/block/stock_link/block_powered.json deleted file mode 100644 index 4f39b8edad..0000000000 --- a/src/main/resources/assets/create/models/block/stock_link/block_powered.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/stock_link/block", - "textures": { - "2": "create:block/stock_link_powered" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/stock_link/block_vertical.json b/src/main/resources/assets/create/models/block/stock_link/block_vertical.json new file mode 100644 index 0000000000..e84e2915d4 --- /dev/null +++ b/src/main/resources/assets/create/models/block/stock_link/block_vertical.json @@ -0,0 +1,152 @@ +{ + "credit": "Made with Blockbench", + "loader": "forge:composite", + "parent": "block/block", + "textures": { + "particle": "create:block/brass_casing" + }, + "children": { + "base": { + "render_type": "minecraft:cutout_mipped", + "textures": { + "0": "create:block/link_base_unpowered", + "1": "create:block/link_details", + "particle": "create:block/vault/vault_front_small" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [8.5, 0.5, 15.5, 2], "texture": "#0"}, + "east": {"uv": [8.5, 2.5, 15.5, 4], "texture": "#0"}, + "south": {"uv": [15.5, 0.5, 8.5, 2], "texture": "#0"}, + "west": {"uv": [8.5, 2.5, 15.5, 4], "texture": "#0"}, + "up": {"uv": [0.5, 0.5, 7.5, 7.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [8.5, 8.5, 15.5, 15.5], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [1.95, -1.05, 1.95], + "to": [14.05, 1.05, 14.05], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [9, 5, 15, 6], "texture": "#0"}, + "east": {"uv": [9, 4, 15, 5], "texture": "#0"}, + "south": {"uv": [9, 5, 15, 6], "texture": "#0"}, + "west": {"uv": [9, 4, 15, 5], "texture": "#0"}, + "down": {"uv": [9, 9, 15, 15], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [9, 4, 3], + "to": [13, 6, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "east": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "south": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "west": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [3, 4, 3], + "to": [7, 6, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "east": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "south": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "west": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "up": {"uv": [6, 5, 8, 7], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [9.5, 6, 5], + "to": [12.5, 10, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [11.5, 6, 13, 8], "texture": "#1"}, + "south": {"uv": [11.5, 6, 13, 8], "texture": "#1"} + } + }, + { + "from": [5, 4, 8], + "to": [11, 6, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [1, 2, 4, 3], "texture": "#1"}, + "east": {"uv": [1, 2, 0, 0], "rotation": 90, "texture": "#1"}, + "south": {"uv": [1, 2, 4, 3], "texture": "#1"}, + "west": {"uv": [1, 0, 0, 2], "rotation": 90, "texture": "#1"}, + "up": {"uv": [1, 0, 4, 2], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [3, 6, 10], + "to": [13, 16, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 3, 5, 8], "texture": "#1"}, + "south": {"uv": [0, 8, 5, 3], "rotation": 180, "texture": "#1"} + } + } + ] + }, + "bulb": { + "render_type": "minecraft:translucent", + "textures": { + "1": "create:block/link_details" + }, + "elements": [ + { + "from": [8.5, 6, 2.5], + "to": [13.5, 11, 7.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"}, + "east": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"}, + "south": {"uv": [16, 2.5, 13.5, 5], "texture": "#1"}, + "west": {"uv": [16, 2.5, 13.5, 5], "texture": "#1"}, + "up": {"uv": [13.5, 0, 16, 2.5], "rotation": 180, "texture": "#1"}, + "down": {"uv": [13.5, 5, 16, 7.5], "rotation": 180, "texture": "#1"} + } + } + ] + } + }, + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [0, 1.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/stock_link/block_vertical_powered.json b/src/main/resources/assets/create/models/block/stock_link/block_vertical_powered.json new file mode 100644 index 0000000000..54ed687d45 --- /dev/null +++ b/src/main/resources/assets/create/models/block/stock_link/block_vertical_powered.json @@ -0,0 +1,120 @@ +{ + "credit": "Made with Blockbench", + "loader": "forge:composite", + "parent": "block/block", + "textures": { + "particle": "create:block/brass_casing" + }, + "children": { + "base": { + "render_type": "minecraft:cutout_mipped", + "textures": { + "0": "create:block/link_base_powered", + "1": "create:block/link_details", + "particle": "create:block/vault/vault_front_small" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [8.5, 0.5, 15.5, 2], "texture": "#0"}, + "east": {"uv": [8.5, 2.5, 15.5, 4], "texture": "#0"}, + "south": {"uv": [15.5, 0.5, 8.5, 2], "texture": "#0"}, + "west": {"uv": [8.5, 2.5, 15.5, 4], "texture": "#0"}, + "up": {"uv": [0.5, 0.5, 7.5, 7.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [8.5, 8.5, 15.5, 15.5], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [1.95, -1.05, 1.95], + "to": [14.05, 1.05, 14.05], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [9, 5, 15, 6], "texture": "#0"}, + "east": {"uv": [9, 4, 15, 5], "texture": "#0"}, + "south": {"uv": [9, 5, 15, 6], "texture": "#0"}, + "west": {"uv": [9, 4, 15, 5], "texture": "#0"}, + "down": {"uv": [9, 9, 15, 15], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [9, 4, 3], + "to": [13, 6, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "east": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "south": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "west": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [3, 4, 3], + "to": [7, 6, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "east": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "south": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "west": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "up": {"uv": [6, 5, 8, 7], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [9.5, 6, 5], + "to": [12.5, 10, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [11.5, 6, 13, 8], "texture": "#1"}, + "south": {"uv": [11.5, 6, 13, 8], "texture": "#1"} + } + }, + { + "from": [5, 4, 8], + "to": [11, 6, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [1, 2, 4, 3], "texture": "#1"}, + "east": {"uv": [1, 2, 0, 0], "rotation": 90, "texture": "#1"}, + "south": {"uv": [1, 2, 4, 3], "texture": "#1"}, + "west": {"uv": [1, 0, 0, 2], "rotation": 90, "texture": "#1"}, + "up": {"uv": [1, 0, 4, 2], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [3, 6, 10], + "to": [13, 16, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 3, 5, 8], "texture": "#1"}, + "south": {"uv": [0, 8, 5, 3], "rotation": 180, "texture": "#1"} + } + } + ] + }, + "bulb": { + "render_type": "minecraft:translucent", + "textures": { + "1": "create:block/link_details" + }, + "elements": [ + { + "from": [8.5, 6, 2.5], + "to": [13.5, 11, 7.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"}, + "east": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"}, + "south": {"uv": [16, 2.5, 13.5, 5], "texture": "#1"}, + "west": {"uv": [16, 2.5, 13.5, 5], "texture": "#1"}, + "up": {"uv": [13.5, 0, 16, 2.5], "rotation": 180, "texture": "#1"}, + "down": {"uv": [13.5, 5, 16, 7.5], "rotation": 180, "texture": "#1"} + } + } + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/stock_link/horizontal_for_editing.json b/src/main/resources/assets/create/models/block/stock_link/horizontal_for_editing.json new file mode 100644 index 0000000000..33dcbdc4b6 --- /dev/null +++ b/src/main/resources/assets/create/models/block/stock_link/horizontal_for_editing.json @@ -0,0 +1,128 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "create:block/link_base_unpowered", + "1": "create:block/link_details", + "particle": "create:block/vault/vault_front_small" + }, + "elements": [ + { + "from": [1.95, 1.95, -1.05], + "to": [14.05, 14.05, 1.05], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [9, 9, 15, 15], "rotation": 180, "texture": "#1"}, + "east": {"uv": [9, 4, 15, 5], "rotation": 270, "texture": "#0"}, + "west": {"uv": [9, 4, 15, 5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9, 5, 15, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [9, 5, 15, 6], "texture": "#0"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [8.5, 8.5, 15.5, 15.5], "rotation": 180, "texture": "#1"}, + "east": {"uv": [8.5, 2.5, 15.5, 4], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0.5, 0.5, 7.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 2.5, 15.5, 4], "rotation": 90, "texture": "#0"}, + "up": {"uv": [15.5, 0.5, 8.5, 2], "rotation": 180, "texture": "#0"}, + "down": {"uv": [8.5, 0.5, 15.5, 2], "texture": "#0"} + } + }, + { + "from": [3, 3, 4], + "to": [7, 7, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [6, 7, 8, 8], "rotation": 270, "texture": "#1"}, + "south": {"uv": [6, 0, 8, 2], "texture": "#1"}, + "west": {"uv": [6, 7, 8, 8], "rotation": 90, "texture": "#1"}, + "up": {"uv": [6, 7, 8, 8], "rotation": 180, "texture": "#1"}, + "down": {"uv": [6, 7, 8, 8], "texture": "#1"} + } + }, + { + "from": [9, 3, 4], + "to": [13, 7, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [6, 7, 8, 8], "rotation": 270, "texture": "#1"}, + "south": {"uv": [6, 5, 8, 7], "texture": "#1"}, + "west": {"uv": [6, 7, 8, 8], "rotation": 90, "texture": "#1"}, + "up": {"uv": [6, 7, 8, 8], "rotation": 180, "texture": "#1"}, + "down": {"uv": [6, 7, 8, 8], "texture": "#1"} + } + }, + { + "from": [3.5, 5, 6], + "to": [6.5, 5, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "up": {"uv": [11.5, 6, 13, 8], "rotation": 180, "texture": "#1"}, + "down": {"uv": [11.5, 6, 13, 8], "texture": "#1"} + } + }, + { + "from": [2.5, 2.5, 6], + "to": [7.5, 7.5, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [13.5, 5, 16, 7.5], "rotation": 180, "texture": "#1"}, + "east": {"uv": [16, 2.5, 13.5, 5], "rotation": 270, "texture": "#1"}, + "south": {"uv": [13.5, 0, 16, 2.5], "texture": "#1"}, + "west": {"uv": [13.5, 2.5, 16, 5], "rotation": 90, "texture": "#1"}, + "up": {"uv": [16, 2.5, 13.5, 5], "rotation": 180, "texture": "#1"}, + "down": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"} + } + }, + { + "from": [5, 8, 4], + "to": [11, 12, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 5]}, + "faces": { + "east": {"uv": [1, 0, 0, 2], "texture": "#1"}, + "south": {"uv": [1, 0, 4, 2], "texture": "#1"}, + "west": {"uv": [1, 2, 0, 0], "rotation": 180, "texture": "#1"}, + "up": {"uv": [1, 2, 4, 3], "rotation": 180, "texture": "#1"}, + "down": {"uv": [1, 2, 4, 3], "texture": "#1"} + } + }, + { + "from": [3, 12, 5], + "to": [13, 22, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 5]}, + "faces": { + "north": {"uv": [0, 8, 5, 3], "rotation": 180, "texture": "#1"}, + "south": {"uv": [0, 3, 5, 8], "texture": "#1"} + } + } + ], + "groups": [ + { + "name": "base", + "origin": [1, 1, 1], + "color": 0, + "children": [0, 1] + }, + { + "name": "details", + "origin": [4, 6, 11], + "color": 0, + "children": [2, 3, 4] + }, + { + "name": "bulb", + "origin": [3, 6, 8], + "color": 0, + "children": [5] + }, + { + "name": "antenna", + "origin": [8, 6, 6], + "color": 0, + "children": [6, 7] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/stock_link/vertical_for_editing.json b/src/main/resources/assets/create/models/block/stock_link/vertical_for_editing.json new file mode 100644 index 0000000000..4e4e9d1d7f --- /dev/null +++ b/src/main/resources/assets/create/models/block/stock_link/vertical_for_editing.json @@ -0,0 +1,128 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "create:block/link_base_unpowered", + "1": "create:block/link_details", + "particle": "create:block/vault/vault_front_small" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [8.5, 0.5, 15.5, 2], "texture": "#0"}, + "east": {"uv": [8.5, 2.5, 15.5, 4], "texture": "#0"}, + "south": {"uv": [15.5, 0.5, 8.5, 2], "texture": "#0"}, + "west": {"uv": [8.5, 2.5, 15.5, 4], "texture": "#0"}, + "up": {"uv": [0.5, 0.5, 7.5, 7.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [8.5, 8.5, 15.5, 15.5], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [1.95, -1.05, 1.95], + "to": [14.05, 1.05, 14.05], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [9, 5, 15, 6], "texture": "#0"}, + "east": {"uv": [9, 4, 15, 5], "texture": "#0"}, + "south": {"uv": [9, 5, 15, 6], "texture": "#0"}, + "west": {"uv": [9, 4, 15, 5], "texture": "#0"}, + "down": {"uv": [9, 9, 15, 15], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [9, 4, 3], + "to": [13, 6, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "east": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "south": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "west": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [3, 4, 3], + "to": [7, 6, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "east": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "south": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "west": {"uv": [6, 7, 8, 8], "texture": "#1"}, + "up": {"uv": [6, 5, 8, 7], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [9.5, 6, 5], + "to": [12.5, 10, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [11.5, 6, 13, 8], "texture": "#1"}, + "south": {"uv": [11.5, 6, 13, 8], "texture": "#1"} + } + }, + { + "from": [8.5, 6, 2.5], + "to": [13.5, 11, 7.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"}, + "east": {"uv": [13.5, 2.5, 16, 5], "texture": "#1"}, + "south": {"uv": [16, 2.5, 13.5, 5], "texture": "#1"}, + "west": {"uv": [16, 2.5, 13.5, 5], "texture": "#1"}, + "up": {"uv": [13.5, 0, 16, 2.5], "rotation": 180, "texture": "#1"}, + "down": {"uv": [13.5, 5, 16, 7.5], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [5, 4, 8], + "to": [11, 6, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [1, 2, 4, 3], "texture": "#1"}, + "east": {"uv": [1, 2, 0, 0], "rotation": 90, "texture": "#1"}, + "south": {"uv": [1, 2, 4, 3], "texture": "#1"}, + "west": {"uv": [1, 0, 0, 2], "rotation": 90, "texture": "#1"}, + "up": {"uv": [1, 0, 4, 2], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [3, 6, 10], + "to": [13, 16, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 3, 5, 8], "texture": "#1"}, + "south": {"uv": [0, 8, 5, 3], "rotation": 180, "texture": "#1"} + } + } + ], + "groups": [ + { + "name": "base", + "origin": [2, -1, 2], + "color": 0, + "children": [0, 1] + }, + { + "name": "details", + "origin": [10, 7, 5], + "color": 0, + "children": [2, 3, 4] + }, + { + "name": "bulb", + "origin": [8, 8, 8], + "color": 0, + "children": [5] + }, + { + "name": "antenna", + "origin": [8, 8, 8], + "color": 0, + "children": [6, 7] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/particles/wifi.json b/src/main/resources/assets/create/particles/wifi.json new file mode 100644 index 0000000000..fc66f4b243 --- /dev/null +++ b/src/main/resources/assets/create/particles/wifi.json @@ -0,0 +1,20 @@ +{ + "textures": [ + "create:wifi_0", + "create:wifi_1", + "create:wifi_2", + "create:wifi_3", + "create:wifi_4", + "create:wifi_5", + "create:wifi_6", + "create:wifi_7", + "create:wifi_8", + "create:wifi_9", + "create:wifi_10", + "create:wifi_11", + "create:wifi_12", + "create:wifi_13", + "create:wifi_14", + "create:wifi_15" + ] +} diff --git a/src/main/resources/assets/create/textures/block/display_link.png b/src/main/resources/assets/create/textures/block/display_link.png deleted file mode 100644 index 2f55176701..0000000000 Binary files a/src/main/resources/assets/create/textures/block/display_link.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/display_link_side.png b/src/main/resources/assets/create/textures/block/display_link_side.png deleted file mode 100644 index d833d6e26c..0000000000 Binary files a/src/main/resources/assets/create/textures/block/display_link_side.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/display_link_side_powered.png b/src/main/resources/assets/create/textures/block/display_link_side_powered.png deleted file mode 100644 index c835a543a9..0000000000 Binary files a/src/main/resources/assets/create/textures/block/display_link_side_powered.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/link_base_powered.png b/src/main/resources/assets/create/textures/block/link_base_powered.png new file mode 100644 index 0000000000..ff518c64b4 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/link_base_powered.png differ diff --git a/src/main/resources/assets/create/textures/block/link_base_unpowered.png b/src/main/resources/assets/create/textures/block/link_base_unpowered.png new file mode 100644 index 0000000000..23fbc43dae Binary files /dev/null and b/src/main/resources/assets/create/textures/block/link_base_unpowered.png differ diff --git a/src/main/resources/assets/create/textures/block/link_details.png b/src/main/resources/assets/create/textures/block/link_details.png new file mode 100644 index 0000000000..2a8054b981 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/link_details.png differ diff --git a/src/main/resources/assets/create/textures/block/packager_horizontal_linked.png b/src/main/resources/assets/create/textures/block/packager_horizontal_linked.png index 4d6c778115..d6e5f93c03 100644 Binary files a/src/main/resources/assets/create/textures/block/packager_horizontal_linked.png and b/src/main/resources/assets/create/textures/block/packager_horizontal_linked.png differ diff --git a/src/main/resources/assets/create/textures/block/packager_vertical_linked.png b/src/main/resources/assets/create/textures/block/packager_vertical_linked.png index e1069290f8..d3eb41a37e 100644 Binary files a/src/main/resources/assets/create/textures/block/packager_vertical_linked.png and b/src/main/resources/assets/create/textures/block/packager_vertical_linked.png differ diff --git a/src/main/resources/assets/create/textures/particle/wifi_0.png b/src/main/resources/assets/create/textures/particle/wifi_0.png new file mode 100644 index 0000000000..1e16298abe Binary files /dev/null and b/src/main/resources/assets/create/textures/particle/wifi_0.png differ diff --git a/src/main/resources/assets/create/textures/particle/wifi_1.png b/src/main/resources/assets/create/textures/particle/wifi_1.png new file mode 100644 index 0000000000..070bd7b8cf Binary files /dev/null and b/src/main/resources/assets/create/textures/particle/wifi_1.png differ diff --git a/src/main/resources/assets/create/textures/particle/wifi_10.png b/src/main/resources/assets/create/textures/particle/wifi_10.png new file mode 100644 index 0000000000..87f80519db Binary files /dev/null and b/src/main/resources/assets/create/textures/particle/wifi_10.png differ diff --git a/src/main/resources/assets/create/textures/particle/wifi_11.png b/src/main/resources/assets/create/textures/particle/wifi_11.png new file mode 100644 index 0000000000..44f5d80b50 Binary files /dev/null and b/src/main/resources/assets/create/textures/particle/wifi_11.png differ diff --git a/src/main/resources/assets/create/textures/particle/wifi_12.png b/src/main/resources/assets/create/textures/particle/wifi_12.png new file mode 100644 index 0000000000..38b3b40efa Binary files /dev/null and b/src/main/resources/assets/create/textures/particle/wifi_12.png differ diff --git a/src/main/resources/assets/create/textures/particle/wifi_13.png b/src/main/resources/assets/create/textures/particle/wifi_13.png new file mode 100644 index 0000000000..1e16298abe Binary files /dev/null and b/src/main/resources/assets/create/textures/particle/wifi_13.png differ diff --git a/src/main/resources/assets/create/textures/particle/wifi_14.png b/src/main/resources/assets/create/textures/particle/wifi_14.png new file mode 100644 index 0000000000..1e16298abe Binary files /dev/null and b/src/main/resources/assets/create/textures/particle/wifi_14.png differ diff --git a/src/main/resources/assets/create/textures/particle/wifi_15.png b/src/main/resources/assets/create/textures/particle/wifi_15.png new file mode 100644 index 0000000000..1e16298abe Binary files /dev/null and b/src/main/resources/assets/create/textures/particle/wifi_15.png differ diff --git a/src/main/resources/assets/create/textures/particle/wifi_2.png b/src/main/resources/assets/create/textures/particle/wifi_2.png new file mode 100644 index 0000000000..cb03d47c44 Binary files /dev/null and b/src/main/resources/assets/create/textures/particle/wifi_2.png differ diff --git a/src/main/resources/assets/create/textures/particle/wifi_3.png b/src/main/resources/assets/create/textures/particle/wifi_3.png new file mode 100644 index 0000000000..c04670093c Binary files /dev/null and b/src/main/resources/assets/create/textures/particle/wifi_3.png differ diff --git a/src/main/resources/assets/create/textures/particle/wifi_4.png b/src/main/resources/assets/create/textures/particle/wifi_4.png new file mode 100644 index 0000000000..ce39b07715 Binary files /dev/null and b/src/main/resources/assets/create/textures/particle/wifi_4.png differ diff --git a/src/main/resources/assets/create/textures/particle/wifi_5.png b/src/main/resources/assets/create/textures/particle/wifi_5.png new file mode 100644 index 0000000000..6a0a9bf57b Binary files /dev/null and b/src/main/resources/assets/create/textures/particle/wifi_5.png differ diff --git a/src/main/resources/assets/create/textures/particle/wifi_6.png b/src/main/resources/assets/create/textures/particle/wifi_6.png new file mode 100644 index 0000000000..cb0d52a436 Binary files /dev/null and b/src/main/resources/assets/create/textures/particle/wifi_6.png differ diff --git a/src/main/resources/assets/create/textures/particle/wifi_7.png b/src/main/resources/assets/create/textures/particle/wifi_7.png new file mode 100644 index 0000000000..20b26f72c4 Binary files /dev/null and b/src/main/resources/assets/create/textures/particle/wifi_7.png differ diff --git a/src/main/resources/assets/create/textures/particle/wifi_8.png b/src/main/resources/assets/create/textures/particle/wifi_8.png new file mode 100644 index 0000000000..e2354113bc Binary files /dev/null and b/src/main/resources/assets/create/textures/particle/wifi_8.png differ diff --git a/src/main/resources/assets/create/textures/particle/wifi_9.png b/src/main/resources/assets/create/textures/particle/wifi_9.png new file mode 100644 index 0000000000..8c2cd615e5 Binary files /dev/null and b/src/main/resources/assets/create/textures/particle/wifi_9.png differ diff --git a/src/main/templates/META-INF/neoforge.mods.toml b/src/main/templates/META-INF/neoforge.mods.toml index 76bd52ba38..f2d1acc178 100644 --- a/src/main/templates/META-INF/neoforge.mods.toml +++ b/src/main/templates/META-INF/neoforge.mods.toml @@ -37,13 +37,6 @@ description='''${mod_description}''' ordering="AFTER" side="CLIENT" -[[dependencies.${mod_id}]] - modId="catnip" - type="required" - versionRange="[0.8,)" - ordering="AFTER" - side="BOTH" - [[dependencies.${mod_id}]] modId="ponder" type="required"