Skip to content

Commit c9693a5

Browse files
committed
Migrated worldgen to new 1.20+ json format and fixed Creative Mode Tab
1 parent be23f75 commit c9693a5

File tree

12 files changed

+93
-104
lines changed

12 files changed

+93
-104
lines changed

src/main/java/com/workert/robotics/Robotics.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
package com.workert.robotics;
22

33
import com.mojang.logging.LogUtils;
4-
import com.simibubi.create.content.logistics.box.PackageEntity;
54
import com.simibubi.create.foundation.data.CreateRegistrate;
65
import com.workert.robotics.base.client.ClientHandler;
76
import com.workert.robotics.base.client.KeybindList;
87
import com.workert.robotics.base.config.RoboticsConfigs;
98
import com.workert.robotics.base.datagen.RoboticsDatagen;
109
import com.workert.robotics.base.registries.*;
11-
import com.workert.robotics.base.world.feature.RoboticsConfiguredFeatures;
12-
import com.workert.robotics.base.world.feature.RoboticsPlacedFeatures;
1310
import com.workert.robotics.unused.smasher.SmasherBlockScreen;
1411
import net.minecraft.client.gui.screens.MenuScreens;
1512
import net.minecraft.resources.ResourceLocation;
@@ -22,7 +19,6 @@
2219

