Fixes lots of issues #2404

PocketSizedWeeb · 2024-04-20T02:41:17Z

JEI Changes:

Fixes issue Solidifier doesn't show liquid requirements #2369
Made the JEI category for the Melter more closely match the Melter's GUI
Moved the JEI "Show Recipe" area for the machines line up with the progress bar
Moved the JEI "Show Recipe" area for the generators line up with the generator name
Every applicable JEI Category got an energy bar added to show max consumed/produced RF
Every applicable JEI Category got a progress bar to show how long the machine will run for
Edited the Melter category texture to add space for energy bar
Possibly fixed HashMap memory leak #2383 by caching an instance of Minecraft instead of grabbing it when needed in the Packager's JEI Category

Dry Peat:

Fixes issue Peat bog cannot be saturated with water-logged leaves #2399 by allowing water-logged blocks to hydrate peat

Solidifier/Melter:

Fully fixes desync issue by making all of the processing server sided.

Crushing Macerator:

Evaporation Generator:

Removed tank tooltip from before it was rotated
Fixes Evaporation Generator 1.19.2 #2322 by implementing a workaround since the fluid portion of FluidTagIngredient was defaulting to empty which was not allowing tagged fluids in the generator

Auto Crafter:

Fixed auto crafting machine duplicate glitch #2358 by checking input before processing
Fixed an issue where the preview slot wasn't updating until the machine was processing a craft

Wireless Transmitter:

Fixed gps card inside wireless transmitter disappearing #2403 by adding an onRemove method to the transmitter that drops the gps card

@Lothrazar I also have a working JEI Category for the Combustion Generator and Devouring Generator if you want me to make a pull request for it.

- Fixes issue Lothrazar#2369 - Made some JEI category changes to make it look a bit better

- Fixed issue Lothrazar#2399 by allowing water-logged blocks to hydrate the peat

- Makes all of the recipe process server only instead of just part of it

- Fixes issue Lothrazar#2343 - Player can no longer put items in the output slot

- Made the JEI category more closely resemble the Melter gui.

- For some reason the time remaining tooltip and the show recipes tooltip clashed, so I moved the click area the the title string for the generators.

- Added the onRemove method to the Wireless Transmitter

- Checks the input before any processing happens - Recipe preview now updates when recipe grid changes instead of when it's done processing

- The fluid portion of the FluidTagIngredient is empty, so I made a work around until it is fixed in FLib.

Lothrazar

great work and thanks for your patience! i tested everything and reviewed all the code and the fixes look good, they address the issues as stated

Lothrazar · 2024-07-28T15:55:56Z

src/main/java/com/lothrazar/cyclic/compat/jei/MelterRecipeCategory.java

  }

  @Override
  public void setRecipe(IRecipeLayoutBuilder builder, RecipeMelter recipe, IFocusGroup focuses) {
    builder.addSlot(RecipeIngredientRole.INPUT, 4, 19).addIngredients(recipe.at(0));
    builder.addSlot(RecipeIngredientRole.INPUT, 22, 19).addIngredients(recipe.at(1));
    List<FluidStack> matchingFluids = List.of(recipe.getRecipeFluid());
-    builder.addSlot(RecipeIngredientRole.OUTPUT, 140, 19).addIngredients(ForgeTypes.FLUID_STACK, matchingFluids);
+    builder.addSlot(RecipeIngredientRole.OUTPUT, 132, 19).addIngredients(ForgeTypes.FLUID_STACK, matchingFluids).setFluidRenderer(4000, false, 16, 16);


sweet i never knew jei had a fluid renderer like this

Lothrazar · 2024-07-28T15:56:56Z

src/main/java/com/lothrazar/cyclic/compat/jei/MelterRecipeCategory.java

    gui = helper.drawableBuilder(new ResourceLocation(ModCyclic.MODID, "textures/jei/melter_recipe.png"), 0, 0, 169, 69).setTextureSize(169, 69).build();
    icon = helper.createDrawableIngredient(VanillaTypes.ITEM_STACK, new ItemStack(BlockRegistry.MELTER.get()));
+    bar = new EnergyBar(font, TileSolidifier.MAX);


ha why didnt i think of that. i made the bars module but never thought to re use them into the jei component. smart

Lothrazar · 2024-07-28T15:59:57Z

src/main/java/com/lothrazar/cyclic/block/wireless/redstone/BlockWirelessTransmit.java

@@ -44,4 +45,18 @@ public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level world, Block
  protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
    builder.add(POWERED);
  }
