Incomplete recipe filling functionality.

Author: MartinSVK12

gradle.properties

@@ -15,6 +15,6 @@ mod_menu_version=3.0.0
 halplibe_version=5.2.4
 
 # Mod
-mod_version=2.0.0
+mod_version=2.1.0
 mod_group=turing
 mod_name=tmb

src/main/java/turing/tmb/TMB.java

@@ -65,6 +65,7 @@ public static void onClientStart() {
 		category.withComponent(new KeyBindingComponent(((IKeybinds) settings).toomanyblocks$getKeyAddFavourite()));
 		category.withComponent(new KeyBindingComponent(((IKeybinds) settings).toomanyblocks$getKeySetDefaultRecipe()));
 		category.withComponent(new KeyBindingComponent(((IKeybinds) settings).toomanyblocks$getKeyShowRecipeTree()));
+		category.withComponent(new KeyBindingComponent(((IKeybinds) settings).toomanyblocks$getKeyFillRecipe()));
 		OptionsPages.CONTROLS.withComponent(category);
 		OptionsCategory category1 = new OptionsCategory("gui.options.page.general.category.tmb");
 		category1.withComponent(new BooleanOptionComponent(((IKeybinds) settings).toomanyblocks$getIsRecipeViewEnabled()));

src/main/java/turing/tmb/api/ISupportsRecipeFilling.java

@@ -0,0 +1,7 @@
+package turing.tmb.api;
+
+import turing.tmb.api.recipe.IRecipeTranslator;
+
+public interface ISupportsRecipeFilling {
+	void fillRecipe(IRecipeTranslator<?> recipe);
+}

src/main/java/turing/tmb/client/ScreenTMBRecipe.java

@@ -18,6 +18,7 @@
 import turing.tmb.RecipeIngredient;
 import turing.tmb.TMB;
 import turing.tmb.TooltipBuilder;
+import turing.tmb.api.ISupportsRecipeFilling;
 import turing.tmb.api.drawable.IIngredientList;
 import turing.tmb.api.drawable.builder.ITooltipBuilder;
 import turing.tmb.api.ingredient.IIngredientRenderer;
@@ -53,6 +54,7 @@ public class ScreenTMBRecipe extends Screen {
 	private final ButtonElement tabLeftButton = new ButtonElement(2, 0, 0, "<");
 	private final ButtonElement tabRightButton = new ButtonElement(3, 0, 0, ">");
 	private String tooltip = "";
+	private int debounce = 10;
 
 	public ScreenTMBRecipe(Screen parent) {
 		super(parent);
@@ -220,6 +222,9 @@ private void scroll(int direction) {
 	@Override
 	@SuppressWarnings("unchecked")
 	public void render(int mx, int my, float partialTick) {
+		if(debounce > 0){
+			debounce--;
+		}
 		renderBackground();
 		GL11.glEnable(3042);
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
@@ -440,6 +445,7 @@ private void renderTab(int x, int mx, int my, boolean selected, IRecipeCategory<
 
 	@Override
 	public void keyPressed(char eventCharacter, int eventKey, int mx, int my) {
+		if(debounce > 0) return;
 		if (eventKey == Keyboard.KEY_BACK) {
 			mc.displayScreen(getParentScreen());
 		} else if (eventKey == Keyboard.KEY_ESCAPE || eventKey == mc.gameSettings.keyInventory.getKeyCode()) {
@@ -450,6 +456,26 @@ public void keyPressed(char eventCharacter, int eventKey, int mx, int my) {
 			mc.displayScreen(s);
 		}
 
+		if(eventKey == ((IKeybinds) mc.gameSettings).toomanyblocks$getKeyFillRecipe().getKeyCode()){
+			Screen s = getParentScreen();
+			while (s instanceof ScreenTMBRecipe) {
+				s = s.getParentScreen();
+			}
+			if(s instanceof ISupportsRecipeFilling){
+				for (int i = 0; i < drawnIngredients.size(); i++) {
+					Pair<ITypedIngredient<?>, Pair<Integer, Integer>> drawn = drawnIngredients.get(i);
+					RecipeIngredient recipeIngredient = recipeIngredients.get(i);
+					if (mx >= drawn.getRight().getLeft() && my >= drawn.getRight().getRight() && mx < drawn.getRight().getLeft() + 16 && my < drawn.getRight().getRight() + 16) {
+						if (recipeIngredient.recipe != null) {
+							mc.displayScreen(s);
+							((ISupportsRecipeFilling) s).fillRecipe(recipeIngredient.recipe);
+							break;
+						}
+					}
+				}
+			}
+		}
+
 		if (eventKey == ((IKeybinds)mc.gameSettings).toomanyblocks$getKeyShowRecipeTree().getKeyCode()){
 			for (int i = 0; i < drawnIngredients.size(); i++) {
 				Pair<ITypedIngredient<?>, Pair<Integer, Integer>> drawn = drawnIngredients.get(i);
@@ -511,8 +537,10 @@ public void keyPressed(char eventCharacter, int eventKey, int mx, int my) {
 				Pair<ITypedIngredient<?>, Pair<Integer, Integer>> drawn = drawnIngredients.get(i);
 				if (mx >= drawn.getRight().getLeft() && my >= drawn.getRight().getRight() && mx < drawn.getRight().getLeft() + 16 && my < drawn.getRight().getRight() + 16) {
 					if (eventKey == mc.gameSettings.keyShowUsage.getKeyCode()) {
+						debounce = 10;
 						TMB.getRuntime().showRecipe(drawn.getLeft(), RecipeIngredientRole.INPUT);
 					} else {
+						debounce = 10;
 						TMB.getRuntime().showRecipe(drawn.getLeft(), RecipeIngredientRole.OUTPUT);
 					}
 					break;

src/main/java/turing/tmb/client/TMBRenderer.java

@@ -233,10 +233,12 @@ public static void renderItems(int mouseX, int mouseY, int width, int height, Mi
 				GL11.glPopMatrix();
 			}
 
-			if (enabledRecipes) {
+			if (enabledRecipes && debounce <= 0) {
 				if (mc.gameSettings.keyShowRecipe.isPressed()) {
+					debounce = 20;
 					runtime.showRecipe(hoveredItem, RecipeIngredientRole.OUTPUT);
 				} else if (mc.gameSettings.keyShowUsage.isPressed()) {
+					debounce = 20;
 					runtime.showRecipe(hoveredItem, RecipeIngredientRole.INPUT);
 				}
 			}
@@ -325,10 +327,12 @@ public static void renderItems2(int mouseX, int mouseY, int width, int height, M
 				GL11.glPopMatrix();
 			}
 
-			if (enabledRecipes) {
+			if (enabledRecipes && debounce <= 0) {
 				if (mc.gameSettings.keyShowRecipe.isPressed()) {
+					debounce = 20;
 					runtime.showRecipe(hoveredItem, RecipeIngredientRole.OUTPUT);
 				} else if (mc.gameSettings.keyShowUsage.isPressed()) {
+					debounce = 20;
 					runtime.showRecipe(hoveredItem, RecipeIngredientRole.INPUT);
 				}
 			}

src/main/java/turing/tmb/mixin/client/GameSettingsMixin.java

@@ -28,6 +28,10 @@ public class GameSettingsMixin implements IKeybinds {
 	@Unique
 	public KeyBinding keyAddFavourite = new KeyBinding("key.tmb.keyAddFavourite").bind(InputDevice.keyboard, Keyboard.KEY_A);
 
+	@Unique
+	public KeyBinding keyFillRecipe = new KeyBinding("key.tmb.keyFillRecipe").bind(InputDevice.keyboard, Keyboard.KEY_F);
+
+
 	@Unique
 	public OptionBoolean isTMBHidden = new OptionBoolean((GameSettings) ((Object) this), "isTMBHidden", false);
 
@@ -72,6 +76,11 @@ public class GameSettingsMixin implements IKeybinds {
 		return keyAddFavourite;
 	}
 
+	@Override
+	public KeyBinding toomanyblocks$getKeyFillRecipe() {
+		return keyFillRecipe;
+	}
+
 	@Inject(method = "saveOptions", at = @At("HEAD"))
 	public void saveTMBState(CallbackInfo ci) {
 		if (TMBRenderer.search != null) {

src/main/java/turing/tmb/util/IKeybinds.java

@@ -19,4 +19,6 @@ public interface IKeybinds {
 	KeyBinding toomanyblocks$getKeySetDefaultRecipe();
 
 	KeyBinding toomanyblocks$getKeyAddFavourite();
+
+	KeyBinding toomanyblocks$getKeyFillRecipe();
 }

src/main/resources/lang/tmb/en_US.lang

@@ -12,6 +12,7 @@ key.tmb.hide=Hide TMB
 key.tmb.keyAddFavourite=Add/Remove Favourite
 key.tmb.setDefaultRecipe=Set/Remove Default Recipe
 key.tmb.showRecipeTree=Show Recipe Tree
+key.tmb.keyFillRecipe=Fill Recipe
 options.isRecipeViewEnabled=Enable Recipe Viewing
 options.isTMBHidden=Hide TMB