Skip to content

Commit

Permalink
Merge branch 'dev/patch' into RotateVectorToStringFix
Browse files Browse the repository at this point in the history
  • Loading branch information
@sovdeeth
sovdeeth authored Sep 27, 2023
2 parents e0a1d6a + d1f73b8 commit da81980
Show file tree
Hide file tree
Showing 20 changed files with 333 additions and 300 deletions.
6 changes: 3 additions & 3 deletions .github/pull_request_template.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<!--- Describe your changes here. --->

---
**Target Minecraft Versions:** <!-- 'any' means all supported versions -->
**Requirements:** <!-- Required plugins, Minecraft versions, server software... -->
**Related Issues:** <!-- Links to related issues -->
**Target Minecraft Versions:** any <!-- 'any' means all supported versions -->
**Requirements:** none <!-- Required plugins, server software... -->
**Related Issues:** none <!-- Links to related issues -->
2 changes: 1 addition & 1 deletion .github/workflows/cleanup-docs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
echo "DOCS_OUTPUT_DIR=${GITHUB_WORKSPACE}/skript-docs/docs/nightly/${BRANCH_NAME}" >> $GITHUB_OUTPUT
echo "DOCS_REPO_DIR=${GITHUB_WORKSPACE}/skript-docs" >> $GITHUB_OUTPUT
- name: Checkout Skript
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
ref: ${{ github.event.repository.default_branch }}
submodules: recursive
Expand Down
5 changes: 2 additions & 3 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {
shadow group: 'org.bstats', name: 'bstats-bukkit', version: '3.0.2'
shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.3.0'

implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.20.1-R0.1-SNAPSHOT'
implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.20.2-R0.1-SNAPSHOT'
implementation group: 'org.eclipse.jdt', name: 'org.eclipse.jdt.annotation', version: '2.2.700'
implementation group: 'com.google.code.findbugs', name: 'findbugs', version: '3.0.1'
implementation group: 'com.sk89q.worldguard', name: 'worldguard-legacy', version: '7.0.0-SNAPSHOT'
Expand Down Expand Up @@ -246,7 +246,7 @@ void createTestTask(String name, String desc, String environments, int javaVersi
}
}

def latestEnv = 'java17/paper-1.20.1.json'
def latestEnv = 'java17/paper-1.20.2.json'
def latestJava = 17
def oldestJava = 8

