Skip to content

Commit 43a0c47

Browse files
rhysdh540rhysdh540
committed
update code
not too bad
1 parent 6dfca20 commit 43a0c47

File tree

7 files changed

+17
-19
lines changed

7 files changed

+17
-19
lines changed

‎build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ subprojects {
150150
"fabric_loader_version" to "fabric_loader_version"(),
151151
"forge_version" to "forge_version"().substringBefore("."), // only specify major version of forge
152152
"create_forge_version" to "create_forge_version"().substringBefore("-"), // cut off build number
153-
"create_fabric_version" to "create_fabric_version"().substringBefore("+") // Trim +mcX.XX.X from version string
153+
"create_fabric_version" to "create_fabric_version"().substringBefore("$$") // Trim +mcX.XX.X from version string
154154
)
155155

156156
inputs.properties(properties)

‎common/src/generated/resources/.cache/e2778987850117b7cc788cc2ae98d0c4537669cf

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2025-01-13T17:16:33.173217 Create: Interiors/Registrate Provider for interiors [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
1+
// 1.20.1 2025-03-10T11:57:14.440376 Create: Interiors/Registrate Provider for interiors [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
22
14aff3c9d61a7542b08a2b7a37385a5aaca94952 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/black_floor_chair.json
33
4f547294cbced34ab6930f8c959efde9183a97ac data/interiors/advancements/recipes/building_blocks/crafting/chair/magenta_chair_from_floor_chair.json
44
f1c40fb2d701527a66f4e026c7f95239681e2352 data/interiors/advancements/recipes/building_blocks/crafting/chair/yellow_chair.json
@@ -20,9 +20,9 @@ dea42a9e5831f84b5021e2aac639d9a62da58c06 assets/interiors/models/block/chair/red
2020
f77ac104d52173fc8ba260f5ee7719138c249894 data/interiors/recipes/crafting/floor_chair/red_floor_chair_from_seat.json
2121
e5e13b678a049b3455cacf9013177a347fbd920f data/interiors/advancements/recipes/building_blocks/crafting/chair/light_blue_chair_from_other_chair.json
2222
a6b1b8d4416aba2a8b1bbbb285ed1663e8b1cbd3 assets/interiors/models/block/chair/light_blue_chair_none.json
23+
c07c54cc70db571d50cae6e804c00e840d7edc9f data/interiors/advancements/recipes/building_blocks/crafting/chair/pink_chair_from_floor_chair.json
2324
8f827d2b2f8904010aef4fa146b8a8d1693d8376 data/interiors/recipes/crafting/chair/cyan_chair_from_other_chair.json
2425
44b6d1ce8c68f8ee7a3cca7668551d4a93e95f1f data/interiors/advancements/recipes/building_blocks/crafting/chair/purple_chair.json
25-
c07c54cc70db571d50cae6e804c00e840d7edc9f data/interiors/advancements/recipes/building_blocks/crafting/chair/pink_chair_from_floor_chair.json
2626
a584c10d9c0ec40fe6bfd818fa44a7e04932f94e assets/interiors/models/block/chair/green_chair_right_cropped.json
2727
1fe8148160ae6a9a7ef19eb31682a69959a313f2 assets/interiors/models/block/chair/gray_chair_none.json
2828
64e8f84ca1926e140d74e22eb4f33b76309328ca data/interiors/recipes/crafting/floor_chair/yellow_floor_chair.json
@@ -101,8 +101,8 @@ aca9d67c4cd107248024656ee4c15aa951229339 assets/interiors/models/block/floor_cha
101101
b327c2d93f1ee4845d21bf04db492345d7810f90 data/interiors/advancements/recipes/building_blocks/crafting/chair/gray_chair_from_seat.json
102102
1a256ea134dafc1b13980af5471c0685c6202756 assets/interiors/models/block/floor_chair/lime_floor_chair_none.json
103103
d0829a63f3d040308aced5c65d57161b09a2c618 assets/interiors/models/block/chair/orange_chair_right.json
104-
060e0b62ca8d96ba0c41791c697ccf578153ebb2 assets/interiors/models/item/light_blue_floor_chair.json
105104
d98ff59cc85da2c53ca0d225e07b771599cc04a0 assets/interiors/models/item/green_floor_chair.json
105+
060e0b62ca8d96ba0c41791c697ccf578153ebb2 assets/interiors/models/item/light_blue_floor_chair.json
106106
73b20e5939b61f5128b2d334c4f9003df8ff83cc data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/white_floor_chair.json
107107
773d03444b7f37386b09836d57c35f66e7f45da8 data/interiors/tags/blocks/chairs.json
108108
79edbf1056c3b969e4d34e76fb6935e8147691ac data/interiors/loot_tables/blocks/orange_floor_chair.json

‎common/src/main/java/com/sudolev/interiors/CreateInteriors.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import net.minecraft.resources.ResourceLocation;
44

5-
import com.simibubi.create.Create;
5+
import com.simibubi.create.CreateBuildInfo;
66
import com.simibubi.create.foundation.data.CreateRegistrate;
77
import com.simibubi.create.foundation.item.ItemDescription.Modifier;
8-
import com.simibubi.create.foundation.item.TooltipHelper.Palette;
8+
import net.createmod.catnip.lang.FontHelper.Palette;
99

1010
import com.sudolev.interiors.content.registry.CIBlocks;
1111
import com.sudolev.interiors.content.registry.CIEntities;
@@ -29,7 +29,7 @@ public abstract class CreateInteriors {
2929

3030
public static void init() {
3131
LOGGER.info("{} v{} initializing! Create version: {} on platform: {}",
32-
NAME, VERSION, Create.VERSION, Utils.platformName());
32+
NAME, VERSION, CreateBuildInfo.VERSION, Utils.platformName());
3333

3434
CITags.register();
3535
CITab.register();

‎common/src/main/java/com/sudolev/interiors/content/block/chair/BigSeatMovementBehaviour.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
77
import com.simibubi.create.content.contraptions.actors.seat.SeatMovementBehaviour;
88
import com.simibubi.create.content.contraptions.behaviour.MovementContext;
9-
import com.simibubi.create.foundation.utility.VecHelper;
9+
import net.createmod.catnip.math.VecHelper;
1010

1111
import com.sudolev.interiors.Utils;
1212

‎common/src/main/java/com/sudolev/interiors/content/block/chair/ChairBlock.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import net.minecraft.world.phys.shapes.VoxelShape;
2727

2828
import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
29-
import com.simibubi.create.foundation.utility.Lang;
29+
import net.createmod.catnip.lang.Lang;
3030

3131
import static com.sudolev.interiors.content.block.chair.ChairBlock.ArmrestConfiguration.*;
3232

‎common/src/main/java/com/sudolev/interiors/content/registry/CIBlocks.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.simibubi.create.Create;
77
import com.simibubi.create.content.contraptions.actors.seat.SeatInteractionBehaviour;
88
import com.simibubi.create.content.contraptions.actors.seat.SeatMovementBehaviour;
9-
import com.simibubi.create.content.redstone.displayLink.source.EntityNameDisplaySource;
109
import com.simibubi.create.foundation.block.DyedBlockList;
1110
import com.simibubi.create.foundation.data.AssetLookup;
1211
import com.simibubi.create.foundation.data.SharedProperties;
@@ -40,13 +39,13 @@
4039

4140
import dev.architectury.injectables.annotations.ExpectPlatform;
4241

43-
import static com.simibubi.create.AllInteractionBehaviours.interactionBehaviour;
44-
import static com.simibubi.create.AllMovementBehaviours.movementBehaviour;
45-
import static com.simibubi.create.content.redstone.displayLink.AllDisplayBehaviours.assignDataBehaviour;
42+
import static com.simibubi.create.api.behaviour.interaction.MovingInteractionBehaviour.interactionBehaviour;
43+
import static com.simibubi.create.api.behaviour.movement.MovementBehaviour.movementBehaviour;
4644
import static com.simibubi.create.foundation.block.ProperWaterloggedBlock.WATERLOGGED;
4745
import static com.simibubi.create.foundation.data.TagGen.axeOnly;
4846
import static com.sudolev.interiors.CreateInteriors.REGISTRATE;
4947

48+
// TODO: is AllDisplayBehaviours.assignDataBehaviour necessary to replace?
5049
@SuppressWarnings("unused")
5150
public final class CIBlocks {
5251

@@ -122,7 +121,7 @@ public final class CIBlocks {
122121
})
123122
.onRegister(movementBehaviour(new SeatMovementBehaviour()))
124123
.onRegister(interactionBehaviour(new SeatInteractionBehaviour()))
125-
.onRegister(assignDataBehaviour(new EntityNameDisplaySource(), "entity_name"))
124+
// .onRegister(assignDataBehaviour(new EntityNameDisplaySource(), "entity_name"))
126125
.onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "block.interiors.chair"))
127126
.tag(CITags.Blocks.FLOOR_CHAIRS)
128127
.item().tag(CITags.Items.FLOOR_CHAIRS)
@@ -181,7 +180,7 @@ public final class CIBlocks {
181180
})
182181
.onRegister(movementBehaviour(new BigSeatMovementBehaviour()))
183182
.onRegister(interactionBehaviour(new SeatInteractionBehaviour()))
184-
.onRegister(assignDataBehaviour(new EntityNameDisplaySource(), "entity_name"))
183+
//.onRegister(assignDataBehaviour(new EntityNameDisplaySource(), "entity_name"))
185184
.onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "block.interiors.chair"))
186185
.tag(CITags.Blocks.CHAIRS)
187186
.item()
@@ -248,7 +247,7 @@ public final class CIBlocks {
248247
}, WATERLOGGED))
249248
.onRegister(movementBehaviour(new SeatMovementBehaviour()))
250249
.onRegister(interactionBehaviour(new SeatInteractionBehaviour()))
251-
.onRegister(assignDataBehaviour(new EntityNameDisplaySource(), "entity_name"))
250+
//.onRegister(assignDataBehaviour(new EntityNameDisplaySource(), "entity_name"))
252251
.onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "block.create.seat"))
253252
.simpleItem()
254253
.register();

