Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.19->1.20 internet card fixups

Browse Source
This commit is contained in:
logan
2025-01-30 21:44:04 -08:00
parent acf408cfa8
commit 0034b8dbfe
8 changed files with 14 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/li/cil/oc2/client/renderer/blockentity/InternetGateWayRenderer.java
View File

@@ -2,8 +2,8 @@ package li.cil.oc2.client.renderer.blockentity;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.mojang.math.Matrix4f;
import com.mojang.math.Vector3f;
import org.joml.Matrix4f;
import org.joml.Vector3f;
import li.cil.oc2.client.renderer.ModRenderType;
import li.cil.oc2.common.blockentity.InternetGateWayBlockEntity;

1
src/main/java/li/cil/oc2/common/Config.java
View File

@@ -88,6 +88,7 @@ public final class Config {
public static boolean monitorsUseEnergy() {
return computerEnergyPerTick > 0 && computerEnergyStorage > 0;
}
public static boolean gatewayUseEnergy() {
return gatewayEnergyPerPacket > 0 && gatewayEnergyStorage > 0;
}

8
src/main/java/li/cil/oc2/common/ConfigManager.java
View File

@@ -199,14 +199,6 @@ public final class ConfigManager {
return new ConfigFieldPair<>(field, configValue, ResourceLocation::new);
}
private static ConfigFieldPair<?> parseBooleanField(final Object instance, final Field field, final String path, final ForgeConfigSpec.Builder builder) throws IllegalAccessException {
final boolean defaultValue = (boolean) field.get(instance);
final ForgeConfigSpec.BooleanValue configValue = builder.define(path, defaultValue);
return new ConfigFieldPair<>(field, configValue);
}
private static String getPath(@Nullable final String prefix, final Field field) {
return (prefix != null ? prefix + "." : "") + field.getName();
}

4
src/main/java/li/cil/oc2/common/block/InternetGatewayBlock.java
View File

@@ -8,14 +8,14 @@ import net.minecraft.world.level.block.HalfTransparentBlock;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MapColor;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
public class InternetGatewayBlock extends HalfTransparentBlock implements EntityBlock {
public InternetGatewayBlock() {
super(Properties.of(Material.METAL).sound(SoundType.METAL).strength(1.5f, 6.0f));
super(Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).strength(1.5f, 6.0f));
}
@Override

6
src/main/java/li/cil/oc2/common/bus/device/provider/ProviderRegistry.java
View File

@@ -37,8 +37,6 @@ public final class ProviderRegistry {
ITEM_DEVICE_PROVIDERS.register("flash_memory", FlashMemoryItemDeviceProvider::new);
ITEM_DEVICE_PROVIDERS.register("flash_memory_custom", FlashMemoryWithExternalDataItemDeviceProvider::new);
ITEM_DEVICE_PROVIDERS.register("redstone_interface_card", RedstoneInterfaceCardItemDeviceProvider::new);
ITEM_DEVICE_PROVIDERS.register("network_interface_card", NetworkInterfaceCardItemDeviceProvider::new);
ITEM_DEVICE_PROVIDERS.register("network_tunnel_card", NetworkTunnelCardItemDeviceProvider::new);
ITEM_DEVICE_PROVIDERS.register("file_import_export_card", FileImportExportCardItemDeviceProvider::new);
ITEM_DEVICE_PROVIDERS.register("sound_card", SoundCardItemDeviceProvider::new);
ITEM_DEVICE_PROVIDERS.register("cpu", CPUItemDeviceProvider::new);
@@ -47,6 +45,10 @@ public final class ProviderRegistry {
ITEM_DEVICE_PROVIDERS.register("block_operations_module", BlockOperationsModuleDeviceProvider::new);
ITEM_DEVICE_PROVIDERS.register("network_tunnel_module", NetworkTunnelModuleItemDeviceProvider::new);
ITEM_DEVICE_PROVIDERS.register("network_interface_card", NetworkInterfaceCardItemDeviceProvider::new);
ITEM_DEVICE_PROVIDERS.register("network_tunnel_card", NetworkTunnelCardItemDeviceProvider::new);
ITEM_DEVICE_PROVIDERS.register("internet_card", InternetCardItemDeviceProvider::new);
ITEM_DEVICE_PROVIDERS.register("item_stack/capability", ItemStackCapabilityDeviceProvider::new);
ITEM_DEVICE_PROVIDERS.register("energy_storage", EnergyStorageItemDeviceProvider::new);
ITEM_DEVICE_PROVIDERS.register("fluid_handler", FluidHandlerItemDeviceProvider::new);

12
src/main/java/li/cil/oc2/common/bus/device/provider/Providers.java
View File

@@ -23,16 +23,6 @@ public final class Providers {
}
public static void registerItemDeviceProviders(final BiConsumer<String, Supplier<ItemDeviceProvider>> registry) {
registry.accept("memory", MemoryItemDeviceProvider::new);
registry.accept("hard_drive", HardDriveItemDeviceProvider::new);
registry.accept("hard_drive_custom", HardDriveWithExternalDataItemDeviceProvider::new);
registry.accept("flash_memory", FlashMemoryItemDeviceProvider::new);
registry.accept("flash_memory_custom", FlashMemoryWithExternalDataItemDeviceProvider::new);
registry.accept("redstone_interface_card", RedstoneInterfaceCardItemDeviceProvider::new);
registry.accept("network_interface_card", NetworkInterfaceCardItemDeviceProvider::new);
registry.accept("network_tunnel_card", NetworkTunnelCardItemDeviceProvider::new);
registry.accept("internet_card", InternetCardItemDeviceProvider::new);
registry.accept("file_import_export_card", FileImportExportCardItemDeviceProvider::new);
registry.accept("sound_card", SoundCardItemDeviceProvider::new);
}
}

4
src/main/java/li/cil/oc2/common/util/TooltipUtils.java
View File

@@ -111,10 +111,10 @@ public final class TooltipUtils {
if (stack.getItem() == Items.INTERNET_GATEWAY.get()) {
if (Config.gatewayEnergyPerPacket > 0) {
final MutableComponent energy = withFormat(String.valueOf(Config.gatewayEnergyPerPacket), ChatFormatting.GREEN);
tooltip.add(withFormat(new TranslatableComponent(Constants.TOOLTIP_INTERNET_ENERGY_PER_PACKET, energy), ChatFormatting.GRAY));
tooltip.add(withFormat(Component.translatable(Constants.TOOLTIP_INTERNET_ENERGY_PER_PACKET, energy), ChatFormatting.GRAY));
}
if (!Config.internetCardEnabled) {
tooltip.add(withFormat(new TranslatableComponent(Constants.TOOLTIP_INTERNET_DISABLED), ChatFormatting.RED));
tooltip.add(withFormat(Component.translatable(Constants.TOOLTIP_INTERNET_DISABLED), ChatFormatting.RED));
}
}
}

4
src/test/java/li/cil/oc2/common/inet/Ipv4SpaceTest.java
View File

@@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.*;
public class Ipv4SpaceTest {
@Test
public void someRangesAndSubnetsTest() {
public void someRangesAndSubnetsTest() throws AddressParseException {
final Ipv4Space ipv4Space = new Ipv4Space(Ipv4Space.Modes.ALLOWLIST);
ipv4Space.put("127.0.1.1");
ipv4Space.put("one.one.one.one");
@@ -29,7 +29,7 @@ public class Ipv4SpaceTest {
}
@Test
public void computeIpSpaceTest() {
public void computeIpSpaceTest() throws AddressParseException {
final Ipv4Space space = InetUtils.computeIpSpace("127.0.0.0/8, 10.0.0.0/8, 100.64.0.0/10, 172.16.0.0/12, 192.168.0.0/16, 224.0.0.0/4", " ");
assertEquals("[172.16.0.0-172.31.255.255, 192.168.0.0-192.168.255.255, 224.0.0.0-239.255.255.255, 10.0.0.0-10.255.255.255, 100.64.0.0-100.127.255.255, 127.0.0.0-127.255.255.255]", space.toString());
assertFalse(space.isAllowed(InetUtils.parseIpv4Address("192.168.1.1")));