Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-06-25 22:21:42 +02:00
Code Issues Projects Releases Wiki Activity

Fix what I just did.

Browse source 
I wanted to add MineTweaker Support, but then I noticed MineTweaker Support is really stupid and complicated so fuck it.
This commit is contained in:
Ellpeck 2015-12-27 03:58:52 +01:00
parent bc663fae4c
commit eedad2e33d
4 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java
View file

@ -18,7 +18,6 @@ import cpw.mods.fml.common.event.*;
import ellpeck.actuallyadditions.achievement.InitAchievements; import ellpeck.actuallyadditions.achievement.InitAchievements;
import ellpeck.actuallyadditions.blocks.InitBlocks; import ellpeck.actuallyadditions.blocks.InitBlocks;
import ellpeck.actuallyadditions.booklet.InitBooklet; import ellpeck.actuallyadditions.booklet.InitBooklet;
import ellpeck.actuallyadditions.communication.InterModCommunications;
import ellpeck.actuallyadditions.config.ConfigurationHandler; import ellpeck.actuallyadditions.config.ConfigurationHandler;
import ellpeck.actuallyadditions.crafting.CrusherCrafting; import ellpeck.actuallyadditions.crafting.CrusherCrafting;
import ellpeck.actuallyadditions.crafting.InitCrafting; import ellpeck.actuallyadditions.crafting.InitCrafting;
@ -49,7 +48,7 @@ import net.minecraft.init.Items;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
// So that BuildCraft Oil always gets used // So that BuildCraft Oil always gets used
@Mod(modid = ModUtil.MOD_ID, name = ModUtil.NAME, version = ModUtil.VERSION, dependencies = "after:BuildCraft|Energy", canBeDeactivated = false, guiFactory = "ellpeck.actuallyadditions.config.GuiFactory") @Mod(modid = ModUtil.MOD_ID, name = ModUtil.NAME, version = ModUtil.VERSION, dependencies = "after:BuildCraft|Energy", guiFactory = "ellpeck.actuallyadditions.config.GuiFactory")
public class ActuallyAdditions{ public class ActuallyAdditions{
@Instance(ModUtil.MOD_ID) @Instance(ModUtil.MOD_ID)
@ -109,15 +108,9 @@ public class ActuallyAdditions{
proxy.postInit(event); proxy.postInit(event);
ModUtil.LOGGER.info("PostInitialization Finished."); ModUtil.LOGGER.info("PostInitialization Finished.");
FakePlayerUtil.info(); FakePlayerUtil.info();
} }
@EventHandler
public void onIMCReceived(FMLInterModComms.IMCEvent event){
InterModCommunications.processIMC(event.getMessages());
}
@EventHandler @EventHandler
public void serverStarting(FMLServerStartingEvent event){ public void serverStarting(FMLServerStartingEvent event){
Util.registerDispenserHandler(InitItems.itemBucketOil, new DispenserHandlerEmptyBucket()); Util.registerDispenserHandler(InitItems.itemBucketOil, new DispenserHandlerEmptyBucket());

2
src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java
View file

@ -16,8 +16,8 @@ import ellpeck.actuallyadditions.blocks.base.BlockStair;
import ellpeck.actuallyadditions.blocks.base.BlockWallAA; import ellpeck.actuallyadditions.blocks.base.BlockWallAA;
import ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; import ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks;
import ellpeck.actuallyadditions.config.values.ConfigBoolValues; import ellpeck.actuallyadditions.config.values.ConfigBoolValues;
import ellpeck.actuallyadditions.util.CompatUtil;
import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.ModUtil;
import ellpeck.actuallyadditions.util.compat.CompatUtil;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.item.EnumRarity; import net.minecraft.item.EnumRarity;

2
src/main/java/ellpeck/actuallyadditions/items/InitItems.java
View file

@ -18,8 +18,8 @@ import ellpeck.actuallyadditions.items.metalists.TheFoods;
import ellpeck.actuallyadditions.items.metalists.TheMiscItems; import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
import ellpeck.actuallyadditions.material.InitArmorMaterials; import ellpeck.actuallyadditions.material.InitArmorMaterials;
import ellpeck.actuallyadditions.material.InitToolMaterials; import ellpeck.actuallyadditions.material.InitToolMaterials;
import ellpeck.actuallyadditions.util.CompatUtil;
import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.ModUtil;
import ellpeck.actuallyadditions.util.compat.CompatUtil;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.EnumRarity; import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item; import net.minecraft.item.Item;

2
src/main/java/ellpeck/actuallyadditions/util/compat/CompatUtil.java → src/main/java/ellpeck/actuallyadditions/util/CompatUtil.java
View file

@ -8,7 +8,7 @@
* © 2015 Ellpeck * © 2015 Ellpeck
*/ */
package ellpeck.actuallyadditions.util.compat; package ellpeck.actuallyadditions.util;
import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLInterModComms;
import ellpeck.actuallyadditions.items.ItemSeed; import ellpeck.actuallyadditions.items.ItemSeed;