From 0710ab56e7e8f76670dab785b907ccfe868ad1d5 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Fri, 22 Nov 2019 17:23:51 +0800 Subject: 3.2.9 --- .../java/me/shedaniel/rei/impl/RecipeHelperImpl.java | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java') diff --git a/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java b/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java index a50ecfd82..95317d17c 100644 --- a/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java +++ b/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java @@ -52,7 +52,7 @@ public class RecipeHelperImpl implements RecipeHelper { private final AtomicInteger recipeCount = new AtomicInteger(); private final Map> recipeCategoryListMap = Maps.newHashMap(); private final List> categories = Lists.newArrayList(); - private final Map speedCraftAreaSupplierMap = Maps.newHashMap(); + private final Map autoCraftAreaSupplierMap = Maps.newHashMap(); private final Map>> categoryWorkingStations = Maps.newHashMap(); private final List displayVisibilityHandlers = Lists.newArrayList(); private final List> liveRecipeGenerators = Lists.newArrayList(); @@ -202,24 +202,18 @@ public class RecipeHelperImpl implements RecipeHelper { @Override public Optional getAutoCraftButtonArea(RecipeCategory category) { - if (!speedCraftAreaSupplierMap.containsKey(category.getIdentifier())) + if (!autoCraftAreaSupplierMap.containsKey(category.getIdentifier())) return Optional.ofNullable(bounds -> new Rectangle(bounds.getMaxX() - 16, bounds.getMaxY() - 16, 10, 10)); - return Optional.ofNullable(speedCraftAreaSupplierMap.get(category.getIdentifier())); + return Optional.ofNullable(autoCraftAreaSupplierMap.get(category.getIdentifier())); } @Override public void registerAutoCraftButtonArea(Identifier category, ButtonAreaSupplier rectangle) { if (rectangle == null) { - if (speedCraftAreaSupplierMap.containsKey(category)) - speedCraftAreaSupplierMap.remove(category); + if (autoCraftAreaSupplierMap.containsKey(category)) + autoCraftAreaSupplierMap.remove(category); } else - speedCraftAreaSupplierMap.put(category, rectangle); - } - - @SuppressWarnings("deprecation") - @Override - public void registerDefaultSpeedCraftButtonArea(Identifier category) { - registerAutoCraftButtonArea(category, bounds -> new Rectangle(bounds.getMaxX() - 16, bounds.getMaxY() - 16, 10, 10)); + autoCraftAreaSupplierMap.put(category, rectangle); } @SuppressWarnings("deprecation") @@ -229,7 +223,7 @@ public class RecipeHelperImpl implements RecipeHelper { this.recipeManager = recipeManager; this.recipeCategoryListMap.clear(); this.categories.clear(); - this.speedCraftAreaSupplierMap.clear(); + this.autoCraftAreaSupplierMap.clear(); this.screenClickAreas.clear(); this.categoryWorkingStations.clear(); this.recipeFunctions.clear(); -- cgit