everything so far
This commit is contained in:
parent
d15ceecfca
commit
5793d88028
|
|
@ -41,7 +41,7 @@ dependencies {
|
|||
}
|
||||
forge "net.minecraftforge:forge:${project.forge_version}"
|
||||
|
||||
modImplementation "com.github.Mysticpasta1:mcef-forge:master-SNAPSHOT"
|
||||
modImplementation "com.github.Mysticpasta1:mcef-forge:fb295e48d0"
|
||||
modImplementation "curse.maven:cloth_config_forge-348521:3546623"
|
||||
// Uncomment the following line to enable the deprecated Fabric API modules.
|
||||
// These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
|
||||
|
|
@ -52,7 +52,7 @@ dependencies {
|
|||
loom {
|
||||
forge {
|
||||
mixinConfigs = [
|
||||
"webdisplays.mixins.json"
|
||||
"webdisplays.mixin.json"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ public class ClientProxy extends SharedProxy implements IDisplayHandler, IJSQuer
|
|||
throw new RuntimeException("MCEF is missing");
|
||||
|
||||
mcef.registerDisplayHandler(this);
|
||||
mcef.registerJSQueryHandler(this);
|
||||
// mcef.registerJSQueryHandler(this); //TODO why crashing on this method!
|
||||
findAdvancementToProgressField();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import net.montoyo.mcef.easy_forge_compat.Configuration;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
@Config(name = "webdisplays")
|
||||
public class ModConfig implements ConfigData {
|
||||
@ConfigEntry.Category("main")
|
||||
public Main main = new Main();
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
package net.montoyo.wd.init;
|
||||
|
||||
import net.minecraft.core.Registry;
|
||||
import net.minecraft.world.item.BlockItem;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraftforge.eventbus.api.IEventBus;
|
||||
import net.minecraftforge.registries.DeferredRegister;
|
||||
import net.minecraftforge.registries.IForgeRegistry;
|
||||
import net.minecraftforge.registries.RegistryObject;
|
||||
import net.montoyo.wd.block.BlockKeyboardRight;
|
||||
import net.montoyo.wd.block.BlockPeripheral;
|
||||
|
|
@ -16,7 +18,7 @@ import java.util.function.Supplier;
|
|||
|
||||
public class BlockInit {
|
||||
|
||||
public static DeferredRegister<Block> BLOCKS = DeferredRegister.create(Block.class, "webdisplays");
|
||||
public static DeferredRegister<Block> BLOCKS = DeferredRegister.create(Registry.BLOCK_REGISTRY, "webdisplays");
|
||||
|
||||
public static void init(IEventBus bus) {
|
||||
BLOCKS.register(bus);
|
||||
|
|
|
|||
|
|
@ -24,12 +24,12 @@ public class ItemInit {
|
|||
return register(id, c);
|
||||
}
|
||||
|
||||
public static final RegistryObject<Item> itemScreenCfg = register("itemScreenConfig", () -> new ItemScreenConfigurator(new Item.Properties()));
|
||||
public static final RegistryObject<Item> itemOwnerThief = register("itemOwnerThief", () -> new ItemOwnershipThief(new Item.Properties()));
|
||||
public static final RegistryObject<Item> itemLinker = register("itemLinker", () -> new ItemLinker(new Item.Properties()));
|
||||
public static final RegistryObject<Item> itemMinePad = register("itemMinePad", () -> new ItemMinePad2(new Item.Properties()));
|
||||
public static final RegistryObject<Item> itemUpgrade = register("itemUpgrade", ItemUpgrade::new);
|
||||
public static final RegistryObject<Item> itemCraftComp = register("itemCraftComp", () -> new ItemCraftComponent(new Item.Properties()));
|
||||
public static final RegistryObject<Item> itemLaserPointer = register("itemLaserPointer", () -> new ItemLaserPointer(new Item.Properties()));
|
||||
public static final RegistryObject<Item> itemScreenCfg = register("item_screen_config", () -> new ItemScreenConfigurator(new Item.Properties()));
|
||||
public static final RegistryObject<Item> itemOwnerThief = register("item_owner_thief", () -> new ItemOwnershipThief(new Item.Properties()));
|
||||
public static final RegistryObject<Item> itemLinker = register("item_linker", () -> new ItemLinker(new Item.Properties()));
|
||||
public static final RegistryObject<Item> itemMinePad = register("item_mine_pad", () -> new ItemMinePad2(new Item.Properties()));
|
||||
public static final RegistryObject<Item> itemUpgrade = register("item_upgrade", ItemUpgrade::new);
|
||||
public static final RegistryObject<Item> itemCraftComp = register("item_craftcomp", () -> new ItemCraftComponent(new Item.Properties()));
|
||||
public static final RegistryObject<Item> itemLaserPointer = register("item_laserpointer", () -> new ItemLaserPointer(new Item.Properties()));
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ import net.minecraftforge.registries.RegistryObject;
|
|||
import net.montoyo.wd.core.DefaultPeripheral;
|
||||
import net.montoyo.wd.entity.TileEntityScreen;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
public class TileInit {
|
||||
|
||||
public static final DeferredRegister<BlockEntityType<?>> TILE_TYPES = DeferredRegister
|
||||
|
|
@ -22,7 +24,7 @@ public class TileInit {
|
|||
public static void registerPeripherals() {
|
||||
for (DefaultPeripheral dp : DefaultPeripheral.values()) {
|
||||
if (dp.getTEClass() != null)
|
||||
PERIPHERAL = TILE_TYPES.register(dp.name(), () -> BlockEntityType.Builder
|
||||
PERIPHERAL = TILE_TYPES.register(dp.name().toLowerCase(Locale.ROOT), () -> BlockEntityType.Builder
|
||||
.of(dp.getTEClass(), BlockInit.blockPeripheral.get()).build(null));
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user