diff options
42 files changed, 804 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e35e9d6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# fabric + +run/ + +# APIs + +libs/ @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 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.
\ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..8627e71 --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +# Sparkt +Wires and stuff! +Requires the [TransitAPI](https://github.com/CoreChg/TransitAPI). + +## Building +1. Clone the repo +2. Create a folder "libs" +3. Download the required APIs and put them in libs +4. Initialize gradle +5. Gradle build + +## License +This mod is available under the MIT license. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..a3b7016 --- /dev/null +++ b/build.gradle @@ -0,0 +1,88 @@ +plugins { + id 'fabric-loom' version '0.2.7-SNAPSHOT' + id 'maven-publish' +} + +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + +archivesBaseName = project.archives_base_name +version = project.mod_version +group = project.maven_group + +repositories { + flatDir { + dirs "libs" + } +} + +dependencies { + //to change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + // 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.corechg.transit:transit-api:${project.transit_version}" + //include "net.corechg.transit:transit-api:${project.transit_version}" + + //modApi "io.github.cottonmc:cotton-resources:${project.cotton_resources_version}" + //include "io.github.cottonmc:cotton-resources:${project.cotton_resources_version}" +} + +processResources { + inputs.property "version", project.version + + from(sourceSets.main.resources.srcDirs) { + include "fabric.mod.json" + expand "version": project.version + } + + from(sourceSets.main.resources.srcDirs) { + exclude "fabric.mod.json" + } +} + +// 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 +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} + +// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task +// if it is present. +// If you remove this task, sources will not be generated. +task sourcesJar(type: Jar, dependsOn: classes) { + classifier = "sources" + from sourceSets.main.allSource +} + +jar { + from "LICENSE" +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + // add all the jars that should be included when publishing to maven + artifact(remapJar) { + builtBy remapJar + } + artifact(sourcesJar) { + builtBy remapSourcesJar + } + } + } + + // select the repositories you want to publish to + repositories { + // uncomment to publish to the local maven + // mavenLocal() + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..e07b797 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,19 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G + +# Fabric Properties + # check these on https://fabricmc.net/use + minecraft_version=1.15.2 + yarn_mappings=1.15.2+build.15 + loader_version=0.8.2+build.194 + +# Mod Properties + mod_version = 0.0.1 + maven_group = net.corechg.sparkt + archives_base_name = sparkt + +# 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.5.1+build.294-1.15 + cotton_resources_version=1.5.1+1.15.2 + transit_version=0.10.2
\ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differnew file mode 100644 index 0000000..f3d88b1 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a4b4429 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# 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 +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"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +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" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +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. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +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" ;; + 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, 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" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..62bd9b9 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,103 @@ +@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 init + +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 init + +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 + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +: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 %CMD_LINE_ARGS% + +: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 diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..5b60df3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + jcenter() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/net/corechg/sparkt/BlockRegister.java b/src/main/java/net/corechg/sparkt/BlockRegister.java new file mode 100644 index 0000000..5833055 --- /dev/null +++ b/src/main/java/net/corechg/sparkt/BlockRegister.java @@ -0,0 +1,31 @@ +package net.corechg.sparkt; + +import net.minecraft.block.Block; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; +import net.corechg.sparkt.block.*; + +public class BlockRegister { + + public static final Block MACHINE_BLOCK = new MachineBlock(); + public static final Block MACHINE_FURNACE = new MachineFurnace(); + public static final Block DRIVER_MECHANICAL = new DriverMechanical(); + public static final Block MACHINE_GRINDER = new MachineGrinder(); + //public static final Block + + public static void register(String modid) { + Registry.register(Registry.BLOCK, new Identifier(modid, "machine_block"), MACHINE_BLOCK); + Registry.register(Registry.ITEM, new Identifier(modid, "machine_block"), new BlockItem(MACHINE_BLOCK, new Item.Settings())); + + Registry.register(Registry.BLOCK, new Identifier(modid, "machine_furnace"), MACHINE_FURNACE); + Registry.register(Registry.ITEM, new Identifier(modid, "machine_furnace"), new BlockItem(MACHINE_FURNACE, new Item.Settings())); + + Registry.register(Registry.BLOCK, new Identifier(modid, "driver_mechanical"), DRIVER_MECHANICAL); + Registry.register(Registry.ITEM, new Identifier(modid, "driver_mechanical"), new BlockItem(DRIVER_MECHANICAL, new Item.Settings())); + + Registry.register(Registry.BLOCK, new Identifier(modid, "machine_grinder"), MACHINE_GRINDER); + Registry.register(Registry.ITEM, new Identifier(modid, "machine_grinder"), new BlockItem(MACHINE_GRINDER, new Item.Settings())); + } +}
\ No newline at end of file diff --git a/src/main/java/net/corechg/sparkt/SparktInit.java b/src/main/java/net/corechg/sparkt/SparktInit.java new file mode 100644 index 0000000..2d2d557 --- /dev/null +++ b/src/main/java/net/corechg/sparkt/SparktInit.java @@ -0,0 +1,19 @@ +package net.corechg.sparkt; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import net.fabricmc.api.ModInitializer; + +public class SparktInit implements ModInitializer { + + public static final Logger LOG = LogManager.getFormatterLogger("Sparkt|Init"); + public static final String MODID = "sparkt"; + + @Override + public void onInitialize() { + LOG.info("Preparing to spark a reaction!"); + BlockRegister.register(MODID); + } + +}
\ No newline at end of file diff --git a/src/main/java/net/corechg/sparkt/block/DriverMechanical.java b/src/main/java/net/corechg/sparkt/block/DriverMechanical.java new file mode 100644 index 0000000..3198120 --- /dev/null +++ b/src/main/java/net/corechg/sparkt/block/DriverMechanical.java @@ -0,0 +1,9 @@ +package net.corechg.sparkt.block; + +public class DriverMechanical extends MachineBlock{ + + public DriverMechanical() { + super(); + } + +}
\ No newline at end of file diff --git a/src/main/java/net/corechg/sparkt/block/MachineBlock.java b/src/main/java/net/corechg/sparkt/block/MachineBlock.java new file mode 100644 index 0000000..7e0c7bb --- /dev/null +++ b/src/main/java/net/corechg/sparkt/block/MachineBlock.java @@ -0,0 +1,12 @@ +package net.corechg.sparkt.block; + +import net.minecraft.block.Block; +import net.minecraft.block.Material; + +public class MachineBlock extends Block{ + + public MachineBlock() { + super(Settings.of(Material.METAL)); + } + +}
\ No newline at end of file diff --git a/src/main/java/net/corechg/sparkt/block/MachineFurnace.java b/src/main/java/net/corechg/sparkt/block/MachineFurnace.java new file mode 100644 index 0000000..f7556ca --- /dev/null +++ b/src/main/java/net/corechg/sparkt/block/MachineFurnace.java @@ -0,0 +1,9 @@ +package net.corechg.sparkt.block; + +public class MachineFurnace extends MachineBlock{ + + public MachineFurnace() { + super(); + } + +}
\ No newline at end of file diff --git a/src/main/java/net/corechg/sparkt/block/MachineGrinder.java b/src/main/java/net/corechg/sparkt/block/MachineGrinder.java new file mode 100644 index 0000000..49c877d --- /dev/null +++ b/src/main/java/net/corechg/sparkt/block/MachineGrinder.java @@ -0,0 +1,9 @@ +package net.corechg.sparkt.block; + +public class MachineGrinder extends MachineBlock{ + + public MachineGrinder() { + super(); + } + +}
\ No newline at end of file diff --git a/src/main/java/net/corechg/sparkt/block/Wire.java b/src/main/java/net/corechg/sparkt/block/Wire.java new file mode 100644 index 0000000..51f9178 --- /dev/null +++ b/src/main/java/net/corechg/sparkt/block/Wire.java @@ -0,0 +1,11 @@ +package net.corechg.sparkt.block; + +import net.minecraft.block.Block; + +public class Wire extends Block{ + + public Wire(Settings settings) { + super(settings); + } + +}
\ No newline at end of file diff --git a/src/main/java/net/corechg/sparkt/block/entity/MachineFurnaceEntity.java b/src/main/java/net/corechg/sparkt/block/entity/MachineFurnaceEntity.java new file mode 100644 index 0000000..edde32b --- /dev/null +++ b/src/main/java/net/corechg/sparkt/block/entity/MachineFurnaceEntity.java @@ -0,0 +1,102 @@ +package net.corechg.sparkt.block.entity; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.util.Tickable; + +import java.util.ArrayList; + +import net.corechg.transit.network.packet.IStaticPacket; +import net.corechg.transit.network.system.INode; +import net.corechg.transit.network.system.ISystem; +import net.corechg.transit.network.system.swap.IAcceptorNode; + +public class MachineFurnaceEntity extends BlockEntity implements IAcceptorNode, Tickable { + + private static final String[] GROUPS = { "ENERGY" }; + private int energyCap = 20000; + private int energyStored = 0; + private ArrayList<INode> connected = new ArrayList<INode>(0); + + public MachineFurnaceEntity(BlockEntityType<?> type) { + super(type); + } + + @Override + public String[] groupsProvided() { + return GROUPS; + } + + @Override + public ISystem getSystem() { + return null; + } + + @Override + public Object getData(String groupID) { + if (groupID == "ENERGY") { + return energyStored; + } + return null; + } + + @Override + public void setData(Object dat, String groupID) { + if (groupID == "ENERGY") { + int tmp = (int) dat; + + energyStored = tmp > energyCap ? energyCap : tmp; + } + + } + + @Override + public INode[] getConnections() { + return (INode[]) connected.toArray(); + } + + @Override + public void tick() { + + } + + @Override + public boolean linkProvider(INode requester, String group) { + if (group == "ENERGY") { + connected.add(requester); + } + return false; + } + + @Override + public boolean unlinkProvider(INode toUnlink) { + for(int i = 0; i < connected.size(); i++) { + if(toUnlink.equals(connected.get(i))) { + connected.remove(i); + return true; + } + } + return false; + } + + @Override + public INode[] getProviders() { + return getConnections(); + } + + @Override + public <T> boolean accept(IStaticPacket<T> packet, String group) { + if (group == "ENERGY") { + int add = (int) packet.getType().toBase(packet, group); + if(add + energyStored > energyCap) { + return false; + } + else { + energyStored += add; + return true; + } + } + return false; + } + +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/blockstates/driver_mechanical.json b/src/main/resources/assets/sparkt/blockstates/driver_mechanical.json new file mode 100644 index 0000000..f01b009 --- /dev/null +++ b/src/main/resources/assets/sparkt/blockstates/driver_mechanical.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "sparkt:block/driver_mechanical" } + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/blockstates/machine_block.json b/src/main/resources/assets/sparkt/blockstates/machine_block.json new file mode 100644 index 0000000..c58ab84 --- /dev/null +++ b/src/main/resources/assets/sparkt/blockstates/machine_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "sparkt:block/machine_block" } + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/blockstates/machine_furnace.json b/src/main/resources/assets/sparkt/blockstates/machine_furnace.json new file mode 100644 index 0000000..2c115f2 --- /dev/null +++ b/src/main/resources/assets/sparkt/blockstates/machine_furnace.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "sparkt:block/machine_furnace" } + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/blockstates/machine_grinder.json b/src/main/resources/assets/sparkt/blockstates/machine_grinder.json new file mode 100644 index 0000000..5e233bf --- /dev/null +++ b/src/main/resources/assets/sparkt/blockstates/machine_grinder.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "sparkt:block/machine_grinder" } + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/icon.png b/src/main/resources/assets/sparkt/icon.png Binary files differnew file mode 100644 index 0000000..b8bb552 --- /dev/null +++ b/src/main/resources/assets/sparkt/icon.png diff --git a/src/main/resources/assets/sparkt/lang/en_us.json b/src/main/resources/assets/sparkt/lang/en_us.json new file mode 100644 index 0000000..28005eb --- /dev/null +++ b/src/main/resources/assets/sparkt/lang/en_us.json @@ -0,0 +1,8 @@ +{ + "block.sparkt.machine_block": "Machine Block", + "block.sparkt.machine_furnace": "Electric Furnace", + "block.sparkt.wire": "Wire", + "block.sparkt.machine_grinder": "Electric Crusher", + "block.sparkt.driver_mechanical": "Mechanical Driver", + "block.sparkt.driver_thermal": "Thermal Driver" +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/block/driver_mechanical.json b/src/main/resources/assets/sparkt/models/block/driver_mechanical.json new file mode 100644 index 0000000..f3bdf7b --- /dev/null +++ b/src/main/resources/assets/sparkt/models/block/driver_mechanical.json @@ -0,0 +1,9 @@ +{ + "parent": "block/orientable_with_bottom", + "textures": { + "top": "sparkt:block/driver_top", + "side": "sparkt:block/driver_side", + "front": "sparkt:block/driver_side", + "bottom": "sparkt:block/machine_bottom" + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/block/machine.json b/src/main/resources/assets/sparkt/models/block/machine.json new file mode 100644 index 0000000..27cab61 --- /dev/null +++ b/src/main/resources/assets/sparkt/models/block/machine.json @@ -0,0 +1,9 @@ +{ + "parent": "block/orientable_with_bottom", + "textures": { + "top": "sparkt:block/machine_top", + "side": "sparkt:block/machine_side", + "front": "#front", + "bottom": "sparkt:block/machine_bottom" + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/block/machine_block.json b/src/main/resources/assets/sparkt/models/block/machine_block.json new file mode 100644 index 0000000..679b548 --- /dev/null +++ b/src/main/resources/assets/sparkt/models/block/machine_block.json @@ -0,0 +1,6 @@ +{ + "parent": "sparkt:block/machine", + "textures": { + "front": "sparkt:block/machine_side" + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/block/machine_furnace.json b/src/main/resources/assets/sparkt/models/block/machine_furnace.json new file mode 100644 index 0000000..e35099f --- /dev/null +++ b/src/main/resources/assets/sparkt/models/block/machine_furnace.json @@ -0,0 +1,6 @@ +{ + "parent": "sparkt:block/machine", + "textures": { + "front": "sparkt:block/furnace_side" + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/block/machine_grinder.json b/src/main/resources/assets/sparkt/models/block/machine_grinder.json new file mode 100644 index 0000000..de72365 --- /dev/null +++ b/src/main/resources/assets/sparkt/models/block/machine_grinder.json @@ -0,0 +1,6 @@ +{ + "parent": "sparkt:block/machine", + "textures": { + "front": "sparkt:block/grinder_side" + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/item/driver_mechanical.json b/src/main/resources/assets/sparkt/models/item/driver_mechanical.json new file mode 100644 index 0000000..19ecb75 --- /dev/null +++ b/src/main/resources/assets/sparkt/models/item/driver_mechanical.json @@ -0,0 +1,3 @@ +{ + "parent": "sparkt:block/driver_mechanical" +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/item/machine_block.json b/src/main/resources/assets/sparkt/models/item/machine_block.json new file mode 100644 index 0000000..a405f71 --- /dev/null +++ b/src/main/resources/assets/sparkt/models/item/machine_block.json @@ -0,0 +1,3 @@ +{ + "parent": "sparkt:block/machine_block" +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/item/machine_furnace.json b/src/main/resources/assets/sparkt/models/item/machine_furnace.json new file mode 100644 index 0000000..ed00d41 --- /dev/null +++ b/src/main/resources/assets/sparkt/models/item/machine_furnace.json @@ -0,0 +1,3 @@ +{ + "parent": "sparkt:block/machine_furnace" +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/models/item/machine_grinder.json b/src/main/resources/assets/sparkt/models/item/machine_grinder.json new file mode 100644 index 0000000..16fa3e9 --- /dev/null +++ b/src/main/resources/assets/sparkt/models/item/machine_grinder.json @@ -0,0 +1,3 @@ +{ + "parent": "sparkt:block/machine_grinder" +}
\ No newline at end of file diff --git a/src/main/resources/assets/sparkt/textures/block/driver_side.png b/src/main/resources/assets/sparkt/textures/block/driver_side.png Binary files differnew file mode 100644 index 0000000..51d0c2c --- /dev/null +++ b/src/main/resources/assets/sparkt/textures/block/driver_side.png diff --git a/src/main/resources/assets/sparkt/textures/block/driver_top.png b/src/main/resources/assets/sparkt/textures/block/driver_top.png Binary files differnew file mode 100644 index 0000000..2e85d33 --- /dev/null +++ b/src/main/resources/assets/sparkt/textures/block/driver_top.png diff --git a/src/main/resources/assets/sparkt/textures/block/furnace_side.png b/src/main/resources/assets/sparkt/textures/block/furnace_side.png Binary files differnew file mode 100644 index 0000000..e7ba9c2 --- /dev/null +++ b/src/main/resources/assets/sparkt/textures/block/furnace_side.png diff --git a/src/main/resources/assets/sparkt/textures/block/grinder_side.png b/src/main/resources/assets/sparkt/textures/block/grinder_side.png Binary files differnew file mode 100644 index 0000000..1f384f8 --- /dev/null +++ b/src/main/resources/assets/sparkt/textures/block/grinder_side.png diff --git a/src/main/resources/assets/sparkt/textures/block/machine_bottom.png b/src/main/resources/assets/sparkt/textures/block/machine_bottom.png Binary files differnew file mode 100644 index 0000000..48d3f40 --- /dev/null +++ b/src/main/resources/assets/sparkt/textures/block/machine_bottom.png diff --git a/src/main/resources/assets/sparkt/textures/block/machine_side.png b/src/main/resources/assets/sparkt/textures/block/machine_side.png Binary files differnew file mode 100644 index 0000000..6e1fb14 --- /dev/null +++ b/src/main/resources/assets/sparkt/textures/block/machine_side.png diff --git a/src/main/resources/assets/sparkt/textures/block/machine_top.png b/src/main/resources/assets/sparkt/textures/block/machine_top.png Binary files differnew file mode 100644 index 0000000..7d4463f --- /dev/null +++ b/src/main/resources/assets/sparkt/textures/block/machine_top.png diff --git a/src/main/resources/data/sparkt/loot_tables/block/machine_block.json b/src/main/resources/data/sparkt/loot_tables/block/machine_block.json new file mode 100644 index 0000000..5c6db56 --- /dev/null +++ b/src/main/resources/data/sparkt/loot_tables/block/machine_block.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "sparkt:machine_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +}
\ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..898a95f --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,32 @@ +{ + "schemaVersion": 1, + "id": "sparkt", + "version": "0.0.1", + + "name": "Sparkt", + "description": "Wires and whatnot!", + "authors": [ + "CCGKyle" + ], + "contact": { + "sources": "https://github.com/CoreChg/Sparkt" + }, + + "license": "MIT", + "icon": "assets/sparkt/icon.png", + + "environment": "*", + "entrypoints": { + "main": [ + "net.corechg.sparkt.SparktInit" + ] + }, + + "depends": { + "fabricloader": ">=0.7.4", + "fabric": "*", + "minecraft": "1.15.x", + + "transit-api": ">=0.10.2" + } +} |
