diff --git a/src/tconstruct/TConstruct.java b/src/tconstruct/TConstruct.java index 7e3cc1b9..179008e0 100644 --- a/src/tconstruct/TConstruct.java +++ b/src/tconstruct/TConstruct.java @@ -113,10 +113,10 @@ public class TConstruct if (PHConstruct.addToVillages) { - // adds to the villager spawner egg - VillagerRegistry.instance().registerVillagerId(78943); - // moved down, not needed if 'addToVillages' is false - VillagerRegistry.instance().registerVillageTradeHandler(78943, new TVillageTrades()); + // adds to the villager spawner egg + VillagerRegistry.instance().registerVillagerId(78943); + // moved down, not needed if 'addToVillages' is false + VillagerRegistry.instance().registerVillageTradeHandler(78943, new TVillageTrades()); VillagerRegistry.instance().registerVillageCreationHandler(new VillageToolStationHandler()); VillagerRegistry.instance().registerVillageCreationHandler(new VillageSmelteryHandler()); try diff --git a/src/tconstruct/worldgen/village/TVillageTrades.java b/src/tconstruct/worldgen/village/TVillageTrades.java index 1591564d..8f73c0bf 100644 --- a/src/tconstruct/worldgen/village/TVillageTrades.java +++ b/src/tconstruct/worldgen/village/TVillageTrades.java @@ -20,25 +20,25 @@ public class TVillageTrades implements IVillageTradeHandler private final int min = 7; public TVillageTrades() { - super(); + super(); - // vanilla blocks - allowedIngredients.add(new ItemStack(Block.pistonBase, 64)); + // vanilla blocks + allowedIngredients.add(new ItemStack(Block.pistonBase, 64)); allowedIngredients.add(new ItemStack(Block.pistonStickyBase, 64)); - // tconstruct blocks - allowedIngredients.add(new ItemStack(TContent.barricadeBirch, 64)); - allowedIngredients.add(new ItemStack(TContent.barricadeJungle, 64)); - allowedIngredients.add(new ItemStack(TContent.barricadeOak, 64)); - allowedIngredients.add(new ItemStack(TContent.barricadeSpruce, 64)); - allowedIngredients.add(new ItemStack(TContent.punji, 64)); - allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 0)); - allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 1)); - allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 5)); - allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 10)); - for (int sc = 0; sc < 4; sc++) { - allowedIngredients.add(new ItemStack(TContent.landmine, 64, sc)); - } + // tconstruct blocks + allowedIngredients.add(new ItemStack(TContent.barricadeBirch, 64)); + allowedIngredients.add(new ItemStack(TContent.barricadeJungle, 64)); + allowedIngredients.add(new ItemStack(TContent.barricadeOak, 64)); + allowedIngredients.add(new ItemStack(TContent.barricadeSpruce, 64)); + allowedIngredients.add(new ItemStack(TContent.punji, 64)); + allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 0)); + allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 1)); + allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 5)); + allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 10)); + for (int sc = 0; sc < 4; sc++) { + allowedIngredients.add(new ItemStack(TContent.landmine, 64, sc)); + } } @Override @@ -46,67 +46,67 @@ public class TVillageTrades implements IVillageTradeHandler { if (villager.getProfession() == 78943) { - ItemStack ingredient; - ItemStack ingredient2; - ItemStack result; + ItemStack ingredient; + ItemStack ingredient2; + ItemStack result; - for (int sc = 8; sc < 12; sc++) { - int num = getNextInt(random, min, max); + for (int sc = 8; sc < 12; sc++) { + int num = getNextInt(random, min, max); - ingredient = getIngredient(random, num); - if (ingredient.stackSize < 13) { - ingredient2 = getIngredient(random, ingredient); - } else { - ingredient2 = null; - } - result = new ItemStack(TContent.oreBerry, calcStackSize(ingredient, ingredient2), sc); - // adds iron, gold, copper & tin orebushes to the recipe list - recipeList.addToListWithCheck(new MerchantRecipe(ingredient, ingredient2, result)); + ingredient = getIngredient(random, num); + if (ingredient.stackSize < 13) { + ingredient2 = getIngredient(random, ingredient); + } else { + ingredient2 = null; + } + result = new ItemStack(TContent.oreBerry, calcStackSize(ingredient, ingredient2), sc); + // adds iron, gold, copper & tin orebushes to the recipe list + recipeList.addToListWithCheck(new MerchantRecipe(ingredient, ingredient2, result)); - if (sc == 8) { - // adds alumine orebush to the recipe list - result = new ItemStack(TContent.oreBerrySecond, calcStackSize(ingredient, ingredient2), sc); - recipeList.addToListWithCheck(new MerchantRecipe(ingredient, ingredient2, result)); - } - } + if (sc == 8) { + // adds alumine orebush to the recipe list + result = new ItemStack(TContent.oreBerrySecond, calcStackSize(ingredient, ingredient2), sc); + recipeList.addToListWithCheck(new MerchantRecipe(ingredient, ingredient2, result)); + } + } } } - private int calcStackSize(ItemStack ingredient, ItemStack ingredient2) { - if (ingredient == null) return 1; - int num = ingredient.stackSize; - if (ingredient2 != null) - num += ingredient2.stackSize; + private int calcStackSize(ItemStack ingredient, ItemStack ingredient2) { + if (ingredient == null) return 1; + int num = ingredient.stackSize; + if (ingredient2 != null) + num += ingredient2.stackSize; - return Math.max(1, Math.round((num - 5) / 4)); - } + return Math.max(1, Math.round((num - 5) / 4)); + } private ItemStack getIngredient(Random random, ItemStack ingredient) { - int sc; - ItemStack is; - int tries = 0; - while (true) { - sc = getNextInt(random, 0, allowedIngredients.size() - 1); - is = allowedIngredients.get(sc); + int sc; + ItemStack is; + int tries = 0; + while (true) { + sc = getNextInt(random, 0, allowedIngredients.size() - 1); + is = allowedIngredients.get(sc); - if (is.itemID != ingredient.itemID || is.getItemDamage() != ingredient.getItemDamage()) - break; + if (is.itemID != ingredient.itemID || is.getItemDamage() != ingredient.getItemDamage()) + break; - tries++; - if (tries == 5) - return null; - } - int num = getNextInt(random, 0, Math.min(is.stackSize , max - ingredient.stackSize)); - return is.copy().splitStack(num); + tries++; + if (tries == 5) + return null; + } + int num = getNextInt(random, 0, Math.min(is.stackSize , max - ingredient.stackSize)); + return is.copy().splitStack(num); } - private ItemStack getIngredient(Random random, int num) { - int sc = getNextInt(random, 0, allowedIngredients.size() - 1); - ItemStack item = allowedIngredients.get(sc); - return item.copy().splitStack(Math.min(num, item.stackSize)); - } + private ItemStack getIngredient(Random random, int num) { + int sc = getNextInt(random, 0, allowedIngredients.size() - 1); + ItemStack item = allowedIngredients.get(sc); + return item.copy().splitStack(Math.min(num, item.stackSize)); + } - private int getNextInt(Random random, int min, int max) { - return random.nextInt(Math.max(1, (max - min) + 1)) + min; - } + private int getNextInt(Random random, int min, int max) { + return random.nextInt(Math.max(1, (max - min) + 1)) + min; + } }