Skip to content

Commit

Permalink
spotless
Browse files Browse the repository at this point in the history
  • Loading branch information
EnderProyects committed Mar 6, 2023
1 parent 17454c4 commit 8e0818b
Show file tree
Hide file tree
Showing 150 changed files with 13,448 additions and 12,631 deletions.
57 changes: 31 additions & 26 deletions src/main/java/ab/AdvancedBotany.java
Original file line number Diff line number Diff line change
@@ -1,40 +1,45 @@
package ab;

import net.minecraft.creativetab.CreativeTabs;

import ab.common.core.proxy.CommonProxy;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraftforge.common.MinecraftForge;

@Mod (modid = AdvancedBotany.modid, name="Advanced Botany", version = AdvancedBotany.version, dependencies = "required-after:Botania", guiFactory = "ab.client.core.handler.GuiABFactory")
@Mod(
modid = AdvancedBotany.modid,
name = "Advanced Botany",
version = AdvancedBotany.version,
dependencies = "required-after:Botania",
guiFactory = "ab.client.core.handler.GuiABFactory")
public class AdvancedBotany {

public static final String modid = "AdvancedBotany";
public static final String version = "1.3.1.5";

@Mod.Instance("AdvancedBotany")
public static final String modid = "AdvancedBotany";
public static final String version = "1.3.1.5";

@Mod.Instance("AdvancedBotany")
public static AdvancedBotany instance;
@SidedProxy(clientSide = "ab.client.core.proxy.ClientProxy", serverSide = "ab.common.core.proxy.CommonProxy")

@SidedProxy(clientSide = "ab.client.core.proxy.ClientProxy", serverSide = "ab.common.core.proxy.CommonProxy")
public static CommonProxy proxy;
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) {
proxy.preInit(event);
}

@Mod.EventHandler
public void init(FMLInitializationEvent event) {
proxy.init(event);
}

@Mod.EventHandler
public void postInit(FMLPostInitializationEvent event) {
proxy.postInit(event);
}
public static final CreativeTabs tabAB = new AdvancedBotanyTab("tabAB");

@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) {
proxy.preInit(event);
}

@Mod.EventHandler
public void init(FMLInitializationEvent event) {
proxy.init(event);
}

@Mod.EventHandler
public void postInit(FMLPostInitializationEvent event) {
proxy.postInit(event);
}

public static final CreativeTabs tabAB = new AdvancedBotanyTab("tabAB");
}
31 changes: 15 additions & 16 deletions src/main/java/ab/AdvancedBotanyTab.java
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
package ab;

import ab.common.lib.register.BlockListAB;
import ab.common.lib.register.ItemListAB;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;

import ab.common.lib.register.BlockListAB;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class AdvancedBotanyTab extends CreativeTabs {

public AdvancedBotanyTab(String str) {
super(str);
this.setNoTitle();
this.setBackgroundImageName("ab.png");
}
@SideOnly(Side.CLIENT)
public Item getTabIconItem() {
return ItemBlock.getItemFromBlock(BlockListAB.blockABSpreader);
}
}
public AdvancedBotanyTab(String str) {
super(str);
this.setNoTitle();
this.setBackgroundImageName("ab.png");
}

@SideOnly(Side.CLIENT)
public Item getTabIconItem() {
return ItemBlock.getItemFromBlock(BlockListAB.blockABSpreader);
}
}
17 changes: 8 additions & 9 deletions src/main/java/ab/api/AchievementAB.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
package ab.api;

import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.Achievement;

import vazkii.botania.api.item.IRelic;

