CircleShift
/
transit-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.20.2

This commit is contained in:
Kyle Gunger 2023-11-14 17:09:23 -05:00
parent 80fe25bcb8
commit d1680864ed
34 changed files with 846 additions and 636 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -1,6 +1,6 @@
MIT License
Copyright (c) 2020 Kyle Gunger
Copyright (c) 2023 Kyle Gunger
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

50
build.gradle
View File

@ -1,15 +1,15 @@
plugins {
id 'fabric-loom' version '0.8-SNAPSHOT'
id 'fabric-loom' version '1.4-SNAPSHOT'
id 'maven-publish'
}
sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_16
archivesBaseName = project.archives_base_name
version = project.mod_version
group = project.maven_group
base {
archivesName = project.archives_base_name
}
repositories {
// Add repositories to retrieve artifacts from in here.
// You should only use this when depending on other mods because
@ -18,6 +18,18 @@ repositories {
// for more information about repositories.
}
loom {
splitEnvironmentSourceSets()
mods {
"modid" {
sourceSet sourceSets.main
sourceSet sourceSets.client
}
}
}
dependencies {
// To change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
@ -26,9 +38,11 @@ dependencies {
// Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
// Uncomment the following line to enable the deprecated Fabric API modules.
// These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
// You may need to force-disable transitiveness on them.
// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
}
processResources {
@ -40,14 +54,7 @@ processResources {
}
tasks.withType(JavaCompile).configureEach {
// ensure that the encoding is set to UTF-8, no matter what the system default is
// this fixes some edge cases with special characters not displaying correctly
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
// If Javadoc is generated, this must be specified in that task too.
it.options.encoding = "UTF-8"
// Minecraft 1.17 (21w19a) upwards uses Java 16.
it.options.release = 16
it.options.release = 17
}
java {
@ -55,11 +62,14 @@ java {
// if it is present.
// If you remove this line, sources will not be generated.
withSourcesJar()
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
jar {
from("LICENSE") {
rename { "${it}_${project.archivesBaseName}"}
rename { "${it}_${project.base.archivesName.get()}"}
}
}
@ -67,13 +77,7 @@ jar {
publishing {
publications {
mavenJava(MavenPublication) {
// add all the jars that should be included when publishing to maven
artifact(remapJar) {
builtBy remapJar
}
artifact(sourcesJar) {
builtBy remapSourcesJar
}
from components.java
}
}

18
gradle.properties
View File

@ -1,17 +1,17 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G
org.gradle.parallel=true
# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.17
yarn_mappings=1.17+build.1
loader_version=0.11.3
# check these on https://fabricmc.net/develop
minecraft_version=1.20.2
yarn_mappings=1.20.2+build.1
loader_version=0.14.22
# Mod Properties
mod_version = 2.0.0
maven_group = net.corechg
archives_base_name = transit-api
mod_version=3.0.0-alpha
maven_group=net.cshift.api
archives_base_name=transit
# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.34.9+1.17
fabric_version=0.89.1+1.20.2

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

293
gradlew vendored
View File

@ -1,7 +1,7 @@
#!/usr/bin/env sh
#!/bin/sh
#
# Copyright 2015 the original author or authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -17,67 +17,98 @@
#
##############################################################################
##
## Gradle start up script for UN*X
##
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
app_path=$0
# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
MAX_FD=maximum
warn () {
echo "$*"
}
} >&2
die () {
echo
echo "$*"
echo
exit 1
}
} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD="$JAVA_HOME/bin/java"
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@ -98,88 +129,120 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
JAVACMD=java
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`
# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@"

181
gradlew.bat vendored
View File

@ -1,89 +1,92 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

18
settings.gradle
View File

@ -1,10 +1,10 @@
pluginManagement {
repositories {
jcenter()
maven {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
}
gradlePluginPortal()
}
}
repositories {
maven {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
}
mavenCentral()
gradlePluginPortal()
}
}

48
src/main/java/net/cshift/api/transit/Transit.java Normal file
View File

@ -0,0 +1,48 @@
/*
MIT License
Copyright (c) 2023 Kyle Gunger
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
package net.cshift.api.transit;
import net.fabricmc.api.ModInitializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.cshift.api.transit.type.group.SimpleGroups;
/**
* @author Kyle Gunger
* @apiNote This is the main entry point for Transit. The api is mostly intended for use on server-side connections.
*/
public class Transit implements ModInitializer {
private static final Logger LOGGER = LoggerFactory.getLogger("Transit API");
@Override
public void onInitialize() {
LOGGER.info("Transit API: Providing a thin wrapper over reality!");
SimpleGroups.init();
}
}

28
src/main/java/net/cshift/transit/network/Channel.java → src/main/java/net/cshift/api/transit/network/Channel.java
View File

@ -1,6 +1,30 @@
package net.cshift.transit.network;
/*
MIT License
import net.cshift.transit.network.packet.IStaticPacket;
Copyright (c) 2023 Kyle Gunger
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
package net.cshift.api.transit.network;
import net.cshift.api.transit.network.packet.IStaticPacket;
/**
* @author Kyle Gunger

4
src/main/java/net/cshift/transit/network/INode.java → src/main/java/net/cshift/api/transit/network/INode.java
View File

@ -1,6 +1,6 @@
package net.cshift.transit.network;
package net.cshift.api.transit.network;
import net.cshift.transit.network.packet.*;
import net.cshift.api.transit.network.packet.*;
/**
* @author Kyle Gunger

2
src/main/java/net/cshift/transit/network/ISystem.java → src/main/java/net/cshift/api/transit/network/ISystem.java
View File

@ -1,4 +1,4 @@
package net.cshift.transit.network;
package net.cshift.api.transit.network;
/**

2
src/main/java/net/cshift/transit/network/PoolManifest.java → src/main/java/net/cshift/api/transit/network/PoolManifest.java
View File

@ -1,4 +1,4 @@
package net.cshift.transit.network;
package net.cshift.api.transit.network;
/**
* @author Kyle Gunger

4
src/main/java/net/cshift/transit/network/packet/DynamicPacket.java → src/main/java/net/cshift/api/transit/network/packet/DynamicPacket.java
View File

@ -1,6 +1,6 @@
package net.cshift.transit.network.packet;
package net.cshift.api.transit.network.packet;
import net.cshift.transit.type.Type;
import net.cshift.api.transit.type.Type;
/**
* Simple packet which stores a fluid value.

2
src/main/java/net/cshift/transit/network/packet/IDynamicPacket.java → src/main/java/net/cshift/api/transit/network/packet/IDynamicPacket.java
View File

@ -1,4 +1,4 @@
package net.cshift.transit.network.packet;
package net.cshift.api.transit.network.packet;
/** Interface describing a fluid packet.
* @author Kyle Gunger

4
src/main/java/net/cshift/transit/network/packet/IStaticPacket.java → src/main/java/net/cshift/api/transit/network/packet/IStaticPacket.java
View File

@ -1,6 +1,6 @@
package net.cshift.transit.network.packet;
package net.cshift.api.transit.network.packet;
import net.cshift.transit.type.*;
import net.cshift.api.transit.type.*;
/** Interface describing an unchanging packet.
* @author Kyle Gunger

4
src/main/java/net/cshift/transit/network/packet/MetaDynamicPacket.java → src/main/java/net/cshift/api/transit/network/packet/MetaDynamicPacket.java
View File

@ -1,6 +1,6 @@
package net.cshift.transit.network.packet;
package net.cshift.api.transit.network.packet;
import net.cshift.transit.type.Type;
import net.cshift.api.transit.type.Type;
/** Static packet with extra data attached.
* @author Kyle Gunger

4
src/main/java/net/cshift/transit/network/packet/MetaPacket.java → src/main/java/net/cshift/api/transit/network/packet/MetaPacket.java
View File

@ -1,6 +1,6 @@
package net.cshift.transit.network.packet;
package net.cshift.api.transit.network.packet;
import net.cshift.transit.type.*;
import net.cshift.api.transit.type.*;
/** Static packet with extra data attached.
* @author Kyle Gunger

4
src/main/java/net/cshift/transit/network/packet/StaticPacket.java → src/main/java/net/cshift/api/transit/network/packet/StaticPacket.java
View File

@ -1,6 +1,6 @@
package net.cshift.transit.network.packet;
package net.cshift.api.transit.network.packet;
import net.cshift.transit.type.*;
import net.cshift.api.transit.type.*;
/** Simple packet which stores an unchanging value.
* @author Kyle Gunger

43
src/main/java/net/cshift/api/transit/type/SimpleTypes.java Normal file
View File

@ -0,0 +1,43 @@
/*
MIT License
Copyright (c) 2023 Kyle Gunger
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
package net.cshift.api.transit.type;
public final class SimpleTypes {
/** Transfers energy. Energy is stored as a numeric.
*/
public static final Type<Long> TransitJoule = new Type<Long>("Joule", "ENERGY");
/** Transfers mana. TMana stores mana count and type.
*/
public static final Type<TMana> TransitMana = new Type<TMana>("TMana", "MANA");
/** Transfers items. TItem stores an item and an item count.
*/
public static final Type<TItem> TransitItem = new Type<TItem>("TItem", "ITEM");
/** Transfers fluid. TFluid stores fluid and mB.
*/
public static final Type<TFluid> TransitFluid = new Type<TFluid>("TFluid", "FLUID");
}

4
src/main/java/net/cshift/transit/type/TFluid.java → src/main/java/net/cshift/api/transit/type/TFluid.java
View File

@ -1,4 +1,4 @@
package net.cshift.transit.type;
package net.cshift.api.transit.type;
import net.minecraft.fluid.*;
@ -13,7 +13,7 @@ public class TFluid {
* Since a bucket of fluid is the same as a block of a fluid, mb can be called millibuckets or milliblocks.
*
* @param f Fluid stored (Water/Lava/etc.)
* @param mB Count of fluid (mB)
* @param mB Count of fluid (droplets)
*/
public TFluid(Fluid f, Number mB) {
fluid = f;

57
src/main/java/net/cshift/api/transit/type/TItem.java Normal file
View File

@ -0,0 +1,57 @@
/*
MIT License
Copyright (c) 2023 Kyle Gunger
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
package net.cshift.api.transit.type;
import net.minecraft.item.*;
/** Item storage
* @author Kyle Gunger
*/
public class TItem {
private Item item;
private Number count;
/** Constructor.
*
* @param i Item stored
* @param c Item count
*/
public TItem(Item i, Number c) {
item = i;
count = c;
}
/** Get the item stored.
*/
public Item getItem() {
return item;
}
/** Get the item count.
*/
public Number getCount() {
return count;
}
}

2
src/main/java/net/cshift/transit/type/TMana.java → src/main/java/net/cshift/api/transit/type/TMana.java
View File

@ -1,4 +1,4 @@
package net.cshift.transit.type;
package net.cshift.api.transit.type;
/** Units of mana.
* @author Kyle Gunger

4
src/main/java/net/cshift/transit/type/Type.java → src/main/java/net/cshift/api/transit/type/Type.java
View File

@ -1,6 +1,6 @@
package net.cshift.transit.type;
package net.cshift.api.transit.type;
import net.cshift.transit.network.packet.*;
import net.cshift.api.transit.network.packet.*;
/**@author Kyle Gunger
*

50
src/main/java/net/cshift/api/transit/type/group/GroupRegistry.java Normal file
View File

@ -0,0 +1,50 @@
package net.cshift.api.transit.type.group;
import java.security.InvalidKeyException;
import java.util.HashMap;
import org.slf4j.*;
import net.cshift.api.transit.type.Type;
public final class GroupRegistry {
private static final HashMap<String, TypeGroup<?>> GROUPS = new HashMap<String, TypeGroup<?>>();
private static final Logger LOGGER = LoggerFactory.getLogger("Transit API/Group Registry");
private GroupRegistry() {}
public static final boolean addGroup(TypeGroup<?> group)
{
if (GROUPS.containsKey(group.getGroup())) {
LOGGER.warn("Failed to add group " + group + " to the registry. Did another mod add a group with the same name?");
return false;
}
GROUPS.put(group.getGroup(), group);
LOGGER.info("Successfully added group " + group + " to the registry.");
return true;
}
public static final <T> TypeGroup<T> groupByID(String groupID)
{
if (GROUPS.containsKey(groupID)) {
TypeGroup<?> g = GROUPS.get(groupID);
return (TypeGroup<T>) g;
}
return null;
}
public static final <T> Type<T> typeByIdentity(String groupID, String typeID) throws InvalidKeyException
{
TypeGroup<T> group = GroupRegistry.<T>groupByID(groupID);
if(group != null)
return group.getType(typeID);
return null;
}
}

58
src/main/java/net/cshift/api/transit/type/group/SimpleGroups.java Normal file
View File

@ -0,0 +1,58 @@
/*
MIT License
Copyright (c) 2023 Kyle Gunger
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
package net.cshift.api.transit.type.group;
import org.slf4j.*;
import net.cshift.api.transit.type.*;
public final class SimpleGroups {
/** Transfers energy. Basic unit is TJoule (Transit Joule).
*/
public static final TypeGroup<Long> ENERGY = new TypeGroup<Long>(SimpleTypes.TransitJoule);
/** Transfers mana. Basic unit is TMana (Transit Mana).
*/
public static final TypeGroup<TMana> MANA = new TypeGroup<TMana>(SimpleTypes.TransitMana);
/** Transfers items. Basic unit is TItem.
*/
public static final TypeGroup<TItem> ITEM = new TypeGroup<TItem>(SimpleTypes.TransitItem);
/** Transfers fluids. Basic unit is TFluid.
*/
public static final TypeGroup<TFluid> FLUID = new TypeGroup<TFluid>(SimpleTypes.TransitFluid);
private static final Logger LOGGER = LoggerFactory.getLogger("Transit API/Simple Groups");
public static final void init()
{
LOGGER.info("Initializing simple groups");
GroupRegistry.addGroup(ENERGY);
GroupRegistry.addGroup(MANA);
GroupRegistry.addGroup(ITEM);
GroupRegistry.addGroup(FLUID);
}
}

220
src/main/java/net/cshift/api/transit/type/group/TypeGroup.java Normal file
View File

@ -0,0 +1,220 @@
/*
MIT License
Copyright (c) 2023 Kyle Gunger
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
package net.cshift.api.transit.type.group;
import java.security.InvalidKeyException;
import java.sql.Types;
import java.util.HashMap;
import org.slf4j.*;
import net.cshift.api.transit.type.Type;
/**
* @author Kyle Gunger
* @param <B> The base object which all grouped Types should convert between.
*/
public final class TypeGroup<B>
{
// The base Type (provides the group's identifier)
private Type<B> baseType;
// The list of types.
private final HashMap<String, Type<B>> TYPES;
// Logger for events in the TypeGroup.
private static final Logger LOGGER = LoggerFactory.getLogger("Transit API/Type Group");
public TypeGroup(Type<B> base)
{
TYPES = new HashMap<String, Type<B>>();
baseType = base;
addType(base);
}
// Type management
/** Add a Type to the TypeGroup.
* The Type must have a group-type combo not already found in this TypeGroup.
* Returns {@code true} if the group was added.
*
* @param type The Type to add
* @return
*/
public boolean addType(Type<B> type)
{
if(TYPES.containsKey(type.getType()))
{
LOGGER.info("Failed to add type " + type + " to group " + getGroup() + ". Was the type already added?");
return false;
}
TYPES.put(type.toString(), type);
LOGGER.info("Added type " + type + " to group " + getGroup());
return true;
}
/** Remove a Type from the TypeGroup.
*
* @param type The Type to remove
* @return
*/
public boolean removeType(Type<B> type)
{
if(type.toString().equals(baseType.toString())) {
LOGGER.warn("Failed to remove type " + type + " from group " + getGroup() + ". This is the base type and can not be removed.");
return false;
}
if(TYPES.containsKey(type.toString()))
{
LOGGER.info("Removed type " + TYPES.remove(type.toString()) + " from group " + getGroup());
return true;
}
LOGGER.warn("Failed to remove type " + type + " from group " + getGroup() + ". Are we sure that the type was added to the group first?");
return false;
}
/** Remove a type from the group based on it's group-type identifier.
*
* @param type
* @return
*/
public boolean removeType(String groupID, String typeID)
{
String typeString = groupID + ":" + typeID;
if(baseType.toString().equals(typeString)) {
LOGGER.warn("Failed to remove type " + baseType + " from group " + getGroup() + ". This is the base type and can not be removed.");
return false;
}
if(TYPES.containsKey(typeString))
{
LOGGER.info("Removed type " + TYPES.remove(typeString) + " from group " + getGroup());
return true;
}
LOGGER.warn("Failed to remove type " + typeString + " from group " + getGroup() + ". Are we sure that the type was added to the group first?");
return false;
}
/** Remove a type from the group based on it's group-type identifier.
*
* @param type
* @return
*/
public boolean removeType(String typeID)
{
return removeType(getGroup(), typeID);
}
// Check if a type is in the group
/**Check if the type is in the group
*
* @param type
* @return boolean
*/
public boolean isInGroup(Type<B> type)
{
return TYPES.containsKey(type.toString()) && TYPES.get(type.toString()) == type;
}
/**Check if the type is in the group
*
* @param groupID
* @param typeID
* @return boolean
*/
public boolean isInGroup(String groupID, String typeID)
{
return TYPES.containsKey(groupID + ":" + typeID);
}
/**Check if the type is in the group
*
* @param typeID
* @return boolean
*/
public boolean isInGroup(String typeID)
{
return isInGroup(getGroup(), typeID);
}
// Get a type in the group
/**Get the type from the group
*
* @param groupID The ID of the group the type is originally from
* @param typeID The ID of the type
* @return Type
*/
public Type<B> getType(String groupID, String typeID) throws InvalidKeyException
{
String typeString = groupID + ":" + typeID;
if (!TYPES.containsKey(typeString))
throw new InvalidKeyException("Invalid key in getType (" + typeString + "is not in group" + getGroup() + ")");
return TYPES.get(typeString);
}
/**Get the type from the group
*
* @param typeID The ID of the type
* @return Type
*/
public Type<B> getType(String typeID) throws InvalidKeyException
{
return getType(getGroup(), typeID);
}
// DO ALL TYPE CONVERSION USING TYPES.
/** The group identifier. Given by the Base Group
* @return String
*/
public final String getGroup()
{
return baseType.getGroup();
}
/** The base group type
* @return Type
*/
public final Type<B> getBase() {
return baseType;
}
@Override
public final String toString() {
return this.getGroup();
}
}

17
src/main/java/net/cshift/transit/Transit.java
View File

@ -1,17 +0,0 @@
package net.cshift.transit;
import net.fabricmc.api.ModInitializer;
import net.cshift.transit.type.group.SimpleGroups;
/**
* @author Kyle Gunger
* @apiNote This is the main entry point for Transit. The api is mostly intended for use on server-side connections.
*/
public class Transit implements ModInitializer {
@Override
public void onInitialize() {
SimpleGroups.init();
}
}

19
src/main/java/net/cshift/transit/type/SimpleTypes.java
View File

@ -1,19 +0,0 @@
package net.cshift.transit.type;
public final class SimpleTypes {
/** Transfers energy. Energy is stored as a numeric.
*/
public static final Type<Number> TransitJoule = new Type<Number>("TJoule", "ENERGY");
/** Transfers mana. TMana stores mana count and type.
*/
public static final Type<TMana> TransitMana = new Type<TMana>("TMana", "MANA");
/** Transfers items. TItem stores an item and an item count.
*/
public static final Type<TItem> TransitItem = new Type<TItem>("TItem", "ITEM");
/** Transfers fluid. TFluid stores fluid and mB.
*/
public static final Type<TFluid> TransitFluid = new Type<TFluid>("TFluid", "FLUID");
}

33
src/main/java/net/cshift/transit/type/TItem.java
View File

@ -1,33 +0,0 @@
package net.cshift.transit.type;
import net.minecraft.item.*;
/** Item storage
* @author Kyle Gunger
*/
public class TItem {
private Item item;
private Number count;
/** Constructor.
*
* @param i Item stored
* @param c Item count
*/
public TItem(Item i, Number c) {
item = i;
count = c;
}
/** Get the item stored.
*/
public Item getItem() {
return item;
}
/** Get the item count.
*/
public Number getCount() {
return count;
}
}

60
src/main/java/net/cshift/transit/type/group/GroupRegistry.java
View File

@ -1,60 +0,0 @@
package net.cshift.transit.type.group;
import java.util.ArrayList;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import net.cshift.transit.type.Type;
public final class GroupRegistry {
private static final ArrayList<TypeGroup<?>> GROUPS = new ArrayList<TypeGroup<?>>(0);
private static final Logger LOG = LogManager.getFormatterLogger("Transit|GroupRegistry");
private GroupRegistry() {}
public static final boolean addGroup(TypeGroup<?> group)
{
for(TypeGroup<?> g : GROUPS)
{
if(g.getGroup().equals(group.getGroup()))
{
LOG.warn("Failed to add group " + group + " to the registry. Did another mod add a group with the same name?");
return false;
}
}
GROUPS.add(group);
LOG.info("Successfully added group " + group + " to the registry.");
return true;
}
public static final <T> TypeGroup<T> groupByID(String groupID)
{
for(TypeGroup<?> g : GROUPS)
{
if(g.getGroup().equals(groupID)){
try{
return (TypeGroup<T>) g;
}catch(ClassCastException e) {
return null;
}
}
}
return null;
}
public static final <T> Type<T> typeByIdentity(String groupID, String typeID)
{
TypeGroup<T> group = GroupRegistry.<T>groupByID(groupID);
if(group != null)
return group.getType(typeID);
return null;
}
}

29
src/main/java/net/cshift/transit/type/group/SimpleGroups.java
View File

@ -1,29 +0,0 @@
package net.cshift.transit.type.group;
import net.cshift.transit.type.*;
public final class SimpleGroups {
/** Transfers energy. Basic unit is TJoule (Transit Joule).
*/
public static final TypeGroup<Number> ENERGY = new TypeGroup<Number>(SimpleTypes.TransitJoule);
/** Transfers mana. Basic unit is TMana (Transit Mana).
*/
public static final TypeGroup<TMana> MANA = new TypeGroup<TMana>(SimpleTypes.TransitMana);
/** Transfers items. Basic unit is TItem.
*/
public static final TypeGroup<TItem> ITEM = new TypeGroup<TItem>(SimpleTypes.TransitItem);
/** Transfers fluids. Basic unit is TFluid.
*/
public static final TypeGroup<TFluid> FLUID = new TypeGroup<TFluid>(SimpleTypes.TransitFluid);
public static final void init()
{
GroupRegistry.addGroup(ENERGY);
GroupRegistry.addGroup(MANA);
GroupRegistry.addGroup(ITEM);
GroupRegistry.addGroup(FLUID);
}
}

204
src/main/java/net/cshift/transit/type/group/TypeGroup.java
View File

@ -1,204 +0,0 @@
package net.cshift.transit.type.group;
import java.util.ArrayList;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import net.cshift.transit.type.Type;
/**
* @author Kyle Gunger
* @param <B> The base object which all grouped Types should convert between.
*/
public final class TypeGroup<B>
{
// The base Type (provides the group's identifier)
private Type<B> baseType;
// The list of types.
private final ArrayList<Type<B>> TYPES = new ArrayList<Type<B>>(0);
// Logger for events in the TypeGroup.
private static final Logger LOG = LogManager.getFormatterLogger("Transit|Group");
public TypeGroup(Type<B> base)
{
baseType = base;
addType(base);
}
// Type management
/** Add a Type to the TypeGroup.
* The Type must have a group-type combo not already found in this TypeGroup.
* Returns {@code true} if the group was added.
*
* @param type The Type to add
* @return
*/
public boolean addType(Type<B> type)
{
if(!isInGroup(type))
{
TYPES.add(type);
LOG.info("Added type " + type + " to group " + getGroup());
return true;
}
LOG.info("Failed to add type " + type + " to group " + getGroup() + ". Was the type already added?");
return false;
}
/** Remove a Type from the TypeGroup.
*
* @param type The Type to remove
* @return
*/
public boolean removeType(Type<B> type)
{
if(type.equals(baseType)) {
LOG.warn("[WARN] Failed to remove type " + type + " from group " + getGroup() + ". This is the base type and can not be removed.");
return false;
}
if(TYPES.indexOf(type) != -1)
{
LOG.info("Removed type " + TYPES.remove(TYPES.indexOf(type)) + " from group " + getGroup());
return true;
}
LOG.warn("[WARN] Failed to remove type " + type + " from group " + getGroup() + ". Are we sure that the type was added to the group first?");
return false;
}
/** Remove a type from the group based on it's group-type identifier.
*
* @param type
* @return
*/
public boolean removeType(String groupID, String typeID)
{
if(baseType.toString() == groupID + ":" + typeID) {
LOG.warn("[WARN] Failed to remove type " + baseType + " from group " + getGroup() + ". This is the base type and can not be removed.");
return false;
}
for(Type<?> type : TYPES)
{
if(type.toString() == groupID + ":" + typeID)
{
LOG.info("Removed type " + TYPES.remove(TYPES.indexOf(type)) + " from group " + getGroup());
return true;
}
}
LOG.warn("[WARN] Failed to remove type " + groupID + ":" + typeID + " from group " + getGroup() + ". Are we sure that the type was added to the group first?");
return false;
}
/** Remove a type from the group based on it's group-type identifier.
*
* @param type
* @return
*/
public boolean removeType(String typeID)
{
return removeType(getGroup(), typeID);
}
// Check if a type is in the group
/**Check if the type is in the group
*
* @param type
* @return boolean
*/
public boolean isInGroup(Type<B> type)
{
for(Type<B> t : TYPES)
{
if(t.equals(type)) return true;
}
return false;
}
/**Check if the type is in the group
*
* @param groupID
* @param typeID
* @return boolean
*/
public boolean isInGroup(String groupID, String typeID)
{
for(Type<B> t : TYPES)
{
if(t.toString() == groupID + ":" + typeID) return true;
}
return false;
}
/**Check if the type is in the group
*
* @param typeID
* @return boolean
*/
public boolean isInGroup(String typeID)
{
return isInGroup(getGroup(), typeID);
}
// Get a type in the group
/**Get the type from the group
*
* @param groupID The ID of the group the type is originally from
* @param typeID The ID of the type
* @return Type
*/
public Type<B> getType(String groupID, String typeID)
{
for(Type<B> t : TYPES)
{
if(t.toString() == groupID + ":" + typeID) return t;
}
return null;
}
/**Get the type from the group
*
* @param typeID The ID of the type
* @return Type
*/
public Type<B> getType(String typeID)
{
return getType(getGroup(), typeID);
}
// DO ALL TYPE CONVERSION USING TYPES.
/** The group identifier. Given by the Base Group
* @return String
*/
public final String getGroup()
{
return baseType.getGroup();
}
/** The base group type
* @return Type
*/
public final Type<B> getBase() {
return baseType;
}
@Override
public final String toString() {
return this.getGroup();
}
}

10
src/main/resources/fabric.mod.json
View File

@ -1,7 +1,7 @@
{
"schemaVersion": 1,
"id": "transit-api",
"version": "2.0.0",
"version": "3.0.0-alpha",
"name": "Transit API",
"description": "Move things about!",
@ -9,7 +9,7 @@
"CSKyle"
],
"contact": {
"homepage": "https://cshift.net/",
"homepage": "https://cshift.net/TransitAPI",
"sources": "https://github.com/CircleShift/TransitAPI",
"issues": "https://github.com/CircleShift/TransitAPI/issues"
},
@ -20,12 +20,12 @@
"environment": "*",
"entrypoints": {
"main": [
"net.cshift.transit.Transit"
"net.cshift.api.transit.Transit"
]
},
"depends": {
"fabricloader": ">=0.7.4",
"minecraft": "1.17.x"
"fabricloader": ">=0.14.0",
"minecraft": "1.20.x"
}
}