Merge remote-tracking branch 'origin/master'

This commit is contained in:
yuesha-yc 2021-10-25 22:49:12 -07:00
commit c05f8d5527
No known key found for this signature in database
GPG key ID: 009D79A802D4ED01

View file

@ -18,6 +18,7 @@
package com.teammoeg.steampowered; package com.teammoeg.steampowered;
import com.simibubi.create.foundation.block.BlockStressDefaults;
import com.simibubi.create.foundation.data.CreateRegistrate; import com.simibubi.create.foundation.data.CreateRegistrate;
import com.simibubi.create.repack.registrate.util.NonNullLazyValue; import com.simibubi.create.repack.registrate.util.NonNullLazyValue;
import com.teammoeg.steampowered.client.SteamPoweredClient; import com.teammoeg.steampowered.client.SteamPoweredClient;
@ -80,7 +81,7 @@ public class SteamPowered {
SPBlocks.register(); SPBlocks.register();
SPTiles.register(); SPTiles.register();
SPItems.register(); SPItems.register();
BlockStressDefaults.setDefaultImpact(new ResourceLocation("create","gantry_shaft"),32.0);
ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, SPConfig.COMMON_CONFIG); ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, SPConfig.COMMON_CONFIG);
ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, SPConfig.SERVER_CONFIG); ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, SPConfig.SERVER_CONFIG);
PacketHandler.register(); PacketHandler.register();