Skip to content

Commit 53a90b0

Browse files
SammyForRealSammyForReal
committed
Update to create v6
1 parent 0b77ce0 commit 53a90b0

18 files changed

+59
-37
lines changed

‎forge/build.gradle

100644100755
Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,16 @@ repositories {
107107
url = "https://maven.blamejared.com/"
108108
}
109109
maven {
110-
name "tterrag maven (create)"
111-
url "https://maven.tterrag.com/"
110+
name = "Create, Ponder, Flywheel"
111+
url = "https://maven.createmod.net"
112+
}
113+
maven {
114+
name = "Registrate"
115+
url = "https://maven.tterrag.com/"
116+
}
117+
maven {
118+
name = "ForgeConfigAPIPort"
119+
url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/"
112120
}
113121
maven {
114122
name = "cursemaven (whatever)"
@@ -122,20 +130,23 @@ repositories {
122130
dependencies {
123131
minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
124132
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
133+
implementation("io.github.llamalad7:mixinextras-forge:0.4.1")
125134

126-
runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")
135+
implementation "folk.sisby:kaleido-config:${kaleido}"
136+
minecraftLibrary "folk.sisby:kaleido-config:${kaleido}"
137+
jarJar(group: 'folk.sisby', name: 'kaleido-config', version: '[${kaleido},)')
127138

128139
implementation("cc.tweaked:cc-tweaked-${mc_version}-core:${cc_version}")
129140
implementation fg.deobf("cc.tweaked:cc-tweaked-${mc_version}-forge:${cc_version}")
130141
implementation("cc.tweaked:cc-tweaked-${mc_version}-forge-api:${cc_version}")
131142

132-
implementation "folk.sisby:kaleido-config:${kaleido}"
133-
minecraftLibrary "folk.sisby:kaleido-config:${kaleido}"
134-
jarJar(group: 'folk.sisby', name: 'kaleido-config', version: '[${kaleido},)')
143+
implementation(fg.deobf("com.simibubi.create:create-${mc_version}:${create_version}:slim") { transitive = false })
144+
implementation(fg.deobf("net.createmod.ponder:Ponder-Forge-${mc_version}:${ponder_version}"))
145+
compileOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-api-${mc_version}:${flywheel_version}"))
146+
runtimeOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-${mc_version}:${flywheel_version}"))
147+
implementation(fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}"))
135148

136-
implementation fg.deobf("com.simibubi.create:create-${mc_version}:${create_version}:slim") { transitive = false }
137-
implementation fg.deobf("com.jozufozu.flywheel:flywheel-forge-${mc_version}:${flywheel_version}")
138-
implementation fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}")
149+
runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")
139150
}
140151

141152
mixin {

‎forge/gradle.properties

100644100755
Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,23 @@ modloader=forge
99

1010
# Properties
1111
mc_version=1.20.1
12-
forge_version=47.1.3
13-
mod_version=1.7.0
12+
forge_version=47.2.6
13+
mod_version=1.8.0
1414

1515
# Mod dependencies
16-
cc_version=1.114.4
16+
cc_version=1.116.0
1717
librarian_version=1.+
1818
parchment_version=2023.09.03
1919
modgradle_version=4.0.4
2020
kaleido=0.3.3+1.3.2
2121

2222
create_minecraft_version=1.20.1
23-
create_version=0.5.1.h-48
24-
create_version_production=0.5.1.h
25-
create_version_production_next=0.6.0
23+
create_version=6.0.6-150
24+
create_version_production=6.0.6
25+
create_version_production_next=7.0.0
26+
ponder_version=1.0.80
2627
registrate_version=MC1.20-1.3.3
27-
flywheel_version=0.6.11-13
28+
flywheel_version=1.0.4
2829

2930
# Runtime only
3031
jei_version=15.20.0.108

‎forge/src/main/java/cc/tweaked_programs/cccbridge/common/CCCRegistries.java

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@
1111
import cc.tweaked_programs.cccbridge.common.modloader.CCCBridge;
1212
import cc.tweaked_programs.cccbridge.common.modloader.PropertiesBuilder;
1313
import com.simibubi.create.AllInteractionBehaviours;
14-
import com.simibubi.create.content.redstone.displayLink.AllDisplayBehaviours;
14+
import com.simibubi.create.api.behaviour.display.DisplaySource;
15+
import com.simibubi.create.api.behaviour.display.DisplayTarget;
16+
import com.simibubi.create.api.behaviour.interaction.MovingInteractionBehaviour;
17+
import com.simibubi.create.api.registry.CreateRegistries;
18+
import com.simibubi.create.api.registry.SimpleRegistry;
1519
import dan200.computercraft.api.ForgeComputerCraftAPI;
1620
import net.minecraft.core.registries.Registries;
1721
import net.minecraft.resources.ResourceLocation;
@@ -42,9 +46,14 @@ public class CCCRegistries {
4246
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, CCCBridge.MOD_ID);
4347
public static final DeferredRegister<EntityType<?>> ENTITIES = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, CCCBridge.MOD_ID);
4448
public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, CCCBridge.MOD_ID);
49+
public static final DeferredRegister<DisplaySource> CREATE_SOURCES = DeferredRegister.create(CreateRegistries.DISPLAY_SOURCE, CCCBridge.MOD_ID);
50+
public static final DeferredRegister<DisplayTarget> CREATE_TARGETS = DeferredRegister.create(CreateRegistries.DISPLAY_TARGET, CCCBridge.MOD_ID);
4551

