diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9563893 --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# fabric + +run/ \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..309c94d --- /dev/null +++ b/build.gradle @@ -0,0 +1,84 @@ +plugins { + id 'fabric-loom' version '0.2.6-SNAPSHOT' + id 'maven-publish' +} + +repositories { + maven { + url 'https://masa.dy.fi/maven' + } +} + +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + +archivesBaseName = project.archives_base_name +version = project.minecraft_version+'-'+project.mod_version +group = project.maven_group + +minecraft { +} + +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" + modCompile "net.fabricmc:fabric-loader:${project.loader_version}" + modCompile "carpet:fabric-carpet:${project.minecraft_version}-${project.carpet_core_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. +} + +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(jar) { + 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..67ad02f --- /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 or https://modmuss50.me/fabric.html + minecraft_version=1.14.4 + yarn_mappings=1.14.4+build.15 + loader_version=0.7.0+build.171 + # check available versions on maven for the given minecraft version you are using + carpet_core_version=1.2.4+v191121 + +# Mod Properties + mod_version = 1.2.4 + maven_group = carpet-autocraftingtable + archives_base_name = carpet-autocraftingtable + +# Dependencies + # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric + # fabric_version=0.3.0+build.187 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..5c2d1cf 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..4b7e1f3 --- /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-5.5.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..8e25e6c --- /dev/null +++ b/gradlew @@ -0,0 +1,188 @@ +#!/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, switch paths to Windows format before running java +if $cygwin ; 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=$((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" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9618d8d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@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 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/carpet_autocraftingtable/AutoCraftingTable.java b/src/main/java/carpet_autocraftingtable/AutoCraftingTable.java new file mode 100644 index 0000000..e1df0fa --- /dev/null +++ b/src/main/java/carpet_autocraftingtable/AutoCraftingTable.java @@ -0,0 +1,20 @@ +package carpet_autocraftingtable; + +import carpet.CarpetExtension; +import carpet.CarpetServer; + +public class AutoCraftingTable implements CarpetExtension +{ + public static void noop() { } + static + { + CarpetServer.manageExtension(new AutoCraftingTable()); + } + + @Override + public void onGameStarted() + { + // let's /carpet handle our few simple settings + CarpetServer.settingsManager.parseSettingsClass(AutoCraftingTableSettings.class); + } +} diff --git a/src/main/java/carpet_autocraftingtable/AutoCraftingTableContainer.java b/src/main/java/carpet_autocraftingtable/AutoCraftingTableContainer.java new file mode 100644 index 0000000..4559d50 --- /dev/null +++ b/src/main/java/carpet_autocraftingtable/AutoCraftingTableContainer.java @@ -0,0 +1,87 @@ +package carpet_autocraftingtable; + +import net.minecraft.client.network.packet.GuiSlotUpdateS2CPacket; +import net.minecraft.container.CraftingTableContainer; +import net.minecraft.container.Slot; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.server.network.ServerPlayNetworkHandler; +import net.minecraft.server.network.ServerPlayerEntity; + +public class AutoCraftingTableContainer extends CraftingTableContainer { + private final CraftingTableBlockEntity blockEntity; + private final PlayerEntity player; + + AutoCraftingTableContainer(int id, PlayerInventory playerInventory, CraftingTableBlockEntity blockEntity) { + super(id, playerInventory); + this.blockEntity = blockEntity; + this.player = playerInventory.player; + slotList.clear(); + this.addSlot(new OutputSlot(this.blockEntity)); + + for(int y = 0; y < 3; ++y) { + for(int x = 0; x < 3; ++x) { + this.addSlot(new Slot(this.blockEntity, x + y * 3 + 1, 30 + x * 18, 17 + y * 18)); + } + } + + for(int y = 0; y < 3; ++y) { + for(int x = 0; x < 9; ++x) { + this.addSlot(new Slot(playerInventory, x + y * 9 + 9, 8 + x * 18, 84 + y * 18)); + } + } + + for(int x = 0; x < 9; ++x) { + this.addSlot(new Slot(playerInventory, x, 8 + x * 18, 142)); + } + } + + @Override + public void onContentChanged(Inventory inv) { + if (this.player instanceof ServerPlayerEntity) { + ServerPlayNetworkHandler netHandler = ((ServerPlayerEntity) this.player).networkHandler; + netHandler.sendPacket(new GuiSlotUpdateS2CPacket(this.syncId, 0, this.blockEntity.getInvStack(0))); + } + } + + @Override + public ItemStack transferSlot(PlayerEntity player, int slot) { + if (slot == 0) { + ItemStack before = this.blockEntity.getInvStack(0).copy(); + ItemStack current = before.copy(); + if (!this.insertItem(current, 10, 46, true)) { + return ItemStack.EMPTY; + } + this.blockEntity.takeInvStack(0, before.getCount() - current.getCount()); + return this.blockEntity.getInvStack(0); + } + return super.transferSlot(player, slot); + } + + public void close(PlayerEntity player) { + PlayerInventory playerInventory = player.inventory; + if (!playerInventory.getCursorStack().isEmpty()) { + player.dropItem(playerInventory.getCursorStack(), false); + playerInventory.setCursorStack(ItemStack.EMPTY); + } + this.blockEntity.onContainerClose(this); + } + + private class OutputSlot extends Slot { + OutputSlot(Inventory inv) { + super(inv, 0, 124, 35); + } + + @Override + public boolean canInsert(ItemStack itemStack_1) { + return false; + } + + @Override + protected void onTake(int amount) { + AutoCraftingTableContainer.this.blockEntity.takeInvStack(0, amount); + } + } +} diff --git a/src/main/java/carpet_autocraftingtable/AutoCraftingTableSettings.java b/src/main/java/carpet_autocraftingtable/AutoCraftingTableSettings.java new file mode 100644 index 0000000..ea78653 --- /dev/null +++ b/src/main/java/carpet_autocraftingtable/AutoCraftingTableSettings.java @@ -0,0 +1,15 @@ +package carpet_autocraftingtable; + +import carpet.settings.Rule; + +import static carpet.settings.RuleCategory.CREATIVE; + +/** + * Here is your example Settings class you can plug to use carpetmod /carpet settings command + */ +public class AutoCraftingTableSettings +{ + @Rule(desc = "Auto-crafting table", category = {CREATIVE, "extras"}) + public static boolean autoCraftingTable = false; + +} diff --git a/src/main/java/carpet_autocraftingtable/CraftingTableBlockEntity.java b/src/main/java/carpet_autocraftingtable/CraftingTableBlockEntity.java new file mode 100644 index 0000000..8217d59 --- /dev/null +++ b/src/main/java/carpet_autocraftingtable/CraftingTableBlockEntity.java @@ -0,0 +1,222 @@ +package carpet_autocraftingtable; + +import carpet_autocraftingtable.mixins.CraftingInventoryMixin; +import net.minecraft.block.Blocks; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.block.entity.LockableContainerBlockEntity; +import net.minecraft.container.Container; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.CraftingInventory; +import net.minecraft.inventory.Inventories; +import net.minecraft.inventory.SidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.recipe.*; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.DefaultedList; +import net.minecraft.util.ItemScatterer; +import net.minecraft.util.math.Direction; +import net.minecraft.util.registry.Registry; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +public class CraftingTableBlockEntity extends LockableContainerBlockEntity implements SidedInventory, RecipeUnlocker, RecipeInputProvider +{ + public static final BlockEntityType TYPE = Registry.register( + Registry.BLOCK_ENTITY, + "carpet:crafting_table", + BlockEntityType.Builder.create(CraftingTableBlockEntity::new, Blocks.CRAFTING_TABLE).build(null) + ); + private static final int[] OUTPUT_SLOTS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + private static final int[] INPUT_SLOTS = {1, 2, 3, 4, 5, 6, 7, 8, 9}; + public DefaultedList inventory; + public ItemStack output = ItemStack.EMPTY; + private List openContainers = new ArrayList<>(); + + public CraftingTableBlockEntity() { //this(BlockEntityType.BARREL); + this(TYPE); + } + + private CraftingInventory craftingInventory = new CraftingInventory(null, 3, 3); + + private CraftingTableBlockEntity(BlockEntityType type) { + super(type); + this.inventory = DefaultedList.ofSize(9, ItemStack.EMPTY); + ((CraftingInventoryMixin) craftingInventory).setInventory(this.inventory); + } + + public static void init() { } // registers BE type + + @Override + public CompoundTag toTag(CompoundTag tag) { + super.toTag(tag); + Inventories.toTag(tag, inventory); + tag.put("Output", output.toTag(new CompoundTag())); + return tag; + } + + @Override + public void fromTag(CompoundTag tag) { + super.fromTag(tag); + Inventories.fromTag(tag, inventory); + this.output = ItemStack.fromTag(tag.getCompound("Output")); + } + + @Override + protected Text getContainerName() { + return new TranslatableText("container.crafting"); + } + + @Override + protected Container createContainer(int id, PlayerInventory playerInventory) { + AutoCraftingTableContainer container = new AutoCraftingTableContainer(id, playerInventory, this); + this.openContainers.add(container); + return container; + } + + @Override + public int[] getInvAvailableSlots(Direction dir) { + if (dir == Direction.DOWN && (!output.isEmpty() || getCurrentRecipe().isPresent())) return OUTPUT_SLOTS; + return INPUT_SLOTS; + } + + @Override + public boolean canInsertInvStack(int slot, ItemStack stack, Direction dir) { + return slot > 0 && getInvStack(slot).isEmpty(); + } + + @Override + public boolean canExtractInvStack(int slot, ItemStack stack, Direction dir) { + if (slot == 0) return !output.isEmpty() || getCurrentRecipe().isPresent(); + return true; + } + + @Override + public boolean isValidInvStack(int slot, ItemStack stack) { + return slot != 0; + } + + @Override + public int getInvSize() { + return 10; + } + + @Override + public boolean isInvEmpty() { + for (ItemStack stack : this.inventory) { + if (!stack.isEmpty()) return false; + } + return output.isEmpty(); + } + + @Override + public ItemStack getInvStack(int slot) { + if (slot > 0) return this.inventory.get(slot - 1); + if (!output.isEmpty()) return output; + Optional recipe = getCurrentRecipe(); + return recipe.map(craftingRecipe -> craftingRecipe.craft(craftingInventory)).orElse(ItemStack.EMPTY); + } + + @Override + public ItemStack takeInvStack(int slot, int amount) { + if (slot == 0) { + if (output.isEmpty()) { + output = craft(); + } + return output.split(amount); + } + return Inventories.splitStack(this.inventory, slot - 1, amount); + } + + @Override + public ItemStack removeInvStack(int slot) { + if (slot == 0) { + ItemStack output = this.output; + this.output = ItemStack.EMPTY; + return output; + } + return Inventories.removeStack(this.inventory, slot - 1); + } + + @Override + public void setInvStack(int slot, ItemStack stack) { + if (slot == 0) { + output = stack; + return; + } + inventory.set(slot - 1, stack); + } + + @Override + public void markDirty() { + super.markDirty(); + for (AutoCraftingTableContainer c : openContainers) c.onContentChanged(this); + } + + @Override + public boolean canPlayerUseInv(PlayerEntity var1) { + return true; + } + + @Override + public void provideRecipeInputs(RecipeFinder finder) { + for (ItemStack stack : this.inventory) { + finder.addItem(stack); + } + } + + @Override + public void setLastRecipe(Recipe var1) { + + } + + @Override + public Recipe getLastRecipe() { + return null; + } + + @Override + public void clear() { + this.inventory.clear(); + } + + private Optional getCurrentRecipe() { + if (this.world == null) return Optional.empty(); + return this.world.getRecipeManager().getFirstMatch(RecipeType.CRAFTING, craftingInventory, world); + } + + private ItemStack craft() { + if (this.world == null) return ItemStack.EMPTY; + Optional optionalRecipe = getCurrentRecipe(); + if (!optionalRecipe.isPresent()) return ItemStack.EMPTY; + CraftingRecipe recipe = optionalRecipe.get(); + ItemStack result = recipe.craft(craftingInventory); + DefaultedList remaining = world.getRecipeManager().getRemainingStacks(RecipeType.CRAFTING, craftingInventory, world); + for (int i = 0; i < 9; i++) { + ItemStack current = inventory.get(i); + ItemStack remainingStack = remaining.get(i); + if (!current.isEmpty()) { + current.decrement(1); + } + if (!remainingStack.isEmpty()) { + if (current.isEmpty()) { + inventory.set(i, remainingStack); + } else if (ItemStack.areItemsEqualIgnoreDamage(current, remainingStack) && ItemStack.areTagsEqual(current, remainingStack)) { + current.increment(remainingStack.getCount()); + } else { + ItemScatterer.spawn(world, pos.getX(), pos.getY(), pos.getZ(), remainingStack); + } + } + } + markDirty(); + return result; + } + + public void onContainerClose(AutoCraftingTableContainer container) { + this.openContainers.remove(container); + } +} diff --git a/src/main/java/carpet_autocraftingtable/mixins/CraftingInventoryMixin.java b/src/main/java/carpet_autocraftingtable/mixins/CraftingInventoryMixin.java new file mode 100644 index 0000000..7f8e208 --- /dev/null +++ b/src/main/java/carpet_autocraftingtable/mixins/CraftingInventoryMixin.java @@ -0,0 +1,14 @@ +package carpet_autocraftingtable.mixins; + +import net.minecraft.inventory.CraftingInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.DefaultedList; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(CraftingInventory.class) +public interface CraftingInventoryMixin +{ + @Accessor("stacks") + void setInventory(DefaultedList inventory); +} diff --git a/src/main/java/carpet_autocraftingtable/mixins/CraftingTableBlockMixin.java b/src/main/java/carpet_autocraftingtable/mixins/CraftingTableBlockMixin.java new file mode 100644 index 0000000..5eb40f2 --- /dev/null +++ b/src/main/java/carpet_autocraftingtable/mixins/CraftingTableBlockMixin.java @@ -0,0 +1,94 @@ +package carpet_autocraftingtable.mixins; + +import carpet_autocraftingtable.AutoCraftingTableSettings; +import net.minecraft.block.Block; +import net.minecraft.block.BlockEntityProvider; +import net.minecraft.block.BlockState; +import net.minecraft.block.CraftingTableBlock; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.container.NameableContainerProvider; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.stat.Stats; +import net.minecraft.util.Hand; +import net.minecraft.util.ItemScatterer; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import carpet_autocraftingtable.CraftingTableBlockEntity; + +@Mixin(CraftingTableBlock.class) +public class CraftingTableBlockMixin extends Block implements BlockEntityProvider { + protected CraftingTableBlockMixin(Settings block$Settings_1) { + super(block$Settings_1); + } + + @Override + public boolean hasBlockEntity() { + return AutoCraftingTableSettings.autoCraftingTable; + } + + @Override + public BlockEntity createBlockEntity(BlockView var1) + { + return AutoCraftingTableSettings.autoCraftingTable ? new CraftingTableBlockEntity() : null; + } + + @Inject(method = "activate", at = @At("HEAD"), cancellable = true) + private void onActivate(BlockState blockState, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit, CallbackInfoReturnable cir) { + if (!hasBlockEntity()) return; + if (!world.isClient) { + BlockEntity blockEntity = world.getBlockEntity(pos); + if (blockEntity instanceof CraftingTableBlockEntity) { + player.openContainer((NameableContainerProvider) blockEntity); + } + } + player.incrementStat(Stats.INTERACT_WITH_CRAFTING_TABLE); + cir.setReturnValue(true); + cir.cancel(); + } + + @Override + public boolean hasComparatorOutput(BlockState blockState) { + return hasBlockEntity(); + } + + @Override + public int getComparatorOutput(BlockState blockState, World world, BlockPos pos) { + if (!hasBlockEntity()) return 0; + BlockEntity blockEntity = world.getBlockEntity(pos); + if (blockEntity instanceof CraftingTableBlockEntity) { + CraftingTableBlockEntity craftingTableBlockEntity = (CraftingTableBlockEntity) blockEntity; + int filled = 0; + for (ItemStack stack : craftingTableBlockEntity.inventory) { + if (!stack.isEmpty()) filled++; + } + return (filled * 15) / 9; + } + return 0; + } + + @Override + public void onBlockRemoved(BlockState state1, World world, BlockPos pos, BlockState state2, boolean boolean_1) { + if (state1.getBlock() != state2.getBlock()) { + BlockEntity blockEntity = world.getBlockEntity(pos); + if (blockEntity instanceof CraftingTableBlockEntity) { + CraftingTableBlockEntity craftingTableBlockEntity = ((CraftingTableBlockEntity)blockEntity); + ItemScatterer.spawn(world, pos, craftingTableBlockEntity.inventory); + if (!craftingTableBlockEntity.output.isEmpty()) { + ItemScatterer.spawn(world, pos.getX(), pos.getY(), pos.getZ(), craftingTableBlockEntity.output); + } + world.updateHorizontalAdjacent(pos, this); + } + world.removeBlockEntity(pos); + + super.onBlockRemoved(state1, world, pos, state2, boolean_1); + } + } +} diff --git a/src/main/java/carpet_autocraftingtable/mixins/MinecraftClient_noopMixin.java b/src/main/java/carpet_autocraftingtable/mixins/MinecraftClient_noopMixin.java new file mode 100644 index 0000000..dfb5e78 --- /dev/null +++ b/src/main/java/carpet_autocraftingtable/mixins/MinecraftClient_noopMixin.java @@ -0,0 +1,22 @@ +package carpet_autocraftingtable.mixins; + +import carpet_autocraftingtable.AutoCraftingTable; +import net.minecraft.client.MinecraftClient; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(MinecraftClient.class) +public class MinecraftClient_noopMixin +{ + // this is here just to load the ExampleExtension class, otherwise noone would load it / need it + // if you have already you own mixins that use your extension class in any shape or form + // you don't need this one + // This one is for the client + @Inject(method = "",at = @At("RETURN")) + private void loadMe(CallbackInfo ci) + { + AutoCraftingTable.noop(); + } +} diff --git a/src/main/java/carpet_autocraftingtable/mixins/MinecraftServer_noopMixin.java b/src/main/java/carpet_autocraftingtable/mixins/MinecraftServer_noopMixin.java new file mode 100644 index 0000000..4e4757e --- /dev/null +++ b/src/main/java/carpet_autocraftingtable/mixins/MinecraftServer_noopMixin.java @@ -0,0 +1,22 @@ +package carpet_autocraftingtable.mixins; + +import carpet_autocraftingtable.AutoCraftingTable; +import net.minecraft.server.MinecraftServer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(MinecraftServer.class) +public class MinecraftServer_noopMixin +{ + // this is here just to load the ExampleExtension class, otherwise noone would load it / need it + // if you have already you own mixins that use your extension class in any shape or form + // you don't need this one + // You need this one to run a server properly + @Inject(method = "", at = @At("RETURN")) + private void loadMe(CallbackInfo ci) + { + AutoCraftingTable.noop(); + } +} diff --git a/src/main/resources/assets/modid/icon.png b/src/main/resources/assets/modid/icon.png new file mode 100644 index 0000000..047b91f Binary files /dev/null and b/src/main/resources/assets/modid/icon.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..e4cae55 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,36 @@ +{ + "schemaVersion": 1, + "id": "carpet-autocraftingtable", + "version": "1.2.4", + + "name": "Auto-Crafting Table mod for carpet-mod", + "description": "Auto-Crafting Table mod for carpet-mod originally by Skyrising", + "authors": [ + "Skyrising, gnembon" + ], + "contact": { + "homepage": "https://web.me/", + "sources": "https://github.com/gnembon/carpet-autoCraftingTable" + }, + + "license": "GNU LGPL V3", + "icon": "assets/modid/icon.png", + + "environment": "*", + "entrypoints": { + "main": [ + ] + }, + "mixins": [ + "modid.mixins.json" + ], + + "depends": { + "minecraft": "1.14.x", + "fabricloader": ">=0.4.0", + "carpet": "*" + }, + "suggests": { + "flamingo": "*" + } +} diff --git a/src/main/resources/modid.mixins.json b/src/main/resources/modid.mixins.json new file mode 100644 index 0000000..746a889 --- /dev/null +++ b/src/main/resources/modid.mixins.json @@ -0,0 +1,16 @@ +{ + "required": true, + "package": "carpet_autocraftingtable.mixins", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MinecraftServer_noopMixin", + "CraftingInventoryMixin", + "CraftingTableBlockMixin" + ], + "client": [ + "MinecraftClient_noopMixin" + ], + "injectors": { + "defaultRequire": 1 + } +}