diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6fdbd9e --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project + +# idea +out +*.ipr +*.iws +*.iml +.idea + +# gradle +build +.gradle + +# other +eclipse +run + +# Files from Forge MDK +forge*changelog.txt +src/generated diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e5e9111 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2013-2021 bdew + +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..b1b7126 --- /dev/null +++ b/README.md @@ -0,0 +1,7 @@ +# Technobauble + +This mod that adds various baubles/curios. + +Curseforge: https://www.curseforge.com/minecraft/mc-mods/technobauble + +Jenkins: https://jenkins.bdew.net/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..3fdd749 --- /dev/null +++ b/build.gradle @@ -0,0 +1,172 @@ +buildscript { + repositories { + maven { url = 'https://files.minecraftforge.net/maven' } + mavenCentral() + } + dependencies { + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.+', changing: true + } +} + +plugins { + id "com.matthewprenger.cursegradle" version "1.4.0" +} + +apply plugin: 'scala' +apply plugin: 'net.minecraftforge.gradle' +apply plugin: 'eclipse' +apply plugin: 'maven-publish' + +file "build.properties" withReader { + def prop = new Properties() + prop.load(it) + ext.config = new ConfigSlurper().parse prop +} + +if (project.hasProperty('buildnum')) { + ext.simpleVersion = "${config.mod.version}.${project.buildnum}" +} else { + ext.simpleVersion = "${config.mod.version}-DEV" +} + +version = simpleVersion + '-mc' + config.minecraft.version + +group = 'net.bdew' +archivesBaseName = config.mod.id + +java.toolchain.languageVersion = JavaLanguageVersion.of(8) + +minecraft { + mappings channel: 'official', version: config.minecraft.version + runs { + client { + workingDirectory project.file('run') + property 'forge.logging.markers', 'REGISTRIES' + property 'forge.logging.console.level', 'debug' + mods { + register(config.mod.id) { + source sourceSets.main + } + } + } + + server { + workingDirectory project.file('run') + property 'forge.logging.markers', 'REGISTRIES' + property 'forge.logging.console.level', 'debug' + mods { + register(config.mod.id) { + source sourceSets.main + } + } + } + + data { + workingDirectory project.file('run') + property 'forge.logging.markers', 'REGISTRIES' + property 'forge.logging.console.level', 'debug' + args '--mod', config.mod.id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') + forceExit false + mods { + register(config.mod.id) { + source sourceSets.main + } + } + } + } +} + +sourceSets.main.resources { + srcDir 'src/generated/resources' + exclude '**/*.psd' +} + +repositories { + maven { + name = "bdew" + url = "https://jenkins.bdew.net/maven" + } + maven { + name = "Azure-SLP" + url = uri("https://pkgs.dev.azure.com/Kotori316/minecraft/_packaging/mods/maven/v1") + content { + includeModule("com.kotori316", "ScalableCatsForce".toLowerCase()) + } + } + maven { + name = "ModMaven" + url = "https://modmaven.dev" + } + repositories.stream().filter { it instanceof MavenArtifactRepository }.forEach { repo -> + repo.content { + excludeVersionByRegex(".*", ".*", ".*_mapped_snapshot_.*") + } + } +} + +dependencies { + minecraft(group: 'net.minecraftforge', name: 'forge', version: "${config.minecraft.version}-${config.forge.version}") + + implementation(group: 'org.scala-lang', name: 'scala-library', version: config.scala.version) + implementation(group: 'com.kotori316', name: 'ScalableCatsForce'.toLowerCase(Locale.ROOT), version: config.slp.version, classifier: 'dev') + + if (findProject(":bdlib") != null) { + implementation project(":bdlib") + } else { + implementation fg.deobf("net.bdew:bdlib:${config.bdlib.version}-mc${config.minecraft.version}") + } + + runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.16.5-${config.curios.version}") + compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.16.5-${config.curios.version}:api") +} + +jar { + manifest { + attributes([ + "Specification-Title" : config.mod.id, + "Specification-Vendor" : "bdew", + "Specification-Version" : "1", + "Implementation-Title" : project.name, + "Implementation-Version" : simpleVersion, + "Implementation-Vendor" : "bdew", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) + } +} + +jar.finalizedBy('reobfJar') + +publishing { + publications { + maven(MavenPublication) { + artifact jar + } + } + repositories { + maven { + url "file://var/www/maven" + } + } +} + +curseforge { + apiKey = project.hasProperty("curseForgeApiKey") ? project.curseForgeApiKey : "" + project { + id = config.curseforge.id + + releaseType = "alpha" + changelog = project.hasProperty("changelog") ? project.changelog : "No changelog available" + + addGameVersion config.minecraft.version + + mainArtifact(jar) { + displayName = "Technobauble ${simpleVersion} (MC ${config.minecraft.version})" + } + + relations { + requiredDependency 'scalable-cats-force' + requiredDependency 'bdlib' + requiredDependency 'curios' + } + } +} \ No newline at end of file diff --git a/build.properties b/build.properties new file mode 100644 index 0000000..d529851 --- /dev/null +++ b/build.properties @@ -0,0 +1,9 @@ +mod.id=technobauble +mod.version=0.1.0 +curseforge.id=492052 +minecraft.version=1.16.5 +forge.version=36.1.0 +bdlib.version=1.17.0.8 +scala.version=2.13.5 +slp.version=2.13.5-build-1 +curios.version=4.0.5.2 \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..878bf1f --- /dev/null +++ b/gradle.properties @@ -0,0 +1,4 @@ +# Sets default memory used for gradle commands. Can be overridden by user or command line properties. +# This is required to provide enough memory for the Minecraft decompilation process. +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..442d913 --- /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.8.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/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..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@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 diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..fc81f3e --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'technobauble' \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..0805587 --- /dev/null +++ b/src/main/resources/META-INF/mods.toml @@ -0,0 +1,43 @@ +modLoader = "kotori_scala" +loaderVersion = "[2.13.3,2.14.0)" +issueTrackerURL = "https://github.com/bdew-minecraft/generators/issues" +license = "MIT" + +[[mods]] +modId = "technobauble" +version = "${file.jarVersion}" +displayName = "Technobauble" +displayURL = "https://www.curseforge.com/minecraft/mc-mods/technobauble" +authors = "bdew" +description = ''' +This mod that adds various baubles/curios +''' + +[[dependencies.technobauble]] +modId = "forge" +mandatory = true +versionRange = "[36,)" +ordering = "NONE" +side = "BOTH" + +[[dependencies.technobauble]] +modId = "minecraft" +mandatory = true +versionRange = "[1.16.5,)" +ordering = "NONE" +side = "BOTH" + +[[dependencies.technobauble]] +modId = "bdlib" +mandatory = true +versionRange = "[1.17.0,)" +ordering = "NONE" +side = "BOTH" + +[[dependencies.technobauble]] +modId = "curios" +mandatory = true +versionRange = "[1.16.5-4.0,)" +ordering = "NONE" +side = "BOTH" + diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..837cc2e --- /dev/null +++ b/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "Technobauble Resources", + "pack_format": 6 + } +} diff --git a/src/main/scala/net/bdew/technobauble/Caps.java b/src/main/scala/net/bdew/technobauble/Caps.java new file mode 100644 index 0000000..0674146 --- /dev/null +++ b/src/main/scala/net/bdew/technobauble/Caps.java @@ -0,0 +1,14 @@ +package net.bdew.technobauble; + +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.CapabilityInject; +import net.minecraftforge.energy.IEnergyStorage; +import top.theillusivec4.curios.api.type.capability.ICurio; + +public class Caps { + @CapabilityInject(ICurio.class) + public static Capability CURIO; + + @CapabilityInject(IEnergyStorage.class) + public static Capability ENERGY; +} diff --git a/src/main/scala/net/bdew/technobauble/Config.scala b/src/main/scala/net/bdew/technobauble/Config.scala new file mode 100644 index 0000000..f51f21e --- /dev/null +++ b/src/main/scala/net/bdew/technobauble/Config.scala @@ -0,0 +1,14 @@ +package net.bdew.technobauble + +import net.bdew.lib.config.ConfigSection +import net.bdew.technobauble.blocks.charger.ConfigCharger +import net.minecraftforge.common.ForgeConfigSpec + + +object Config { + private val commmonBuilder = new ForgeConfigSpec.Builder + + val Charger: ConfigCharger = ConfigSection(commmonBuilder, "Charger", new ConfigCharger(commmonBuilder)) + + val COMMON: ForgeConfigSpec = commmonBuilder.build() +} diff --git a/src/main/scala/net/bdew/technobauble/Techobauble.scala b/src/main/scala/net/bdew/technobauble/Techobauble.scala new file mode 100644 index 0000000..5b36cbb --- /dev/null +++ b/src/main/scala/net/bdew/technobauble/Techobauble.scala @@ -0,0 +1,13 @@ +package net.bdew.technobauble + +import net.minecraftforge.fml.ModLoadingContext +import net.minecraftforge.fml.common.Mod +import net.minecraftforge.fml.config.ModConfig + +@Mod(Techobauble.ModId) +object Techobauble { + final val ModId = "technobauble" + + ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, Config.COMMON) + +} diff --git a/src/main/scala/net/bdew/technobauble/blocks/charger/BlockCharger.scala b/src/main/scala/net/bdew/technobauble/blocks/charger/BlockCharger.scala new file mode 100644 index 0000000..c5ba5c0 --- /dev/null +++ b/src/main/scala/net/bdew/technobauble/blocks/charger/BlockCharger.scala @@ -0,0 +1,9 @@ +package net.bdew.technobauble.blocks.charger + +import net.bdew.lib.block.HasTE +import net.bdew.technobauble.registries.Blocks +import net.minecraft.block.Block + +class BlockCharger extends Block(Blocks.machineProps) with HasTE[TileCharger] { + +} diff --git a/src/main/scala/net/bdew/technobauble/blocks/charger/ConfigCharger.scala b/src/main/scala/net/bdew/technobauble/blocks/charger/ConfigCharger.scala new file mode 100644 index 0000000..2d5a92c --- /dev/null +++ b/src/main/scala/net/bdew/technobauble/blocks/charger/ConfigCharger.scala @@ -0,0 +1,8 @@ +package net.bdew.technobauble.blocks.charger + +import net.bdew.lib.config.PowerConfig +import net.minecraftforge.common.ForgeConfigSpec + +class ConfigCharger(spec: ForgeConfigSpec.Builder) extends PowerConfig(spec, 50000, 1000000) { + val transferLoss: () => Float = floatVal(spec, "TransferLoss", "Energy loss ratio when charging", 0.25f, 0f, 1f) +} \ No newline at end of file diff --git a/src/main/scala/net/bdew/technobauble/blocks/charger/TileCharger.scala b/src/main/scala/net/bdew/technobauble/blocks/charger/TileCharger.scala new file mode 100644 index 0000000..c685ef6 --- /dev/null +++ b/src/main/scala/net/bdew/technobauble/blocks/charger/TileCharger.scala @@ -0,0 +1,35 @@ +package net.bdew.technobauble.blocks.charger + +import net.bdew.lib.capabilities.Capabilities +import net.bdew.lib.capabilities.handlers.PowerEnergyHandler +import net.bdew.lib.data.base.TileDataSlots +import net.bdew.lib.power.DataSlotPower +import net.bdew.lib.tile.TileExtended +import net.bdew.technobauble.Config +import net.minecraft.tileentity.TileEntityType +import net.minecraft.util.Direction +import net.minecraftforge.common.capabilities.Capability +import net.minecraftforge.common.util.LazyOptional +import net.minecraftforge.energy.IEnergyStorage + +class TileCharger(teType: TileEntityType[_]) extends TileExtended(teType) with TileDataSlots { + val power: DataSlotPower = DataSlotPower("power", this) + + val powerHandler: LazyOptional[IEnergyStorage] = PowerEnergyHandler.create(power, true, false) + val chargeHandler: PowerEnergyHandler = new PowerEnergyHandler(power, false, true) + + power.configure(Config.Charger) + + //noinspection ComparingUnrelatedTypes + override def getCapability[T](cap: Capability[T], side: Direction): LazyOptional[T] = { + if (cap == Capabilities.CAP_ENERGY_HANDLER) + powerHandler.cast() + else + super.getCapability(cap, side) + } + + override def invalidateCaps(): Unit = { + super.invalidateCaps() + powerHandler.invalidate() + } +} diff --git a/src/main/scala/net/bdew/technobauble/items/receiver/ItemReceiver.scala b/src/main/scala/net/bdew/technobauble/items/receiver/ItemReceiver.scala new file mode 100644 index 0000000..4a80b58 --- /dev/null +++ b/src/main/scala/net/bdew/technobauble/items/receiver/ItemReceiver.scala @@ -0,0 +1,8 @@ +package net.bdew.technobauble.items.receiver + +import net.bdew.technobauble.registries.Items +import net.minecraft.item.Item + +class ItemReceiver extends Item(Items.nonStackable) { + +} diff --git a/src/main/scala/net/bdew/technobauble/registries/Blocks.scala b/src/main/scala/net/bdew/technobauble/registries/Blocks.scala new file mode 100644 index 0000000..c234259 --- /dev/null +++ b/src/main/scala/net/bdew/technobauble/registries/Blocks.scala @@ -0,0 +1,17 @@ +package net.bdew.technobauble.registries + +import net.bdew.lib.managers.BlockManager +import net.bdew.technobauble.blocks.charger.{BlockCharger, TileCharger} +import net.minecraft.block.AbstractBlock.Properties +import net.minecraft.block.SoundType +import net.minecraft.block.material.Material + +object Blocks extends BlockManager(Items) { + def machineProps: Properties = props(Material.STONE) + .sound(SoundType.STONE) + .strength(2, 8) + + define("charger", () => new BlockCharger) + .withTE(new TileCharger(_)) + .register +} diff --git a/src/main/scala/net/bdew/technobauble/registries/Items.scala b/src/main/scala/net/bdew/technobauble/registries/Items.scala new file mode 100644 index 0000000..1cc7575 --- /dev/null +++ b/src/main/scala/net/bdew/technobauble/registries/Items.scala @@ -0,0 +1,12 @@ +package net.bdew.technobauble.registries + +import net.bdew.lib.managers.ItemManager +import net.minecraft.item.{Item, ItemGroup, ItemStack} + +object CreativeTab extends ItemGroup("compacter") { + override def makeIcon(): ItemStack = ??? +} + +object Items extends ItemManager(CreativeTab) { + def nonStackable: Item.Properties = props.stacksTo(1) +}