upstream/Binnie
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Binnie.git synced 2026-11-15 17:55:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve code readability in binnie.botany package

Browse Source
This commit is contained in:
kordum authored and mezz committed 2017-04-28 17:45:38 -07:00
1 parent e05bf8bb7b
commit b609d6688f
93 files changed
+3594 -3838
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java
+31 -39
View File
@@ -1,36 +1,32 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.botany.ceramic;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import binnie.botany.items.BotanyItems;
import net.minecraft.item.ItemStack;
import binnie.botany.Botany;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.botany.items.BotanyItems;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
import net.minecraft.client.renderer.texture.IIconRegister;
import binnie.extratrees.carpentry.EnumPattern;
import binnie.extratrees.api.IPattern;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.carpentry.DesignerManager;
import java.util.HashMap;
import net.minecraft.util.IIcon;
import java.util.Map;
import binnie.extratrees.api.IDesignSystem;
import binnie.extratrees.api.IPattern;
import binnie.extratrees.carpentry.DesignerManager;
import binnie.extratrees.carpentry.EnumPattern;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
public class CeramicDesignSystem implements IDesignSystem
{
public static CeramicDesignSystem instance;
Map<Integer, IIcon> primary;
Map<Integer, IIcon> secondary;
import java.util.HashMap;
import java.util.Map;
public class CeramicDesignSystem implements IDesignSystem {
public static CeramicDesignSystem instance = new CeramicDesignSystem();
protected Map<Integer, IIcon> primary;
protected Map<Integer, IIcon> secondary;
CeramicDesignSystem() {
this.primary = new HashMap<Integer, IIcon>();
this.secondary = new HashMap<Integer, IIcon>();
primary = new HashMap<>();
secondary = new HashMap<>();
DesignerManager.instance.registerDesignSystem(this);
}
@@ -45,12 +41,12 @@ public class CeramicDesignSystem implements IDesignSystem
}
@Override
public IDesignMaterial getMaterial(final int id) {
public IDesignMaterial getMaterial(int id) {
return CeramicColor.get(EnumFlowerColor.get(id));
}
@Override
public int getMaterialIndex(final IDesignMaterial id) {
public int getMaterialIndex(IDesignMaterial id) {
return ((CeramicColor) id).color.ordinal();
}
@@ -59,26 +55,26 @@ public class CeramicDesignSystem implements IDesignSystem
}
@Override
public IIcon getPrimaryIcon(final IPattern pattern) {
public IIcon getPrimaryIcon(IPattern pattern) {
if (pattern instanceof EnumPattern) {
return this.primary.get(((EnumPattern) pattern).ordinal());
return primary.get(((EnumPattern) pattern).ordinal());
}
return null;
}
@Override
public IIcon getSecondaryIcon(final IPattern pattern) {
public IIcon getSecondaryIcon(IPattern pattern) {
if (pattern instanceof EnumPattern) {
return this.secondary.get(((EnumPattern) pattern).ordinal());
return secondary.get(((EnumPattern) pattern).ordinal());
}
return null;
}
@Override
public void registerIcons(final IIconRegister register) {
for (final EnumPattern pattern : EnumPattern.values()) {
this.primary.put(pattern.ordinal(), BinnieCore.proxy.getIcon(register, this.getMod().getModID(), this.getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0"));
this.secondary.put(pattern.ordinal(), BinnieCore.proxy.getIcon(register, this.getMod().getModID(), this.getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1"));
public void registerIcons(IIconRegister register) {
for (EnumPattern pattern : EnumPattern.values()) {
primary.put(pattern.ordinal(), BinnieCore.proxy.getIcon(register, getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0"));
secondary.put(pattern.ordinal(), BinnieCore.proxy.getIcon(register, getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1"));
}
}
@@ -92,11 +88,7 @@ public class CeramicDesignSystem implements IDesignSystem
}
@Override
public IDesignMaterial getMaterial(final ItemStack itemStack) {
return (itemStack.getItem() == Item.getItemFromBlock(Botany.ceramic)) ? this.getMaterial(itemStack.getItemDamage()) : null;
}
static {
CeramicDesignSystem.instance = new CeramicDesignSystem();
public IDesignMaterial getMaterial(ItemStack stack) {
return (stack.getItem() == Item.getItemFromBlock(Botany.ceramic)) ? getMaterial(stack.getItemDamage()) : null;
}
}