Skip to content

Commit 7a3c1aa

Browse files
committed
Tunnel color tweaks, more test mod updates
1 parent 6e080d6 commit 7a3c1aa

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ dependencies {
286286
runtimeOnly(fg.deobf("curse.maven:shutupexperimental-407174:3544525"))
287287

288288
// Testing Mods - Trash Cans, Pipez, Create, Refined Pipes, Pretty Pipes, Refined Storage
289-
runtimeOnly(fg.deobf("curse.maven:SuperMartijn642-454372:3544563"))
290-
runtimeOnly(fg.deobf("curse.maven:trashcans-394535:3544028"))
289+
runtimeOnly(fg.deobf("curse.maven:SuperMartijn642-454372:3649270"))
290+
runtimeOnly(fg.deobf("curse.maven:trashcans-394535:3597654"))
291291
runtimeOnly(fg.deobf("curse.maven:pipez-443900:3569514"))
292292
runtimeOnly(fg.deobf("curse.maven:flywheel-486392:3687357"))
293293
runtimeOnly(fg.deobf("curse.maven:create-328085:3687358"))

src/tunnels/java/dev/compactmods/machines/tunnel/definitions/ForgeEnergyTunnel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class ForgeEnergyTunnel extends ForgeRegistryEntry<TunnelDefinition>
2222
implements TunnelDefinition, CapabilityTunnel<ForgeEnergyTunnel.Instance> {
2323
@Override
2424
public int ringColor() {
25-
return FastColor.ARGB32.color(255, 193, 100, 222);
25+
return FastColor.ARGB32.color(255, 0, 166, 88);
2626
}
2727

2828
@Override

src/tunnels/java/dev/compactmods/machines/tunnel/definitions/ItemTunnel.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import net.minecraft.core.Direction;
1111
import net.minecraft.core.NonNullList;
1212
import net.minecraft.nbt.CompoundTag;
13+
import net.minecraft.util.FastColor;
1314
import net.minecraft.world.Containers;
1415
import net.minecraft.world.item.ItemStack;
1516
import net.minecraftforge.common.capabilities.Capability;
@@ -27,7 +28,7 @@ public class ItemTunnel extends ForgeRegistryEntry<TunnelDefinition>
2728

2829
@Override
2930
public int ringColor() {
30-
return 0xffcd8f24;
31+
return FastColor.ARGB32.color(255, 205, 143, 36);
3132
}
3233

3334
/**
@@ -39,9 +40,7 @@ public Instance newInstance(BlockPos pos, Direction side) {
3940

4041
@Override
4142
public ImmutableSet<Capability<?>> getSupportedCapabilities() {
42-
return ImmutableSet.<Capability<?>>builder()
43-
.add(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
44-
.build();
43+
return ImmutableSet.of(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY);
4544
}
4645

4746
/**
@@ -52,7 +51,7 @@ public ImmutableSet<Capability<?>> getSupportedCapabilities() {
5251
*/
5352
@Override
5453
public <CapType> LazyOptional<CapType> getCapability(Capability<CapType> capType, Instance instance) {
55-
if(capType == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
54+
if (capType == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
5655
return instance.lazy();
5756
}
5857

@@ -69,9 +68,9 @@ public void onRemoved(TunnelPosition position, Instance instance) {
6968
BlockPos dropAt = position.pos().relative(position.side());
7069

7170
NonNullList<ItemStack> stacks = NonNullList.create();
72-
for(int i = 0; i < instance.handler.getSlots(); i++) {
71+
for (int i = 0; i < instance.handler.getSlots(); i++) {
7372
ItemStack stack = instance.handler.getStackInSlot(i);
74-
if(!stack.isEmpty())
73+
if (!stack.isEmpty())
7574
stacks.add(stack);
7675
}
7776

0 commit comments

Comments
 (0)