Skip to content

Commit 131b959

Browse files
moving recipe to correct folder + correcting DataComponent registration + renamed recipe folder
1 parent e540c7b commit 131b959

File tree

260 files changed

+473
-297
lines changed

Some content is hidden

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

260 files changed

+473
-297
lines changed

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@
2020
import com.simibubi.create.foundation.item.KineticStats;
2121
import com.simibubi.create.foundation.item.TooltipModifier;
2222
import net.createmod.catnip.lang.FontHelper;
23+
import net.minecraft.resources.ResourceKey;
2324
import net.minecraft.resources.ResourceLocation;
2425

26+
import net.minecraft.world.item.CreativeModeTab;
2527
import net.neoforged.bus.api.EventPriority;
2628
import net.neoforged.bus.api.IEventBus;
2729
import net.neoforged.fml.ModContainer;
@@ -39,14 +41,12 @@ public class CreatingSpace {
3941

4042
public static final String MODID = "creatingspace" ;
4143

42-
public static final CreateRegistrate REGISTRATE = CreateRegistrate.create(MODID);
43-
44-
static {
45-
REGISTRATE.setTooltipModifierFactory(item -> {
46-
return new ItemDescription.Modifier(item, FontHelper.Palette.STANDARD_CREATE).
47-
andThen(TooltipModifier.mapNull(KineticStats.create(item)));
48-
});
49-
}
44+
public static final CreateRegistrate REGISTRATE = CreateRegistrate.create(MODID)
45+
.defaultCreativeTab((ResourceKey<CreativeModeTab>) null)
46+
.setTooltipModifierFactory(item -> {
47+
return new ItemDescription.Modifier(item, FontHelper.Palette.STANDARD_CREATE).
48+
andThen(TooltipModifier.mapNull(KineticStats.create(item)));
49+
});
5050

5151
public CreatingSpace(IEventBus modEventBus, ModContainer modContainer) {
5252
IEventBus forgeEventBus = NeoForge.EVENT_BUS;
@@ -62,19 +62,20 @@ public CreatingSpace(IEventBus modEventBus, ModContainer modContainer) {
6262

6363
TagsInit.init();
6464

65+
DataComponentsInit.register(modEventBus);
6566
SoundInit.register(modEventBus);
6667
ItemInit.register();
6768
BlockInit.register();
6869
BlockEntityInit.register();
6970
EntityInit.register();
7071
FluidInit.register();
72+
MiscInit.register(modEventBus);
7173
PropellantTypeInit.register(modEventBus);
7274
PaintingInit.register(modEventBus);
7375
RecipeInit.register(modEventBus);
7476
ParticleTypeInit.register(modEventBus);
7577

7678
EntityDataSerializersInit.register(modEventBus);
77-
MiscInit.register(modEventBus);
7879
CreativeModeTabsInit.register(modEventBus);
7980

8081
CSConfigs.registerConfigs(modLoadingContext,modContainer);

src/main/java/com/rae/creatingspace/content/fluids/storage/CryogenicTankItem.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.rae.creatingspace.init.ingameobject.BlockInit;
55
import com.rae.creatingspace.init.ingameobject.ItemInit;
66
import com.simibubi.create.foundation.ICapabilityProvider;
7+
import net.createmod.catnip.platform.CatnipClientServices;
78
import net.minecraft.ChatFormatting;
89
import net.minecraft.core.component.DataComponents;
910
import net.minecraft.nbt.CompoundTag;
@@ -28,7 +29,6 @@ public class CryogenicTankItem extends BlockItem {
2829
public CryogenicTankItem(Block block, Properties properties) {
2930
super(block, properties);
3031
}
31-
//TODO capabilities -> register capabilities in EventHandler with an item fluid capability
3232
public static void registerCapabilities(RegisterCapabilitiesEvent event) {
3333
event.registerItem(
3434
Capabilities.FluidHandler.ITEM,
@@ -77,6 +77,7 @@ public void appendHoverText(ItemStack stack, TooltipContext context, List<Compon
7777
.append(" ")
7878
.append(String.valueOf(fluid.getAmount()))
7979
.append(" / 4000mb")
80+
//.withColor(CatnipClientServices.FLUID_HELPER.getColor(fluid.getFluid()))
8081
.withStyle(ChatFormatting.AQUA)
8182
);
8283
} else {

src/main/java/com/rae/creatingspace/content/rocket/rocket_control/RocketControlsItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public RocketControlsItem(Block p_40565_, Properties p_40566_) {
2424
@Override
2525
public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> components, TooltipFlag flag) {
2626
super.appendHoverText(stack, context, components, flag);
27-
Map<ResourceLocation,BlockPos> initialBlockPos = stack.get(DataComponentsInit.INITIAL_POS_MAP);//TODO create a DataComponent
27+
Map<ResourceLocation,BlockPos> initialBlockPos = stack.getOrDefault(DataComponentsInit.INITIAL_POS_MAP, Map.of());
2828
components.add(Component.literal("Stored dimension entry point :").withStyle(ChatFormatting.GOLD));
2929
for (ResourceLocation dimension:initialBlockPos.keySet()) {
3030
components.add(

src/main/java/com/rae/creatingspace/init/CreativeModeTabsInit.java

Lines changed: 339 additions & 163 deletions
Large diffs are not rendered by default.

src/main/java/com/rae/creatingspace/init/MiscInit.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import static com.rae.creatingspace.content.event.DataEventHandler.getSideAwareRegistry;
1616

1717
public class MiscInit {
18+
//TODO there is no need for 2 different classes for MiscInit and PropellantInit, merge them
1819
public static final DeferredRegister<ExhaustPackType> DEFERRED_EXHAUST_PACK_TYPE =
1920
DeferredRegister.create(Keys.EXHAUST_PACK_TYPE, CreatingSpace.MODID);
2021

src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.rae.creatingspace.content.rocket.rocket_control.RocketControlsBlock;
1212
import com.rae.creatingspace.content.rocket.engine.table.RocketEngineerTableBlock;
1313
import com.rae.creatingspace.content.rocket.flight_recorder.FlightRecorderBlock;
14+
import com.rae.creatingspace.init.CreativeModeTabsInit;
1415
import com.rae.creatingspace.init.graphics.SpriteShiftInit;
1516
import com.rae.creatingspace.content.life_support.spacesuit.OxygenBacktankBlock;
1617
import com.rae.creatingspace.legacy.server.blocks.multiblock.BigRocketStructuralBlock;
@@ -47,7 +48,9 @@
4748
import static com.simibubi.create.foundation.data.TagGen.*;
4849

4950
public class BlockInit {
50-
51+
static{
52+
REGISTRATE.setCreativeTab(CreativeModeTabsInit.MACHINE_TAB);
53+
}
5154
//just blocks
5255
//TODO add geode's blocks
5356
public static final BlockEntry<RocketEngineerTableBlock> ROCKET_ENGINEER_TABLE = REGISTRATE
@@ -215,6 +218,9 @@ public class BlockInit {
215218
.build()
216219
.register();
217220

221+
static{
222+
REGISTRATE.setCreativeTab(CreativeModeTabsInit.MINERALS_TAB);
223+
}
218224

219225
public static final BlockEntry<Block> MOON_STONE = REGISTRATE
220226
.block("moon_stone",Block::new).initialProperties(()-> Blocks.STONE)

0 commit comments

Comments
 (0)