Remove debug text, bump version
This commit is contained in:
parent
0ca725187f
commit
b5cbfff336
|
@ -9,7 +9,7 @@ yarn_mappings=1.21.1+build.3
|
||||||
loader_version=0.16.10
|
loader_version=0.16.10
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version=0.0.1.alpha.4
|
mod_version=0.0.1.alpha.5
|
||||||
maven_group=arzumify.coretechs
|
maven_group=arzumify.coretechs
|
||||||
archives_base_name=coretechs
|
archives_base_name=coretechs
|
||||||
|
|
||||||
|
@ -17,4 +17,4 @@ archives_base_name=coretechs
|
||||||
fabric_version=0.115.1+1.21.1
|
fabric_version=0.115.1+1.21.1
|
||||||
polymer_version=0.9.18+1.21.1
|
polymer_version=0.9.18+1.21.1
|
||||||
polyenergy_version=3.0.0
|
polyenergy_version=3.0.0
|
||||||
located_version=1.0.0
|
located_version=1.0.0
|
||||||
|
|
|
@ -21,7 +21,6 @@ public class TexturedBlockItem extends PolymerBlockItem {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getPolymerCustomModelData(ItemStack itemStack, @Nullable ServerPlayerEntity player) {
|
public int getPolymerCustomModelData(ItemStack itemStack, @Nullable ServerPlayerEntity player) {
|
||||||
System.out.println(model.modelPath());
|
|
||||||
return model.value();
|
return model.value();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,11 +44,8 @@ public class CopperWire extends BlockWithEntity implements PolymerTexturedBlock
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
|
protected void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
|
||||||
System.out.println("onStateReplaced");
|
|
||||||
if (!world.isClient() && !state.isOf(newState.getBlock())) {
|
if (!world.isClient() && !state.isOf(newState.getBlock())) {
|
||||||
System.out.println("world is not client");
|
|
||||||
var entity = world.getBlockEntity(pos);
|
var entity = world.getBlockEntity(pos);
|
||||||
System.out.println("entity: " + entity);
|
|
||||||
if (entity != null) {
|
if (entity != null) {
|
||||||
((ServerBlockEntityEvents.Unload) entity).onUnload(entity, (ServerWorld) world);
|
((ServerBlockEntityEvents.Unload) entity).onUnload(entity, (ServerWorld) world);
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,20 +38,14 @@ public class CopperWireEntity extends BlockEntity implements EnergyProvider, Ene
|
||||||
|
|
||||||
if (!wire.receivers.isEmpty() && wire.energy > 0 && wire.active) {
|
if (!wire.receivers.isEmpty() && wire.energy > 0 && wire.active) {
|
||||||
wire.energy = Common.extract(1, 16, wire.energy, wire.providers, wire);
|
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
|
@Override
|
||||||
public long extract(long amount, EnergyReceiver receiver) {
|
public long extract(long amount, EnergyReceiver receiver) {
|
||||||
System.out.println("Giving " + amount + " to " + receiver);
|
|
||||||
if (!blackListed.contains(receiver)) {
|
if (!blackListed.contains(receiver)) {
|
||||||
System.out.println("Not blacklisted");
|
|
||||||
var extracted = Math.min(amount, Math.min(1, energy));
|
var extracted = Math.min(amount, Math.min(1, energy));
|
||||||
System.out.println("Extracted " + extracted);
|
|
||||||
energy -= extracted;
|
energy -= extracted;
|
||||||
System.out.println("Energy is now " + energy);
|
|
||||||
blackListed.add(receiver);
|
blackListed.add(receiver);
|
||||||
return extracted;
|
return extracted;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -38,11 +38,8 @@ public class CreativeGenerator extends BlockWithEntity implements BlockEntityPro
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
|
protected void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
|
||||||
System.out.println("onStateReplaced");
|
|
||||||
if (!world.isClient() && !state.isOf(newState.getBlock())) {
|
if (!world.isClient() && !state.isOf(newState.getBlock())) {
|
||||||
System.out.println("world is not client");
|
|
||||||
var entity = world.getBlockEntity(pos);
|
var entity = world.getBlockEntity(pos);
|
||||||
System.out.println("entity: " + entity);
|
|
||||||
if (entity != null) {
|
if (entity != null) {
|
||||||
((ServerBlockEntityEvents.Unload) entity).onUnload(entity, (ServerWorld) world);
|
((ServerBlockEntityEvents.Unload) entity).onUnload(entity, (ServerWorld) world);
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,14 +29,12 @@ public class CreativeGeneratorEntity extends BlockEntity implements EnergyProvid
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void ready(EnergyReceiver energyReceiver) {
|
public void ready(EnergyReceiver energyReceiver) {
|
||||||
System.out.println("Ready " + energyReceiver);
|
|
||||||
receivers.add(energyReceiver);
|
receivers.add(energyReceiver);
|
||||||
energyReceiver.ready(this);
|
energyReceiver.ready(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void unready(EnergyReceiver energyReceiver) {
|
public void unready(EnergyReceiver energyReceiver) {
|
||||||
System.out.println("Unready " + energyReceiver);
|
|
||||||
receivers.remove(energyReceiver);
|
receivers.remove(energyReceiver);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,11 +40,8 @@ public class Magnet extends BlockWithEntity implements BlockEntityProvider, Poly
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
|
protected void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
|
||||||
System.out.println("onStateReplaced");
|
|
||||||
if (!world.isClient() && !state.isOf(newState.getBlock())) {
|
if (!world.isClient() && !state.isOf(newState.getBlock())) {
|
||||||
System.out.println("world is not client");
|
|
||||||
var entity = world.getBlockEntity(pos);
|
var entity = world.getBlockEntity(pos);
|
||||||
System.out.println("entity: " + entity);
|
|
||||||
if (entity != null) {
|
if (entity != null) {
|
||||||
((ServerBlockEntityEvents.Unload) entity).onUnload(entity, (ServerWorld) world);
|
((ServerBlockEntityEvents.Unload) entity).onUnload(entity, (ServerWorld) world);
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,23 +42,18 @@ public class MagnetEntity extends BlockEntity implements EnergyReceiver, ServerB
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void ready(EnergyProvider energyProvider) {
|
public void ready(EnergyProvider energyProvider) {
|
||||||
System.out.println("Ready " + energyProvider);
|
|
||||||
providers.add(energyProvider);
|
providers.add(energyProvider);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void unready(EnergyProvider energyProvider) {
|
public void unready(EnergyProvider energyProvider) {
|
||||||
System.out.println("Unready " + energyProvider);
|
|
||||||
providers.remove(energyProvider);
|
providers.remove(energyProvider);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void tick(World world, BlockPos pos, BlockState ignoredState, MagnetEntity magnet) {
|
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);
|
magnet.energy = Common.extract(1, 16, magnet.energy, magnet.providers, magnet);
|
||||||
|
|
||||||
System.out.println("Tick energy: " + magnet.energy);
|
|
||||||
if (magnet.energy >= 1 && magnet.active) {
|
if (magnet.energy >= 1 && magnet.active) {
|
||||||
System.out.println("Magnet activated");
|
|
||||||
magnet.energy -= 1;
|
magnet.energy -= 1;
|
||||||
var entities = world.getOtherEntities(null, new Box(pos).expand(10));
|
var entities = world.getOtherEntities(null, new Box(pos).expand(10));
|
||||||
for (var entity : entities) {
|
for (var entity : entities) {
|
||||||
|
|
|
@ -40,11 +40,8 @@ public class Summoner extends BlockWithEntity implements BlockEntityProvider, Po
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
|
protected void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
|
||||||
System.out.println("onStateReplaced");
|
|
||||||
if (!world.isClient() && !state.isOf(newState.getBlock())) {
|
if (!world.isClient() && !state.isOf(newState.getBlock())) {
|
||||||
System.out.println("world is not client");
|
|
||||||
var entity = world.getBlockEntity(pos);
|
var entity = world.getBlockEntity(pos);
|
||||||
System.out.println("entity: " + entity);
|
|
||||||
if (entity != null) {
|
if (entity != null) {
|
||||||
((ServerBlockEntityEvents.Unload) entity).onUnload(entity, (ServerWorld) world);
|
((ServerBlockEntityEvents.Unload) entity).onUnload(entity, (ServerWorld) world);
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,13 +36,11 @@ public class SummonerEntity extends BlockEntity implements EnergyReceiver, Serve
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void ready(EnergyProvider energyProvider) {
|
public void ready(EnergyProvider energyProvider) {
|
||||||
System.out.println("Ready " + energyProvider);
|
|
||||||
providers.add(energyProvider);
|
providers.add(energyProvider);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void unready(EnergyProvider energyProvider) {
|
public void unready(EnergyProvider energyProvider) {
|
||||||
System.out.println("Unready " + energyProvider);
|
|
||||||
providers.remove(energyProvider);
|
providers.remove(energyProvider);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -91,4 +89,4 @@ public class SummonerEntity extends BlockEntity implements EnergyReceiver, Serve
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,11 +40,8 @@ public class Voltmeter extends BlockWithEntity implements BlockEntityProvider, P
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
|
protected void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
|
||||||
System.out.println("onStateReplaced");
|
|
||||||
if (!world.isClient() && !state.isOf(newState.getBlock())) {
|
if (!world.isClient() && !state.isOf(newState.getBlock())) {
|
||||||
System.out.println("world is not client");
|
|
||||||
var entity = world.getBlockEntity(pos);
|
var entity = world.getBlockEntity(pos);
|
||||||
System.out.println("entity: " + entity);
|
|
||||||
if (entity != null) {
|
if (entity != null) {
|
||||||
((ServerBlockEntityEvents.Unload) entity).onUnload(entity, (ServerWorld) world);
|
((ServerBlockEntityEvents.Unload) entity).onUnload(entity, (ServerWorld) world);
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,19 +29,17 @@ public class VoltmeterEntity extends BlockEntity implements EnergyReceiver, Serv
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void ready(EnergyProvider energyProvider) {
|
public void ready(EnergyProvider energyProvider) {
|
||||||
System.out.println("Ready " + energyProvider);
|
|
||||||
providers.add(energyProvider);
|
providers.add(energyProvider);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void unready(EnergyProvider energyProvider) {
|
public void unready(EnergyProvider energyProvider) {
|
||||||
System.out.println("Unready " + energyProvider);
|
|
||||||
providers.remove(energyProvider);
|
providers.remove(energyProvider);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void tick(World ignoredWorld, BlockPos ignoredPos, BlockState ignoredState, VoltmeterEntity voltmeter) {
|
public static void tick(World ignoredWorld, BlockPos ignoredPos, BlockState ignoredState, VoltmeterEntity voltmeter) {
|
||||||
for (EnergyProvider provider : voltmeter.providers) {
|
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue