DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

:lex:

Browse Source
This commit is contained in:
DBotThePony 2021-11-20 13:04:46 +07:00
parent 03d7edf0ec
commit 5f73a18d9f
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 21 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
View File

@ -136,6 +136,8 @@ public class OverdriveThatMatters {
MinecraftForge.EVENT_BUS.register(MatterRegistry.class); MinecraftForge.EVENT_BUS.register(MatterRegistry.class);
MinecraftForge.EVENT_BUS.register(BlockEntityBlackHole.BlackHoleExplosionQueue.class); MinecraftForge.EVENT_BUS.register(BlockEntityBlackHole.BlackHoleExplosionQueue.class);
FMLJavaModLoadingContext.get().getModEventBus().register(MatteryCapability.class);
FMLJavaModLoadingContext.get().getModEventBus().register(Registry.Items.class); FMLJavaModLoadingContext.get().getModEventBus().register(Registry.Items.class);
FMLJavaModLoadingContext.get().getModEventBus().register(Registry.Blocks.class); FMLJavaModLoadingContext.get().getModEventBus().register(Registry.Blocks.class);
FMLJavaModLoadingContext.get().getModEventBus().register(Registry.BlockEntities.class); FMLJavaModLoadingContext.get().getModEventBus().register(Registry.BlockEntities.class);
@ -162,12 +164,7 @@ public class OverdriveThatMatters {
}; };
} }
private static AbstractMatteryDrive drive;
private void setup(final FMLCommonSetupEvent event) { private void setup(final FMLCommonSetupEvent event) {
// some preinit code
MatteryCapability.register();
// LOGGER.info("Registered capabilities");
MatteryNetworking.register(); MatteryNetworking.register();
// LOGGER.info("Registered network"); // LOGGER.info("Registered network");

54
src/main/java/ru/dbotthepony/mc/otm/capability/MatteryCapability.java
View File

@ -1,8 +1,6 @@
package ru.dbotthepony.mc.otm.capability; package ru.dbotthepony.mc.otm.capability;
import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.*;
import net.minecraftforge.common.capabilities.CapabilityInject;
import net.minecraftforge.common.capabilities.CapabilityManager;
import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.energy.IEnergyStorage;
import ru.dbotthepony.mc.otm.capability.android.IAndroidCapability; import ru.dbotthepony.mc.otm.capability.android.IAndroidCapability;
import ru.dbotthepony.mc.otm.capability.drive.IMatteryDrive; import ru.dbotthepony.mc.otm.capability.drive.IMatteryDrive;
@ -16,39 +14,25 @@ import java.math.MathContext;
import java.math.RoundingMode; import java.math.RoundingMode;
public class MatteryCapability { public class MatteryCapability {
@CapabilityInject(IMatteryEnergyStorage.class) public static final Capability<IMatteryEnergyStorage> ENERGY = CapabilityManager.get(new CapabilityToken<>() {});
public static Capability<IMatteryEnergyStorage> ENERGY = null; public static final Capability<IAndroidCapability> ANDROID = CapabilityManager.get(new CapabilityToken<>() {});
public static final Capability<IMatterHandler> MATTER = CapabilityManager.get(new CapabilityToken<>() {});
public static final Capability<IMatterGridCell> MATTER_CELL = CapabilityManager.get(new CapabilityToken<>() {});
public static final Capability<IPatternStorage> PATTERN = CapabilityManager.get(new CapabilityToken<>() {});
public static final Capability<IMatterTaskProvider> TASK = CapabilityManager.get(new CapabilityToken<>() {});
public static final Capability<IMatteryDrive> DRIVE = CapabilityManager.get(new CapabilityToken<>() {});
public static final Capability<IStorageGridCell> STORAGE_CELL = CapabilityManager.get(new CapabilityToken<>() {});
@CapabilityInject(IAndroidCapability.class) @SuppressWarnings("unused")
public static Capability<IAndroidCapability> ANDROID = null; public static void register(final RegisterCapabilitiesEvent event) {
event.register(IMatteryEnergyStorage.class);
@CapabilityInject(IMatterHandler.class) event.register(IAndroidCapability.class);
public static Capability<IMatterHandler> MATTER = null; event.register(IMatterHandler.class);
event.register(IMatterGridCell.class);
@CapabilityInject(IMatterGridCell.class) event.register(IPatternStorage.class);
public static Capability<IMatterGridCell> MATTER_CELL = null; event.register(IMatterTaskProvider.class);
event.register(IMatteryDrive.class);
@CapabilityInject(IPatternStorage.class) event.register(IStorageGridCell.class);
public static Capability<IPatternStorage> PATTERN = null;
@CapabilityInject(IMatterTaskProvider.class)
public static Capability<IMatterTaskProvider> TASK = null;
@CapabilityInject(IMatteryDrive.class)
public static Capability<IMatteryDrive> DRIVE = null;
@CapabilityInject(IStorageGridCell.class)
public static Capability<IStorageGridCell> STORAGE_CELL = null;
public static void register() {
CapabilityManager.INSTANCE.register(IAndroidCapability.class);
CapabilityManager.INSTANCE.register(IMatteryEnergyStorage.class);
CapabilityManager.INSTANCE.register(IMatterHandler.class);
CapabilityManager.INSTANCE.register(IPatternStorage.class);
CapabilityManager.INSTANCE.register(IMatterGridCell.class);
CapabilityManager.INSTANCE.register(IMatterTaskProvider.class);
CapabilityManager.INSTANCE.register(IMatteryDrive.class);
CapabilityManager.INSTANCE.register(IStorageGridCell.class);
} }
public static final MathContext ROUND_RULES = new MathContext(32, RoundingMode.HALF_DOWN); public static final MathContext ROUND_RULES = new MathContext(32, RoundingMode.HALF_DOWN);