hiajen/EAA_MOD
1
1
Fork 0
Code Issues 4 Pull requests 1 Projects Releases 4 Activity

#11 Provide readonly config, extend readme, refactor database location

Browse source
This commit is contained in:
Hiajen Hiajen 2021-07-27 12:17:39 +02:00
parent df3f64bcf3
commit 87d167d87b
8 changed files with 63 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/net/saltymc/eaa/commands/TagCommand.java
View file

@ -35,15 +35,17 @@ public class TagCommand extends EaaModCommand{
.then(
argument("player", StringArgumentType.word())
.suggests((ctx, builder) -> EntityArgumentType.player().listSuggestions(ctx, builder))
.then(argument("tag", StringArgumentType.word())
.suggests(((context, builder) -> {
for (DB_Tag.Type tag : DB_Tag.Type.values())
builder.suggest(tag.name());
return builder.buildFuture();
}))
.then(
argument("grade", IntegerArgumentType.integer(0,10))
.executes(this)
)));
.then(
argument("tag", StringArgumentType.word())
.suggests(((context, builder) -> {
for (DB_Tag.Type tag : DB_Tag.Type.values())
builder.suggest(tag.name());
return builder.buildFuture();
}))
.then(
argument("grade", IntegerArgumentType.integer(0,10))
.suggests((ctx, builder) -> IntegerArgumentType.integer(0,10).listSuggestions(ctx, builder))
.executes(this)
)));
}
}

4
src/main/java/net/saltymc/eaa/function/LobbyFunction.java
View file

@ -38,7 +38,7 @@ public class LobbyFunction {
if (type == DB_Tag.Type.HACKER){
dangerLvl = 2;
break;
} else if (type == DB_Tag.Type.IDIOT){
} else if (type == DB_Tag.Type.IDIOT || type == DB_Tag.Type.NOOB){
dangerLvl = 1;
}
}
@ -49,7 +49,7 @@ public class LobbyFunction {
SystemToast.add(source.getClient().getToastManager(), SystemToast.Type.WORLD_BACKUP, Text.of("OKAY!"), Text.of("No Hackers found"));
break;
case 1:
SystemToast.add(source.getClient().getToastManager(), SystemToast.Type.TUTORIAL_HINT, Text.of("MEH!"), Text.of("There is an Idiot!"));
SystemToast.add(source.getClient().getToastManager(), SystemToast.Type.TUTORIAL_HINT, Text.of("MEH!"), Text.of("There is an Idiot or Noob!"));
break;
case 2:
SystemToast.add(source.getClient().getToastManager(), SystemToast.Type.WORLD_ACCESS_FAILURE, Text.of("ALARM!"), Text.of("There is a Hacker!"));

2
src/main/java/net/saltymc/eaa/util/database/DB_Tag.java
View file

@ -1,7 +1,5 @@
package net.saltymc.eaa.util.database;
import net.minecraft.util.Formatting;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;

BIN
src/main/resources/datenbank/datenbank_shema.mwb
View file

Binary file not shown.

BIN
src/main/resources/datenbank/datenbank_shema.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 11 KiB

86
src/main/resources/datenbank/datenbank_shema.sql
View file

@ -1,86 +0,0 @@
-- MySQL Script generated by MySQL Workbench
-- Sun May 23 00:03:01 2021
-- Model: New Model Version: 1.0
-- MySQL Workbench Forward Engineering
SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES';
-- -----------------------------------------------------
-- Schema mydb
-- -----------------------------------------------------
-- -----------------------------------------------------
-- Schema mydb
-- -----------------------------------------------------
CREATE SCHEMA IF NOT EXISTS `mydb` DEFAULT CHARACTER SET utf8 ;
USE `mydb` ;
-- -----------------------------------------------------
-- Table `mydb`.`Player`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `mydb`.`Player` (
`id` INT NOT NULL,
`name` VARCHAR(45) NULL,
`UUID` VARCHAR(36) NOT NULL,
`tag` VARCHAR(45) NULL,
PRIMARY KEY (`id`),
UNIQUE INDEX `UUID_UNIQUE` (`UUID` ASC))
ENGINE = InnoDB;
-- -----------------------------------------------------
-- Table `mydb`.`Report`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `mydb`.`Report` (
`Player_id` INT NOT NULL,
`id` INT NOT NULL,
`date` DATE NOT NULL,
`reason` VARCHAR(255) NULL,
`grade` INT NULL,
INDEX `fk_Report_Player_idx` (`Player_id` ASC),
PRIMARY KEY (`Player_id`, `id`),
CONSTRAINT `fk_Report_Player`
FOREIGN KEY (`Player_id`)
REFERENCES `mydb`.`Player` (`id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION)
ENGINE = InnoDB;
-- -----------------------------------------------------
-- Table `mydb`.`Map`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `mydb`.`Map` (
`id` INT NOT NULL,
`name` VARCHAR(45) NOT NULL,
`Color` VARCHAR(45) NOT NULL,
PRIMARY KEY (`id`),
UNIQUE INDEX `name_UNIQUE` (`name` ASC))
ENGINE = InnoDB;
-- -----------------------------------------------------
-- Table `mydb`.`Server_Reports`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `mydb`.`Server_Reports` (
`id` INT NOT NULL,
`date` DATE NOT NULL,
`appeals` VARCHAR(255) NOT NULL,
`grade` INT NULL,
`Server_Reportscol` VARCHAR(45) NULL,
`Player_id` INT NOT NULL,
PRIMARY KEY (`id`, `Player_id`),
INDEX `fk_Server_Reports_Player1_idx` (`Player_id` ASC),
CONSTRAINT `fk_Server_Reports_Player1`
FOREIGN KEY (`Player_id`)
REFERENCES `mydb`.`Player` (`id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION)
ENGINE = InnoDB;
SET SQL_MODE=@OLD_SQL_MODE;
SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;