Skip to content

Commit c4081f2

Browse files
robotgryphonrobotgryphon
committed
Clean up and merge several capability packages/classes
1 parent 5c12669 commit c4081f2

File tree

9 files changed

+33
-50
lines changed

9 files changed

+33
-50
lines changed

src/main/java/dev/compactmods/crafting/capability/IProjectorRenderInfo.java renamed to src/api/java/dev/compactmods/crafting/api/projector/IProjectorRenderInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.compactmods.crafting.capability;
1+
package dev.compactmods.crafting.api.projector;
22

33
import java.util.Set;
44
import com.mojang.blaze3d.vertex.PoseStack;

‎src/main/java/dev/compactmods/crafting/capability/CapabilityProjectorRenderInfo.java‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/main/java/dev/compactmods/crafting/capability/CapabilityRegistration.java‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/main/java/dev/compactmods/crafting/client/ClientEventHandler.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
import dev.compactmods.crafting.api.EnumCraftingState;
66
import dev.compactmods.crafting.api.field.IActiveWorldFields;
77
import dev.compactmods.crafting.api.field.IMiniaturizationField;
8-
import dev.compactmods.crafting.capability.CapabilityProjectorRenderInfo;
9-
import dev.compactmods.crafting.capability.IProjectorRenderInfo;
8+
import dev.compactmods.crafting.api.projector.IProjectorRenderInfo;
109
import dev.compactmods.crafting.core.CCCapabilities;
1110
import dev.compactmods.crafting.field.render.CraftingPreviewRenderer;
1211
import net.minecraft.client.Camera;
@@ -33,7 +32,7 @@ public static void onTick(final TickEvent.ClientTickEvent evt) {
3332

3433
final LocalPlayer player = Minecraft.getInstance().player;
3534
if(player != null) {
36-
player.getCapability(CapabilityProjectorRenderInfo.TEMP_PROJECTOR_RENDERING)
35+
player.getCapability(CCCapabilities.TEMP_PROJECTOR_RENDERING)
3736
.ifPresent(IProjectorRenderInfo::tick);
3837
}
3938

@@ -51,7 +50,7 @@ public static void onWorldRender(final RenderLevelLastEvent event) {
5150
if (mc.level == null)
5251
return;
5352

54-
mc.player.getCapability(CapabilityProjectorRenderInfo.TEMP_PROJECTOR_RENDERING)
53+
mc.player.getCapability(CCCapabilities.TEMP_PROJECTOR_RENDERING)
5554
.ifPresent(render -> render.render(event.getPoseStack()));
5655

5756
final Camera mainCamera = mc.gameRenderer.getMainCamera();

‎src/main/java/dev/compactmods/crafting/client/render/ClientProjectorRenderInfo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.util.Set;
66
import com.mojang.blaze3d.vertex.PoseStack;
77
import dev.compactmods.crafting.api.field.MiniaturizationFieldSize;
8-
import dev.compactmods.crafting.capability.IProjectorRenderInfo;
8+
import dev.compactmods.crafting.api.projector.IProjectorRenderInfo;
99
import dev.compactmods.crafting.client.ClientConfig;
1010
import dev.compactmods.crafting.core.CCBlocks;
1111
import dev.compactmods.crafting.projector.FieldProjectorBlock;

‎src/main/java/dev/compactmods/crafting/core/CCCapabilities.java‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,37 @@
11
package dev.compactmods.crafting.core;
22

3+
import dev.compactmods.crafting.CompactCrafting;
34
import dev.compactmods.crafting.api.field.IActiveWorldFields;
45
import dev.compactmods.crafting.api.field.IFieldListener;
56
import dev.compactmods.crafting.api.field.IMiniaturizationField;
7+
import dev.compactmods.crafting.api.projector.IProjectorRenderInfo;
68
import net.minecraftforge.common.capabilities.Capability;
79
import net.minecraftforge.common.capabilities.CapabilityManager;
810
import net.minecraftforge.common.capabilities.CapabilityToken;
11+
import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent;
12+
import net.minecraftforge.eventbus.api.SubscribeEvent;
13+
import net.minecraftforge.fml.common.Mod;
914

15+
@Mod.EventBusSubscriber(modid = CompactCrafting.MOD_ID)
1016
public class CCCapabilities {
1117

12-
public static Capability<IActiveWorldFields> FIELDS = CapabilityManager.get(new CapabilityToken<IActiveWorldFields>() {
18+
public static Capability<IProjectorRenderInfo> TEMP_PROJECTOR_RENDERING = CapabilityManager.get(new CapabilityToken<>() {
1319
});
1420

15-
public static Capability<IFieldListener> FIELD_LISTENER = CapabilityManager.get(new CapabilityToken<IFieldListener>() {
21+
public static Capability<IActiveWorldFields> FIELDS = CapabilityManager.get(new CapabilityToken<>() {
1622
});
1723

18-
public static Capability<IMiniaturizationField> MINIATURIZATION_FIELD = CapabilityManager.get(new CapabilityToken<IMiniaturizationField>() {
24+
public static Capability<IFieldListener> FIELD_LISTENER = CapabilityManager.get(new CapabilityToken<>() {
1925
});
26+
27+
public static Capability<IMiniaturizationField> MINIATURIZATION_FIELD = CapabilityManager.get(new CapabilityToken<>() {
28+
});
29+
30+
@SubscribeEvent
31+
public void registerCapabilities(RegisterCapabilitiesEvent evt) {
32+
evt.register(IProjectorRenderInfo.class);
33+
evt.register(IMiniaturizationField.class);
34+
evt.register(IActiveWorldFields.class);
35+
evt.register(IFieldListener.class);
36+
}
2037
}

‎src/main/java/dev/compactmods/crafting/events/CapabilityEventHandler.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import javax.annotation.Nonnull;
44
import javax.annotation.Nullable;
55
import dev.compactmods.crafting.CompactCrafting;
6-
import dev.compactmods.crafting.capability.CapabilityProjectorRenderInfo;
7-
import dev.compactmods.crafting.capability.IProjectorRenderInfo;
6+
import dev.compactmods.crafting.api.projector.IProjectorRenderInfo;
87
import dev.compactmods.crafting.client.render.ClientProjectorRenderInfo;
9-
import net.minecraft.world.entity.Entity;
10-
import net.minecraft.world.entity.player.Player;
8+
import dev.compactmods.crafting.core.CCCapabilities;
119
import net.minecraft.core.Direction;
1210
import net.minecraft.resources.ResourceLocation;
11+
import net.minecraft.world.entity.Entity;
12+
import net.minecraft.world.entity.player.Player;
1313
import net.minecraftforge.api.distmarker.Dist;
1414
import net.minecraftforge.common.capabilities.Capability;
1515
import net.minecraftforge.common.capabilities.ICapabilityProvider;
@@ -31,7 +31,7 @@ public static void onCapPlayerAttach(final AttachCapabilitiesEvent<Entity> event
3131
@Nonnull
3232
@Override
3333
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
34-
if (cap == CapabilityProjectorRenderInfo.TEMP_PROJECTOR_RENDERING)
34+
if (cap == CCCapabilities.TEMP_PROJECTOR_RENDERING)
3535
return renderData.cast();
3636

3737
return LazyOptional.empty();

src/main/java/dev/compactmods/crafting/field/capability/events/CapabilitySetupForgeEvents.java renamed to src/main/java/dev/compactmods/crafting/field/events/ActiveWorldFieldsAttacher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.compactmods.crafting.field.capability.events;
1+
package dev.compactmods.crafting.field.events;
22

33
import javax.annotation.Nonnull;
44
import javax.annotation.Nullable;
@@ -17,7 +17,7 @@
1717
import net.minecraftforge.fml.common.Mod;
1818

1919
@Mod.EventBusSubscriber(modid = CompactCrafting.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE)
20-
public class CapabilitySetupForgeEvents {
20+
public class ActiveWorldFieldsAttacher {
2121

2222
@SubscribeEvent
2323
public static void onCapWorldAttach(final AttachCapabilitiesEvent<Level> event) {

‎src/main/java/dev/compactmods/crafting/projector/FieldProjectorBlock.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import java.util.stream.Stream;
77
import dev.compactmods.crafting.api.field.IMiniaturizationField;
88
import dev.compactmods.crafting.api.field.MiniaturizationFieldSize;
9-
import dev.compactmods.crafting.capability.CapabilityProjectorRenderInfo;
109
import dev.compactmods.crafting.core.CCCapabilities;
1110
import dev.compactmods.crafting.field.MiniaturizationField;
1211
import dev.compactmods.crafting.network.FieldActivatedPacket;
@@ -145,7 +144,7 @@ public InteractionResult use(BlockState state, Level world, BlockPos pos, Player
145144
if (world.isClientSide) {
146145
final boolean hasMissing = ProjectorHelper.getMissingProjectors(world, pos, state.getValue(FACING)).findAny().isPresent();
147146
if(hasMissing) {
148-
player.getCapability(CapabilityProjectorRenderInfo.TEMP_PROJECTOR_RENDERING)
147+
player.getCapability(CCCapabilities.TEMP_PROJECTOR_RENDERING)
149148
.ifPresent(rend -> {
150149
rend.resetRenderTime();
151150
rend.setProjector(world, pos);

0 commit comments

Comments
 (0)