Team-EnderIO/EnderIO
1
0
Fork 0
Code Issues 114 Pull requests 13 Projects Releases 79 Packages Wiki Activity Actions

Add Vacuum Blocks #80

Merged
dphaldes merged 30 commits from dev/vacuum into dev/1.19.x 2023-01-13 18:15:53 +00:00
Conversation 17 Commits 30 Files changed 43 +1818 -28
dphaldes commented 2022-08-17 19:33:25 +00:00 (Migrated from github.com)
Copy link

Co-authored-by: ferriarnus ferriarnus@users.noreply.github.com

Description

Adds Vacuum Blocks - Vacuum Chest and XP Vacuum blocks
supersedes #22

Todo (Vacuum Chest)

  • Work with hopper
  • Model
  • GUI layout
  • lang
  • IO config
  • Check render screen resize

Todo (XP Vacuum)

  • Work with tank
  • Model
  • Liquid
  • GUI layout
  • lang
  • IO config

Checklist:

  • My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you)
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
Co-authored-by: ferriarnus <ferriarnus@users.noreply.github.com> # Description Adds Vacuum Blocks - Vacuum Chest and XP Vacuum blocks supersedes #22 # Todo (Vacuum Chest) - [x] Work with hopper - [x] Model - [x] GUI layout - [x] lang - [ ] ~~IO config~~ - [x] ~~Check render screen resize~~ # Todo (XP Vacuum) - [x] Work with tank - [x] Model - [x] Liquid - [x] GUI layout - [x] lang - [ ] ~~IO config~~ # Checklist: - [x] My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you) - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas - [x] I have made corresponding changes to the documentation <!-- Thanks to: https://embeddedartistry.com/blog/2017/08/04/a-github-pull-request-template-for-your-projects/ for the building blocks of this template -->
EpicSquid (Migrated from github.com) reviewed 2022-08-17 19:33:25 +00:00
EpicSquid (Migrated from github.com) requested changes 2022-09-30 11:15:23 +00:00
EpicSquid (Migrated from github.com) left a comment
Copy link

Looks mostly good from the code, just a few small things to fix up.

Looks mostly good from the code, just a few small things to fix up.
src/core/java/com/enderio/core/client/RenderUtil.java
@ -10,6 +10,7 @@ import net.minecraft.core.Direction;
import net.minecraftforge.client.model.IQuadTransformer;
EpicSquid (Migrated from github.com) commented 2022-09-30 06:49:58 +00:00
Copy link

Please undo the changes to the formatting here

Please undo the changes to the formatting here
src/core/java/com/enderio/core/common/blockentity/EnderBlockEntity.java
EpicSquid (Migrated from github.com) commented 2022-09-30 06:52:48 +00:00
Copy link

Please remove the changes to this file since its just formatting changes. Even if they are correct we can save it for a refactoring commit separately to the whole repo.

Please remove the changes to this file since its just formatting changes. Even if they are correct we can save it for a refactoring commit separately to the whole repo.
src/machines/java/com/enderio/machines/common/blockentity/VacuumChestBlockEntity.java
@ -0,0 +1,72 @@
package com.enderio.machines.common.blockentity;
EpicSquid (Migrated from github.com) commented 2022-09-30 06:58:03 +00:00
Copy link

Can you remove this if its not longer relevant

Can you remove this if its not longer relevant
src/machines/java/com/enderio/machines/common/blockentity/XPVacuumBlockEntity.java
@ -0,0 +1,112 @@
package com.enderio.machines.common.blockentity;
EpicSquid (Migrated from github.com) commented 2022-09-30 07:01:16 +00:00
Copy link

If this file doesn't already exist, make a common NBTUtils class in base and put it in there.

If this file doesn't already exist, make a common NBTUtils class in base and put it in there.
EpicSquid (Migrated from github.com) commented 2022-09-30 07:01:30 +00:00
Copy link

Go with tank

Go with tank
src/machines/java/com/enderio/machines/common/blockentity/XPVacuumBlockEntity.java
@ -0,0 +41,4 @@
this.rCol = (float)Integer.parseInt(color.substring(4,6), 16) / 255;
// Create fluid tank.
this.fluidTank = createFluidTank(Integer.MAX_VALUE);
EpicSquid (Migrated from github.com) commented 2022-09-30 06:59:52 +00:00
Copy link

