-
Notifications
You must be signed in to change notification settings - Fork 171
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: ITEM PIPES because someone took too long and people wanted these * fix a sync issue in fluid ingredients * one last bug to fix: the items sometimes cycle back to the input * finish item pipe, start on long distance pipeline * feat: IT WORKS LESSGOOOOOOOO except some textures are wonky, but IT WORKS LESSSGOOOOOOO * chore: changelog, fix endpoint textures * fix: LD pipes not saving data * chore: fill out changelog * Update common/src/main/java/com/gregtechceu/gtceu/api/pipenet/longdistance/LongDistancePipeType.java Co-authored-by: Mikerooni <[email protected]> * Update common/src/main/java/com/gregtechceu/gtceu/common/cover/ConveyorCover.java Co-authored-by: Mikerooni <[email protected]> * Update common/src/main/java/com/gregtechceu/gtceu/common/cover/ConveyorCover.java Co-authored-by: Mikerooni <[email protected]> * Update common/src/main/java/com/gregtechceu/gtceu/common/cover/ItemFilterCover.java Co-authored-by: Mikerooni <[email protected]> * Update common/src/main/java/com/gregtechceu/gtceu/common/machine/storage/LongDistanceEndpointMachine.java Co-authored-by: Mikerooni <[email protected]> * requested changes * more getters * add this back --------- Co-authored-by: Mikerooni <[email protected]>
- Loading branch information
Showing
127 changed files
with
3,267 additions
and
126 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,8 @@ | ||
| # ChangeLog | ||
|
|
||
| * fix custom veins not working in non-vanilla dimensions | ||
| * fix large miners not macerating ores properly | ||
| * fix the turbines' generation being off by factor of turbine efficiency | ||
| * fix recipes not working when a world is loaded for the first time | ||
| * fix mipmapping issue | ||
| * fix the watertight steel mixer recipe | ||
| * fix fabric fluid textures | ||
| * add fluid ingredients for fluid input/output unification | ||
| * add item pipes | ||
| * add long distance pipelines | ||
| * fix crash when joining servers | ||
| * fix pipe covers not having collision | ||
| * add oilsands veins | ||
| * fix machines sometimes losing NBT |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
common/src/main/java/com/gregtechceu/gtceu/api/pipenet/longdistance/ILDEndpoint.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| package com.gregtechceu.gtceu.api.pipenet.longdistance; | ||
|
|
||
| import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; | ||
| import com.gregtechceu.gtceu.api.machine.MetaMachine; | ||
| import net.minecraft.core.BlockPos; | ||
| import net.minecraft.core.Direction; | ||
| import net.minecraft.world.level.Level; | ||
| import net.minecraft.world.level.LevelAccessor; | ||
| import net.minecraft.world.level.block.entity.BlockEntity; | ||
|
|
||
| import javax.annotation.Nullable; | ||
|
|
||
| public interface ILDEndpoint { | ||
|
|
||
| /** | ||
| * @return the current type of this endpoint (input, output or none) | ||
| */ | ||
| Type getType(); | ||
|
|
||
| /** | ||
| * @param type new active type | ||
| */ | ||
| void setType(Type type); | ||
|
|
||
| /** | ||
| * @return true if this endpoint is considered a network input | ||
| */ | ||
| default boolean isInput() { | ||
| return getType() == Type.INPUT; | ||
| } | ||
|
|
||
| /** | ||
| * @return true if this endpoint is considered a network output | ||
| */ | ||
| default boolean isOutput() { | ||
| return getType() == Type.OUTPUT; | ||
| } | ||
|
|
||
| /** | ||
| * @return the currently linked endpoint or null | ||
| */ | ||
| @Nullable | ||
| ILDEndpoint getLink(); | ||
|
|
||
| /** | ||
| * removes the linked endpoint if there is any | ||
| */ | ||
| void invalidateLink(); | ||
|
|
||
| /** | ||
| * @return the front facing, usually the input face | ||
| */ | ||
| Direction getFrontFacing(); | ||
|
|
||
| /** | ||
| * @return the output facing | ||
| */ | ||
| Direction getOutputFacing(); | ||
|
|
||
| /** | ||
| * @return the ld pipe type for this endpoint | ||
| */ | ||
| LongDistancePipeType getPipeType(); | ||
|
|
||
| /** | ||
| * @return pos in world | ||
| */ | ||
| BlockPos getPos(); | ||
|
|
||
| static ILDEndpoint tryGet(LevelAccessor world, BlockPos pos) { | ||
| BlockEntity te = world.getBlockEntity(pos); | ||
| if (te instanceof IMachineBlockEntity iMachineBlock) { | ||
| MetaMachine mte = iMachineBlock.getMetaMachine(); | ||
| if (mte instanceof ILDEndpoint) { | ||
| return (ILDEndpoint) mte; | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| enum Type { | ||
| NONE, INPUT, OUTPUT | ||
| } | ||
| } |
Oops, something went wrong.