public class AchievementAB extends Achievement {

public AchievementAB(String name, int x, int y, ItemStack icon, Achievement parent) {
super("achievement.ab:" + name, "ab:" + name, x, y, icon, parent);
AdvancedBotanyAPI.achievements.add(this);
registerStat();
if(icon.getItem() instanceof IRelic)
((IRelic)icon.getItem()).setBindAchievement(this);
}

public AchievementAB(String name, int x, int y, ItemStack icon, Achievement parent) {
super("achievement.ab:" + name, "ab:" + name, x, y, icon, parent);
AdvancedBotanyAPI.achievements.add(this);
registerStat();
if (icon.getItem() instanceof IRelic) ((IRelic) icon.getItem()).setBindAchievement(this);
}
}
82 changes: 45 additions & 37 deletions src/main/java/ab/api/AdvancedBotanyAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
import java.util.ArrayList;
import java.util.List;

import ab.api.recipe.RecipeAdvancedPlate;
import ab.api.recipe.RecipeAncientAlphirine;
import ab.common.core.handler.ConfigABHandler;
import ab.common.lib.register.ItemListAB;
import net.minecraft.block.Block;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
Expand All @@ -15,39 +11,51 @@
import net.minecraft.stats.Achievement;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.common.util.EnumHelper;
import vazkii.botania.common.item.ModItems;

import ab.api.recipe.RecipeAdvancedPlate;
import ab.api.recipe.RecipeAncientAlphirine;
import ab.common.core.handler.ConfigABHandler;

public class AdvancedBotanyAPI {

public static List<RecipeAdvancedPlate> advancedPlateRecipes = new ArrayList<RecipeAdvancedPlate>();
public static List<RecipeAncientAlphirine> alphirineRecipes = new ArrayList<RecipeAncientAlphirine>();
public static List<TerraFarmlandList> farmlandList = new ArrayList<TerraFarmlandList>();
public static List<Achievement> achievements = new ArrayList<Achievement>();
public static List<ItemStack> relicList = new ArrayList<ItemStack>();
public static List<ItemStack> diceList = new ArrayList<ItemStack>();

public static Item.ToolMaterial mithrilToolMaterial = EnumHelper.addToolMaterial("MITHRIL", 7, -1, 8.0F, 4.0F, 24);
public static ItemArmor.ArmorMaterial nebulaArmorMaterial = EnumHelper.addArmorMaterial("NEBULA", 0, new int[] { (int)(3 * ConfigABHandler.protectionFactorNebula), (int)(8 * ConfigABHandler.protectionFactorNebula), (int)(6 * ConfigABHandler.protectionFactorNebula), (int)(3 * ConfigABHandler.protectionFactorNebula) }, 26);
public static ItemArmor.ArmorMaterial wildHundArmor = EnumHelper.addArmorMaterial("WILD_HUNT_MATERIAL", 34, new int[] { 7, 8, 3, 2 }, 26);

public static EnumRarity rarityNebula = EnumHelper.addRarity("NEBULA", EnumChatFormatting.LIGHT_PURPLE, "Nebula");
public static EnumRarity rarityWildHunt = EnumHelper.addRarity("WILD_HUNT", EnumChatFormatting.AQUA, "WildHunt");

public static RecipeAdvancedPlate registerAdvancedPlateRecipe(ItemStack output, ItemStack input1, ItemStack input2, ItemStack input3, int mana, int color) {
RecipeAdvancedPlate recipe = new RecipeAdvancedPlate(output, mana, color, input1, input2, input3);
advancedPlateRecipes.add(recipe);
return recipe;
}

public static RecipeAncientAlphirine registerAlphirineRecipe(ItemStack output, ItemStack input, int chance) {
RecipeAncientAlphirine recipe = new RecipeAncientAlphirine(output, input, chance);
alphirineRecipes.add(recipe);
return recipe;
}

public static TerraFarmlandList registerFarmlandSeed(Block block, int meta) {
TerraFarmlandList seed = new TerraFarmlandList(block, meta);
farmlandList.add(seed);
return seed;
}
}
public static List<RecipeAdvancedPlate> advancedPlateRecipes = new ArrayList<RecipeAdvancedPlate>();
public static List<RecipeAncientAlphirine> alphirineRecipes = new ArrayList<RecipeAncientAlphirine>();
public static List<TerraFarmlandList> farmlandList = new ArrayList<TerraFarmlandList>();
public static List<Achievement> achievements = new ArrayList<Achievement>();
public static List<ItemStack> relicList = new ArrayList<ItemStack>();
public static List<ItemStack> diceList = new ArrayList<ItemStack>();

