diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..f811f6a --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +# Disable autocrlf on generated files, they always generate with LF +# Add any extra files or paths here to make git stop saying they +# are changed when only line endings change. +src/generated/**/.cache/cache text eol=lf +src/generated/**/*.json text eol=lf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..eb267dd --- /dev/null +++ b/.gitignore @@ -0,0 +1,29 @@ +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project + +# idea +out +*.ipr +*.iws +*.iml +.idea + +# gradle +build +.gradle + +# other +eclipse +run +runClient +runServer +runData + + +# Files from Forge MDK +forge*changelog.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..3c577b0 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,24 @@ +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +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 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. + +For more information, please refer to \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..0d73fcb --- /dev/null +++ b/build.gradle @@ -0,0 +1,20 @@ +buildscript { + apply from: 'https://noeppi-noeppi.github.io/ModUtils/v3/buildscript.gradle', to: buildscript +} + +apply from: 'https://noeppi-noeppi.github.io/ModUtils/v3/mod.gradle' + +repositories { + maven { + // location of the maven that hosts JEI files + name = "Progwml6 maven" + url = "https://dvs1.progwml6.com/files/maven/" + } + maven { + name = "MelanX" + url = "https://maven.melanx.de" + } +} +minecraft { + accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..4e2ff08 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,14 @@ +# 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 + +modid=circular +group=dev.agnor99 +base_version=1.0 + +forge_version=1.18.1-39.0.66 +mappings=sugarcane_2021.12.19-1.18.1 + +license_name=The Unlicense +license_url=https://unlicense.org \ 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..7454180 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..e750102 --- /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-7.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..c53aefa --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# 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. +# 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 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/master/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 +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 + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${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 "$*" +} >&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 ;; #( + MSYS* | 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" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# 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. + +# 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 + +# 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 \ + "$@" + +# 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" "$@" 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/src/main/java/dev/agnor99/circular/Circular.java b/src/main/java/dev/agnor99/circular/Circular.java new file mode 100644 index 0000000..1ff3163 --- /dev/null +++ b/src/main/java/dev/agnor99/circular/Circular.java @@ -0,0 +1,21 @@ +package dev.agnor99.circular; + +import net.minecraftforge.fml.IExtensionPoint; +import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.network.NetworkConstants; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +// The value here should match an entry in the META-INF/mods.toml file +@Mod("circular") +public class Circular { + // Directly reference a log4j logger. + private static final Logger LOGGER = LogManager.getLogger(); + + public Circular() { + + ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, + () -> new IExtensionPoint.DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true)); + } +} diff --git a/src/main/java/dev/agnor99/circular/CircularScreen.java b/src/main/java/dev/agnor99/circular/CircularScreen.java new file mode 100644 index 0000000..5201c82 --- /dev/null +++ b/src/main/java/dev/agnor99/circular/CircularScreen.java @@ -0,0 +1,151 @@ +package dev.agnor99.circular; + +import com.mojang.blaze3d.platform.Lighting; +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.math.Quaternion; +import com.mojang.math.Vector3f; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; +import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen; +import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.entity.EntityRenderDispatcher; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.inventory.InventoryMenu; +import net.minecraft.world.phys.Vec2; + +import java.util.List; + +public class CircularScreen extends AbstractContainerScreen { + + private static final Vec2i SIZE = new Vec2i(279,279); + private static final Vec2i CENTER = new Vec2i(140,140); + public static final ResourceLocation INVENTORY_LOCATION = new ResourceLocation("circular","textures/gui/inventory.png"); + + public CircularScreen(InventoryMenu menu, Inventory inventory, Component component) { + super(menu, inventory, component); + menu.slots.forEach(slot -> { + if (slot.container == inventory) { + if (List.of(5,6,7,8,45).contains(slot.index)) { + //ArmorSlots+Shield(45) + int relSlot = slot.index == 45 ? 4 : slot.index - 5; + slot.x = (int)(Math.sin(getAngleForSlot(relSlot, 5))*50)-8 + CENTER.x(); + slot.y = (int)(-Math.cos(getAngleForSlot(relSlot, 5))*50)-8 + CENTER.y(); + } else { + //Inventory + int relSlot = slot.index%9; + int row; + if (slot.index >= 36) { + row = 0; + } else { + row = slot.index/9; + } + slot.x = (int)(Math.sin(getAngleForSlot(relSlot, 9))*(70 + 18*row))-8 + CENTER.x(); + slot.y = (int)(-Math.cos(getAngleForSlot(relSlot, 9))*(70 + 18*row))-8 + CENTER.y(); + } + } else { + //Crafting + } + }); + } + + private static double getAngleForSlot(int relIndex, int slotsPerCircle) { + return Math.toRadians(relIndex*(360f / slotsPerCircle)); + } + + @Override + public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTick) { + this.renderBackground(poseStack); + super.render(poseStack, mouseX, mouseY, partialTick); + this.renderTooltip(poseStack, mouseX, mouseY); + } + + @Override + protected void init() { + if (minecraft.gameMode.hasInfiniteItems()) { + minecraft.setScreen(new CreativeModeInventoryScreen(minecraft.player)); + } else { + imageWidth = SIZE.x(); + imageHeight = SIZE.y(); + super.init(); + } + titleLabelX = Integer.MIN_VALUE; + titleLabelY = Integer.MIN_VALUE; + inventoryLabelX = Integer.MIN_VALUE; + inventoryLabelY = Integer.MIN_VALUE; + } + + @Override + protected void renderBg(PoseStack poseStack, float partialTick, int mouseX, int mouseY) { + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.setShaderTexture(0, INVENTORY_LOCATION); + this.blit(poseStack, leftPos, topPos, 0, 0, this.imageWidth, this.imageHeight, this.imageWidth, this.imageHeight); + Vec2 normalMouseVec = new Vec2i(mouseX - CENTER.x() - leftPos, mouseY - CENTER.y() - topPos).toFloat().normalized(); + renderEntityInInventory(leftPos + CENTER.x(), topPos+CENTER.y(), 30, findClosestAngle(normalMouseVec), this.minecraft.player); + } + + public static int findClosestAngle(Vec2 targetVec) { + int angle = 0; + float closesDistance = Float.MAX_VALUE; + for (int i = 0; i < 360; i++) { + float dist = targetVec.distanceToSqr(new Vec2((float)Math.sin(Math.toRadians(i)), (float)-Math.cos(Math.toRadians(i)))); + if (dist < closesDistance) { + closesDistance = dist; + angle = i; + } + } + return angle; + } + + public static void renderEntityInInventory(int posX, int posY, int scale, int angle, LivingEntity livingEntity) { + PoseStack viewStack = RenderSystem.getModelViewStack(); + viewStack.pushPose(); + viewStack.translate(posX, posY, 1050.0D); + viewStack.scale(1.0F, 1.0F, -1.0F); + RenderSystem.applyModelViewMatrix(); + PoseStack poseStack = new PoseStack(); + poseStack.translate(0.0D, 0.0D, 1000.0D); + poseStack.scale((float)scale, (float)scale, (float)scale); + Quaternion quaternion = Vector3f.ZP.rotationDegrees(180.0F); + Quaternion quaternion1 = Vector3f.ZP.rotationDegrees(angle); + Quaternion quaternion2 = Vector3f.YP.rotationDegrees(180F); + quaternion.mul(quaternion1); + quaternion.mul(quaternion2); + poseStack.mulPose(quaternion); + poseStack.translate(0, -1, 0); + float f2 = livingEntity.yBodyRot; + float f3 = livingEntity.getYRot(); + float f4 = livingEntity.getXRot(); + float f5 = livingEntity.yHeadRotO; + float f6 = livingEntity.yHeadRot; + livingEntity.yBodyRot = 0; + livingEntity.setYRot(0); + livingEntity.setXRot(0); + livingEntity.yHeadRot = livingEntity.getYRot(); + livingEntity.yHeadRotO = livingEntity.getYRot(); + Lighting.setupForEntityInInventory(); + EntityRenderDispatcher entityrenderdispatcher = Minecraft.getInstance().getEntityRenderDispatcher(); + quaternion1.conj(); + entityrenderdispatcher.overrideCameraOrientation(quaternion1); + entityrenderdispatcher.setRenderShadow(false); + MultiBufferSource.BufferSource source = Minecraft.getInstance().renderBuffers().bufferSource(); + RenderSystem.runAsFancy(() -> + entityrenderdispatcher.render(livingEntity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F, poseStack, source, 15728880) + ); + source.endBatch(); + entityrenderdispatcher.setRenderShadow(true); + livingEntity.yBodyRot = f2; + livingEntity.setYRot(f3); + livingEntity.setXRot(f4); + livingEntity.yHeadRotO = f5; + livingEntity.yHeadRot = f6; + viewStack.popPose(); + RenderSystem.applyModelViewMatrix(); + Lighting.setupFor3DItems(); + } +} diff --git a/src/main/java/dev/agnor99/circular/ClientEvents.java b/src/main/java/dev/agnor99/circular/ClientEvents.java new file mode 100644 index 0000000..7b8358a --- /dev/null +++ b/src/main/java/dev/agnor99/circular/ClientEvents.java @@ -0,0 +1,19 @@ +package dev.agnor99.circular; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.inventory.InventoryScreen; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.ScreenOpenEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; + +@Mod.EventBusSubscriber(Dist.CLIENT) +public class ClientEvents { + + @SubscribeEvent + public static void event(ScreenOpenEvent event) { + if (event.getScreen() instanceof InventoryScreen inventoryScreen) { + event.setScreen(new CircularScreen(inventoryScreen.getMenu(), Minecraft.getInstance().player.getInventory(), inventoryScreen.getTitle())); + } + } +} diff --git a/src/main/java/dev/agnor99/circular/Vec2i.java b/src/main/java/dev/agnor99/circular/Vec2i.java new file mode 100644 index 0000000..046e924 --- /dev/null +++ b/src/main/java/dev/agnor99/circular/Vec2i.java @@ -0,0 +1,17 @@ +package dev.agnor99.circular; + +import net.minecraft.world.phys.Vec2; + +public record Vec2i(int x, int y) { + + public Vec2i add(Vec2i other) { + return this.add(other.x, other.y); + } + public Vec2i add(int x, int y) { + return new Vec2i(this.x + x, this.y + y); + } + + public Vec2 toFloat() { + return new Vec2(x, y); + } +} diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg new file mode 100644 index 0000000..17c9215 --- /dev/null +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -0,0 +1,3 @@ +public-f net.minecraft.world.inventory.Slot f_40220_ # x +public-f net.minecraft.world.inventory.Slot f_40221_ # y +public net.minecraft.world.inventory.Slot f_40217_ # slot \ 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..cab5d0e --- /dev/null +++ b/src/main/resources/META-INF/mods.toml @@ -0,0 +1,36 @@ + +modLoader="javafml" +loaderVersion="[39,)" +license="Public Domain" +[[mods]] +modId="circular" +version="${file.jarVersion}" +displayName="Circular" +# A URL for the "homepage" for this mod, displayed in the mod UI +#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional +# A file name (in the root of the mod JAR) containing a logo for display +logoFile="examplemod.png" #optional +# A text field displayed in the mod UI +credits="Thanks to PhoenixSC for showing me circular minecraft, I hate you" #optional +# A text field displayed in the mod UI +authors="agnor99" #optional +# The description text for the mod (multi line!) (#mandatory) +description=''' +Heyo, +I'm really sorry to everyone seeing this +''' +# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. +[[dependencies.circular]] + modId="forge" + mandatory=true + versionRange="[39,)" + ordering="NONE" + side="BOTH" +# Here's another dependency +[[dependencies.examplemod]] + modId="minecraft" + mandatory=true +# This version range declares a minimum of the current minecraft version up to but not including the next major version + versionRange="[1.18.1,1.19)" + ordering="NONE" + side="BOTH" diff --git a/src/main/resources/assets/circular/textures/gui/inventory.png b/src/main/resources/assets/circular/textures/gui/inventory.png new file mode 100644 index 0000000..f32b822 Binary files /dev/null and b/src/main/resources/assets/circular/textures/gui/inventory.png differ diff --git a/src/main/resources/examplemod.png b/src/main/resources/examplemod.png new file mode 100644 index 0000000..49ab949 Binary files /dev/null and b/src/main/resources/examplemod.png differ diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..1d95293 --- /dev/null +++ b/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "circular resources", + "pack_format": 8 + } +}