diff --git a/gradle.properties b/gradle.properties index 1a81c1e..846cee7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.21.1+build.3 loader_version=0.16.10 # Mod Properties -mod_version=0.0.1.alpha.4 +mod_version=0.0.1.alpha.5 maven_group=arzumify.coretechs archives_base_name=coretechs @@ -17,4 +17,4 @@ archives_base_name=coretechs fabric_version=0.115.1+1.21.1 polymer_version=0.9.18+1.21.1 polyenergy_version=3.0.0 -located_version=1.0.0 \ No newline at end of file +located_version=1.0.0 diff --git a/src/main/java/arzumify/coretechs/TexturedBlockItem.java b/src/main/java/arzumify/coretechs/TexturedBlockItem.java index c516a74..c6d74c2 100644 --- a/src/main/java/arzumify/coretechs/TexturedBlockItem.java +++ b/src/main/java/arzumify/coretechs/TexturedBlockItem.java @@ -21,7 +21,6 @@ public class TexturedBlockItem extends PolymerBlockItem { @Override public int getPolymerCustomModelData(ItemStack itemStack, @Nullable ServerPlayerEntity player) { - System.out.println(model.modelPath()); return model.value(); } } diff --git a/src/main/java/arzumify/coretechs/energy/CopperWire.java b/src/main/java/arzumify/coretechs/energy/CopperWire.java index 27e49df..467977c 100644 --- a/src/main/java/arzumify/coretechs/energy/CopperWire.java +++ b/src/main/java/arzumify/coretechs/energy/CopperWire.java @@ -44,11 +44,8 @@ public class CopperWire extends BlockWithEntity implements PolymerTexturedBlock @Override protected void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) { - System.out.println("onStateReplaced"); if (!world.isClient() && !state.isOf(newState.getBlock())) { - System.out.println("world is not client"); var entity = world.getBlockEntity(pos); - System.out.println("entity: " + entity); if (entity != null) { ((ServerBlockEntityEvents.Unload) entity).onUnload(entity, (ServerWorld) world); } diff --git a/src/main/java/arzumify/coretechs/energy/CopperWireEntity.java b/src/main/java/arzumify/coretechs/energy/CopperWireEntity.java index 57537f4..c98a34f 100644 --- a/src/main/java/arzumify/coretechs/energy/CopperWireEntity.java +++ b/src/main/java/arzumify/coretechs/energy/CopperWireEntity.java @@ -38,20 +38,14 @@ public class CopperWireEntity extends BlockEntity implements EnergyProvider, Ene if (!wire.receivers.isEmpty() && wire.energy > 0 && wire.active) { wire.energy = Common.extract(1, 16, wire.energy, wire.providers, wire); - } else { - System.out.println("Fails conditions: " + wire.receivers.isEmpty() + " " + wire.energy + " " + wire.active); - } + } } @Override public long extract(long amount, EnergyReceiver receiver) { - System.out.println("Giving " + amount + " to " + receiver); if (!blackListed.contains(receiver)) { - System.out.println("Not blacklisted"); var extracted = Math.min(amount, Math.min(1, energy)); - System.out.println("Extracted " + extracted); energy -= extracted; - System.out.println("Energy is now " + energy); blackListed.add(receiver); return extracted; } else { diff --git a/src/main/java/arzumify/coretechs/energy/CreativeGenerator.java b/src/main/java/arzumify/coretechs/energy/CreativeGenerator.java index ddbe796..3ac2964 100644 --- a/src/main/java/arzumify/coretechs/energy/CreativeGenerator.java +++ b/src/main/java/arzumify/coretechs/energy/CreativeGenerator.java @@ -38,11 +38,8 @@ public class CreativeGenerator extends BlockWithEntity implements BlockEntityPro @Override protected void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) { - System.out.println("onStateReplaced"); if (!world.isClient() && !state.isOf(newState.getBlock())) { - System.out.println("world is not client"); var entity = world.getBlockEntity(pos); - System.out.println("entity: " + entity); if (entity != null) { ((ServerBlockEntityEvents.Unload) entity).onUnload(entity, (ServerWorld) world); } diff --git a/src/main/java/arzumify/coretechs/energy/CreativeGeneratorEntity.java b/src/main/java/arzumify/coretechs/energy/CreativeGeneratorEntity.java index 5fdb506..b82b7bf 100644 --- a/src/main/java/arzumify/coretechs/energy/CreativeGeneratorEntity.java +++ b/src/main/java/arzumify/coretechs/energy/CreativeGeneratorEntity.java @@ -29,14 +29,12 @@ public class CreativeGeneratorEntity extends BlockEntity implements EnergyProvid @Override public void ready(EnergyReceiver energyReceiver) { - System.out.println("Ready " + energyReceiver); receivers.add(energyReceiver); energyReceiver.ready(this); } @Override public void unready(EnergyReceiver energyReceiver) { - System.out.println("Unready " + energyReceiver); receivers.remove(energyReceiver); } diff --git a/src/main/java/arzumify/coretechs/energy/Magnet.java b/src/main/java/arzumify/coretechs/energy/Magnet.java index 77de191..350018a 100644 --- a/src/main/java/arzumify/coretechs/energy/Magnet.java +++ b/src/main/java/arzumify/coretechs/energy/Magnet.java @@ -40,11 +40,8 @@ public class Magnet extends BlockWithEntity implements BlockEntityProvider, Poly @Override protected void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) { - System.out.println("onStateReplaced"); if (!world.isClient() && !state.isOf(newState.getBlock())) { - System.out.println("world is not client"); var entity = world.getBlockEntity(pos); - System.out.println("entity: " + entity); if (entity != null) { ((ServerBlockEntityEvents.Unload) entity).onUnload(entity, (ServerWorld) world); } diff --git a/src/main/java/arzumify/coretechs/energy/MagnetEntity.java b/src/main/java/arzumify/coretechs/energy/MagnetEntity.java index a9389e0..420d041 100644 --- a/src/main/java/arzumify/coretechs/energy/MagnetEntity.java +++ b/src/main/java/arzumify/coretechs/energy/MagnetEntity.java @@ -42,23 +42,18 @@ public class MagnetEntity extends BlockEntity implements EnergyReceiver, ServerB @Override public void ready(EnergyProvider energyProvider) { - System.out.println("Ready " + energyProvider); providers.add(energyProvider); } @Override public void unready(EnergyProvider energyProvider) { - System.out.println("Unready " + energyProvider); providers.remove(energyProvider); } public static void tick(World world, BlockPos pos, BlockState ignoredState, MagnetEntity magnet) { - System.out.println("Trying to extract energy"); magnet.energy = Common.extract(1, 16, magnet.energy, magnet.providers, magnet); - System.out.println("Tick energy: " + magnet.energy); if (magnet.energy >= 1 && magnet.active) { - System.out.println("Magnet activated"); magnet.energy -= 1; var entities = world.getOtherEntities(null, new Box(pos).expand(10)); for (var entity : entities) { diff --git a/src/main/java/arzumify/coretechs/energy/Summoner.java b/src/main/java/arzumify/coretechs/energy/Summoner.java index 70eb7c9..09218fc 100644 --- a/src/main/java/arzumify/coretechs/energy/Summoner.java +++ b/src/main/java/arzumify/coretechs/energy/Summoner.java @@ -40,11 +40,8 @@ public class Summoner extends BlockWithEntity implements BlockEntityProvider, Po @Override protected void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) { - System.out.println("onStateReplaced"); if (!world.isClient() && !state.isOf(newState.getBlock())) { - System.out.println("world is not client"); var entity = world.getBlockEntity(pos); - System.out.println("entity: " + entity); if (entity != null) { ((ServerBlockEntityEvents.Unload) entity).onUnload(entity, (ServerWorld) world); } diff --git a/src/main/java/arzumify/coretechs/energy/SummonerEntity.java b/src/main/java/arzumify/coretechs/energy/SummonerEntity.java index 2e4e975..4537a7d 100644 --- a/src/main/java/arzumify/coretechs/energy/SummonerEntity.java +++ b/src/main/java/arzumify/coretechs/energy/SummonerEntity.java @@ -36,13 +36,11 @@ public class SummonerEntity extends BlockEntity implements EnergyReceiver, Serve @Override public void ready(EnergyProvider energyProvider) { - System.out.println("Ready " + energyProvider); providers.add(energyProvider); } @Override public void unready(EnergyProvider energyProvider) { - System.out.println("Unready " + energyProvider); providers.remove(energyProvider); } @@ -91,4 +89,4 @@ public class SummonerEntity extends BlockEntity implements EnergyReceiver, Serve } } } -} \ No newline at end of file +} diff --git a/src/main/java/arzumify/coretechs/energy/Voltmeter.java b/src/main/java/arzumify/coretechs/energy/Voltmeter.java index 448acf5..a3fe1b7 100644 --- a/src/main/java/arzumify/coretechs/energy/Voltmeter.java +++ b/src/main/java/arzumify/coretechs/energy/Voltmeter.java @@ -40,11 +40,8 @@ public class Voltmeter extends BlockWithEntity implements BlockEntityProvider, P @Override protected void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) { - System.out.println("onStateReplaced"); if (!world.isClient() && !state.isOf(newState.getBlock())) { - System.out.println("world is not client"); var entity = world.getBlockEntity(pos); - System.out.println("entity: " + entity); if (entity != null) { ((ServerBlockEntityEvents.Unload) entity).onUnload(entity, (ServerWorld) world); } diff --git a/src/main/java/arzumify/coretechs/energy/VoltmeterEntity.java b/src/main/java/arzumify/coretechs/energy/VoltmeterEntity.java index 4f0193d..03f67c0 100644 --- a/src/main/java/arzumify/coretechs/energy/VoltmeterEntity.java +++ b/src/main/java/arzumify/coretechs/energy/VoltmeterEntity.java @@ -29,19 +29,17 @@ public class VoltmeterEntity extends BlockEntity implements EnergyReceiver, Serv @Override public void ready(EnergyProvider energyProvider) { - System.out.println("Ready " + energyProvider); providers.add(energyProvider); } @Override public void unready(EnergyProvider energyProvider) { - System.out.println("Unready " + energyProvider); providers.remove(energyProvider); } public static void tick(World ignoredWorld, BlockPos ignoredPos, BlockState ignoredState, VoltmeterEntity voltmeter) { for (EnergyProvider provider : voltmeter.providers) { - System.out.println("Extracted " + provider.extract(Long.MAX_VALUE, voltmeter)); + // System.out.println("Extracted " + provider.extract(Long.MAX_VALUE, voltmeter)); } }