public static Item.ToolMaterial mithrilToolMaterial = EnumHelper.addToolMaterial("MITHRIL", 7, -1, 8.0F, 4.0F, 24);
public static ItemArmor.ArmorMaterial nebulaArmorMaterial = EnumHelper.addArmorMaterial(
"NEBULA",
0,
new int[] { (int) (3 * ConfigABHandler.protectionFactorNebula),
(int) (8 * ConfigABHandler.protectionFactorNebula),
(int) (6 * ConfigABHandler.protectionFactorNebula),
(int) (3 * ConfigABHandler.protectionFactorNebula) },
26);
public static ItemArmor.ArmorMaterial wildHundArmor = EnumHelper
.addArmorMaterial("WILD_HUNT_MATERIAL", 34, new int[] { 7, 8, 3, 2 }, 26);

public static EnumRarity rarityNebula = EnumHelper.addRarity("NEBULA", EnumChatFormatting.LIGHT_PURPLE, "Nebula");
public static EnumRarity rarityWildHunt = EnumHelper.addRarity("WILD_HUNT", EnumChatFormatting.AQUA, "WildHunt");

public static RecipeAdvancedPlate registerAdvancedPlateRecipe(ItemStack output, ItemStack input1, ItemStack input2,
ItemStack input3, int mana, int color) {
RecipeAdvancedPlate recipe = new RecipeAdvancedPlate(output, mana, color, input1, input2, input3);
advancedPlateRecipes.add(recipe);
return recipe;
}

public static RecipeAncientAlphirine registerAlphirineRecipe(ItemStack output, ItemStack input, int chance) {
RecipeAncientAlphirine recipe = new RecipeAncientAlphirine(output, input, chance);
alphirineRecipes.add(recipe);
return recipe;
}

public static TerraFarmlandList registerFarmlandSeed(Block block, int meta) {
TerraFarmlandList seed = new TerraFarmlandList(block, meta);
farmlandList.add(seed);
return seed;
}
}
5 changes: 3 additions & 2 deletions src/main/java/ab/api/IBoundRender.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package ab.api;

import net.minecraft.util.ChunkCoordinates;

import vazkii.botania.api.wand.IWandBindable;

public interface IBoundRender extends IWandBindable {
public ChunkCoordinates[] getBlocksCoord();

public ChunkCoordinates[] getBlocksCoord();
}
9 changes: 5 additions & 4 deletions src/main/java/ab/api/IRankItem.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package ab.api;

import net.minecraft.item.ItemStack;

import vazkii.botania.api.mana.IManaItem;

public interface IRankItem extends IManaItem {
public int getLevel(ItemStack stack);
public int[] getLevels();

public int getLevel(ItemStack stack);

public int[] getLevels();
}
2 changes: 1 addition & 1 deletion src/main/java/ab/api/IRenderHud.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@

public interface IRenderHud {

public void renderHud(Minecraft mc, ScaledResolution res);
public void renderHud(Minecraft mc, ScaledResolution res);
}
30 changes: 15 additions & 15 deletions src/main/java/ab/api/TerraFarmlandList.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@

public class TerraFarmlandList {

Block block;
int meta;
public TerraFarmlandList(Block block, int meta) {
this.block = block;
this.meta = meta;
}
public Block getBlock() {
return block;
}
public int getMeta() {
return meta;
}
Block block;
int meta;

public TerraFarmlandList(Block block, int meta) {
this.block = block;
this.meta = meta;
}

public Block getBlock() {
return block;
}

public int getMeta() {
return meta;
}
}
Loading

0 comments on commit 8e0818b

Please sign in to comment.