2320
@Mod(Robotics.MOD_ID)
2421
public class Robotics {
25-
PackageEntity
2622
public static final String MOD_ID = "robotics";
2723
public static final Logger LOGGER = LogUtils.getLogger();
2824

@@ -37,7 +33,8 @@ public Robotics() {
3733
REGISTRATE.registerEventListeners(this.modEventBus);
3834
this.modEventBus.addListener(RoboticsDatagen::gatherData);
3935

40-
Robotics.REGISTRATE.defaultCreativeTab();
36+
CreativeModeTabRegistry.register(this.modEventBus);
37+
4138
BlockRegistry.register();
4239
EntityRegistry.register();
4340
ItemRegistry.register();
@@ -46,9 +43,6 @@ public Robotics() {
4643
MenuRegistry.register(this.modEventBus);
4744
RecipeRegistry.register(this.modEventBus);
4845

49-
RoboticsConfiguredFeatures.register(this.modEventBus);
50-
RoboticsPlacedFeatures.register(this.modEventBus);
51-
5246
PacketRegistry.registerPackets();
5347

5448
RoboticsConfigs.register(ModLoadingContext.get());

src/main/java/com/workert/robotics/base/registries/BlockRegistry.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.simibubi.create.content.redstone.displayLink.source.ComputerDisplaySource;
55
import com.simibubi.create.foundation.data.TagGen;
66
import com.simibubi.create.foundation.item.ItemDescription;
7-
import com.simibubi.create.infrastructure.config.CStress;
87
import com.tterrag.registrate.providers.loot.RegistrateBlockLootTables;
98
import com.tterrag.registrate.util.entry.BlockEntry;
109
import com.workert.robotics.Robotics;
@@ -136,7 +135,7 @@ public static void register() {
136135
provider.models().getExistingFile(provider.modLoc("block/computer"))))
137136
.initialProperties(() -> Blocks.STONE)
138137
.transform(TagGen.pickaxeOnly())
139-
.transform(CStress.setImpact(12))
138+
//.transform(CStress.setImpact(12))
140139
.onRegister((block) -> DisplaySource.BY_BLOCK.add(block, new TerminalDisplaySource()))
141140
.onRegister((block) -> DisplaySource.BY_BLOCK.add(block, new ComputerDisplaySource()))
142141
.simpleItem()
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package com.workert.robotics.base.registries;
2+
3+
import com.simibubi.create.Create;
4+
import net.minecraft.core.registries.Registries;
5+
import net.minecraft.network.chat.Component;
6+
import net.minecraft.world.item.CreativeModeTab;
7+
import net.minecraft.world.item.CreativeModeTabs;
8+
import net.minecraftforge.eventbus.api.IEventBus;
9+
import net.minecraftforge.fml.common.Mod;
10+
import net.minecraftforge.registries.DeferredRegister;
11+
import net.minecraftforge.registries.RegistryObject;
12+
13+
@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD)
14+
public class CreativeModeTabRegistry {
15+
private static final DeferredRegister<CreativeModeTab> REGISTER =
16+
DeferredRegister.create(Registries.CREATIVE_MODE_TAB, Create.ID);
17+
18+
public static final RegistryObject<CreativeModeTab> BASE_CREATIVE_TAB = REGISTER.register("base",
19+
() -> CreativeModeTab.builder()
20+
.title(Component.translatable("itemGroup.create.base"))
21+
.withTabsBefore(CreativeModeTabs.SPAWN_EGGS)
22+
.icon(BlockRegistry.TIN_ORE::asStack)
23+
//.displayItems(new RegistrateDisplayItemsGenerator(true, CreativeModeTabRegistry.BASE_CREATIVE_TAB))
24+
.build());
25+
26+
public static void register(IEventBus modEventBus) {
27+
REGISTER.register(modEventBus);
28+
}
29+
}

src/main/java/com/workert/robotics/base/registries/ItemRegistry.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@
99
import com.workert.robotics.content.robotics.BaseRobotItem;
1010
import com.workert.robotics.content.utility.extendoboots.ExtendOBootsItem;
1111
import net.minecraft.core.registries.Registries;
12-
import net.minecraft.world.item.CreativeModeTab;
1312
import net.minecraft.world.item.Item;
1413
import net.minecraft.world.item.Rarity;
1514
import net.minecraftforge.common.Tags;
1615

1716
public class ItemRegistry {
17+
1818
public static void register() {
1919
}
2020

21-
public static final CreativeModeTab ROBOTICS_TAB = CreativeModeTab.builder()
22-
.icon(ItemRegistry.BRONZE_INGOT::asStack).build();
21+
static {
22+
Robotics.REGISTRATE.setCreativeTab(CreativeModeTabRegistry.BASE_CREATIVE_TAB);
23+
}
2324

2425
public static final ItemEntry<Item> TIN_INGOT = Robotics.REGISTRATE
2526
.item("tin_ingot", Item::new)

src/main/java/com/workert/robotics/base/world/feature/RoboticsConfiguredFeatures.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/main/java/com/workert/robotics/base/world/feature/RoboticsOrePlacement.java

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/main/java/com/workert/robotics/base/world/feature/RoboticsPlacedFeatures.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/main/java/com/workert/robotics/content/computers/computer/ComputerBlock.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public ComputerBlock(Properties properties) {
3333
super(properties);
3434
}
3535

36-
3736
@Override
3837
public InteractionResult use(BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand hand, BlockHitResult result) {
3938
ItemStack held = player.getMainHandItem();

src/main/resources/META-INF/mods.toml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ loaderVersion = "[42,)"
33

44
license = "All rights reserved"
55

6+
67
[[mods]]
78
modId = "robotics"
89
version = "${file.jarVersion}"
@@ -21,13 +22,6 @@ Create Robotics has also a system planned for you to build and code your own rob
2122
'''
2223

2324

24-
[[dependencies.robotics]]
25-
modId = "geckolib"
26-
mandatory = true
27-
versionRange = "[4.7.0,4.8.0)"
28-
ordering = "NONE"
29-
side = "BOTH"
30-
3125
[[dependencies.robotics]]
3226
modId = "create"
3327
mandatory = true

src/main/resources/data/robotics/forge/biome_modifier/tin_ore.json renamed to src/main/resources/data/robotics/forge/biome_modifier/ore_tin_modifier.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"type": "forge:add_features",
33
"biomes": "#minecraft:is_overworld",
4-
"features": "robotics:tin_ore_placed",
4+
"features": "robotics:ore_tin_placed",
55
"step": "underground_ores"
66
}

0 commit comments

Comments
 (0)