+
+  @Override // was onReplaced
+  public void onRemove(BlockState state, Level worldIn, BlockPos pos, BlockState newState, boolean isMoving) {


Lothrazar · 2024-07-28T16:00:58Z

src/main/java/com/lothrazar/cyclic/block/solidifier/TileSolidifier.java

+    //Fixes sync issue entirely
+    if(level.isClientSide()) return;
+    //Checks if there is space in the output slot
+    if(this.outputSlots.getStackInSlot(0).getCount() > 64 - currentRecipe.getResultItem(level.registryAccess()).getCount()) return;


can we assume the max is always 64? what if its an ender pearl and 16 is the max. well we can check that later, still a good fix

Lothrazar · 2024-07-28T16:01:19Z

src/main/java/com/lothrazar/cyclic/block/melter/TileMelter.java

@@ -67,6 +67,8 @@ public void tick() {
    if (currentRecipe == null) {
      return;
    }
+    //Fixes sync issue entirely


Lothrazar · 2024-07-28T16:14:25Z

src/main/java/com/lothrazar/cyclic/block/crusher/TileCrusher.java

+        return;
+    }
+    //Checks if there is space in the output slots before processing
+    if(outputSlots.getStackInSlot(0).getCount() > 64 - currentRecipe.getResultItem(level.registryAccess()).copy().getCount()) return;


fix looks good! the hardcoded 64 can be an issue, for example if i have a recipe that outputs 3 ender pearls, that has a max stack size of 16 so it has that issue. i can change it later you just do it something like this

var result = currentRecipe.getResultItem(level.registryAccess()).copy(); var max = result.getMaxStackSize();

Lothrazar · 2024-07-28T16:35:01Z

src/main/java/com/lothrazar/cyclic/block/crafter/TileCrafter.java

+		  gridStacks.add(gridHandler.getStackInSlot(i).copy());
+	  }
+	  for(ItemStack stack : inputStacks) {
+		  List<ItemStack> lolbit = new ArrayList<ItemStack>();


aha so lolbit are the matches so we know what to clear out when we are removingall i got it. works in my testing 👍

Lothrazar · 2024-07-28T16:54:22Z

And yeah for "I also have a working JEI Category for the Combustion Generator and Devouring Generator if you want me to make a pull request for it." yeah i would merge it. i figured people would just know what is edible or what is furnace fuel (coal and lava) but it would be nice for lots of players

PocketSizedWeeb added 15 commits April 13, 2024 19:58

JEI compat changes

8ed9ca2

- Fixes issue Lothrazar#2369 - Made some JEI category changes to make it look a bit better

Peat Fix

c77c366

- Fixed issue Lothrazar#2399 by allowing water-logged blocks to hydrate the peat

Better desync fix

103be4e

- Makes all of the recipe process server only instead of just part of it

Fixes to crushing macerator

7d0525d

- Fixes issue Lothrazar#2343 - Player can no longer put items in the output slot

- Finalizes JEI compat fixes

6c7c0ec

- Fixes JEI click region on gui for all compatible machines

c182ad0

Forgot to add the edited JEI melter texture.

008b8eb

Forgot to remove the string for total RF

489f34c

Melter category change

d25e0c0

- Made the JEI category more closely resemble the Melter gui.

Realigned JEI click area again

47c9b6d

- For some reason the time remaining tooltip and the show recipes tooltip clashed, so I moved the click area the the title string for the generators.

Removed ghost tank from the Evaporation Generator

ba04e8a

Fixed Lothrazar#2403

a681f80

- Added the onRemove method to the Wireless Transmitter

Fixes dupe glitch in Lothrazar#2358

6d79204

- Checks the input before any processing happens - Recipe preview now updates when recipe grid changes instead of when it's done processing

Fixes Lothrazar#2322

21a012d

- The fluid portion of the FluidTagIngredient is empty, so I made a work around until it is fixed in FLib.

Possible memory leak fix

1ca0c86

Lothrazar self-assigned this Jul 28, 2024

Lothrazar added the 1.20 label Jul 28, 2024

Lothrazar approved these changes Jul 28, 2024

View reviewed changes

Lothrazar merged commit 02cfd51 into Lothrazar:trunk/1.20.1 Jul 28, 2024
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes lots of issues #2404

Fixes lots of issues #2404

PocketSizedWeeb commented Apr 20, 2024 •

edited

Loading

Lothrazar left a comment

Lothrazar Jul 28, 2024

Lothrazar Jul 28, 2024

Lothrazar Jul 28, 2024

Lothrazar Jul 28, 2024

Lothrazar Jul 28, 2024

Lothrazar Jul 28, 2024

Lothrazar Jul 28, 2024

Lothrazar commented Jul 28, 2024

Fixes lots of issues #2404

Fixes lots of issues #2404

Conversation

PocketSizedWeeb commented Apr 20, 2024 • edited Loading

Lothrazar left a comment

Choose a reason for hiding this comment

Lothrazar Jul 28, 2024

Choose a reason for hiding this comment

Lothrazar Jul 28, 2024

Choose a reason for hiding this comment

Lothrazar Jul 28, 2024

Choose a reason for hiding this comment

Lothrazar Jul 28, 2024

Choose a reason for hiding this comment

Lothrazar Jul 28, 2024

Choose a reason for hiding this comment

Lothrazar Jul 28, 2024

Choose a reason for hiding this comment

Lothrazar Jul 28, 2024

Choose a reason for hiding this comment

Lothrazar commented Jul 28, 2024

PocketSizedWeeb commented Apr 20, 2024 •

edited

Loading