Packages done: worldgen, utils, items, init, genetics & blocks. Now on to the hard part...

This commit is contained in:
Elec332 committed 2017-05-12 18:13:06 +02:00
1 parent a1aa3661d5
commit 1828ad9f3b
8 files changed
+71 -52

No files matched your search

+1 -1
View File
@@ -3,7 +3,6 @@ package binnie;
public final class Constants {
public static final String CORE_MOD_ID = "binniecore";
public static final String BOTANY_MOD_ID = "botany";
public static final String EXTRA_BEES_MOD_ID = "extrabees";
public static final String EXTRA_TREES_MOD_ID = "extratrees";
public static final String GENETICS_MOD_ID = "genetics";
@@ -13,4 +12,5 @@ public final class Constants {
public static final String LIQUID_CREOSOTE = "Creosote Oil";
public static final String LIQUID_BIO_ETHANOL = "bioethanol";
public static final String LIQUID_FOR_HONEY = "for.honey";
}
@@ -18,7 +18,6 @@ import binnie.extrabees.init.BlockRegister;
import binnie.extrabees.init.ItemRegister;
import binnie.extrabees.init.RecipeRegister;
import binnie.extrabees.items.ItemHoneyComb;
import binnie.extrabees.liquids.ModuleLiquids;
import binnie.extrabees.proxy.ExtraBeesProxy;
import binnie.extrabees.utils.MaterialBeehive;
import binnie.extrabees.utils.config.ConfigHandler;
@@ -33,19 +32,23 @@ import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import net.minecraftforge.fml.common.registry.GameRegistry;
@Mod(modid = Constants.EXTRA_BEES_MOD_ID, name = "Binnie's Extra Bees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID)
@Mod(modid = ExtraBees.MODID, name = "Binnie's Extra Bees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID)
public class ExtraBees extends AbstractMod {
public static final String MODID = "extrabees";
@SuppressWarnings("NullableProblems")
@Mod.Instance(Constants.EXTRA_BEES_MOD_ID)
@Mod.Instance(MODID)
public static ExtraBees instance;
@SuppressWarnings("NullableProblems")
@SidedProxy(clientSide = "binnie.extrabees.proxy.ExtraBeesProxyClient", serverSide = "binnie.extrabees.proxy.ExtraBeesProxyServer")
public static ExtraBeesProxy proxy;
public static ConfigHandler configHandler;
public static SimpleNetworkWrapper networkHandler;
public static Block hive;
public static Material materialBeehive;
@@ -96,7 +99,6 @@ public class ExtraBees extends AbstractMod {
@Override
protected void registerModules() {
this.addModule(new ModuleCore());
this.addModule(new ModuleLiquids());
this.addModule(new ModuleApiary());
}
@@ -122,7 +124,7 @@ public class ExtraBees extends AbstractMod {
@Override
public String getModID() {
return Constants.EXTRA_BEES_MOD_ID;
return MODID;
}
@Override
@@ -519,6 +519,13 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
}
public static class Birthday {
private Birthday(final int month, final int date, final String name) {
this.month = month;
this.date = date + 1;
this.name = name;
}
private final int month;
private final int date;
private final String name;
@@ -531,10 +538,5 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
return this.name;
}
private Birthday(final int month, final int date, final String name) {
this.month = month;
this.date = date + 1;
this.name = name;
}
}
}
@@ -1,13 +1,39 @@
package binnie.extrabees.liquids;
package binnie.extrabees.init;
import binnie.Binnie;
import binnie.Constants;
import binnie.core.liquid.FluidContainerType;
import binnie.core.liquid.ILiquidType;
import binnie.extrabees.ExtraBees;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
import binnie.extrabees.utils.ExtraBeesResourceLocation;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
/**
* Created by Elec332 on 12-5-2017.
*/
public final class FluidRegister {
//Fluids seem unused,
//TODO: find out what they were used for
public static Fluid acid, poison, liquid_nitrogen;
public static void preInitFluids(){
acid = createFluid("acid");
poison = createFluid("poison");
liquid_nitrogen = createFluid("liquidnitrogen");
}
private static Fluid createFluid(String name){
name = name.toLowerCase();
Fluid ret = new Fluid(name, new ExtraBeesResourceLocation("blocks/liquids/" + name), new ExtraBeesResourceLocation("blocks/liquids/" + name)){
@Override
public int getColor() {
return 16777215;
}
};
FluidRegistry.registerFluid(ret);
return ret;
}
/* Please leave here to verify it all works correctly
public enum ExtraBeeLiquid implements ILiquidType {
ACID("acid", 11528985),
POISON("poison", 15406315),
@@ -23,12 +49,12 @@ public enum ExtraBeeLiquid implements ILiquidType {
@Override
public ResourceLocation getFlowing() {
return new ResourceLocation(Constants.EXTRA_BEES_MOD_ID, "blocks/liquids/" + this.getIdentifier());
return new ExtraBeesResourceLocation("blocks/liquids/" + this.getIdentifier());
}
@Override
public ResourceLocation getStill() {
return new ResourceLocation(Constants.EXTRA_BEES_MOD_ID, "blocks/liquids/" + this.getIdentifier());
return new ExtraBeesResourceLocation("blocks/liquids/" + this.getIdentifier());
}
@Override
@@ -70,4 +96,7 @@ public enum ExtraBeeLiquid implements ILiquidType {
public int getContainerColour() {
return this.colour;
}
}*/
}
@@ -1,19 +0,0 @@
package binnie.extrabees.liquids;
import binnie.Binnie;
import binnie.core.IInitializable;
public class ModuleLiquids implements IInitializable {
@Override
public void preInit() {
Binnie.LIQUID.createLiquids(ExtraBeeLiquid.values());
}
@Override
public void init() {
}
@Override
public void postInit() {
}
}
@@ -1,10 +0,0 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.extrabees.liquids;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -1,7 +1,7 @@
package binnie.extrabees.proxy;
import binnie.Constants;
import binnie.core.models.ModelManager;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.genetics.ExtraBeesSpecies;
import forestry.api.apiculture.BeeManager;
import forestry.api.apiculture.EnumBeeType;
@@ -15,7 +15,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ExtraBeesProxyClient extends ExtraBeesProxy {
public static ModelManager modelManager = new ModelManager(Constants.EXTRA_BEES_MOD_ID);
public static ModelManager modelManager = new ModelManager(ExtraBees.MODID);
@Override
public void registerBeeModel(ExtraBeesSpecies type) {
@@ -0,0 +1,15 @@
package binnie.extrabees.utils;
import binnie.extrabees.ExtraBees;
import net.minecraft.util.ResourceLocation;
/**
* Created by Elec332 on 12-5-2017.
*/
public class ExtraBeesResourceLocation extends ResourceLocation {
public ExtraBeesResourceLocation(String resourceName) {
super(ExtraBees.MODID, resourceName);
}
}