‎forge/src/main/java/com/sudolev/interiors/content/registry/forge/CITabImpl.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.sudolev.interiors.content.registry.forge;
22

33
import net.minecraft.core.registries.Registries;
4+
import net.minecraft.network.chat.Component;
45
import net.minecraft.resources.ResourceKey;
56
import net.minecraft.world.item.CreativeModeTab;
67
import net.minecraft.world.item.DyeColor;
@@ -9,8 +10,6 @@
910
import net.minecraftforge.registries.DeferredRegister;
1011
import net.minecraftforge.registries.RegistryObject;
1112

12-
import com.simibubi.create.foundation.utility.Components;
13-
1413
import com.sudolev.interiors.CreateInteriors;
1514
import com.sudolev.interiors.content.registry.CIBlocks;
1615

@@ -19,7 +18,7 @@ public class CITabImpl {
1918

2019
public static final RegistryObject<CreativeModeTab> TAB = REGISTER.register("main",
2120
CreativeModeTab.builder()
22-
.title(Components.literal(CreateInteriors.NAME))
21+
.title(Component.literal(CreateInteriors.NAME))
2322
.icon(() -> CIBlocks.CHAIRS.get(DyeColor.RED).asStack(1))
2423
.displayItems((parameters, output) -> CreateInteriors.REGISTRATE
2524
.getAll(Registries.BLOCK).stream()

0 commit comments

Comments
 (0)