Computer program cleanup

src/main/generated/resources/assets/minestuck/lang/en_us.json

@@ -2931,7 +2931,6 @@
   "minestuck.predefine.title_already_set": "That player already has their title set to %s",
   "minestuck.private_computer": "You are not allowed to access other players computers.",
   "minestuck.program.client.client_active_message": "Client is already active",
-  "minestuck.program.client.connect_button": "%s",
   "minestuck.program.client.resume_client_message": "Waiting for server...",
   "minestuck.program.client.select_color_button": "Select a Color",
   "minestuck.program.client.select_message": "Select a server below",

src/main/java/com/mraof/minestuck/Minestuck.java

@@ -10,7 +10,6 @@
 import com.mraof.minestuck.blockentity.MSBlockEntityTypes;
 import com.mraof.minestuck.command.MSSuggestionProviders;
 import com.mraof.minestuck.command.argument.MSArgumentTypes;
-import com.mraof.minestuck.computer.ProgramData;
 import com.mraof.minestuck.computer.editmode.DeployList;
 import com.mraof.minestuck.effects.MSEffects;
 import com.mraof.minestuck.entity.MSEntityTypes;
@@ -143,8 +142,6 @@ private void mainThreadSetup()
 
 		MSPottedSaplings.addSaplingsToPot();
 
-		ProgramData.init();
-
 		BlockCopier.addStep(new ComputerBlockProcess());
 		BlockCopier.addStep(new TransportalizerBlockProcess());
 		if(ModList.get().isLoaded("refinedstorage"))

src/main/java/com/mraof/minestuck/block/machine/ComputerBlock.java

@@ -5,7 +5,7 @@
 import com.mraof.minestuck.block.MSProperties;
 import com.mraof.minestuck.blockentity.ComputerBlockEntity;
 import com.mraof.minestuck.client.gui.MSScreenFactories;
-import com.mraof.minestuck.computer.ProgramData;
+import com.mraof.minestuck.computer.ProgramType;
 import com.mraof.minestuck.computer.theme.MSComputerThemes;
 import com.mraof.minestuck.item.MSItems;
 import com.mraof.minestuck.player.IdentifierHandler;
@@ -37,7 +37,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 import java.util.Map;
-import java.util.OptionalInt;
+import java.util.Objects;
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
@@ -86,7 +86,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev
 		ItemStack heldItem = player.getItemInHand(hand);
 		if(state.getValue(STATE) == State.OFF)
 		{
-			if(ProgramData.getProgramID(heldItem).isEmpty())
+			if(ProgramType.getForDisk(heldItem).isEmpty())
 				return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION;
 
 			turnOn(state, level, pos, player);
@@ -95,7 +95,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev
 		if(!(level.getBlockEntity(pos) instanceof ComputerBlockEntity blockEntity))
 			return ItemInteractionResult.FAIL;
 
-		if(insertDisk(blockEntity, state, level, pos, player, hand))
+		if(blockEntity.insertDisk(player.getItemInHand(hand)))
 			return ItemInteractionResult.SUCCESS;
 		//insertion of code handled in ReadableSburbCodeItem onItemUseFirst()
 
@@ -133,59 +133,12 @@ private void turnOn(BlockState state, Level level, BlockPos pos, Player player)
 
 		if(level.getBlockEntity(pos) instanceof ComputerBlockEntity computer)
 		{
-			computer.owner = IdentifierHandler.encode(player);
+			computer.initializeOwner(Objects.requireNonNull(IdentifierHandler.encode(player)));
 
 			computer.setTheme(defaultTheme);
 		}
 	}
 
-	private boolean insertDisk(ComputerBlockEntity blockEntity, BlockState state, Level level, BlockPos pos, Player player, InteractionHand handIn)
-	{
-		if(blockEntity.isBroken())
-			return false;
-
-		ItemStack stackInHand = player.getItemInHand(handIn);
-		OptionalInt optionalId = ProgramData.getProgramID(stackInHand);
-
-		if(stackInHand.is(MSItems.BLANK_DISK.get()))
-		{
-			if(blockEntity.blankDisksStored < 2) //only allow two blank disks to be burned at a time
-			{
-				stackInHand.shrink(1);
-				blockEntity.blankDisksStored++;
-				blockEntity.setChanged();
-				level.sendBlockUpdated(pos, state, state, 3);
-				return true;
-			}
-		} else if(stackInHand.is(Items.MUSIC_DISC_11))
-		{
-			if(!level.isClientSide && blockEntity.installedPrograms.size() < 3)
-			{
-				stackInHand.shrink(1);
-				blockEntity.closeAll();
-				level.setBlock(pos, state.setValue(STATE, State.BROKEN), Block.UPDATE_CLIENTS);
-				blockEntity.setChanged();
-				level.sendBlockUpdated(pos, state, state, 3);
-			}
-			return true;
-		} else if(optionalId.isPresent())
-		{
-			int id = optionalId.getAsInt();
-			if(!level.isClientSide && !blockEntity.hasProgram(id))
-			{
-				stackInHand.shrink(1);
-				blockEntity.installedPrograms.add(id);
-				level.setBlock(pos, state.setValue(STATE, State.GAME_LOADED), Block.UPDATE_CLIENTS);
-				blockEntity.setChanged();
-				level.sendBlockUpdated(pos, state, state, 3);
-				ProgramData.getHandler(id).ifPresent(handler -> handler.onDiskInserted(blockEntity));
-			}
-			return true;
-		}
-
-		return false;
-	}
-
 	@Nullable
 	@Override
 	public BlockEntity newBlockEntity(BlockPos pos, BlockState state)
@@ -212,8 +165,8 @@ private void dropItems(Level level, int x, int y, int z, BlockState state)
 		be.closeAll();
 
 		//program disks
-		for(int id : be.installedPrograms)
-			Containers.dropItemStack(level, x, y, z, ProgramData.getItem(id));
+		be.installedPrograms().forEach(programType -> programType.diskItem()
+				.ifPresent(disk -> Containers.dropItemStack(level, x, y, z, disk.getDefaultInstance())));
 
 		//blank disks
 		Containers.dropItemStack(level, x, y, z, new ItemStack(MSItems.BLANK_DISK.get(), be.blankDisksStored));