upstream/ForestryMC
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ForestryMC.git synced 2026-11-14 01:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #881 Update codebase to Java 7

Browse Source
This commit is contained in:
mezz committed 2015-10-10 22:49:09 -07:00
1 parent 9ecab0fecd
commit 3f0dc9e74f
185 files changed
+427 -414
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/forestry/plugins/PluginApiculture.java
+6 -6
View File
@@ -175,8 +175,8 @@ public class PluginApiculture extends ForestryPlugin {
private static MachineDefinition definitionBeehouse;
private static MachineDefinition definitionAnalyzer;
private final Map<String, String[]> defaultAcceptedFlowers = new HashMap<String, String[]>();
private final Map<String, String[]> defaultPlantableFlowers = new HashMap<String, String[]>();
private final Map<String, String[]> defaultAcceptedFlowers = new HashMap<>();
private final Map<String, String[]> defaultPlantableFlowers = new HashMap<>();
@Override
@SuppressWarnings({"unchecked"})
@@ -188,7 +188,7 @@ public class PluginApiculture extends ForestryPlugin {
FlowerManager.flowerRegistry = new FlowerRegistry();
BeeManager.villageBees = new ArrayList[]{new ArrayList<IBeeGenome>(), new ArrayList<IBeeGenome>()};
BeeManager.villageBees = new ArrayList[]{new ArrayList<>(), new ArrayList<>()};
BeeManager.beeFactory = new BeeFactory();
BeeManager.beeMutationFactory = new BeeMutationFactory();
@@ -436,8 +436,8 @@ public class PluginApiculture extends ForestryPlugin {
for (String flowerType : FlowerManager.flowerRegistry.getFlowerTypes()) {
Set<IFlower> flowers = FlowerManager.flowerRegistry.getAcceptableFlowers(flowerType);
List<String> acceptedFlowerNames = new ArrayList<String>();
List<String> plantableFlowerNames = new ArrayList<String>();
List<String> acceptedFlowerNames = new ArrayList<>();
List<String> plantableFlowerNames = new ArrayList<>();
if (flowers != null) {
for (IFlower flower : flowers) {
String name = GameData.getBlockRegistry().getNameForObject(flower.getBlock());
@@ -881,7 +881,7 @@ public class PluginApiculture extends ForestryPlugin {
}
private static IRecipe[] createAlyzerRecipes(Block block, int meta) {
ArrayList<IRecipe> recipes = new ArrayList<IRecipe>();
ArrayList<IRecipe> recipes = new ArrayList<>();
recipes.add(ShapedRecipeCustom.createShapedRecipe(new ItemStack(block, 1, meta), "XTX", " Y ", "X X", 'Y', ForestryItem.sturdyCasing, 'T', ForestryItem.beealyzer, 'X', "ingotBronze"));
recipes.add(ShapedRecipeCustom.createShapedRecipe(new ItemStack(block, 1, meta), "XTX", " Y ", "X X", 'Y', ForestryItem.sturdyCasing, 'T', ForestryItem.treealyzer, 'X', "ingotBronze"));
return recipes.toArray(new IRecipe[recipes.size()]);