Skip to content

Commit

Permalink
Revert "Allow mods to refresh ingredients when their tooltips change"
Browse files Browse the repository at this point in the history
This reverts commit ba905df.
  • Loading branch information
mezz committed Nov 12, 2016
1 parent ba905df commit fdd43c9
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 30 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Expand Up @@ -5,4 +5,4 @@ curse_project_id=238222

version_major=3
version_minor=13
version_patch=3
version_patch=2
7 changes: 0 additions & 7 deletions src/main/java/mezz/jei/IngredientInformation.java
Expand Up @@ -65,11 +65,4 @@ public static void onStart(boolean resourceReload) {
colorCache.clear();
}
}

public static void clearCachedIngredients(List<Object> ingredients) {
for (Object ingredient : ingredients) {
tooltipCache.remove(ingredient);
colorCache.remove(ingredient);
}
}
}
4 changes: 0 additions & 4 deletions src/main/java/mezz/jei/ProxyCommon.java
Expand Up @@ -34,10 +34,6 @@ public void restartJEI() {

}

public void reloadItemList() {

}

public void sendPacketToServer(PacketJei packet) {
Log.error("Tried to send packet to the server from the server: {}", packet);
}
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/mezz/jei/ProxyCommonClient.java
Expand Up @@ -134,8 +134,7 @@ private void restartJEI(boolean resourceReload) {
}
}

@Override
public void reloadItemList() {
private static void reloadItemList() {
JeiRuntime runtime = Internal.getRuntime();
if (runtime != null) {
ItemListOverlay itemListOverlay = runtime.getItemListOverlay();
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/mezz/jei/api/IItemListOverlay.java
Expand Up @@ -2,7 +2,6 @@

import javax.annotation.Nullable;
import java.util.Collection;
import java.util.List;

import com.google.common.collect.ImmutableList;
import net.minecraft.item.ItemStack;
Expand Down Expand Up @@ -45,10 +44,4 @@ public interface IItemListOverlay {
* Tells JEI which stacks to highlight
*/
void highlightStacks(Collection<ItemStack> stacks);

/**
* Refresh all cached data (tooltips, colors, etc) about a list of ingredients.
* @since JEI 3.13.3
*/
void refreshIngredients(List<Object> ingredients);
}
2 changes: 1 addition & 1 deletion src/main/java/mezz/jei/api/package-info.java
@@ -1,4 +1,4 @@
@API(apiVersion = "4.10.2", owner = "JEI", provides = "JustEnoughItemsAPI")
@API(apiVersion = "4.10.1", owner = "JEI", provides = "JustEnoughItemsAPI")
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
package mezz.jei.api;
Expand Down
8 changes: 0 additions & 8 deletions src/main/java/mezz/jei/gui/ItemListOverlay.java
Expand Up @@ -7,9 +7,7 @@
import java.util.Set;

import com.google.common.collect.ImmutableList;
import mezz.jei.IngredientInformation;
import mezz.jei.ItemFilter;
import mezz.jei.JustEnoughItems;
import mezz.jei.api.IItemListOverlay;
import mezz.jei.api.gui.IAdvancedGuiHandler;
import mezz.jei.api.ingredients.IIngredientRegistry;
Expand Down Expand Up @@ -103,12 +101,6 @@ public void highlightStacks(Collection<ItemStack> stacks) {
highlightedStacks.addAll(stacks);
}

@Override
public void refreshIngredients(List<Object> ingredients) {
IngredientInformation.clearCachedIngredients(ingredients);
JustEnoughItems.getProxy().reloadItemList();
}

public Set<ItemStack> getHighlightedStacks() {
return highlightedStacks;
}
Expand Down

0 comments on commit fdd43c9

Please sign in to comment.