Skip to content

Commit effa6d9

Browse files
AlphaModeAlphaMode
committed
Update to 1.19.1 and fix #2 
1 parent b092f5d commit effa6d9

38 files changed

+117
-234
lines changed

‎build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,15 @@ dependencies {
130130
mappings loom.officialMojangMappings()
131131
modImplementation("net.fabricmc:fabric-loader:${project.loader_version}")
132132
modImplementation("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
133-
modImplementation(include("io.github.fabricators_of_create:Porting-Lib:${project.port_lib_version}+${project.minecraft_version}.${project.port_lib_hash}"))
133+
modImplementation(include("io.github.fabricators_of_create:Porting-Lib:${project.port_lib_version}+${project.minecraft_version}"))
134134
modImplementation(include("me.alphamode:ForgeTags:${project.forge_tags_version}"))
135135

136136
// REI
137137
modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}")
138-
modImplementation("me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}")
138+
modCompileOnly("me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}")
139139

140140
// JEI
141-
modCompileOnly("mezz.jei:jei-${project.minecraft_version}-fabric:${project.jei_version}") { transitive = false }
141+
modImplementation("mezz.jei:jei-${project.minecraft_version}-fabric:${project.jei_version}") { transitive = false }
142142

143143
include modApi('teamreborn:energy:2.2.0') {
144144
exclude(group: "net.fabricmc.fabric-api")
@@ -153,7 +153,7 @@ dependencies {
153153
// runtimeOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-1.16:${top_version}")
154154

155155
// Nicephore - Screenshots and Stuff
156-
modRuntimeOnly("curse.maven:nicephore-fabric-405990:3848375")
156+
// modRuntimeOnly("curse.maven:nicephore-fabric-405990:3848375")
157157

158158
// Shut up Experimental Settings - so we don't have to deal with that CONSTANTLY
159159
modRuntimeOnly("curse.maven:fabric-disable-custom-worlds-advice-401978:3827588")
@@ -199,7 +199,7 @@ processResources {
199199
properties.put("loader_version", project.loader_version)
200200
properties.put("fabric_version", project.fabric_version)
201201
properties.put("minecraft_version", project.minecraft_version)
202-
properties.put("port_lib_version", "${project.port_lib_version}+${project.minecraft_version}.${project.port_lib_hash}")
202+
properties.put("port_lib_version", "${project.port_lib_version}+${project.minecraft_version}")
203203

204204
properties.forEach((k, v) -> inputs.property(k, v))
205205

‎gradle.properties‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ mod_id=compactmachines
1212
# Dependencies and Libs
1313
jei_mc_version=1.19.1
1414
jei_version=11.2.0.241
15-
rei_version=9.1.517
15+
rei_version=9.1.518
1616
top_version=1.19-6.0.0
17-
port_lib_version=2.0.422
18-
port_lib_hash=26b170a
17+
port_lib_version=2.0.437
1918
forge_tags_version=2.2
2019
night_config_toml_version=3.6.3
2120
night_config_core_version=3.6.3

‎src/api/java/dev/compactmods/machines/api/core/Constants.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package dev.compactmods.machines.api.core;
22

3+
import net.minecraft.resources.ResourceLocation;
4+
35
public abstract class Constants {
46
public static final String MOD_ID = "compactmachines";
57

‎src/datagen/java/dev/compactmods/machines/datagen/BlockLootGenerator.java‎

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

‎src/main/java/dev/compactmods/machines/CompactMachines.java‎

Lines changed: 28 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
package dev.compactmods.machines;
22

33
import dev.compactmods.machines.api.core.Constants;
4+
import dev.compactmods.machines.api.tunnels.capability.CapabilityTunnel;
45
import dev.compactmods.machines.command.Commands;
56
import dev.compactmods.machines.config.CommonConfig;
67
import dev.compactmods.machines.config.EnableVanillaRecipesConfigCondition;
78
import dev.compactmods.machines.config.ServerConfig;
8-
import dev.compactmods.machines.core.Registries;
9-
import dev.compactmods.machines.core.UIRegistration;
9+
import dev.compactmods.machines.core.*;
1010
import dev.compactmods.machines.dimension.Dimension;
1111
import dev.compactmods.machines.graph.Graph;
12+
import dev.compactmods.machines.machine.CompactMachineBlockEntity;
1213
import dev.compactmods.machines.machine.Machines;
14+
import dev.compactmods.machines.room.RoomEventHandler;
1315
import dev.compactmods.machines.room.data.LootFunctions;
16+
import dev.compactmods.machines.room.network.RoomNetworkHandler;
1417
import dev.compactmods.machines.shrinking.Shrinking;
18+
import dev.compactmods.machines.tunnel.TunnelWallEntity;
1519
import dev.compactmods.machines.tunnel.Tunnels;
1620
import dev.compactmods.machines.upgrade.MachineRoomUpgrades;
1721
import dev.compactmods.machines.wall.Walls;
@@ -62,28 +66,18 @@ public void onInitialize() {
6266
doRegistration();
6367

6468
// Configuration
65-
ModLoadingContext mlCtx = ModLoadingContext.get();
66-
mlCtx.registerConfig(ModConfig.Type.COMMON, CommonConfig.CONFIG);
67-
mlCtx.registerConfig(ModConfig.Type.SERVER, ServerConfig.CONFIG);
69+
ModLoadingContext.registerConfig(Constants.MOD_ID, ModConfig.Type.COMMON, CommonConfig.CONFIG);
70+
ModLoadingContext.registerConfig(Constants.MOD_ID, ModConfig.Type.SERVER, ServerConfig.CONFIG);
6871

6972
EnableVanillaRecipesConfigCondition.register();
7073

71-
// UIRegistration.init(); TODO: PORT
72-
// Tunnels.init();
73-
// CMGraphRegistration.init();
74-
// MachineRoomUpgrades.init();
75-
// CompactMachinesCommands.init();
76-
// CompactMachinesLootFunctions.init();
77-
//
78-
// ModLoadingContext.registerConfig(MOD_ID, ModConfig.Type.COMMON, CommonConfig.CONFIG);
79-
// ModLoadingContext.registerConfig(MOD_ID, ModConfig.Type.SERVER, ServerConfig.CONFIG);
80-
// ModConfigEvent.LOADING.register(CommonConfig::onLoaded);
81-
// ServerWorldEvents.LOAD.register(ServerEventHandler::onWorldLoaded);
82-
// ServerEntityWorldChangeEvents.AFTER_PLAYER_CHANGE_WORLD.register(ServerEventHandler::onPlayerDimChange);
83-
// ServerPlayConnectionEvents.JOIN.register(ServerEventHandler::onPlayerLogin);
84-
// CommonEventHandler.init();
85-
// RoomEventHandler.init();
86-
// ModBusEvents.setup();
74+
ModConfigEvent.LOADING.register(CommonConfig::onLoaded);
75+
ServerWorldEvents.LOAD.register(ServerEventHandler::onWorldLoaded);
76+
ServerEntityWorldChangeEvents.AFTER_PLAYER_CHANGE_WORLD.register(ServerEventHandler::onPlayerDimChange);
77+
ServerPlayConnectionEvents.JOIN.register(ServerEventHandler::onPlayerLogin);
78+
CommonEventHandler.init();
79+
RoomEventHandler.init();
80+
ModBusEvents.setup();
8781

8882
CompactMachinesNet.CHANNEL.initServerListener();
8983
RoomNetworkHandler.CHANNEL.initServerListener();
@@ -92,47 +86,43 @@ public void onInitialize() {
9286
RoomNetworkHandler.CHANNEL.initClientListener();
9387
}
9488

95-
Registration.init();
96-
9789
ItemStorage.SIDED.registerForBlockEntities((blockEntity, context) -> {
9890
if (blockEntity instanceof CompactMachineBlockEntity machine)
9991
return machine.getTunnelContext(CapabilityTunnel.ITEM, context);
10092
if (blockEntity instanceof TunnelWallEntity tunnel)
10193
return tunnel.getCapability(CapabilityTunnel.ITEM, context);
10294
return null;
103-
}, Registration.MACHINE_TILE_ENTITY.get(), Tunnels.TUNNEL_BLOCK_ENTITY.get());
95+
}, Machines.MACHINE_TILE_ENTITY.get(), Tunnels.TUNNEL_BLOCK_ENTITY.get());
10496
FluidStorage.SIDED.registerForBlockEntities((blockEntity, context) -> {
10597
if (blockEntity instanceof CompactMachineBlockEntity machine)
10698
return machine.getTunnelContext(CapabilityTunnel.FLUID, context);
10799
if (blockEntity instanceof TunnelWallEntity tunnel)
108100
return tunnel.getCapability(CapabilityTunnel.FLUID, context);
109101
return null;
110-
}, Registration.MACHINE_TILE_ENTITY.get(), Tunnels.TUNNEL_BLOCK_ENTITY.get());
102+
}, Machines.MACHINE_TILE_ENTITY.get(), Tunnels.TUNNEL_BLOCK_ENTITY.get());
111103
EnergyStorage.SIDED.registerForBlockEntities((blockEntity, context) -> {
112104
if (blockEntity instanceof CompactMachineBlockEntity machine)
113105
return machine.getTunnelContext(CapabilityTunnel.ENERGY, context);
114106
if (blockEntity instanceof TunnelWallEntity tunnel)
115107
return tunnel.getCapability(CapabilityTunnel.ENERGY, context);
116108
return null;
117-
}, Registration.MACHINE_TILE_ENTITY.get(), Tunnels.TUNNEL_BLOCK_ENTITY.get());
109+
}, Machines.MACHINE_TILE_ENTITY.get(), Tunnels.TUNNEL_BLOCK_ENTITY.get());
118110
}
119111