Can we make this a configurable value?

Can we make this a configurable value?
src/machines/java/com/enderio/machines/common/blockentity/base/VacuumMachineEntity.java
@ -0,0 +68,4 @@
@Override
protected IIOConfig createIOConfig() {
return new FixedIOConfig(IOMode.PUSH);
EpicSquid (Migrated from github.com) commented 2022-09-30 07:49:41 +00:00
Copy link

Correct me if I am wrong, but did we have a way to configure sides to be push or none in 1.12? I know the gui for side configuration isn't ready but it would be worth making sure the inventory is just accessible rather than actively pushing by default

Correct me if I am wrong, but did we have a way to configure sides to be push or none in 1.12? I know the gui for side configuration isn't ready but it would be worth making sure the inventory is just accessible rather than actively pushing by default
src/machines/java/com/enderio/machines/common/init/MachineBlocks.java
EpicSquid (Migrated from github.com) commented 2022-09-30 08:04:42 +00:00
Copy link

Please undo the formatting changes for the non-vacuum entries

Please undo the formatting changes for the non-vacuum entries
src/machines/java/com/enderio/machines/common/init/MachineMenus.java
EpicSquid (Migrated from github.com) commented 2022-09-30 08:05:02 +00:00
Copy link

Also remove the formatting changes for non-vacuum entries here

Also remove the formatting changes for non-vacuum entries here
src/main/java/com/enderio/base/client/particle/RangeParticle.java
@ -0,0 +1,125 @@
package com.enderio.base.client.particle;
EpicSquid (Migrated from github.com) commented 2022-09-30 10:59:15 +00:00
Copy link

Can you change these var's to floats/vecs (for the ones below) since they are simple enough types

Can you change these var's to floats/vecs (for the ones below) since they are simple enough types
src/main/java/com/enderio/base/common/init/EIOParticles.java
@ -0,0 +13,4 @@
public static final DeferredRegister<ParticleType<?>> PARTICLE_TYPES = DeferredRegister.create(ForgeRegistries.PARTICLE_TYPES, EnderIO.MODID);
public static final RegistryObject<RangeParticleType> RANGE_PARTICLE = PARTICLE_TYPES.register("range_particle", RangeParticleType::new);
EpicSquid (Migrated from github.com) commented 2022-09-30 11:03:13 +00:00
Copy link

Is this possible with Registrate? I believe it should be possible with Registrate.simple()

Is this possible with Registrate? I believe it should be possible with Registrate.simple()
src/main/resources/assets/enderio/textures/block/tesseract_portal.png.mcmeta
EpicSquid (Migrated from github.com) commented 2022-09-30 11:10:43 +00:00
Copy link

Please rename this file given we aren't calling it "tesseract". Just go with "vacuum_portal" or similar

Please rename this file given we aren't calling it "tesseract". Just go with "vacuum_portal" or similar
dphaldes (Migrated from github.com) reviewed 2022-09-30 13:37:19 +00:00
src/machines/java/com/enderio/machines/common/blockentity/XPVacuumBlockEntity.java
@ -0,0 +41,4 @@
this.rCol = (float)Integer.parseInt(color.substring(4,6), 16) / 255;
// Create fluid tank.
this.fluidTank = createFluidTank(Integer.MAX_VALUE);
dphaldes (Migrated from github.com) commented 2022-09-30 13:37:18 +00:00
Copy link

Do you mean like configurable through client.toml file ?

Do you mean like configurable through client.toml file ?
dphaldes (Migrated from github.com) reviewed 2022-09-30 13:51:15 +00:00
src/main/java/com/enderio/base/common/init/EIOParticles.java
@ -0,0 +13,4 @@
public static final DeferredRegister<ParticleType<?>> PARTICLE_TYPES = DeferredRegister.create(ForgeRegistries.PARTICLE_TYPES, EnderIO.MODID);
public static final RegistryObject<RangeParticleType> RANGE_PARTICLE = PARTICLE_TYPES.register("range_particle", RangeParticleType::new);
dphaldes (Migrated from github.com) commented 2022-09-30 13:51:14 +00:00
Copy link

what would be the value for ResourceKey<Registry<R>> registryType

what would be the value for `ResourceKey<Registry<R>> registryType`
dphaldes (Migrated from github.com) reviewed 2022-09-30 14:32:58 +00:00
src/machines/java/com/enderio/machines/common/blockentity/VacuumChestBlockEntity.java
@ -0,0 +1,72 @@
package com.enderio.machines.common.blockentity;
dphaldes (Migrated from github.com) commented 2022-09-30 14:32:58 +00:00
Copy link

@ferriarnus added this. Is this still needed/or to be done ?

@ferriarnus added this. Is this still needed/or to be done ?
dphaldes (Migrated from github.com) reviewed 2022-09-30 14:45:28 +00:00
src/machines/java/com/enderio/machines/common/blockentity/base/VacuumMachineEntity.java
@ -0,0 +68,4 @@
@Override
protected IIOConfig createIOConfig() {
return new FixedIOConfig(IOMode.PUSH);
dphaldes (Migrated from github.com) commented 2022-09-30 14:45:28 +00:00
Copy link

In 1.12, Both the vacuum block don't have an option to configure automatic push/pull. However, XP vacuum has a very small internal buffer and thus requires an external storage connected to it. It pushes automatically to a tank next to it. On the other hand, Vacuum chest doesn't push anything automatically.

In 1.12, Both the vacuum block don't have an option to configure automatic push/pull. However, XP vacuum has a very small internal buffer and thus requires an external storage connected to it. It pushes automatically to a tank next to it. On the other hand, Vacuum chest doesn't push anything automatically.
EpicSquid (Migrated from github.com) reviewed 2022-09-30 21:43:07 +00:00
src/machines/java/com/enderio/machines/common/blockentity/XPVacuumBlockEntity.java
@ -0,0 +41,4 @@
this.rCol = (float)Integer.parseInt(color.substring(4,6), 16) / 255;
// Create fluid tank.
this.fluidTank = createFluidTank(Integer.MAX_VALUE);
EpicSquid (Migrated from github.com) commented 2022-09-30 21:43:07 +00:00
Copy link

Should be configured through the server toml and synced to the client

Should be configured through the server toml and synced to the client
EpicSquid (Migrated from github.com) reviewed 2022-09-30 21:43:57 +00:00
src/main/java/com/enderio/base/common/init/EIOParticles.java
@ -0,0 +13,4 @@
public static final DeferredRegister<ParticleType<?>> PARTICLE_TYPES = DeferredRegister.create(ForgeRegistries.PARTICLE_TYPES, EnderIO.MODID);
public static final RegistryObject<RangeParticleType> RANGE_PARTICLE = PARTICLE_TYPES.register("range_particle", RangeParticleType::new);
EpicSquid (Migrated from github.com) commented 2022-09-30 21:43:57 +00:00
Copy link

I don't remember currently, might have to experiment and find out

I don't remember currently, might have to experiment and find out
dphaldes (Migrated from github.com) reviewed 2022-10-24 16:03:59 +00:00
src/machines/java/com/enderio/machines/common/blockentity/XPVacuumBlockEntity.java
@ -0,0 +41,4 @@
this.rCol = (float)Integer.parseInt(color.substring(4,6), 16) / 255;
// Create fluid tank.
this.fluidTank = createFluidTank(Integer.MAX_VALUE);
dphaldes (Migrated from github.com) commented 2022-10-24 16:03:59 +00:00
Copy link

Done!

Done!
ferriarnus (Migrated from github.com) reviewed 2022-11-08 17:25:53 +00:00
src/machines/java/com/enderio/machines/common/blockentity/VacuumChestBlockEntity.java
@ -0,0 +1,72 @@
package com.enderio.machines.common.blockentity;
ferriarnus (Migrated from github.com) commented 2022-11-08 17:25:53 +00:00
Copy link

it seems this can go now yeah, probably legacy. It matches the super method

it seems this can go now yeah, probably legacy. It matches the super method
ferriarnus (Migrated from github.com) reviewed 2022-11-08 17:28:56 +00:00
src/machines/java/com/enderio/machines/common/blockentity/base/VacuumMachineEntity.java
@ -0,0 +68,4 @@
@Override
protected IIOConfig createIOConfig() {
return new FixedIOConfig(IOMode.PUSH);
ferriarnus (Migrated from github.com) commented 2022-11-08 17:28:56 +00:00
Copy link

I felt like giving these blocks also control over the sides be a good idea. And as a correction, from what I could see in the 1.12 code, the buffer of the xp vacuum is really large (to the point it may need a nerf).

I felt like giving these blocks also control over the sides be a good idea. And as a correction, from what I could see in the 1.12 code, the buffer of the xp vacuum is really large (to the point it may need a nerf).
ferriarnus commented 2022-11-08 17:36:27 +00:00 (Migrated from github.com)
Copy link

I had a look in game and it all still worked like a remember it does (and a new range indicator that seems to be doing it's job quiet well, though some angles don't render, but I think this is a mc limit? If that's the reason it should be fine). If no one else has any remarks about the code (I'm really bad at checking code like this). I think it's ready to be merged (after fixing the conflicts and 1 comment).

I had a look in game and it all still worked like a remember it does (and a new range indicator that seems to be doing it's job quiet well, though some angles don't render, but I think this is a mc limit? If that's the reason it should be fine). If no one else has any remarks about the code (I'm really bad at checking code like this). I think it's ready to be merged (after fixing the conflicts and 1 comment).
dphaldes (Migrated from github.com) reviewed 2022-11-11 08:01:01 +00:00
src/machines/java/com/enderio/machines/common/blockentity/base/VacuumMachineEntity.java
@ -0,0 +68,4 @@
@Override
protected IIOConfig createIOConfig() {
return new FixedIOConfig(IOMode.PUSH);
dphaldes (Migrated from github.com) commented 2022-11-11 08:01:00 +00:00
Copy link

Should I keep it default or change it ?

Should I keep it default or change it ?
dphaldes commented 2022-12-02 09:55:16 +00:00 (Migrated from github.com)
Copy link

Fixed merge conflicts. Waiting for IO widget to complete this PR.

Fixed merge conflicts. Waiting for IO widget to complete this PR.
justliliandev (Migrated from github.com) reviewed 2022-12-29 14:20:32 +00:00
src/machines/java/com/enderio/machines/client/gui/screen/VacuumChestScreen.java
@ -0,0 +13,4 @@
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.player.Inventory;
public class VacuumChestScreen extends EIOScreen<VacuumChestMenu> {
justliliandev (Migrated from github.com) commented 2022-12-29 14:10:17 +00:00
Copy link

don't use this. for variables you can access without the prefix

don't use `this.` for variables you can access without the prefix
src/machines/java/com/enderio/machines/client/gui/screen/XPVacuumScreen.java
@ -0,0 +1,65 @@
package com.enderio.machines.client.gui.screen;
justliliandev (Migrated from github.com) commented 2022-12-29 14:11:38 +00:00
Copy link

widgetsv2 isn't used, extract the things you need from there to a seperate texture file

widgetsv2 isn't used, extract the things you need from there to a seperate texture file
src/machines/java/com/enderio/machines/common/menu/VacuumChestMenu.java
@ -0,0 +1,34 @@
package com.enderio.machines.common.menu;
justliliandev (Migrated from github.com) commented 2022-12-29 14:17:44 +00:00
Copy link

use the other Nullable Annotation

use the other Nullable Annotation
justliliandev (Migrated from github.com) requested changes 2023-01-05 21:55:40 +00:00
justliliandev (Migrated from github.com) left a comment
Copy link

No need to remove some characters. We aren't limited to storage

No need to remove some characters. We aren't limited to storage
src/machines/java/com/enderio/machines/client/gui/screen/XPVacuumScreen.java
@ -0,0 +15,4 @@
import net.minecraft.world.entity.player.Inventory;
public class XPVacuumScreen extends EIOScreen<XPVacuumMenu> {
justliliandev (Migrated from github.com) commented 2023-01-05 21:53:04 +00:00
Copy link
    private static final ResourceLocation RANGE_BUTTON_TEXTURE = EnderIO.loc("textures/gui/icons/range_buttons.png");
```suggestion private static final ResourceLocation RANGE_BUTTON_TEXTURE = EnderIO.loc("textures/gui/icons/range_buttons.png"); ```
src/machines/java/com/enderio/machines/client/gui/screen/XPVacuumScreen.java
@ -0,0 +28,4 @@
@Override
protected void init() {
super.init();
addRenderableOnly(new FluidStackStaticWidget(this, getMenu().getBlockEntity()::getFluidTank, leftPos + 27, topPos + 22, 32, 32));
justliliandev (Migrated from github.com) commented 2023-01-05 21:53:59 +00:00
Copy link
        addRenderableWidget(new ToggleImageButton<>(this, leftPos + imageWidth - 8 - 16, topPos + 34, 16, 16, 0, 0, 16, 0, RANGE_BUTTON_TEXTURE,
```suggestion addRenderableWidget(new ToggleImageButton<>(this, leftPos + imageWidth - 8 - 16, topPos + 34, 16, 16, 0, 0, 16, 0, RANGE_BUTTON_TEXTURE, ```
justliliandev (Migrated from github.com) approved these changes 2023-01-06 11:52:47 +00:00
justliliandev (Migrated from github.com) left a comment
Copy link

looks good to me

looks good to me
Sign in to join this conversation.
Reviewers
No reviewers
EpicSquid
justliliandev
Labels
Clear labels   
Area-Assets

   
Area-Backend

Backend work not usually visible to players.

  
Area-Conduits

Everything involving conduits

  
Area-Datapacks

   
Area-Lang

   
Area-Mod Compat

   
Area-Parity

1.12.2 missing features

  
Area-Rendering

Rendering code, might be shaders specific or general.

  
Good first issue

   
MC-1.19.2

   
MC-1.20.1

   
MC-1.20.4

   
MC-1.20.6

   
MC-1.21

   
MC-1.21.1

   
Modtoberfest

   
P-0-High

High priority, crash/breaking.

  
P-1-Medium

Medium priority. Potentially deleting items or breaking functionality.

  
P-2-Low

Low priority. Not hurting anyone, just annoying.

  
Status-Awaiting Response

Waiting for OP to respond

  
Status-Behind-Flag

This change is available but is placed behind a feature flag.

  
Status-Blocked

Blocked by a specific issue or protocol.

  
Status-Cannot Reproduce

   
Status-Duplicate

This issue or pull request already exists

  
Status-Help Wanted

We need some help to try and track this thing down..

  
Status-Incomplete Report

   
Status-Invalid

This doesn't seem right

  
Status-Needs LTS Backport

Fixed in latest but requires LTS backport.

  
Status-Needs Updating

Needs updating to a newer Minecraft version.

  
Status-Stale

This may not be updated by the OP any further.

  
Status-To Implement

   
Status-Triage

A Triage Member should take a look at this

  
Status-Wontfix

This will not be worked on

  
Status-Wontmerge

This PR won't be merged, but is left now for reference of ongoing or future works.

  
Type-Backport

   
Type-Bug

There is a problem.

  
Type-Documentation

Improvements or additions to documentation

  
Type-Enhancement

New feature or enhancement to existing feature.

  
Type-Question

Further information is requested

  
Type-RFC

Request for comments.

  
Type-Suggestion
No labels
Area-Assets
Area-Backend
Area-Conduits
Area-Datapacks
Area-Lang
Area-Mod Compat
Area-Parity
Area-Rendering
Good first issue
MC-1.19.2
MC-1.20.1
MC-1.20.4
MC-1.20.6
MC-1.21
MC-1.21.1
Modtoberfest
P-0-High
P-1-Medium
P-2-Low
Status-Awaiting Response
Status-Behind-Flag
Status-Blocked
Status-Cannot Reproduce
Status-Duplicate
Status-Help Wanted
Status-Incomplete Report
Status-Invalid
Status-Needs LTS Backport
Status-Needs Updating
Status-Stale
Status-To Implement
Status-Triage
Status-Wontfix
Status-Wontmerge
Type-Backport
Type-Bug
Type-Documentation
Type-Enhancement
Type-Question
Type-RFC
Type-Suggestion
Milestone
Clear milestone
No items
No milestone
First Alpha Release (v6.0)
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Team-EnderIO/EnderIO#80
No description provided.
Delete branch "dev/vacuum"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?