Expand Down Expand Up @@ -389,7 +389,6 @@ task nightlyRelease(type: ShadowJar) {

javadoc {
dependsOn nightlyResources

source = sourceSets.main.allJava

exclude("ch/njol/skript/conditions/**")
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ org.gradle.parallel=true

groupid=ch.njol
name=skript
version=2.8.0-dev
version=2.7.1
jarName=Skript.jar
testEnv=java17/paper-1.20.1
testEnv=java17/paper-1.20.2
testEnvJavaVersion=17
138 changes: 68 additions & 70 deletions src/main/java/ch/njol/skript/Skript.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,76 +18,9 @@
*/
package ch.njol.skript;

import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.lang.Thread.UncaughtExceptionHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.logging.Filter;
import java.util.logging.Level;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;

import org.bstats.bukkit.Metrics;
import org.bstats.charts.SimplePie;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
import org.bukkit.command.PluginCommand;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.ServerCommandEvent;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.plugin.java.JavaPlugin;
import org.eclipse.jdt.annotation.Nullable;
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
import org.skriptlang.skript.lang.entry.EntryValidator;
import org.skriptlang.skript.lang.script.Script;
import org.skriptlang.skript.lang.structure.Structure;
import org.skriptlang.skript.lang.structure.StructureInfo;

import com.google.common.collect.Lists;
import com.google.gson.Gson;

import ch.njol.skript.aliases.Aliases;
import ch.njol.skript.bukkitutil.BurgerHelper;
import ch.njol.skript.classes.ClassInfo;
import org.skriptlang.skript.lang.comparator.Comparator;
import org.skriptlang.skript.lang.converter.Converter;
import ch.njol.skript.classes.data.BukkitClasses;
import ch.njol.skript.classes.data.BukkitEventValues;
import ch.njol.skript.classes.data.DefaultComparators;
Expand Down Expand Up @@ -124,8 +57,6 @@
import ch.njol.skript.log.SkriptLogger;
import ch.njol.skript.log.Verbosity;
import ch.njol.skript.registrations.Classes;
import org.skriptlang.skript.lang.comparator.Comparators;
import org.skriptlang.skript.lang.converter.Converters;
import ch.njol.skript.registrations.EventValues;
import ch.njol.skript.test.runner.EffObjectives;
import ch.njol.skript.test.runner.SkriptJUnitTest;
Expand Down Expand Up @@ -153,6 +84,73 @@
import ch.njol.util.StringUtils;
import ch.njol.util.coll.iterator.CheckedIterator;
import ch.njol.util.coll.iterator.EnumerationIterable;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
import org.bstats.bukkit.Metrics;
import org.bstats.charts.SimplePie;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
import org.bukkit.command.PluginCommand;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.ServerCommandEvent;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.plugin.java.JavaPlugin;
import org.eclipse.jdt.annotation.Nullable;
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
import org.skriptlang.skript.lang.comparator.Comparator;
import org.skriptlang.skript.lang.comparator.Comparators;
import org.skriptlang.skript.lang.converter.Converter;
import org.skriptlang.skript.lang.converter.Converters;
import org.skriptlang.skript.lang.entry.EntryValidator;
import org.skriptlang.skript.lang.script.Script;
import org.skriptlang.skript.lang.structure.Structure;
import org.skriptlang.skript.lang.structure.StructureInfo;

import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.lang.Thread.UncaughtExceptionHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.logging.Filter;
import java.util.logging.Level;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;

// TODO meaningful error if someone uses an %expression with percent signs% outside of text or a variable

Expand Down Expand Up @@ -770,7 +768,7 @@ protected void afterErrors() {
SkriptConfig.defaultEventPriority.value().name().toLowerCase(Locale.ENGLISH).replace('_', ' ')
));
metrics.addCustomChart(new SimplePie("logPlayerCommands", () ->
SkriptConfig.logPlayerCommands.value().toString()
String.valueOf((SkriptConfig.logEffectCommands.value() || SkriptConfig.logPlayerCommands.value()))
));
metrics.addCustomChart(new SimplePie("maxTargetDistance", () ->
SkriptConfig.maxTargetBlockDistance.value().toString()
Expand Down
12 changes: 9 additions & 3 deletions src/main/java/ch/njol/skript/SkriptConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,14 @@ public class SkriptConfig {
public static final Option<Boolean> enableEffectCommands = new Option<>("enable effect commands", false);
public static final Option<String> effectCommandToken = new Option<>("effect command token", "!");
public static final Option<Boolean> allowOpsToUseEffectCommands = new Option<>("allow ops to use effect commands", false);


/*
* @deprecated Will be removed in 2.8.0. Use {@link #logEffectCommands} instead.
*/
@Deprecated
public static final Option<Boolean> logPlayerCommands = new Option<>("log player commands", false).optional(true);
public static final Option<Boolean> logEffectCommands = new Option<>("log effect commands", false);

// everything handled by Variables
public static final OptionSection databases = new OptionSection("databases");

Expand Down Expand Up @@ -164,8 +171,7 @@ public static String formatDate(final long timestamp) {
return null;
}
});

public static final Option<Boolean> logPlayerCommands = new Option<Boolean>("log player commands", false);


/**
* Maximum number of digits to display after the period for floats and doubles
Expand Down
39 changes: 24 additions & 15 deletions src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -877,6 +877,30 @@ public Block get(PlayerMoveEvent event) {
return event.getTo().clone().subtract(0, 0.5, 0).getBlock();
}
}, EventValues.TIME_NOW);
EventValues.registerEventValue(PlayerMoveEvent.class, Location.class, new Getter<Location, PlayerMoveEvent>() {
@Override
public Location get(PlayerMoveEvent event) {
return event.getFrom();
}
}, EventValues.TIME_PAST);
EventValues.registerEventValue(PlayerMoveEvent.class, Location.class, new Getter<Location, PlayerMoveEvent>() {
@Override
public Location get(PlayerMoveEvent event) {
return event.getTo();
}
}, EventValues.TIME_NOW);
EventValues.registerEventValue(PlayerMoveEvent.class, Chunk.class, new Getter<Chunk, PlayerMoveEvent>() {
@Override
public Chunk get(PlayerMoveEvent event) {
return event.getFrom().getChunk();
}
}, EventValues.TIME_PAST);
EventValues.registerEventValue(PlayerMoveEvent.class, Chunk.class, new Getter<Chunk, PlayerMoveEvent>() {
@Override
public Chunk get(PlayerMoveEvent event) {
return event.getTo().getChunk();
}
}, EventValues.TIME_NOW);
// PlayerItemDamageEvent
EventValues.registerEventValue(PlayerItemDamageEvent.class, ItemStack.class, new Getter<ItemStack, PlayerItemDamageEvent>() {
@Override
Expand Down Expand Up @@ -1464,21 +1488,6 @@ public TeleportCause get(final PlayerTeleportEvent e) {
return e.getCause();
}
}, 0);
//PlayerMoveEvent
EventValues.registerEventValue(PlayerMoveEvent.class, Location.class, new Getter<Location, PlayerMoveEvent>() {
@Override
@Nullable
public Location get(PlayerMoveEvent e) {
return e.getFrom();
}
}, EventValues.TIME_PAST);
EventValues.registerEventValue(PlayerMoveEvent.class, Location.class, new Getter<Location, PlayerMoveEvent>() {
@Override
@Nullable
public Location get(PlayerMoveEvent e) {
return e.getTo();
}
}, EventValues.TIME_NOW);
//EntityMoveEvent
if (Skript.classExists("io.papermc.paper.event.entity.EntityMoveEvent")) {
EventValues.registerEventValue(EntityMoveEvent.class, Location.class, new Getter<Location, EntityMoveEvent>() {
Expand Down
Loading

0 comments on commit da81980

Please sign in to comment.