120112
/**
121113
* Sets up the deferred registration for usage in package/module setup.
122114
*/
123115
private static void doRegistration() {
124-
var bus = FMLJavaModLoadingContext.get().getModEventBus();
125-
126-
Registries.BLOCKS.register(bus);
127-
Registries.ITEMS.register(bus);
128-
Registries.BLOCK_ENTITIES.register(bus);
129-
Registries.TUNNEL_DEFINITIONS.register(bus);
130-
Registries.CONTAINERS.register(bus);
131-
Registries.UPGRADES.register(bus);
132-
Registries.NODE_TYPES.register(bus);
133-
Registries.EDGE_TYPES.register(bus);
134-
Registries.COMMAND_ARGUMENT_TYPES.register(bus);
135-
Registries.LOOT_FUNCS.register(bus);
116+
Registries.BLOCKS.register();
117+
Registries.ITEMS.register();
118+
Registries.BLOCK_ENTITIES.register();
119+
Registries.TUNNEL_DEFINITIONS.register();
120+
Registries.CONTAINERS.register();
121+
Registries.UPGRADES.register();
122+
Registries.NODE_TYPES.register();
123+
Registries.EDGE_TYPES.register();
124+
Registries.COMMAND_ARGUMENT_TYPES.register();
125+
Registries.LOOT_FUNCS.register();
136126
}
137127

