Improve code readability in binnie.extratrees package

This commit is contained in:
kordum authored and mezz committed 2017-05-03 14:10:02 -07:00
1 parent adccdd181a
commit 96e4814ae3
225 files changed
+8968 -9306

No files matched your search

@@ -1,29 +1,76 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.extratrees.carpentry;
import binnie.extratrees.api.IDesignSystem;
import binnie.core.block.TileEntityMetadata;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraft.item.ItemStack;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.CarpentryManager;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.client.IItemRenderer;
import binnie.core.block.MultipassItemRenderer;
import net.minecraft.item.Item;
import binnie.core.BinnieCore;
import net.minecraft.block.Block;
import cpw.mods.fml.common.registry.GameRegistry;
import binnie.core.block.ItemMetadata;
import binnie.extratrees.ExtraTrees;
import binnie.core.IInitializable;
import binnie.core.block.ItemMetadata;
import binnie.core.block.MultipassItemRenderer;
import binnie.core.block.TileEntityMetadata;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.CarpentryManager;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.api.IDesignSystem;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.ForgeDirection;
public class ModuleCarpentry implements IInitializable {
static {
CarpentryManager.carpentryInterface = new CarpentryInterface();
}
public static ItemStack getItemStack(BlockDesign block, IDesignMaterial type1, IDesignMaterial type2, IDesign design) {
return getItemStack(block, block.getDesignSystem().getMaterialIndex(type1), block.getDesignSystem().getMaterialIndex(type2), CarpentryManager.carpentryInterface.getDesignIndex(design));
}
public static ItemStack getItemStack(BlockDesign block, int type1, int type2, int design) {
return TileEntityMetadata.getItemStack(block, getMetadata(type1, type2, design, 0, ForgeDirection.UP.ordinal()));
}
public static ItemStack getItemStack(BlockDesign blockC, DesignBlock block) {
return getItemStack(blockC, block.getPrimaryMaterial(), block.getSecondaryMaterial(), block.getDesign());
}
public static int getMetadata(int plank1, int plank2, int design, int rotation, int facing) {
return plank1 + (plank2 << 8) + (design << 16) + (rotation << 26) + (facing << 28);
}
public static DesignBlock getDesignBlock(IDesignSystem system, int meta) {
int plankID1 = meta & 0xFF;
int plankID2 = meta >> 8 & 0xFF;
int tile = meta >> 16 & 0x3FF;
int rotation = meta >> 26 & 0x3;
int axis = meta >> 28 & 0x7;
IDesignMaterial type1 = system.getMaterial(plankID1);
IDesignMaterial type2 = system.getMaterial(plankID2);
IDesign type3 = CarpentryManager.carpentryInterface.getDesign(tile);
return new DesignBlock(system, type1, type2, type3, rotation, ForgeDirection.getOrientation(axis));
}
public static DesignBlock getCarpentryPanel(IDesignSystem system, int meta) {
DesignBlock block = getDesignBlock(system, meta);
block.setPanel();
return block;
}
public static int getBlockMetadata(IDesignSystem system, DesignBlock block) {
int plank1 = system.getMaterialIndex(block.getPrimaryMaterial());
int plank2 = system.getMaterialIndex(block.getSecondaryMaterial());
int design = CarpentryManager.carpentryInterface.getDesignIndex(block.getDesign());
int rotation = block.getRotation();
int facing = block.getFacing().ordinal();
return getMetadata(plank1, plank2, design, rotation, facing);
}
public static int getItemMetadata(IDesignSystem system, DesignBlock block) {
int plank1 = system.getMaterialIndex(block.getPrimaryMaterial());
int plank2 = system.getMaterialIndex(block.getSecondaryMaterial());
int design = CarpentryManager.carpentryInterface.getDesignIndex(block.getDesign());
return getMetadata(plank1, plank2, design, 0, ForgeDirection.UP.ordinal());
}
public class ModuleCarpentry implements IInitializable
{
@Override
public void preInit() {
ExtraTrees.blockCarpentry = new BlockCarpentry();
@@ -40,73 +87,19 @@ public class ModuleCarpentry implements IInitializable
@Override
public void init() {
// ignored
}
@Override
public void postInit() {
for (final EnumDesign design : EnumDesign.values()) {
for (EnumDesign design : EnumDesign.values()) {
CarpentryManager.carpentryInterface.registerDesign(design.ordinal(), design);
}
}
public static ItemStack getItemStack(final BlockDesign block, final IDesignMaterial type1, final IDesignMaterial type2, final IDesign design) {
return getItemStack(block, block.getDesignSystem().getMaterialIndex(type1), block.getDesignSystem().getMaterialIndex(type2), CarpentryManager.carpentryInterface.getDesignIndex(design));
}
public static ItemStack getItemStack(final BlockDesign block, final int type1, final int type2, final int design) {
return TileEntityMetadata.getItemStack(block, getMetadata(type1, type2, design, 0, ForgeDirection.UP.ordinal()));
}
public static ItemStack getItemStack(final BlockDesign blockC, final DesignBlock block) {
return getItemStack(blockC, block.getPrimaryMaterial(), block.getSecondaryMaterial(), block.getDesign());
}
public static int getMetadata(final int plank1, final int plank2, final int design, final int rotation, final int facing) {
return plank1 + (plank2 << 8) + (design << 16) + (rotation << 26) + (facing << 28);
}
public static DesignBlock getDesignBlock(final IDesignSystem system, final int meta) {
final int plankID1 = meta & 0xFF;
final int plankID2 = meta >> 8 & 0xFF;
final int tile = meta >> 16 & 0x3FF;
final int rotation = meta >> 26 & 0x3;
final int axis = meta >> 28 & 0x7;
final IDesignMaterial type1 = system.getMaterial(plankID1);
final IDesignMaterial type2 = system.getMaterial(plankID2);
final IDesign type3 = CarpentryManager.carpentryInterface.getDesign(tile);
return new DesignBlock(system, type1, type2, type3, rotation, ForgeDirection.getOrientation(axis));
}
public static DesignBlock getCarpentryPanel(final IDesignSystem system, final int meta) {
final DesignBlock block = getDesignBlock(system, meta);
block.setPanel();
return block;
}
public static int getBlockMetadata(final IDesignSystem system, final DesignBlock block) {
final int plank1 = system.getMaterialIndex(block.getPrimaryMaterial());
final int plank2 = system.getMaterialIndex(block.getSecondaryMaterial());
final int design = CarpentryManager.carpentryInterface.getDesignIndex(block.getDesign());
final int rotation = block.getRotation();
final int facing = block.getFacing().ordinal();
return getMetadata(plank1, plank2, design, rotation, facing);
}
public static int getItemMetadata(final IDesignSystem system, final DesignBlock block) {
final int plank1 = system.getMaterialIndex(block.getPrimaryMaterial());
final int plank2 = system.getMaterialIndex(block.getSecondaryMaterial());
final int design = CarpentryManager.carpentryInterface.getDesignIndex(block.getDesign());
return getMetadata(plank1, plank2, design, 0, ForgeDirection.UP.ordinal());
}
static {
CarpentryManager.carpentryInterface = new CarpentryInterface();
}
enum Axis
{
enum Axis {
Y,
X,
Z;
Z
}
}