4652
public static final RegistryObject<CreativeModeTab> TAB = CREATIVE_MODE_TABS.register("cccbridge_group", PropertiesBuilder.CCCGROUP::build);
4753

54+
public static final RegistryObject<SourceBlockDisplaySource> SOURCE_BLOCK_SOURCE = CREATE_SOURCES.register("source_block_display_source", SourceBlockDisplaySource::new);
55+
public static final RegistryObject<TargetBlockDisplayTarget> TARGET_BLOCK_TARGET = CREATE_TARGETS.register("target_block_display_target", TargetBlockDisplayTarget::new);
56+
4857
public static final RegistryObject<Block> SOURCE_BLOCK = BLOCKS.register("source_block", () -> new SourceBlock(SOURCE_BLOCK_PROPERTIES));
4958
public static final RegistryObject<Block> TARGET_BLOCK = BLOCKS.register("target_block", () -> new TargetBlock(TARGET_BLOCK_PROPERTIES));
5059
public static final RegistryObject<Block> REDROUTER_BLOCK = BLOCKS.register("redrouter_block", () -> new RedRouterBlock(REDROUTER_BLOCK_PROPERTIES));
@@ -74,6 +83,9 @@ public static void register() {
7483
ENTITIES.register(modEventBus);
7584
SOUNDS.register(modEventBus);
7685

86+
CREATE_SOURCES.register(modEventBus);
87+
CREATE_TARGETS.register(modEventBus);
88+
7789
ITEMS.register(modEventBus);
7890

7991
PAINTINGS.register("funny_redrouters", () -> new PaintingVariant(32,16));
@@ -83,10 +95,9 @@ public static void register() {
8395

8496
public static void registerCompat() {
8597
// Create stuff
86-
AllDisplayBehaviours.assignBlockEntity(AllDisplayBehaviours.register(new ResourceLocation(CCCBridge.MOD_ID, "source_block_display_source"), new SourceBlockDisplaySource()), CCCRegistries.SOURCE_BLOCK_ENTITY.get());
87-
AllDisplayBehaviours.assignBlockEntity(AllDisplayBehaviours.register(new ResourceLocation(CCCBridge.MOD_ID, "target_block_display_target"), new TargetBlockDisplayTarget()), CCCRegistries.TARGET_BLOCK_ENTITY.get());
88-
89-
AllInteractionBehaviours.registerBehaviour(CCCRegistries.ANIMATRONIC_BLOCK.getId(), new AnimatronicInteractionBehaviour());
98+
MovingInteractionBehaviour.REGISTRY.register(CCCRegistries.ANIMATRONIC_BLOCK.get(), new AnimatronicInteractionBehaviour());
99+
DisplaySource.BY_BLOCK_ENTITY.add(SOURCE_BLOCK_ENTITY.get(), SOURCE_BLOCK_SOURCE.get());
100+
DisplayTarget.BY_BLOCK_ENTITY.register(TARGET_BLOCK_ENTITY.get(), TARGET_BLOCK_TARGET.get());
90101

91102
// ComputerCraft stuff
92103
ForgeComputerCraftAPI.registerPeripheralProvider(new TweakedPeripheralProvider());

‎forge/src/main/java/cc/tweaked_programs/cccbridge/common/create/behaviour/AnimatronicInteractionBehaviour.java

100644100755
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
import cc.tweaked_programs.cccbridge.common.minecraft.block.AnimatronicBlock;
44
import com.simibubi.create.AllItems;
55
import com.simibubi.create.AllSoundEvents;
6+
import com.simibubi.create.api.behaviour.interaction.MovingInteractionBehaviour;
67
import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
78
import com.simibubi.create.content.contraptions.Contraption;
8-
import com.simibubi.create.content.contraptions.behaviour.MovingInteractionBehaviour;
99
import com.simibubi.create.content.trains.entity.CarriageContraption;
1010
import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
1111
import com.simibubi.create.content.trains.entity.Train;
1212
import com.simibubi.create.content.trains.schedule.Schedule;
1313
import com.simibubi.create.content.trains.schedule.ScheduleItem;
1414
import com.simibubi.create.foundation.advancement.AllAdvancements;
15-
import com.simibubi.create.foundation.utility.Iterate;
16-
import com.simibubi.create.foundation.utility.Lang;
15+
import net.createmod.catnip.data.Iterate;
1716
import net.minecraft.ChatFormatting;
1817
import net.minecraft.core.BlockPos;
1918
import net.minecraft.core.Direction;
19+
import net.minecraft.network.chat.Component;
2020
import net.minecraft.world.InteractionHand;
2121
import net.minecraft.world.entity.player.Player;
2222
import net.minecraft.world.item.ItemStack;
@@ -53,18 +53,18 @@ public boolean handlePlayerInteraction(Player player, InteractionHand activeHand
5353
if (train.runtime.paused && !train.runtime.completed) {
5454
train.runtime.paused = false;
5555
AllSoundEvents.CONFIRM.playOnServer(player.level(), player.blockPosition(), 1, 1);
56-
player.displayClientMessage(Lang.translateDirect("schedule.continued"), true);
56+
player.displayClientMessage(Component.translatable("schedule.continued"), true);
5757
return true;
5858
}
5959

6060
if (!itemInHand.isEmpty()) {
6161
AllSoundEvents.DENY.playOnServer(player.level(), player.blockPosition(), 1, 1);
62-
player.displayClientMessage(Lang.translateDirect("schedule.remove_with_empty_hand"), true);
62+
player.displayClientMessage(Component.translatable("schedule.remove_with_empty_hand"), true);
6363
return true;
6464
}
6565

6666
AllSoundEvents.playItemPickup(player);
67-
player.displayClientMessage(Lang.translateDirect(
67+
player.displayClientMessage(Component.translatable(
6868
train.runtime.isAutoSchedule ? "schedule.auto_removed_from_train" : "schedule.removed_from_train"),
6969
true);
7070
player.setItemInHand(activeHand, train.runtime.returnSchedule());
@@ -80,7 +80,7 @@ public boolean handlePlayerInteraction(Player player, InteractionHand activeHand
8080

8181
if (schedule.entries.isEmpty()) {
8282
AllSoundEvents.DENY.playOnServer(player.level(), player.blockPosition(), 1, 1);
83-
player.displayClientMessage(Lang.translateDirect("schedule.no_stops"), true);
83+
player.displayClientMessage(Component.translatable("schedule.no_stops"), true);
8484
return true;
8585
}
8686

@@ -89,14 +89,14 @@ public boolean handlePlayerInteraction(Player player, InteractionHand activeHand
8989
train.runtime.setSchedule(schedule, false);
9090
AllAdvancements.CONDUCTOR.awardTo(player);
9191
AllSoundEvents.CONFIRM.playOnServer(player.level(), player.blockPosition(), 1, 1);
92-
player.displayClientMessage(Lang.translateDirect("schedule.applied_to_train")
92+
player.displayClientMessage(Component.translatable("schedule.applied_to_train")
9393
.withStyle(ChatFormatting.GREEN), true);
9494
itemInHand.shrink(1);
9595
player.setItemInHand(activeHand, itemInHand.isEmpty() ? ItemStack.EMPTY : itemInHand);
9696
return true;
9797
}
9898

99-
player.displayClientMessage(Lang.translateDirect("schedule.non_controlling_seat"), true);
99+
player.displayClientMessage(Component.translatable("schedule.non_controlling_seat"), true);
100100
AllSoundEvents.DENY.playOnServer(player.level(), player.blockPosition(), 1, 1);
101101
return true;
102102
}

‎forge/src/main/java/cc/tweaked_programs/cccbridge/common/create/behaviour/LuaScrollValueBehaviour.java

100644100755
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBoard;
88
import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsFormatter;
99
import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour;
10-
import com.simibubi.create.foundation.utility.Components;
1110
import net.minecraft.nbt.CompoundTag;
1211
import net.minecraft.network.chat.Component;
1312
import net.minecraft.sounds.SoundEvents;
@@ -91,12 +90,12 @@ public ValueSettingsBoard createBoard(Player player, BlockHitResult hitResult) {
9190
List<Component> rows;
9291
if (hasMinus)
9392
rows = ImmutableList.of(
94-
Components.translatable("cccbridge.general.unit.scroller.negative"),
95-
Components.translatable("cccbridge.general.unit.scroller.positive")
93+
Component.translatable("cccbridge.general.unit.scroller.negative"),
94+
Component.translatable("cccbridge.general.unit.scroller.positive")
9695
);
9796
else
9897
rows = ImmutableList.of(
99-
Components.translatable("cccbridge.general.unit.scroller")
98+
Component.translatable("cccbridge.general.unit.scroller")
10099
);
101100

102101
return new ValueSettingsBoard(label, max, 5, rows,

‎forge/src/main/java/cc/tweaked_programs/cccbridge/common/create/display/SourceBlockDisplaySource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import cc.tweaked_programs.cccbridge.common.assistance.CharsetManipulator;
44
import cc.tweaked_programs.cccbridge.common.computercraft.peripherals.SourceBlockPeripheral;
55
import cc.tweaked_programs.cccbridge.common.minecraft.blockEntity.SourceBlockEntity;
6+
import com.simibubi.create.api.behaviour.display.DisplaySource;
67
import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
7-
import com.simibubi.create.content.redstone.displayLink.source.DisplaySource;
88
import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
99
import net.minecraft.network.chat.MutableComponent;
1010
import net.minecraft.world.level.block.entity.BlockEntity;

‎forge/src/main/java/cc/tweaked_programs/cccbridge/common/minecraft/TweakedBlockItem.java

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cc.tweaked_programs.cccbridge.common.minecraft;
22

33
import cc.tweaked_programs.cccbridge.common.assistance.CharsetManipulator;
4-
import com.simibubi.create.foundation.utility.LangNumberFormat;
4+
import net.createmod.catnip.lang.LangNumberFormat;
55
import net.minecraft.client.gui.screens.Screen;
66
import net.minecraft.network.chat.Component;
77
import net.minecraft.world.item.BlockItem;

‎forge/src/main/java/cc/tweaked_programs/cccbridge/common/minecraft/block/AnimatronicBlock.java

100644100755
File mode changed.

‎forge/src/main/java/cc/tweaked_programs/cccbridge/common/minecraft/block/RedRouterBlock.java

100644100755
File mode changed.

‎forge/src/main/java/cc/tweaked_programs/cccbridge/common/minecraft/block/ScrollerBlock.java

100644100755
File mode changed.

0 commit comments

Comments
 (0)