Skip to content

Commit

Permalink
feat: 0.3.0をベースに修正
Browse files Browse the repository at this point in the history
  • Loading branch information
@yupix
yupix committed Jan 30, 2023
1 parent ed796e3 commit c88557a
Show file tree
Hide file tree
Showing 126 changed files with 6,018 additions and 13,161 deletions.
63 changes: 36 additions & 27 deletions src/main/java/com/pahimar/ee3/EquivalentExchange3.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
import java.io.File;

import com.pahimar.ee3.array.AlchemyArrayRegistry;
import com.pahimar.ee3.blacklist.BlacklistRegistry;
import com.pahimar.ee3.command.CommandEE;
import com.pahimar.ee3.exchange.CachedOreDictionary;
import com.pahimar.ee3.exchange.EnergyValueRegistry;
import com.pahimar.ee3.handler.*;
import com.pahimar.ee3.init.*;
import com.pahimar.ee3.knowledge.AbilityRegistry;
import com.pahimar.ee3.knowledge.TransmutationKnowledgeRegistry;
import com.pahimar.ee3.knowledge.PlayerKnowledgeRegistry;
import com.pahimar.ee3.network.PacketHandler;
import com.pahimar.ee3.proxy.IProxy;
import com.pahimar.ee3.recipe.AludelRecipeManager;
import com.pahimar.ee3.recipe.RecipeRegistry;
import com.pahimar.ee3.reference.Files;
import com.pahimar.ee3.reference.Messages;
import com.pahimar.ee3.reference.Reference;
import com.pahimar.ee3.reference.Settings;
import com.pahimar.ee3.test.EnergyValueMappingsTestSuite;
import com.pahimar.ee3.test.EETestSuite;
import com.pahimar.ee3.test.EnergyValueTestSuite;
import com.pahimar.ee3.test.VanillaTestSuite;
import com.pahimar.ee3.util.FluidHelper;
import com.pahimar.ee3.util.LogHelper;
import com.pahimar.ee3.util.SerializationHelper;
Expand Down Expand Up @@ -49,6 +49,7 @@ public class EquivalentExchange3 {

@EventHandler
public void invalidFingerprint(FMLFingerprintViolationEvent event) {

if (Reference.FINGERPRINT.equals("@FINGERPRINT@")) {
LogHelper.info(Messages.NO_FINGERPRINT_MESSAGE);
} else {
Expand All @@ -58,20 +59,19 @@ public void invalidFingerprint(FMLFingerprintViolationEvent event) {

@EventHandler
public void onServerStarting(FMLServerStartingEvent event) {
SerializationHelper.initModDataDirectories();

TransmutationKnowledgeRegistry.getInstance();

AbilityRegistry.getInstance().loadAbilityRegistryFromFile(Settings.Abilities.onlyLoadFile);
Files.updateFileReferences();

SerializationHelper.initModDataDirectories();
event.registerServerCommand(new CommandEE());
}

@EventHandler
public void preInit(FMLPreInitializationEvent event) {

ConfigurationHandler.init(event.getSuggestedConfigurationFile());

Files.Global.init(event);
Files.init(event);

PacketHandler.init();

Expand All @@ -83,16 +83,20 @@ public void preInit(FMLPreInitializationEvent event) {

FluidHelper.registerFluids();

EnergyValues.addDefaultEnergyValues();
EnergyValues.init();

AlchemyArrays.registerAlchemyArrays();
}

@EventHandler
public void init(FMLInitializationEvent event) {

// Register the GUI Handler
NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GuiHandler());

// Initialize the blacklist registry
BlacklistRegistry.INSTANCE.load();

// Initialize mod tile entities
TileEntities.init();

Expand All @@ -114,21 +118,26 @@ public void init(FMLInitializationEvent event) {

@EventHandler
public void postInit(FMLPostInitializationEvent event) {
CachedOreDictionary.getInstance();
Abilities.initNotLearnables();

Abilities.init();

// Initialize our test files
new VanillaTestSuite().build().save();
new EETestSuite().build().save();
}

@EventHandler
public void onServerStopping(FMLServerStoppingEvent event) {
WorldEventHandler.hasInitilialized = false;

EnergyValueRegistry.getInstance().save();
TransmutationKnowledgeRegistry.getInstance().clear();
AbilityRegistry.getInstance().save();
WorldEventHandler.hasInitilialized = false;
EnergyValueRegistry.INSTANCE.save();
PlayerKnowledgeRegistry.INSTANCE.saveAll();
BlacklistRegistry.INSTANCE.saveAll();
}

@EventHandler
public void handleMissingMappingEvent(FMLMissingMappingsEvent event) {

for (FMLMissingMappingsEvent.MissingMapping mapping : event.get()) {
if (mapping.type == GameRegistry.Type.ITEM) {
if (mapping.name.equals("EE3:alchemicalTome")) {
Expand All @@ -139,38 +148,38 @@ public void handleMissingMappingEvent(FMLMissingMappingsEvent event) {
}

public EnergyValueRegistry getEnergyValueRegistry() {
return EnergyValueRegistry.getInstance();
return EnergyValueRegistry.INSTANCE;
}

public RecipeRegistry getRecipeRegistry() {
return RecipeRegistry.getInstance();
return RecipeRegistry.INSTANCE;
}

public AludelRecipeManager getAludelRecipeManager() {
return AludelRecipeManager.getInstance();
}

public AbilityRegistry getAbilityRegistry() {
return AbilityRegistry.getInstance();
public BlacklistRegistry getBlacklistRegistry() {
return BlacklistRegistry.INSTANCE;
}

public AlchemyArrayRegistry getAlchemyArrayRegistry() {
return AlchemyArrayRegistry.getInstance();
}

public TransmutationKnowledgeRegistry getTransmutationKnowledgeRegistry() {
return TransmutationKnowledgeRegistry.getInstance();
public PlayerKnowledgeRegistry getPlayerKnowledgeRegistry() {
return PlayerKnowledgeRegistry.INSTANCE;
}

public TileEntityDataHelper getTileEntityDataHelper() {
return TileEntityDataHelper.getInstance();
}

public void runEnergyValueMappingTest(File file) {
runEnergyValueMappingTest(file, false);
public void runEnergyValueTestSuite(File file) {
runEnergyValueTestSuite(file, false);
}

public void runEnergyValueMappingTest(File file, boolean strict) {
new EnergyValueMappingsTestSuite(file).runTestSuite(strict);
public void runEnergyValueTestSuite(File file, boolean strict) {
new EnergyValueTestSuite(file).run(strict);
}
}
20 changes: 20 additions & 0 deletions src/main/java/com/pahimar/ee3/api/event/AbilityEvent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,18 @@

import cpw.mods.fml.common.eventhandler.Event;

/**
* @deprecated See {@link BlacklistEvent}
*/
@Deprecated
public class AbilityEvent extends Event {

public final Object object;

/**
* @deprecated See {@link BlacklistEvent}
*/
@Deprecated
public AbilityEvent(Object object) {
this.object = object;
}
Expand All @@ -15,27 +23,39 @@ public boolean isCancelable() {
return true;
}

/**
* @deprecated See {@link com.pahimar.ee3.api.event.BlacklistEvent.KnowledgeWhitelistEvent}
*/
public static class SetLearnableEvent extends AbilityEvent {

public SetLearnableEvent(Object object) {
super(object);
}
}

/**
* @deprecated See {@link com.pahimar.ee3.api.event.BlacklistEvent.KnowledgeBlacklistEvent}
*/
public static class SetNotLearnableEvent extends AbilityEvent {

public SetNotLearnableEvent(Object object) {
super(object);
}
}

/**
* @deprecated See {@link com.pahimar.ee3.api.event.BlacklistEvent.ExchangeWhitelistEvent}
*/
public static class SetRecoverableEvent extends AbilityEvent {

public SetRecoverableEvent(Object object) {
super(object);
}
}

/**
* @deprecated See {@link com.pahimar.ee3.api.event.BlacklistEvent.ExchangeBlacklistEvent}
*/
public static class SetNotRecoverableEvent extends AbilityEvent {

public SetNotRecoverableEvent(Object object) {
Expand Down
17 changes: 7 additions & 10 deletions src/main/java/com/pahimar/ee3/api/event/EnergyValueEvent.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.pahimar.ee3.api.event;

import net.minecraft.entity.player.EntityPlayer;

import com.pahimar.ee3.api.exchange.EnergyValue;
import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy;
import cpw.mods.fml.common.eventhandler.Event;
Expand All @@ -10,12 +8,11 @@ public class EnergyValueEvent extends Event {

public final Object object;
public final EnergyValueRegistryProxy.Phase phase;
public final EntityPlayer entityPlayer;

public EnergyValueEvent(Object object, EnergyValueRegistryProxy.Phase phase, EntityPlayer entityPlayer) {
public EnergyValueEvent(Object object, EnergyValueRegistryProxy.Phase phase) {

this.object = object;
this.phase = phase;
this.entityPlayer = entityPlayer;
}

@Override
Expand All @@ -27,17 +24,17 @@ public static class SetEnergyValueEvent extends EnergyValueEvent {

public final EnergyValue newEnergyValue;

public SetEnergyValueEvent(Object object, EnergyValue newEnergyValue, EnergyValueRegistryProxy.Phase phase,
EntityPlayer entityPlayer) {
super(object, phase, entityPlayer);
public SetEnergyValueEvent(Object object, EnergyValue newEnergyValue, EnergyValueRegistryProxy.Phase phase) {

super(object, phase);
this.newEnergyValue = newEnergyValue;
}
}

public static class RemoveEnergyValueEvent extends EnergyValueEvent {

public RemoveEnergyValueEvent(Object object, EnergyValueRegistryProxy.Phase phase, EntityPlayer entityPlayer) {
super(object, phase, entityPlayer);
public RemoveEnergyValueEvent(Object object, EnergyValueRegistryProxy.Phase phase) {
super(object, phase);
}
}
}
Loading

0 comments on commit c88557a

Please sign in to comment.