From 5d818580b1b9fc886742bfd2e9998f68b5fbea03 Mon Sep 17 00:00:00 2001 From: lothrazar Date: Sun, 28 Jul 2024 10:21:17 -0700 Subject: [PATCH] update font in jei categories to modern standards --- .../java/com/lothrazar/cyclic/block/crafter/TileCrafter.java | 3 +-- .../com/lothrazar/cyclic/block/crusher/ContainerCrusher.java | 2 ++ .../cyclic/block/generatorfluid/ScreenGeneratorFluid.java | 3 +-- .../com/lothrazar/cyclic/compat/jei/CrusherRecipeCategory.java | 2 +- .../lothrazar/cyclic/compat/jei/GenfluidRecipeCategory.java | 2 +- .../com/lothrazar/cyclic/compat/jei/GenitemRecipeCategory.java | 2 +- .../com/lothrazar/cyclic/compat/jei/MelterRecipeCategory.java | 2 +- .../lothrazar/cyclic/compat/jei/PackagerRecipeCategory.java | 2 +- .../lothrazar/cyclic/compat/jei/SolidifierRecipeCategory.java | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/lothrazar/cyclic/block/crafter/TileCrafter.java b/src/main/java/com/lothrazar/cyclic/block/crafter/TileCrafter.java index 020f99376..a791677af 100644 --- a/src/main/java/com/lothrazar/cyclic/block/crafter/TileCrafter.java +++ b/src/main/java/com/lothrazar/cyclic/block/crafter/TileCrafter.java @@ -238,8 +238,7 @@ private boolean checkInput(IItemHandler inv) { gridStacks.removeAll(lolbit); } } - if(gridStacks.isEmpty()) return true; - return false; + return gridStacks.isEmpty(); } //TODO:? re-write this whole thing using ASSEMBLE? diff --git a/src/main/java/com/lothrazar/cyclic/block/crusher/ContainerCrusher.java b/src/main/java/com/lothrazar/cyclic/block/crusher/ContainerCrusher.java index 87ef35eba..1d149bd7a 100644 --- a/src/main/java/com/lothrazar/cyclic/block/crusher/ContainerCrusher.java +++ b/src/main/java/com/lothrazar/cyclic/block/crusher/ContainerCrusher.java @@ -29,6 +29,7 @@ public void setChanged() { }); addSlot(new SlotItemHandler(tile.outputSlots, 0, 105 + 4, 21 + 4) { + // do not allow player place stuff in output slot @Override public boolean mayPlace(ItemStack stack) { return false; @@ -41,6 +42,7 @@ public void setChanged() { }); addSlot(new SlotItemHandler(tile.outputSlots, 1, 109, 55) { + // do not allow player place stuff in output-bonus slot @Override public boolean mayPlace(ItemStack stack) { return false; diff --git a/src/main/java/com/lothrazar/cyclic/block/generatorfluid/ScreenGeneratorFluid.java b/src/main/java/com/lothrazar/cyclic/block/generatorfluid/ScreenGeneratorFluid.java index 56ed738bb..1668c048e 100644 --- a/src/main/java/com/lothrazar/cyclic/block/generatorfluid/ScreenGeneratorFluid.java +++ b/src/main/java/com/lothrazar/cyclic/block/generatorfluid/ScreenGeneratorFluid.java @@ -58,7 +58,7 @@ public void render(GuiGraphics gg, int mouseX, int mouseY, float partialTicks) { this.renderTooltip(gg, mouseX, mouseY); energy.renderHoveredToolTip(gg, mouseX, mouseY, menu.tile.getEnergy()); progress.renderHoveredToolTip(gg, mouseX, mouseY, menu.tile.getField(TileGeneratorFluid.Fields.TIMER.ordinal())); - //fluid.renderHoveredToolTip(gg, mouseX, mouseY, menu.tile.getFluid()); + btnRedstone.onValueUpdate(menu.tile); var pose = gg.pose(); pose.pushPose(); @@ -68,7 +68,6 @@ public void render(GuiGraphics gg, int mouseX, int mouseY, float partialTicks) { Vector4f vec = new Vector4f(mouseX, mouseY, 0, 1); // vec = pose.last().pose().transform(vec); - // vec.transform(ms.last().pose()); pose.popPose(); //Look, it's a bit hacky, but it gets the job done. Rotation Math! if (fluid.isMouseover((int) vec.x(), (int) vec.y())) { fluid.renderTooltip(gg, mouseX, mouseY, menu.tile.getFluid()); diff --git a/src/main/java/com/lothrazar/cyclic/compat/jei/CrusherRecipeCategory.java b/src/main/java/com/lothrazar/cyclic/compat/jei/CrusherRecipeCategory.java index 46e76de92..22d685848 100644 --- a/src/main/java/com/lothrazar/cyclic/compat/jei/CrusherRecipeCategory.java +++ b/src/main/java/com/lothrazar/cyclic/compat/jei/CrusherRecipeCategory.java @@ -26,7 +26,7 @@ public class CrusherRecipeCategory implements IRecipeCategory { - private static final int FONT = 4210752; + private static final int FONT = 0xFFFFFFFF; private static final ResourceLocation ID = new ResourceLocation(ModCyclic.MODID, "crusher"); static final RecipeType TYPE = new RecipeType<>(ID, RecipeCrusher.class); private IDrawable gui; diff --git a/src/main/java/com/lothrazar/cyclic/compat/jei/GenfluidRecipeCategory.java b/src/main/java/com/lothrazar/cyclic/compat/jei/GenfluidRecipeCategory.java index 9dddf5687..57eb87999 100644 --- a/src/main/java/com/lothrazar/cyclic/compat/jei/GenfluidRecipeCategory.java +++ b/src/main/java/com/lothrazar/cyclic/compat/jei/GenfluidRecipeCategory.java @@ -24,7 +24,7 @@ public class GenfluidRecipeCategory implements IRecipeCategory { - private static final int FONT = 4210752; + private static final int FONT = 0xFFFFFFFF; static final ResourceLocation ID = new ResourceLocation(ModCyclic.MODID, "generator_fluid"); static final RecipeType TYPE = new RecipeType<>(ID, RecipeGeneratorFluid.class); private IDrawable gui; diff --git a/src/main/java/com/lothrazar/cyclic/compat/jei/GenitemRecipeCategory.java b/src/main/java/com/lothrazar/cyclic/compat/jei/GenitemRecipeCategory.java index 906516e84..b79a367e0 100644 --- a/src/main/java/com/lothrazar/cyclic/compat/jei/GenitemRecipeCategory.java +++ b/src/main/java/com/lothrazar/cyclic/compat/jei/GenitemRecipeCategory.java @@ -21,7 +21,7 @@ public class GenitemRecipeCategory implements IRecipeCategory { - private static final int FONT = 4210752; + private static final int FONT = 0xFFFFFFFF; private static final ResourceLocation ID = new ResourceLocation(ModCyclic.MODID, "generator_item"); static final RecipeType TYPE = new RecipeType<>(ID, RecipeGeneratorItem.class); private IDrawable gui; diff --git a/src/main/java/com/lothrazar/cyclic/compat/jei/MelterRecipeCategory.java b/src/main/java/com/lothrazar/cyclic/compat/jei/MelterRecipeCategory.java index 5ea2bfae9..500154937 100644 --- a/src/main/java/com/lothrazar/cyclic/compat/jei/MelterRecipeCategory.java +++ b/src/main/java/com/lothrazar/cyclic/compat/jei/MelterRecipeCategory.java @@ -29,7 +29,7 @@ public class MelterRecipeCategory implements IRecipeCategory { - private static final int FONT = 4210752; + private static final int FONT = 0xFFFFFFFF; private static final ResourceLocation ID = new ResourceLocation(ModCyclic.MODID, "melter"); static final RecipeType TYPE = new RecipeType<>(ID, RecipeMelter.class); private IDrawable gui; diff --git a/src/main/java/com/lothrazar/cyclic/compat/jei/PackagerRecipeCategory.java b/src/main/java/com/lothrazar/cyclic/compat/jei/PackagerRecipeCategory.java index aefa1446f..3806ccfba 100644 --- a/src/main/java/com/lothrazar/cyclic/compat/jei/PackagerRecipeCategory.java +++ b/src/main/java/com/lothrazar/cyclic/compat/jei/PackagerRecipeCategory.java @@ -25,7 +25,7 @@ public class PackagerRecipeCategory implements IRecipeCategory { private static final ResourceLocation ID = new ResourceLocation(ModCyclic.MODID, "packager"); static final RecipeType TYPE = new RecipeType<>(ID, CraftingRecipe.class); - Minecraft instance; + Minecraft instance; // since we call on this so often for recipe validatoin, cache one copy of it for the duration private IDrawable gui; private IDrawable icon; diff --git a/src/main/java/com/lothrazar/cyclic/compat/jei/SolidifierRecipeCategory.java b/src/main/java/com/lothrazar/cyclic/compat/jei/SolidifierRecipeCategory.java index e4afc41bf..ee4baee9d 100644 --- a/src/main/java/com/lothrazar/cyclic/compat/jei/SolidifierRecipeCategory.java +++ b/src/main/java/com/lothrazar/cyclic/compat/jei/SolidifierRecipeCategory.java @@ -29,7 +29,7 @@ public class SolidifierRecipeCategory implements IRecipeCategory { - private static final int FONT = 4210752; + private static final int FONT = 0xFFFFFFFF; private static final ResourceLocation ID = new ResourceLocation(ModCyclic.MODID, "solidifier"); static final RecipeType TYPE = new RecipeType<>(ID, RecipeSolidifier.class); private IDrawable gui;