Skip to content

Commit aff8386

Browse files
RealAntEngineerRealAntEngineer
committed
some work
1 parent ad9b07c commit aff8386

File tree

49 files changed

+593
-642
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+593
-642
lines changed

‎src/main/java/com/rae/creatingspace/CreatingSpace.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.simibubi.create.foundation.item.ItemDescription;
2121
import com.simibubi.create.foundation.item.KineticStats;
2222
import com.simibubi.create.foundation.item.TooltipModifier;
23+
import com.simibubi.create.foundation.utility.DistExecutor;
2324
import net.createmod.catnip.lang.FontHelper;
2425
import net.minecraft.resources.ResourceLocation;
2526

@@ -79,10 +80,10 @@ public CreatingSpace(IEventBus modEventBus, ModContainer modContainer) {
7980
MiscInit.register(modEventBus);
8081
CreativeModeTabsInit.register(modEventBus);
8182

82-
CSConfigs.registerConfigs(modLoadingContext);
83+
CSConfigs.registerConfigs(modLoadingContext,modContainer);
8384

8485
MenuTypesInit.register();
85-
PacketInit.registerPackets();
86+
PacketInit.register();
8687
IgniteOnPlace.register();
8788

8889
CarverInit.register(modEventBus);
@@ -92,7 +93,7 @@ public CreatingSpace(IEventBus modEventBus, ModContainer modContainer) {
9293
modEventBus.addListener(CreatingSpace::init);
9394
modEventBus.addListener(EventPriority.LOWEST, CSDatagen::gatherData);
9495
forgeEventBus.addListener(CreatingSpace::onAddReloadListeners);
95-
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> CreatingSpaceClient.clientRegister(modEventBus));
96+
//DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> CreatingSpaceClient.clientRegister(modEventBus));
9697

9798
}
9899
public static void init(final FMLCommonSetupEvent event) {

‎src/main/java/com/rae/creatingspace/CreatingSpaceClient.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@
55
import com.rae.creatingspace.init.graphics.PartialModelInit;
66
import com.rae.creatingspace.init.graphics.ParticleTypeInit;
77
import net.createmod.ponder.foundation.PonderIndex;
8-
import net.minecraftforge.eventbus.api.IEventBus;
8+
import net.neoforged.api.distmarker.Dist;
9+
import net.neoforged.bus.api.IEventBus;
10+
import net.neoforged.fml.common.Mod;
911

12+
@Mod(value = CreatingSpace.MODID, dist = Dist.CLIENT)
1013
public class CreatingSpaceClient {
11-
public static void clientRegister(IEventBus modEventBus) {
14+
public CreatingSpaceClient(IEventBus modEventBus) {
1215
modEventBus.addListener(ParticleTypeInit::registerFactories);
1316
modEventBus.register(DimensionEffectInit.class);
1417
PartialModelInit.init();

‎src/main/java/com/rae/creatingspace/api/squedule/RocketSchedule.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.rae.creatingspace.api.squedule.instruction.ScheduleInstruction;
77
import net.createmod.catnip.data.Pair;
88
import net.createmod.catnip.nbt.NBTHelper;
9+
import net.minecraft.core.HolderLookup;
910
import net.minecraft.nbt.CompoundTag;
1011
import net.minecraft.nbt.ListTag;
1112
import net.minecraft.nbt.Tag;
@@ -63,19 +64,19 @@ public RocketSchedule() {
6364
savedProgress = 0;
6465
}
6566

66-
public CompoundTag write() {
67+
public CompoundTag write(HolderLookup.Provider registries) {
6768
CompoundTag tag = new CompoundTag();
68-
ListTag list = NBTHelper.writeCompoundList(entries, ScheduleEntry::write);
69+
ListTag list = NBTHelper.writeCompoundList(entries, e -> e.write(registries));
6970
tag.put("Entries", list);
7071
tag.putBoolean("Cyclic", cyclic);
7172
if (savedProgress > 0)
7273
tag.putInt("Progress", savedProgress);
7374
return tag;
7475
}
7576

76-
public static RocketSchedule fromTag(CompoundTag tag) {
77+
public static RocketSchedule fromTag(HolderLookup.Provider registries,CompoundTag tag) {
7778
RocketSchedule schedule = new RocketSchedule();
78-
schedule.entries = NBTHelper.readCompoundList(tag.getList("Entries", Tag.TAG_COMPOUND), ScheduleEntry::fromTag);
79+
schedule.entries = NBTHelper.readCompoundList(tag.getList("Entries", Tag.TAG_COMPOUND), t-> ScheduleEntry.fromTag(registries, tag));
7980
schedule.cyclic = tag.getBoolean("Cyclic");
8081
if (tag.contains("Progress"))
8182
schedule.savedProgress = tag.getInt("Progress");

‎src/main/java/com/rae/creatingspace/api/squedule/RocketScheduleRuntime.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.rae.creatingspace.content.planets.CSDimensionUtil;
1010
import com.rae.creatingspace.content.rocket.contraption.RocketContraption;
1111
import net.createmod.catnip.nbt.NBTHelper;
12+
import net.minecraft.core.HolderLookup;
1213
import net.minecraft.nbt.CompoundTag;
1314
import net.minecraft.nbt.Tag;
1415
import net.minecraft.network.chat.Component;
@@ -243,29 +244,29 @@ private void reset() {
243244
predictionTicks = new ArrayList<>();
244245
}
245246

246-
public CompoundTag write() {
247+
public CompoundTag write(HolderLookup.Provider registries) {
247248
CompoundTag tag = new CompoundTag();
248249
tag.putInt("CurrentEntry", currentEntry);
249250
tag.putBoolean("AutoSchedule", isAutoSchedule);
250251
tag.putBoolean("Paused", paused);
251252
tag.putBoolean("Completed", completed);
252253
if (schedule != null)
253-
tag.put("Schedule", schedule.write());
254+
tag.put("Schedule", schedule.write(registries));
254255
NBTHelper.writeEnum(tag, "State", state);
255256
tag.putIntArray("ConditionProgress", conditionProgress);
256257
tag.put("ConditionContext", NBTHelper.writeCompoundList(conditionContext, CompoundTag::copy));
257258
tag.putIntArray("TransitTimes", predictionTicks);
258259
return tag;
259260
}
260261

261-
public void read(CompoundTag tag) {
262+
public void read(HolderLookup.Provider registries,CompoundTag tag) {
262263
reset();
263264
paused = tag.getBoolean("Paused");
264265
completed = tag.getBoolean("Completed");
265266
isAutoSchedule = tag.getBoolean("AutoSchedule");
266267
currentEntry = tag.getInt("CurrentEntry");
267268
if (tag.contains("Schedule"))
268-
schedule = RocketSchedule.fromTag(tag.getCompound("Schedule"));
269+
schedule = RocketSchedule.fromTag(registries,tag.getCompound("Schedule"));
269270
state = NBTHelper.readEnum(tag, "State", State.class);
270271
for (int i : tag.getIntArray("ConditionProgress"))
271272
conditionProgress.add(i);

‎src/main/java/com/rae/creatingspace/api/squedule/ScheduleEntry.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.rae.creatingspace.api.squedule.condition.ScheduleWaitCondition;
44
import com.rae.creatingspace.api.squedule.instruction.ScheduleInstruction;
55
import net.createmod.catnip.nbt.NBTHelper;
6+
import net.minecraft.core.HolderLookup;
67
import net.minecraft.nbt.CompoundTag;
78
import net.minecraft.nbt.ListTag;
89
import net.minecraft.nbt.Tag;
@@ -18,11 +19,11 @@ public ScheduleEntry() {
1819
conditions = new ArrayList<>();
1920
}
2021

21-
public ScheduleEntry clone() {
22-
return fromTag(write());
22+
public ScheduleEntry clone(HolderLookup.Provider registries) {
23+
return fromTag(registries,write(registries));
2324
}
2425

25-
public CompoundTag write() {
26+
public CompoundTag write(HolderLookup.Provider registries) {
2627
CompoundTag tag = new CompoundTag();
2728
ListTag outer = new ListTag();
2829
tag.put("Instruction", instruction.write());
@@ -32,20 +33,20 @@ public CompoundTag write() {
3233
if (column.contains(null)) {
3334
System.out.println("encountered null value in condition list :" + column);
3435
}
35-
outer.add(NBTHelper.writeCompoundList(column, ScheduleWaitCondition::write));
36+
outer.add(NBTHelper.writeCompoundList(column, t -> t.write(registries)));
3637
}
3738
tag.put("Conditions", outer);
3839
return tag;
3940
}
4041

41-
public static ScheduleEntry fromTag(CompoundTag tag) {
42+
public static ScheduleEntry fromTag(HolderLookup.Provider registries,CompoundTag tag) {
4243
ScheduleEntry entry = new ScheduleEntry();
4344
entry.instruction = ScheduleInstruction.fromTag(tag.getCompound("Instruction"));
4445
entry.conditions = new ArrayList<>();
4546
if (entry.instruction.supportsConditions())
4647
for (Tag t : tag.getList("Conditions", Tag.TAG_LIST))
4748
if (t instanceof ListTag list)
48-
entry.conditions.add(NBTHelper.readCompoundList(list, ScheduleWaitCondition::fromTag));
49+
entry.conditions.add(NBTHelper.readCompoundList(list, ct->ScheduleWaitCondition.fromTag(registries,ct)));
4950
return entry;
5051
}
5152

‎src/main/java/com/rae/creatingspace/api/squedule/condition/FluidThresholdCondition.java‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@
88
import com.simibubi.create.foundation.utility.CreateLang;
99
import net.minecraft.ChatFormatting;
1010
import net.minecraft.client.Minecraft;
11+
import net.minecraft.core.HolderLookup;
1112
import net.minecraft.nbt.CompoundTag;
1213
import net.minecraft.network.chat.Component;
1314
import net.minecraft.network.chat.MutableComponent;
1415
import net.minecraft.resources.ResourceLocation;
1516
import net.minecraft.world.item.ItemStack;
1617
import net.minecraft.world.level.Level;
17-
import net.minecraftforge.api.distmarker.Dist;
18-
import net.minecraftforge.api.distmarker.OnlyIn;
19-
import net.minecraftforge.fluids.FluidStack;
20-
import net.minecraftforge.fluids.capability.IFluidHandler;
18+
import net.neoforged.api.distmarker.Dist;
19+
import net.neoforged.api.distmarker.OnlyIn;
20+
import net.neoforged.neoforge.fluids.FluidStack;
21+
import net.neoforged.neoforge.fluids.capability.IFluidHandler;
2122

2223
import java.util.List;
2324

@@ -54,17 +55,18 @@ protected boolean test(Level level, RocketContraptionEntity rocket, CompoundTag
5455
return operator.test(foundFluid, target * 1000);
5556
}
5657

58+
5759
@Override
58-
protected void writeAdditional(CompoundTag tag) {
59-
super.writeAdditional(tag);
60-
tag.put("Bucket", compareStack.serializeNBT());
60+
protected void writeAdditional(HolderLookup.Provider registries, CompoundTag tag) {
61+
super.writeAdditional(registries,tag);
62+
tag.put("Bucket", compareStack.serializeNBT(registries));
6163
}
6264

6365
@Override
64-
protected void readAdditional(CompoundTag tag) {
65-
super.readAdditional(tag);
66+
protected void readAdditional(HolderLookup.Provider registries, CompoundTag tag) {
67+
super.readAdditional(registries,tag);
6668
if (tag.contains("Bucket"))
67-
compareStack = FilterItemStack.of(tag.getCompound("Bucket"));
69+
compareStack = FilterItemStack.of(registries,tag.getCompound("Bucket"));
6870
}
6971

7072
@Override

‎src/main/java/com/rae/creatingspace/api/squedule/condition/ItemThresholdCondition.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@
77
import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
88
import com.simibubi.create.foundation.utility.CreateLang;
99
import net.minecraft.ChatFormatting;
10+
import net.minecraft.core.HolderLookup;
1011
import net.minecraft.nbt.CompoundTag;
1112
import net.minecraft.network.chat.Component;
1213
import net.minecraft.network.chat.MutableComponent;
1314
import net.minecraft.resources.ResourceLocation;
1415
import net.minecraft.world.item.ItemStack;
1516
import net.minecraft.world.level.Level;
16-
import net.minecraftforge.api.distmarker.Dist;
17-
import net.minecraftforge.api.distmarker.OnlyIn;
18-
import net.minecraftforge.items.IItemHandlerModifiable;
17+
import net.neoforged.api.distmarker.Dist;
18+
import net.neoforged.api.distmarker.OnlyIn;
19+
import net.neoforged.neoforge.items.IItemHandlerModifiable;
1920

2021
import java.util.List;
2122

@@ -58,16 +59,16 @@ protected boolean test(Level level, RocketContraptionEntity rocket, CompoundTag
5859
}
5960

6061
@Override
61-
protected void writeAdditional(CompoundTag tag) {
62-
super.writeAdditional(tag);
63-
tag.put("Item", stack.serializeNBT());
62+
protected void writeAdditional(HolderLookup.Provider registries, CompoundTag tag) {
63+
super.writeAdditional(registries,tag);
64+
tag.put("Item", stack.serializeNBT(registries));
6465
}
6566

6667
@Override
67-
protected void readAdditional(CompoundTag tag) {
68-
super.readAdditional(tag);
68+
protected void readAdditional(HolderLookup.Provider registries,CompoundTag tag) {
69+
super.readAdditional(registries,tag);
6970
if (tag.contains("Item"))
70-
stack = FilterItemStack.of(tag.getCompound("Item"));
71+
stack = FilterItemStack.of(registries,tag.getCompound("Item"));
7172
}
7273

7374
@Override

‎src/main/java/com/rae/creatingspace/api/squedule/condition/RedstoneLinkCondition.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@
1212
import net.createmod.catnip.data.Pair;
1313

1414
import net.minecraft.ChatFormatting;
15+
import net.minecraft.core.HolderLookup;
1516
import net.minecraft.nbt.CompoundTag;
1617
import net.minecraft.nbt.Tag;
1718
import net.minecraft.network.chat.Component;
1819
import net.minecraft.network.chat.MutableComponent;
1920
import net.minecraft.resources.ResourceLocation;
2021
import net.minecraft.world.item.ItemStack;
2122
import net.minecraft.world.level.Level;
22-
import net.minecraftforge.api.distmarker.Dist;
23-
import net.minecraftforge.api.distmarker.OnlyIn;
23+
import net.neoforged.api.distmarker.Dist;
24+
import net.neoforged.api.distmarker.OnlyIn;
2425

2526
import java.util.List;
2627

@@ -96,19 +97,18 @@ public ResourceLocation getId() {
9697
}
9798

9899
@Override
99-
protected void writeAdditional(CompoundTag tag) {
100-
tag.put("Frequency", freq.serializeEach(f -> f.getStack()
101-
.serializeNBT()));
100+
protected void writeAdditional(HolderLookup.Provider registries, CompoundTag tag) {
101+
tag.put("Frequency", freq.serializeEach(f -> (CompoundTag) f.getStack().save(registries)));
102102
}
103103

104104
public boolean lowActivation() {
105105
return intData("Inverted") == 1;
106106
}
107107

108108
@Override
109-
protected void readAdditional(CompoundTag tag) {
109+
protected void readAdditional(HolderLookup.Provider registries, CompoundTag tag) {
110110
if (tag.contains("Frequency"))
111-
freq = Couple.deserializeEach(tag.getList("Frequency", Tag.TAG_COMPOUND), c -> Frequency.of(ItemStack.of(c)));
111+
freq = Couple.deserializeEach(tag.getList("Frequency", Tag.TAG_COMPOUND), c -> Frequency.of(ItemStack.parseOptional(registries,c)));
112112
}
113113

114114
@Override

‎src/main/java/com/rae/creatingspace/api/squedule/condition/ScheduleWaitCondition.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.simibubi.create.Create;
66
import com.simibubi.create.content.trains.schedule.ScheduleDataEntry;
77
import net.createmod.catnip.data.Pair;
8+
import net.minecraft.core.HolderLookup;
89
import net.minecraft.nbt.CompoundTag;
910
import net.minecraft.network.chat.MutableComponent;
1011
import net.minecraft.resources.ResourceLocation;
@@ -20,17 +21,17 @@ protected void requestStatusToUpdate(CompoundTag context) {
2021
context.putInt("StatusVersion", context.getInt("StatusVersion") + 1);
2122
}
2223

23-
public final CompoundTag write() {
24+
public final CompoundTag write(HolderLookup.Provider registries) {
2425
CompoundTag tag = new CompoundTag();
2526
CompoundTag dataCopy = data.copy();
26-
writeAdditional(dataCopy);
27+
writeAdditional(registries,dataCopy);
2728
tag.putString("Id", getId().toString());
2829
tag.put("Data", dataCopy);
2930
return tag;
3031
}
3132

32-
public static ScheduleWaitCondition fromTag(CompoundTag tag) {
33-
ResourceLocation location = new ResourceLocation(tag.getString("Id"));
33+
public static ScheduleWaitCondition fromTag(HolderLookup.Provider registries,CompoundTag tag) {
34+
ResourceLocation location = ResourceLocation.tryParse(tag.getString("Id"));
3435
Supplier<? extends ScheduleWaitCondition> supplier = null;
3536
for (Pair<ResourceLocation, Supplier<? extends ScheduleWaitCondition>> pair : RocketSchedule.CONDITION_TYPES)
3637
if (pair.getFirst()
@@ -44,9 +45,9 @@ public static ScheduleWaitCondition fromTag(CompoundTag tag) {
4445

4546
ScheduleWaitCondition condition = supplier.get();
4647
// Left around for migration purposes. Data added in writeAdditional has moved into the "Data" tag
47-
condition.readAdditional(tag);
48+
condition.readAdditional(registries,tag);
4849
CompoundTag data = tag.getCompound("Data");
49-
condition.readAdditional(data);
50+
condition.readAdditional(registries,data);
5051
condition.data = data;
5152
return condition;
5253
}

‎src/main/java/com/rae/creatingspace/api/squedule/instruction/ChangeThrottleInstruction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import net.minecraft.network.chat.MutableComponent;
1313
import net.minecraft.resources.ResourceLocation;
1414
import net.minecraft.world.item.ItemStack;
15-
import net.minecraftforge.api.distmarker.Dist;
16-
import net.minecraftforge.api.distmarker.OnlyIn;
15+
import net.neoforged.api.distmarker.Dist;
16+
import net.neoforged.api.distmarker.OnlyIn;
1717

1818
import java.util.List;
1919

0 commit comments

Comments
 (0)