-
Notifications
You must be signed in to change notification settings - Fork 182
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: fabricated gate drops not containing NBT data
- Loading branch information
Showing
8 changed files
with
88 additions
and
56 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
7 changes: 4 additions & 3 deletions
7
fabrication/src/main/java/mrtjp/projectred/fabrication/item/FabricatedGatePartItem.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
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
38 changes: 38 additions & 0 deletions
38
integration/src/main/java/mrtjp/projectred/integration/item/BaseGatePartItem.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,38 @@ | ||
| package mrtjp.projectred.integration.item; | ||
|
|
||
| import codechicken.multipart.api.ItemMultipart; | ||
| import codechicken.multipart.api.part.MultiPart; | ||
| import codechicken.multipart.util.MultipartPlaceContext; | ||
| import mrtjp.projectred.core.PlacementLib; | ||
| import mrtjp.projectred.integration.GateType; | ||
| import mrtjp.projectred.integration.part.GatePart; | ||
| import net.minecraft.core.BlockPos; | ||
| import net.minecraft.core.Direction; | ||
|
|
||
| public abstract class BaseGatePartItem extends ItemMultipart { | ||
|
|
||
| protected final GateType gateType; | ||
|
|
||
| public BaseGatePartItem(Properties properties, GateType gateType) { | ||
| super(properties); | ||
| this.gateType = gateType; | ||
| } | ||
|
|
||
| public GateType getGateType() { | ||
| return gateType; | ||
| } | ||
|
|
||
| @Override | ||
| public MultiPart newPart(MultipartPlaceContext context) { | ||
| Direction side = context.getClickedFace(); | ||
| BlockPos onPos = context.getClickedPos().relative(side.getOpposite()); | ||
| if (!PlacementLib.canPlaceGateOnSide(context.getLevel(), onPos, side)) { | ||
| return null; | ||
| } | ||
| GatePart gatePart = gateType.newPart(); | ||
| if (!gatePart.preparePlacement(context)) { | ||
| return null; | ||
| } | ||
| return gatePart; | ||
| } | ||
| } |
29 changes: 2 additions & 27 deletions
29
integration/src/main/java/mrtjp/projectred/integration/item/GatePartItem.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 |
|---|---|---|
| @@ -1,38 +1,13 @@ | ||
| package mrtjp.projectred.integration.item; | ||
|
|
||
| import codechicken.multipart.api.ItemMultipart; | ||
| import codechicken.multipart.api.part.MultiPart; | ||
| import codechicken.multipart.util.MultipartPlaceContext; | ||
| import mrtjp.projectred.core.PlacementLib; | ||
| import mrtjp.projectred.integration.GateType; | ||
| import mrtjp.projectred.integration.ProjectRedIntegration; | ||
| import mrtjp.projectred.integration.part.GatePart; | ||
| import net.minecraft.core.BlockPos; | ||
| import net.minecraft.core.Direction; | ||
| import net.minecraft.world.item.Item; | ||
|
|
||
| public class GatePartItem extends ItemMultipart { | ||
|
|
||
| private final GateType gateType; | ||
| public class GatePartItem extends BaseGatePartItem { | ||
|
|
||
| public GatePartItem(GateType gateType) { | ||
| super(new Item.Properties().tab(ProjectRedIntegration.CREATIVE_TAB)); | ||
| this.gateType = gateType; | ||
| } | ||
|
|
||
| public GateType getGateType() { | ||
| return gateType; | ||
| super(new Item.Properties().tab(ProjectRedIntegration.CREATIVE_TAB), gateType); | ||
| } | ||
|
|
||
| @Override | ||
| public MultiPart newPart(MultipartPlaceContext context) { | ||
| Direction side = context.getClickedFace(); | ||
| BlockPos onPos = context.getClickedPos().relative(side.getOpposite()); | ||
| if (!PlacementLib.canPlaceGateOnSide(context.getLevel(), onPos, side)) { | ||
| return null; | ||
| } | ||
| GatePart gatePart = gateType.newPart(); | ||
| gatePart.preparePlacement(context.getPlayer(), onPos, side.ordinal()); | ||
| return gatePart; | ||
| } | ||
| } |
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