138128
private static void preparePackages() {

‎src/main/java/dev/compactmods/machines/client/ClientEventHandler.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@
1515

1616
public class ClientEventHandler implements ClientModInitializer {
1717

18-
@SubscribeEvent
1918
public static void onItemColors() {
2019
ColorProviderRegistry.ITEM.register(new TunnelItemColor(), Tunnels.ITEM_TUNNEL.get());
2120
}
2221

23-
@SubscribeEvent
2422
public static void onBlockColors() {
2523
ColorProviderRegistry.BLOCK.register(new TunnelColors(), Tunnels.BLOCK_TUNNEL_WALL.get());
2624
}

‎src/main/java/dev/compactmods/machines/client/gui/widget/PSDIconButton.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import dev.compactmods.machines.room.client.MachineRoomScreen;
66
import dev.compactmods.machines.room.network.PlayerRequestedTeleportPacket;
77
import dev.compactmods.machines.shrinking.Shrinking;
8+
import io.github.fabricators_of_create.porting_lib.util.client.ExtendedButton;
9+
import net.fabricmc.fabric.api.client.screen.v1.Screens;
810
import net.minecraft.client.gui.components.Button;
911
import net.minecraft.network.chat.Component;
1012
import net.minecraft.world.item.ItemStack;
@@ -23,7 +25,7 @@ public PSDIconButton(MachineRoomScreen parent, int xPos, int yPos) {
2325
public void render(@NotNull PoseStack pose, int mouseX, int mouseY, float partialTicks) {
2426
super.render(pose, mouseX, mouseY, partialTicks);
2527

26-
((ScreenAccessor)this.parent).port_lib$getMinecraft().getItemRenderer().renderAndDecorateItem(
28+
Screens.getItemRenderer(this.parent).renderAndDecorateItem(
2729
new ItemStack(Shrinking.PERSONAL_SHRINKING_DEVICE.get()),
2830
x + 2, y + 2, 40);
2931
}

‎src/main/java/dev/compactmods/machines/command/Commands.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
1515
import net.minecraft.commands.CommandBuildContext;
1616
import net.minecraft.commands.CommandSourceStack;
17+
import net.minecraft.commands.synchronization.ArgumentTypeInfo;
1718
import net.minecraft.commands.synchronization.ArgumentTypeInfos;
1819
import net.minecraft.commands.synchronization.SingletonArgumentInfo;
1920

@@ -37,10 +38,10 @@ public static <A extends ArgumentType<?>, T extends ArgumentTypeInfo.Template<A>
3738

3839

3940
public static void init() {
40-
CommandRegistrationCallback.EVENT.register(CompactMachinesCommands::onCommandsRegister);
41+
CommandRegistrationCallback.EVENT.register(Commands::onCommandsRegister);
4142
}
4243

43-
public static void onCommandsRegister(CommandDispatcher<CommandSourceStack> dispatcher, CommandBuildContext registryAccess, Commands.CommandSelection environment) {
44+
public static void onCommandsRegister(CommandDispatcher<CommandSourceStack> dispatcher, CommandBuildContext registryAccess, net.minecraft.commands.Commands.CommandSelection environment) {
4445
final LiteralArgumentBuilder<CommandSourceStack> root = LiteralArgumentBuilder.literal(CompactMachines.MOD_ID);
4546
root.then(CMEjectSubcommand.make());
4647
root.then(CMSummarySubcommand.make());

‎src/main/java/dev/compactmods/machines/compat/rei/CompactMachinesReiPlugin.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package dev.compactmods.machines.compat.rei;
22

33
import dev.compactmods.machines.api.core.JeiInfo;
4-
import dev.compactmods.machines.core.Registration;
5-
import dev.compactmods.machines.core.Tunnels;
4+
import dev.compactmods.machines.api.room.RoomSize;
65
import dev.compactmods.machines.i18n.TranslationUtil;
76
import dev.compactmods.machines.machine.CompactMachineItem;
8-
import dev.compactmods.machines.room.RoomSize;
7+
import dev.compactmods.machines.shrinking.Shrinking;
8+
import dev.compactmods.machines.tunnel.Tunnels;
99
import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
1010
import me.shedaniel.rei.api.client.registry.display.DisplayRegistry;
1111
import me.shedaniel.rei.api.common.entry.comparison.ItemComparatorRegistry;
@@ -27,7 +27,7 @@ public void registerDisplays(DisplayRegistry registry) {
2727

2828

2929
registry.add(DefaultInformationDisplay.createFromEntry(
30-
EntryStacks.of(Registration.PERSONAL_SHRINKING_DEVICE.get()),
30+
EntryStacks.of(Shrinking.PERSONAL_SHRINKING_DEVICE.get()),
3131
Component.empty())
3232
.lines(TranslationUtil.jeiInfo(JeiInfo.SHRINKING_DEVICE)));
3333

‎src/main/java/dev/compactmods/machines/compat/theoneprobe/providers/TunnelProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void addProbeInfo(ProbeMode probeMode, IProbeInfo info, Player playerEnti
4646

4747
if (probeMode == ProbeMode.EXTENDED) {
4848
TunnelDefinition definition = tile.getTunnelType();
49-
final var tunnelReg = Tunnels.TUNNEL_DEF_REGISTRY;
49+
final var tunnelReg = Tunnels.TUNNEL_DEF_REGISTRY.get();
5050
MutableComponent tunType = Component.literal(tunnelReg.getKey(definition).toString())
5151
.withStyle(ChatFormatting.GRAY);
5252

0 commit comments

Comments
 (0)