Improve code readability for binnie.core package (#14)

This commit is contained in:
Alexander Kornilov authored and mezz committed 2017-04-22 18:31:40 -07:00
1 parent a610833a24
commit d251d83105
241 files changed
+5085 -5971

No files matched your search

+23 -30
View File
@@ -1,44 +1,38 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.core;
import cpw.mods.fml.common.versioning.ArtifactVersion;
import cpw.mods.fml.common.versioning.Restriction;
import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
import cpw.mods.fml.common.Loader;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
import cpw.mods.fml.common.versioning.Restriction;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
public class Mods
{
public class Mods {
public static Mod Forestry;
public static Mod IC2;
public static Mod Botania;
private static boolean WARN;
private static Item findItem(final String modId, final String name) {
final Item stack = GameRegistry.findItem(modId, name);
if (stack == null && Mods.WARN && modId == "Forestry") {
private static Item findItem(String modId, String name) {
Item stack = GameRegistry.findItem(modId, name);
if (stack == null && Mods.WARN && modId.equals("Forestry")) {
throw new RuntimeException("Item not found: " + modId + ":" + name);
}
return stack;
}
private static ItemStack findItemStack(final String modId, final String name, final int stackSize) {
final ItemStack stack = GameRegistry.findItemStack(modId, name, stackSize);
if (stack == null && Mods.WARN && modId == "Forestry") {
private static ItemStack findItemStack(String modId, String name, int stackSize) {
ItemStack stack = GameRegistry.findItemStack(modId, name, stackSize);
if (stack == null && Mods.WARN && modId.equals("Forestry")) {
throw new RuntimeException("Stack not found: " + modId + ":" + name);
}
return stack;
}
private static Block findBlock(final String modId, final String name) {
final Block stack = GameRegistry.findBlock(modId, name);
if (stack == null && Mods.WARN && modId == "Forestry") {
private static Block findBlock(String modId, String name) {
Block stack = GameRegistry.findBlock(modId, name);
if (stack == null && Mods.WARN && modId.equals("Forestry")) {
throw new RuntimeException("Block not found: " + modId + ":" + name);
}
return stack;
@@ -48,8 +42,8 @@ public class Mods
Mods.Forestry = new Mod("Forestry") {
@Override
public boolean dev() {
final String forVersion = Loader.instance().getIndexedModList().get("Forestry").getVersion();
final Restriction rest = new Restriction(new DefaultArtifactVersion("3.6"), true, (ArtifactVersion) null, false);
String forVersion = Loader.instance().getIndexedModList().get("Forestry").getVersion();
Restriction rest = new Restriction(new DefaultArtifactVersion("3.6"), true, null, false);
return rest.containsVersion(new DefaultArtifactVersion(forVersion));
}
};
@@ -58,31 +52,30 @@ public class Mods
Mods.WARN = true;
}
public static class Mod
{
public static class Mod {
private String id;
private Mod(final String id) {
private Mod(String id) {
this.id = id;
}
public Item item(final String name) {
public Item item(String name) {
return findItem(this.id, name);
}
public Block block(final String name) {
public Block block(String name) {
return findBlock(this.id, name);
}
public ItemStack stack(final String name, final int stackSize) {
public ItemStack stack(String name, int stackSize) {
return findItemStack(this.id, name, stackSize);
}
public ItemStack stack(final String name) {
public ItemStack stack(String name) {
return this.stack(name, 1);
}
public ItemStack stack(final String string, final int i, final int j) {
public ItemStack stack(String string, int i, int j) {
return new ItemStack(this.item(string), i, j);
}