This commit is contained in:
halsamen 2021-03-20 15:52:45 +09:00
parent 08ec3e20d3
commit fc763bb62f
184 changed files with 11684 additions and 13833 deletions

View File

@ -1,25 +0,0 @@
# 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

View File

@ -1,149 +0,0 @@
buildscript {
repositories {
maven { url = 'https://files.minecraftforge.net/maven' }
jcenter()
mavenCentral()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
}
}
apply plugin: 'net.minecraftforge.gradle'
// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
apply plugin: 'eclipse'
apply plugin: 'maven-publish'
version = '1.14.4-1.0.1'
group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'modid'
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
minecraft {
// The mappings can be changed at any time, and must be in the following format.
// snapshot_YYYYMMDD Snapshot are built nightly.
// stable_# Stables are built at the discretion of the MCP team.
// Use non-default mappings at your own risk. they may not always work.
// Simply re-run your setup task after changing the mappings to update your workspace.
mappings channel: 'snapshot', version: '20190719-1.14.3'
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
// accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
// Default run configurations.
// These can be tweaked, removed, or duplicated as needed.
runs {
client {
workingDirectory project.file('run')
// Recommended logging data for a userdev environment
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
// Recommended logging level for the console
property 'forge.logging.console.level', 'debug'
mods {
examplemod {
source sourceSets.main
}
}
}
server {
workingDirectory project.file('run')
// Recommended logging data for a userdev environment
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
// Recommended logging level for the console
property 'forge.logging.console.level', 'debug'
mods {
examplemod {
source sourceSets.main
}
}
}
data {
workingDirectory project.file('run')
// Recommended logging data for a userdev environment
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
// Recommended logging level for the console
property 'forge.logging.console.level', 'debug'
args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/')
mods {
examplemod {
source sourceSets.main
}
}
}
}
}
dependencies {
// Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
// that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
// The userdev artifact is a special name and will get all sorts of transformations applied to it.
minecraft 'net.minecraftforge:forge:1.14.4-28.1.0'
// You may put jars on which you depend on in ./libs or you may define them like so..
// compile "some.group:artifact:version:classifier"
// compile "some.group:artifact:version"
// Real examples
// compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env
// compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
// The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
// provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
// These dependencies get remapped to your current MCP mappings
// deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev'
// For more info...
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
// http://www.gradle.org/docs/current/userguide/dependency_management.html
}
// Example for how to get properties into the manifest for reading by the runtime..
jar {
manifest {
attributes([
"Specification-Title": "examplemod",
"Specification-Vendor": "examplemodsareus",
"Specification-Version": "1", // We are version 1 of ourselves
"Implementation-Title": project.name,
"Implementation-Version": "${version}",
"Implementation-Vendor" :"examplemodsareus",
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
])
}
}
// Example configuration to allow publishing using the maven-publish task
// we define a custom artifact that is sourced from the reobfJar output task
// and then declare that to be published
// Note you'll need to add a repository here
def reobfFile = file("$buildDir/reobfJar/output.jar")
def reobfArtifact = artifacts.add('default', reobfFile) {
type 'jar'
builtBy 'reobfJar'
}
publishing {
publications {
mavenJava(MavenPublication) {
artifact reobfArtifact
}
}
repositories {
maven {
url "file:///${project.projectDir}/mcmodsrepo"
}
}
}

View File

@ -1,4 +0,0 @@
# 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

View File

@ -1,172 +0,0 @@
#!/usr/bin/env sh
##############################################################################
##
## 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=""
# 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" "$@"

View File

@ -1,84 +0,0 @@
@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=
@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

View File

@ -1,153 +1,3 @@
<<<<<<< HEAD
buildscript {
repositories {
maven { url = 'https://files.minecraftforge.net/maven' }
jcenter()
mavenCentral()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
}
}
apply plugin: 'net.minecraftforge.gradle'
// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
apply plugin: 'eclipse'
apply plugin: 'maven-publish'
version = '1.14.4-1.0.1'
group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'modid'
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
minecraft {
// The mappings can be changed at any time, and must be in the following format.
// snapshot_YYYYMMDD Snapshot are built nightly.
// stable_# Stables are built at the discretion of the MCP team.
// Use non-default mappings at your own risk. they may not always work.
// Simply re-run your setup task after changing the mappings to update your workspace.
mappings channel: 'snapshot', version: '20190719-1.14.3'
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
// accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
// Default run configurations.
// These can be tweaked, removed, or duplicated as needed.
runs {
client {
workingDirectory project.file('run')
// Recommended logging data for a userdev environment
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
// Recommended logging level for the console
property 'forge.logging.console.level', 'debug'
mods {
examplemod {
source sourceSets.main
}
}
}
server {
workingDirectory project.file('run')
// Recommended logging data for a userdev environment
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
// Recommended logging level for the console
property 'forge.logging.console.level', 'debug'
mods {
examplemod {
source sourceSets.main
}
}
}
data {
workingDirectory project.file('run')
// Recommended logging data for a userdev environment
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
// Recommended logging level for the console
property 'forge.logging.console.level', 'debug'
args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/')
mods {
examplemod {
source sourceSets.main
}
}
}
}
}
dependencies {
// Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
// that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
// The userdev artifact is a special name and will get all sorts of transformations applied to it.
minecraft 'net.minecraftforge:forge:1.14.4-28.1.0'
// You may put jars on which you depend on in ./libs or you may define them like so..
// compile "some.group:artifact:version:classifier"
// compile "some.group:artifact:version"
// Real examples
// compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env
// compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
// The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
// provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
// These dependencies get remapped to your current MCP mappings
// deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev'
// For more info...
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
// http://www.gradle.org/docs/current/userguide/dependency_management.html
}
// Example for how to get properties into the manifest for reading by the runtime..
jar {
manifest {
attributes([
"Specification-Title": "examplemod",
"Specification-Vendor": "examplemodsareus",
"Specification-Version": "1", // We are version 1 of ourselves
"Implementation-Title": project.name,
"Implementation-Version": "${version}",
"Implementation-Vendor" :"examplemodsareus",
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
])
}
}
// Example configuration to allow publishing using the maven-publish task
// we define a custom artifact that is sourced from the reobfJar output task
// and then declare that to be published
// Note you'll need to add a repository here
def reobfFile = file("$buildDir/reobfJar/output.jar")
def reobfArtifact = artifacts.add('default', reobfFile) {
type 'jar'
builtBy 'reobfJar'
}
publishing {
publications {
mavenJava(MavenPublication) {
artifact reobfArtifact
}
}
repositories {
maven {
url "file:///${project.projectDir}/mcmodsrepo"
}
}
=======
buildscript {
repositories {
maven { url = 'https://files.minecraftforge.net/maven' }
@ -163,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'eclipse'
apply plugin: 'maven-publish'
version = '1.14.4-1.0.1'
version = '1.14.4-1.1.0'
group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'modid'
@ -296,5 +146,4 @@ publishing {
url "file:///${project.projectDir}/mcmodsrepo"
}
}
>>>>>>> test
}

View File

@ -1,4 +1,4 @@
Args: "--in-jar", "C:\Mods\HelicoBacterMod\build\libs\modid-1.14.4-1.0.1.jar", "--out-jar", "C:\Mods\HelicoBacterMod\build\reobfJar\output.jar", "--srg-in", "C:\Mods\HelicoBacterMod\build\createMcpToSrg\output.tsrg", "--live"
Args: "--in-jar", "C:\Mods\HelicoBacterMod\build\libs\modid-1.14.4-1.1.0.jar", "--out-jar", "C:\Mods\HelicoBacterMod\build\reobfJar\output.jar", "--srg-in", "C:\Mods\HelicoBacterMod\build\createMcpToSrg\output.tsrg", "--live"
Classpath: C:\Users\pylori169\.gradle\caches\forge_gradle\maven_downloader\net\md-5\SpecialSource\1.8.3\SpecialSource-1.8.3-shaded.jar
Classpath: C:\Users\pylori169\.gradle\caches\forge_gradle\minecraft_user_repo\net\minecraftforge\forge\1.14.4-28.1.0_mapped_snapshot_20190719-1.14.3\forge-1.14.4-28.1.0_mapped_snapshot_20190719-1.14.3-recomp.jar
Classpath: C:\Users\pylori169\.gradle\caches\forge_gradle\minecraft_user_repo\net\minecraftforge\forge\1.14.4-28.1.0_mapped_snapshot_20190719-1.14.3\forge-1.14.4-28.1.0_mapped_snapshot_20190719-1.14.3-launcher.jar

View File

@ -7,12 +7,12 @@ modId="helicobactermod"
version="${file.jarVersion}"
displayName="Helico Bacter Mod"
updateJSONURL="http://myurl.me/"
displayURL="https://twitter.com/popcorn_bomzone"
displayURL="https://github.com/qrhlhplhp/HelicoBacterMod"
logoFile="logo.png"
credits="たくさんのピロリ菌たち"
authors="伊藤しえる"
description='''
'''
[[dependencies.helicobactermod]]

View File

@ -2,6 +2,8 @@
"itemGroup.helicobactermod": "HelicoBacter",
"item.helicobactermod.stomach": "Stomach",
"item.helicobactermod.fermented_stomach": "Fermented Stomach",
"item.helicobactermod.rotten_stomach": "Rotten Stomach",
"item.helicobactermod.breeded_stomach": "Breeded Stomach",
"item.helicobactermod.pylori": "Pylori",
"item.helicobactermod.urease_pylori": "Urease-covered Pylori",
"item.helicobactermod.urease": "Urease",
@ -27,6 +29,7 @@
"item.helicobactermod.urease_chestplate": "Urease-covered Pylori Chestplate",
"item.helicobactermod.urease_leggings": "Urease-covered Pylori Leggings",
"item.helicobactermod.urease_boots": "Urease-covered Pylori boots",
"item.helicobactermod.mask_pylori": "Mask of Pylori",
"block.helicobactermod.pylori_block": "Metal Block of Pylori",
"block.helicobactermod.pylori_plank": "Block of Pylori",
"block.helicobactermod.urease_block": "Urease-covered Metal Block of Pylori",

View File

@ -2,6 +2,8 @@
"itemGroup.helicobactermod": "ヘリコバクテル",
"item.helicobactermod.stomach": "胃",
"item.helicobactermod.fermented_stomach": "発酵した胃",
"item.helicobactermod.rotten_stomach": "腐敗した胃",
"item.helicobactermod.breeded_stomach": "細菌が繁殖した胃",
"item.helicobactermod.pylori": "ピロリ菌",
"item.helicobactermod.urease_pylori": "ウレアーゼに塗れたピロリ菌",
"item.helicobactermod.urease": "ウレアーゼ",
@ -27,6 +29,7 @@
"item.helicobactermod.urease_chestplate": "ウレアーゼに塗れたピロリ菌のチェストプレート",
"item.helicobactermod.urease_leggings": "ウレアーゼに塗れたピロリ菌のレギンス",
"item.helicobactermod.urease_boots": "ウレアーゼに塗れたピロリ菌のブーツ",
"item.helicobactermod.mask_pylori": "ピロリのお面",
"block.helicobactermod.pylori_block": "ピロリ菌硬質ブロック",
"block.helicobactermod.pylori_plank": "ピロリ菌ブロック",
"block.helicobactermod.urease_block": "ウレアーゼに塗れたピロリ菌硬質ブロック",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 159 B

After

Width:  |  Height:  |  Size: 203 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 158 B

After

Width:  |  Height:  |  Size: 203 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 266 B

After

Width:  |  Height:  |  Size: 393 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 551 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 227 B

After

Width:  |  Height:  |  Size: 348 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 382 B

After

Width:  |  Height:  |  Size: 555 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 227 B

After

Width:  |  Height:  |  Size: 341 B

View File

@ -18,7 +18,7 @@
"item": "minecraft:rabbit"
},
{
"item": "minecraft:rotten_flesh"
"item": "minecraft:mutton"
}
]
},

View File

@ -2,7 +2,7 @@
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "helicobactermod:fermented_stomach"
"item": "helicobactermod:breeded_stomach"
}
],
"result": {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 317 B

After

Width:  |  Height:  |  Size: 70 KiB

View File

@ -1,6 +1,6 @@
{
"pack": {
"description": "examplemod resources",
"description": "helicobactermod resources",
"pack_format": 4,
}
}

View File

@ -1,9 +1,9 @@
Manifest-Version: 1.0
Implementation-Title: HelicoBacterMod
Implementation-Version: 1.14.4-1.0.1
Implementation-Version: 1.14.4-1.1.0
Specification-Vendor: examplemodsareus
Specification-Title: examplemod
Implementation-Timestamp: 2021-03-14T19:38:34+0900
Implementation-Timestamp: 2021-03-20T13:39:50+0900
Specification-Version: 1
Implementation-Vendor: examplemodsareus

View File

@ -1,89 +1,3 @@
<<<<<<< HEAD
@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=
@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
=======
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@ -168,4 +82,3 @@ exit /b 1
if "%OS%"=="Windows_NT" endlocal
:omega
>>>>>>> test

File diff suppressed because it is too large Load Diff

View File

@ -1,13 +1,13 @@
[1432021 19:13:25.116] [main/INFO] [cpw.mods.modlauncher.Launcher/MODLAUNCHER]: ModLauncher running: args [--gameDir, ., --launchTarget, fmluserdevclient, --fml.mcpVersion, 20190829.143755, --fml.mcVersion, 1.14.4, --fml.forgeGroup, net.minecraftforge, --fml.forgeVersion, 28.1.0, --version, MOD_DEV, --assetIndex, 1.14, --assetsDir, C:\Users\pylori169\.gradle\caches\forge_gradle\assets, --username, Dev, --accessToken, ????????, --userProperties, {}]
[1432021 19:13:25.116] [main/INFO] [cpw.mods.modlauncher.Launcher/MODLAUNCHER]: ModLauncher 3.2.0+60+b86c1d4 starting: java version 1.8.0_282 by Amazon.com Inc.
[1432021 19:13:25.431] [main/INFO] [net.minecraftforge.fml.loading.FixSSL/CORE]: Added Lets Encrypt root certificates as additional trust
[1432021 19:13:26.104] [main/INFO] [cpw.mods.modlauncher.LaunchServiceHandler/MODLAUNCHER]: Launching target 'fmluserdevclient' with arguments [--version, MOD_DEV, --gameDir, ., --assetsDir, C:\Users\pylori169\.gradle\caches\forge_gradle\assets, --assetIndex, 1.14, --username, Dev, --accessToken, ????????, --userProperties, {}]
[1432021 19:13:27.753] [Client thread/INFO] [net.minecraft.client.Minecraft/]: Setting user: Dev
[1432021 19:13:36.045] [Client thread/WARN] [net.minecraft.client.GameSettings/]: Skipping bad option: lastServer:
[1432021 19:13:36.077] [Client thread/INFO] [net.minecraft.client.Minecraft/]: LWJGL Version: 3.2.2 build 10
[1432021 19:13:37.198] [modloading-worker-2/INFO] [net.minecraftforge.common.ForgeMod/FORGEMOD]: Forge mod loading, version 28.1.0, for MC 1.14.4 with MCP 20190829.143755
[1432021 19:13:37.199] [modloading-worker-2/INFO] [net.minecraftforge.common.MinecraftForge/FORGE]: MinecraftForge v28.1.0 Initialized
[1432021 19:13:37.991] [Client thread/ERROR] [net.minecraft.resources.ResourcePack/]: Couldn't load pack metadata
[2032021 13:29:16.717] [main/INFO] [cpw.mods.modlauncher.Launcher/MODLAUNCHER]: ModLauncher running: args [--gameDir, ., --launchTarget, fmluserdevclient, --fml.mcpVersion, 20190829.143755, --fml.mcVersion, 1.14.4, --fml.forgeGroup, net.minecraftforge, --fml.forgeVersion, 28.1.0, --version, MOD_DEV, --assetIndex, 1.14, --assetsDir, C:\Users\pylori169\.gradle\caches\forge_gradle\assets, --username, Dev, --accessToken, ????????, --userProperties, {}]
[2032021 13:29:16.720] [main/INFO] [cpw.mods.modlauncher.Launcher/MODLAUNCHER]: ModLauncher 3.2.0+60+b86c1d4 starting: java version 1.8.0_282 by Amazon.com Inc.
[2032021 13:29:17.053] [main/INFO] [net.minecraftforge.fml.loading.FixSSL/CORE]: Added Lets Encrypt root certificates as additional trust
[2032021 13:29:17.725] [main/INFO] [cpw.mods.modlauncher.LaunchServiceHandler/MODLAUNCHER]: Launching target 'fmluserdevclient' with arguments [--version, MOD_DEV, --gameDir, ., --assetsDir, C:\Users\pylori169\.gradle\caches\forge_gradle\assets, --assetIndex, 1.14, --username, Dev, --accessToken, ????????, --userProperties, {}]
[2032021 13:29:19.355] [Client thread/INFO] [net.minecraft.client.Minecraft/]: Setting user: Dev
[2032021 13:29:27.669] [Client thread/WARN] [net.minecraft.client.GameSettings/]: Skipping bad option: lastServer:
[2032021 13:29:27.691] [Client thread/INFO] [net.minecraft.client.Minecraft/]: LWJGL Version: 3.2.2 build 10
[2032021 13:29:28.939] [modloading-worker-2/INFO] [net.minecraftforge.common.ForgeMod/FORGEMOD]: Forge mod loading, version 28.1.0, for MC 1.14.4 with MCP 20190829.143755
[2032021 13:29:28.939] [modloading-worker-2/INFO] [net.minecraftforge.common.MinecraftForge/FORGE]: MinecraftForge v28.1.0 Initialized
[2032021 13:29:29.822] [Client thread/ERROR] [net.minecraft.resources.ResourcePack/]: Couldn't load pack metadata
com.google.gson.JsonParseException: com.google.gson.stream.MalformedJsonException: Expected name at line 5 column 6 path $.pack.pack_format
at net.minecraft.util.JSONUtils.fromJson(JSONUtils.java:359) ~[forge-1.14.4-28.1.0_mapped_snapshot_20190719-1.14.3-recomp.jar:?]
at net.minecraft.util.JSONUtils.fromJson(JSONUtils.java:411) ~[forge-1.14.4-28.1.0_mapped_snapshot_20190719-1.14.3-recomp.jar:?]
@ -41,8 +41,8 @@ Caused by: com.google.gson.stream.MalformedJsonException: Expected name at line
at com.google.gson.internal.bind.TypeAdapters$35$1.read(TypeAdapters.java:910) ~[gson-2.8.0.jar:?]
at net.minecraft.util.JSONUtils.fromJson(JSONUtils.java:357) ~[forge-1.14.4-28.1.0_mapped_snapshot_20190719-1.14.3-recomp.jar:?]
... 21 more
[1432021 19:13:38.005] [Client thread/ERROR] [net.minecraft.resources.ResourcePackInfo/]: Broken/missing pack.mcmeta detected, fudging it into existance. Please check that your launcher has downloaded all assets for the game correctly!
[1432021 19:13:38.031] [Client thread/ERROR] [net.minecraft.resources.ResourcePack/]: Couldn't load language metadata
[2032021 13:29:29.835] [Client thread/ERROR] [net.minecraft.resources.ResourcePackInfo/]: Broken/missing pack.mcmeta detected, fudging it into existance. Please check that your launcher has downloaded all assets for the game correctly!
[2032021 13:29:29.855] [Client thread/ERROR] [net.minecraft.resources.ResourcePack/]: Couldn't load language metadata
com.google.gson.JsonParseException: com.google.gson.stream.MalformedJsonException: Expected name at line 5 column 6 path $.pack.pack_format
at net.minecraft.util.JSONUtils.fromJson(JSONUtils.java:359) ~[forge-1.14.4-28.1.0_mapped_snapshot_20190719-1.14.3-recomp.jar:?]
at net.minecraft.util.JSONUtils.fromJson(JSONUtils.java:411) ~[forge-1.14.4-28.1.0_mapped_snapshot_20190719-1.14.3-recomp.jar:?]
@ -74,16 +74,16 @@ Caused by: com.google.gson.stream.MalformedJsonException: Expected name at line
at com.google.gson.internal.bind.TypeAdapters$35$1.read(TypeAdapters.java:910) ~[gson-2.8.0.jar:?]
at net.minecraft.util.JSONUtils.fromJson(JSONUtils.java:357) ~[forge-1.14.4-28.1.0_mapped_snapshot_20190719-1.14.3-recomp.jar:?]
... 19 more
[1432021 19:13:39.307] [Client thread/INFO] [com.mojang.text2speech.NarratorWindows/]: Narrator library for x64 successfully loaded
[1432021 19:13:39.484] [modloading-worker-9/INFO] [jp.qhrlhplhp.helicobactermod.HelicoBacterMod/]: HELLO FROM PREINIT
[1432021 19:13:39.485] [modloading-worker-9/INFO] [jp.qhrlhplhp.helicobactermod.HelicoBacterMod/]: DIRT BLOCK >> minecraft:dirt
[1432021 19:13:39.486] [Thread-1/FATAL] [net.minecraftforge.common.ForgeConfig/CORE]: Forge config just got changed on the file system!
[1432021 19:13:40.471] [Forge Version Check/INFO] [net.minecraftforge.fml.VersionChecker/]: [forge] Starting version check at https://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json
[1432021 19:13:40.471] [modloading-worker-9/INFO] [jp.qhrlhplhp.helicobactermod.HelicoBacterMod/]: Got game settings net.minecraft.client.GameSettings@f8c7778
[1432021 19:13:41.450] [Realms Notification Availability checker #1/INFO] [com.mojang.realmsclient.client.RealmsClient/]: Could not authorize you against Realms server: Invalid session id
[1432021 19:13:41.618] [Forge Version Check/INFO] [net.minecraftforge.fml.VersionChecker/]: [forge] Found status: OUTDATED Current: 28.1.0 Target: 28.2.0
[1432021 19:13:41.618] [Forge Version Check/INFO] [net.minecraftforge.fml.VersionChecker/]: [helicobactermod] Starting version check at http://myurl.me/
[1432021 19:13:41.899] [Forge Version Check/WARN] [net.minecraftforge.fml.VersionChecker/]: Failed to process update information
[2032021 13:29:31.123] [Client thread/INFO] [com.mojang.text2speech.NarratorWindows/]: Narrator library for x64 successfully loaded
[2032021 13:29:31.307] [modloading-worker-9/INFO] [jp.qhrlhplhp.helicobactermod.HelicoBacterMod/]: HELLO FROM PREINIT
[2032021 13:29:31.308] [Thread-1/FATAL] [net.minecraftforge.common.ForgeConfig/CORE]: Forge config just got changed on the file system!
[2032021 13:29:31.308] [modloading-worker-9/INFO] [jp.qhrlhplhp.helicobactermod.HelicoBacterMod/]: DIRT BLOCK >> minecraft:dirt
[2032021 13:29:32.302] [Forge Version Check/INFO] [net.minecraftforge.fml.VersionChecker/]: [forge] Starting version check at https://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json
[2032021 13:29:32.304] [modloading-worker-9/INFO] [jp.qhrlhplhp.helicobactermod.HelicoBacterMod/]: Got game settings net.minecraft.client.GameSettings@46e25e9e
[2032021 13:29:33.440] [Realms Notification Availability checker #1/INFO] [com.mojang.realmsclient.client.RealmsClient/]: Could not authorize you against Realms server: Invalid session id
[2032021 13:29:33.457] [Forge Version Check/INFO] [net.minecraftforge.fml.VersionChecker/]: [forge] Found status: OUTDATED Current: 28.1.0 Target: 28.2.0
[2032021 13:29:33.457] [Forge Version Check/INFO] [net.minecraftforge.fml.VersionChecker/]: [helicobactermod] Starting version check at http://myurl.me/
[2032021 13:29:33.746] [Forge Version Check/WARN] [net.minecraftforge.fml.VersionChecker/]: Failed to process update information
java.io.IOException: Server returned HTTP response code: 403 for URL: http://myurl.me/
at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[?:1.8.0_282]
at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[?:1.8.0_282]
@ -105,23 +105,24 @@ Caused by: java.io.IOException: Server returned HTTP response code: 403 for URL:
at java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:480) ~[?:1.8.0_282]
at net.minecraftforge.fml.VersionChecker$1.openUrlStream(VersionChecker.java:173) ~[?:?]
... 3 more
[1432021 19:13:43.343] [modloading-worker-9/INFO] [jp.qhrlhplhp.helicobactermod.HelicoBacterMod/]: Got IMC []
[1432021 19:13:43.638] [Client thread/WARN] [net.minecraft.client.GameSettings/]: Skipping bad option: lastServer:
[1432021 19:13:43.887] [Client thread/INFO] [net.minecraft.client.audio.SoundSystem/]: OpenAL initialized.
[1432021 19:13:43.888] [Client thread/INFO] [net.minecraft.client.audio.SoundEngine/SOUNDS]: Sound engine started
[1432021 19:13:44.022] [Client thread/INFO] [net.minecraft.client.renderer.texture.AtlasTexture/]: Created: 1024x512 textures-atlas
[1432021 19:13:44.493] [Client thread/INFO] [net.minecraft.client.renderer.texture.AtlasTexture/]: Created: 256x256 textures/particle-atlas
[1432021 19:13:44.495] [Client thread/INFO] [net.minecraft.client.renderer.texture.AtlasTexture/]: Created: 256x256 textures/painting-atlas
[1432021 19:13:44.497] [Client thread/INFO] [net.minecraft.client.renderer.texture.AtlasTexture/]: Created: 128x128 textures/mob_effect-atlas
[1432021 19:13:49.672] [Client thread/WARN] [net.minecraft.command.Commands/]: Ambiguity between arguments [teleport, destination] and [teleport, targets] with inputs: [Player, 0123, @e, dd12be42-52a9-4a91-a8a1-11c01849e498]
[1432021 19:13:49.673] [Client thread/WARN] [net.minecraft.command.Commands/]: Ambiguity between arguments [teleport, location] and [teleport, destination] with inputs: [0.1 -0.5 .9, 0 0 0]
[1432021 19:13:49.673] [Client thread/WARN] [net.minecraft.command.Commands/]: Ambiguity between arguments [teleport, location] and [teleport, targets] with inputs: [0.1 -0.5 .9, 0 0 0]
[1432021 19:13:49.674] [Client thread/WARN] [net.minecraft.command.Commands/]: Ambiguity between arguments [teleport, targets] and [teleport, destination] with inputs: [Player, 0123, dd12be42-52a9-4a91-a8a1-11c01849e498]
[1432021 19:13:49.674] [Client thread/WARN] [net.minecraft.command.Commands/]: Ambiguity between arguments [teleport, targets, location] and [teleport, targets, destination] with inputs: [0.1 -0.5 .9, 0 0 0]
[1432021 19:13:49.788] [Server thread/INFO] [net.minecraft.server.integrated.IntegratedServer/]: Starting integrated minecraft server version 1.14.4
[1432021 19:13:49.789] [Server thread/INFO] [net.minecraft.server.integrated.IntegratedServer/]: Generating keypair
[1432021 19:13:49.914] [Server thread/INFO] [net.minecraftforge.registries.GameData/REGISTRIES]: Injecting existing registry data into this SERVER instance
[1432021 19:13:50.077] [Server thread/ERROR] [net.minecraft.resources.ResourcePack/]: Couldn't load pack metadata
[2032021 13:29:35.094] [modloading-worker-9/INFO] [jp.qhrlhplhp.helicobactermod.HelicoBacterMod/]: Hello world from the MDK
[2032021 13:29:35.094] [modloading-worker-9/INFO] [jp.qhrlhplhp.helicobactermod.HelicoBacterMod/]: Got IMC [Hello world]
[2032021 13:29:35.402] [Client thread/WARN] [net.minecraft.client.GameSettings/]: Skipping bad option: lastServer:
[2032021 13:29:35.661] [Client thread/INFO] [net.minecraft.client.audio.SoundSystem/]: OpenAL initialized.
[2032021 13:29:35.662] [Client thread/INFO] [net.minecraft.client.audio.SoundEngine/SOUNDS]: Sound engine started
[2032021 13:29:35.788] [Client thread/INFO] [net.minecraft.client.renderer.texture.AtlasTexture/]: Created: 1024x512 textures-atlas
[2032021 13:29:36.349] [Client thread/INFO] [net.minecraft.client.renderer.texture.AtlasTexture/]: Created: 256x256 textures/particle-atlas
[2032021 13:29:36.352] [Client thread/INFO] [net.minecraft.client.renderer.texture.AtlasTexture/]: Created: 256x256 textures/painting-atlas
[2032021 13:29:36.353] [Client thread/INFO] [net.minecraft.client.renderer.texture.AtlasTexture/]: Created: 128x128 textures/mob_effect-atlas
[2032021 13:29:54.345] [Client thread/WARN] [net.minecraft.command.Commands/]: Ambiguity between arguments [teleport, destination] and [teleport, targets] with inputs: [Player, 0123, @e, dd12be42-52a9-4a91-a8a1-11c01849e498]
[2032021 13:29:54.346] [Client thread/WARN] [net.minecraft.command.Commands/]: Ambiguity between arguments [teleport, location] and [teleport, destination] with inputs: [0.1 -0.5 .9, 0 0 0]
[2032021 13:29:54.347] [Client thread/WARN] [net.minecraft.command.Commands/]: Ambiguity between arguments [teleport, location] and [teleport, targets] with inputs: [0.1 -0.5 .9, 0 0 0]
[2032021 13:29:54.347] [Client thread/WARN] [net.minecraft.command.Commands/]: Ambiguity between arguments [teleport, targets] and [teleport, destination] with inputs: [Player, 0123, dd12be42-52a9-4a91-a8a1-11c01849e498]
[2032021 13:29:54.348] [Client thread/WARN] [net.minecraft.command.Commands/]: Ambiguity between arguments [teleport, targets, location] and [teleport, targets, destination] with inputs: [0.1 -0.5 .9, 0 0 0]
[2032021 13:29:54.459] [Server thread/INFO] [net.minecraft.server.integrated.IntegratedServer/]: Starting integrated minecraft server version 1.14.4
[2032021 13:29:54.459] [Server thread/INFO] [net.minecraft.server.integrated.IntegratedServer/]: Generating keypair
[2032021 13:29:54.588] [Server thread/INFO] [net.minecraftforge.registries.GameData/REGISTRIES]: Injecting existing registry data into this SERVER instance
[2032021 13:29:54.763] [Server thread/ERROR] [net.minecraft.resources.ResourcePack/]: Couldn't load pack metadata
com.google.gson.JsonParseException: com.google.gson.stream.MalformedJsonException: Expected name at line 5 column 6 path $.pack.pack_format
at net.minecraft.util.JSONUtils.fromJson(JSONUtils.java:359) ~[?:?]
at net.minecraft.util.JSONUtils.fromJson(JSONUtils.java:411) ~[?:?]
@ -146,9 +147,9 @@ Caused by: com.google.gson.stream.MalformedJsonException: Expected name at line
at com.google.gson.internal.bind.TypeAdapters$35$1.read(TypeAdapters.java:910) ~[gson-2.8.0.jar:?]
at net.minecraft.util.JSONUtils.fromJson(JSONUtils.java:357) ~[?:?]
... 12 more
[1432021 19:13:50.079] [Server thread/ERROR] [net.minecraft.resources.ResourcePackInfo/]: Broken/missing pack.mcmeta detected, fudging it into existance. Please check that your launcher has downloaded all assets for the game correctly!
[1432021 19:13:50.081] [Server thread/INFO] [net.minecraft.resources.SimpleReloadableResourceManager/]: Reloading ResourceManager: Default, main, forge-1.14.4-28.1.0_mapped_snapshot_20190719-1.14.3-recomp.jar
[1432021 19:13:50.927] [Server thread/ERROR] [net.minecraft.item.crafting.RecipeManager/]: Parsing error loading recipe helicobactermod:pylori_ingot
[2032021 13:29:54.765] [Server thread/ERROR] [net.minecraft.resources.ResourcePackInfo/]: Broken/missing pack.mcmeta detected, fudging it into existance. Please check that your launcher has downloaded all assets for the game correctly!
[2032021 13:29:54.766] [Server thread/INFO] [net.minecraft.resources.SimpleReloadableResourceManager/]: Reloading ResourceManager: Default, main, forge-1.14.4-28.1.0_mapped_snapshot_20190719-1.14.3-recomp.jar
[2032021 13:29:55.663] [Server thread/ERROR] [net.minecraft.item.crafting.RecipeManager/]: Parsing error loading recipe helicobactermod:pylori_ingot
com.google.gson.JsonSyntaxException: Unknown item 'example_mod:pylori_ingot'
at net.minecraft.item.crafting.ShapedRecipe.lambda$deserializeItem$0(ShapedRecipe.java:280) ~[?:?]
at java.util.Optional.orElseThrow(Optional.java:290) ~[?:1.8.0_282]
@ -176,66 +177,55 @@ com.google.gson.JsonSyntaxException: Unknown item 'example_mod:pylori_ingot'
at net.minecraft.server.integrated.IntegratedServer.init(IntegratedServer.java:97) [?:?]
at net.minecraft.server.MinecraftServer.run(MinecraftServer.java:622) [?:?]
at java.lang.Thread.run(Thread.java:748) [?:1.8.0_282]
[1432021 19:13:50.946] [Server thread/INFO] [net.minecraft.item.crafting.RecipeManager/]: Loaded 6 recipes
[1432021 19:13:51.810] [Server thread/INFO] [net.minecraft.advancements.AdvancementList/]: Loaded 811 advancements
[1432021 19:13:52.153] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Preparing start region for dimension minecraft:overworld
[1432021 19:13:52.989] [Client thread/INFO] [net.minecraft.world.chunk.listener.LoggingChunkStatusListener/]: スポーン地点を準備中0%
[1432021 19:13:52.989] [Client thread/INFO] [net.minecraft.world.chunk.listener.LoggingChunkStatusListener/]: スポーン地点を準備中0%
[1432021 19:13:53.225] [Client thread/INFO] [net.minecraft.world.chunk.listener.LoggingChunkStatusListener/]: スポーン地点を準備中50%
[1432021 19:13:54.563] [Client thread/INFO] [net.minecraft.world.chunk.listener.LoggingChunkStatusListener/]: スポーン地点を準備中83%
[1432021 19:13:54.563] [Client thread/INFO] [net.minecraft.world.chunk.listener.LoggingChunkStatusListener/]: スポーン地点を準備中83%
[1432021 19:13:54.672] [Client thread/INFO] [net.minecraft.world.chunk.listener.LoggingChunkStatusListener/]: スポーン地点を準備中98%
[1432021 19:13:55.061] [Server thread/INFO] [jp.qhrlhplhp.helicobactermod.HelicoBacterMod/]: HELLO from server starting
[1432021 19:13:55.069] [Client thread/INFO] [net.minecraft.world.chunk.listener.LoggingChunkStatusListener/]: Time elapsed: 2912 ms
[1432021 19:13:55.487] [Server thread/INFO] [net.minecraft.world.server.ChunkManager/]: ThreadedAnvilChunkStorage (DIM1): All chunks are saved
[1432021 19:13:55.487] [Server thread/INFO] [net.minecraft.world.server.ChunkManager/]: ThreadedAnvilChunkStorage (DIM-1): All chunks are saved
[1432021 19:13:58.413] [Netty Local Client IO #0/INFO] [net.minecraftforge.fml.network.NetworkHooks/]: Connected to a modded server.
[1432021 19:13:58.577] [Server thread/INFO] [net.minecraft.server.management.PlayerList/]: Dev[local:E:1a0e6e52] logged in with entity id 261 at (-151.44667512594648, 67.79673560066871, 155.69999998807907)
[1432021 19:13:58.610] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Dev がゲームに参加しました
[1432021 19:13:58.883] [Server thread/INFO] [net.minecraft.server.integrated.IntegratedServer/]: Saving and pausing game...
[1432021 19:13:58.912] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Saving chunks for level '新規ワールド'/minecraft:overworld
[1432021 19:13:59.270] [Client thread/INFO] [net.minecraft.advancements.AdvancementList/]: Loaded 56 advancements
[1432021 19:14:14.436] [Client thread/INFO] [net.minecraft.advancements.AdvancementList/]: Loaded 57 advancements
[1432021 19:14:14.519] [Client thread/INFO] [net.minecraft.advancements.AdvancementList/]: Loaded 57 advancements
[1432021 19:14:23.201] [Server thread/INFO] [net.minecraft.server.integrated.IntegratedServer/]: Saving and pausing game...
[1432021 19:14:23.220] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Saving chunks for level '新規ワールド'/minecraft:overworld
[1432021 19:15:52.142] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] [デバッグ]: 高度な情報:表示
[1432021 19:16:07.927] [Client thread/INFO] [net.minecraft.advancements.AdvancementList/]: Loaded 67 advancements
[1432021 19:16:16.767] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: [Dev: ゲームモードをクリエイティブモードに変更しました]
[1432021 19:16:16.782] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] ゲームモードをクリエイティブモードに変更しました
[1432021 19:16:40.679] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Dev は進捗 [不気味で怖いスケルトン] を達成した
[1432021 19:16:40.680] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] Dev は進捗 [不気味で怖いスケルトン] を達成した
[1432021 19:16:40.714] [Client thread/INFO] [net.minecraft.advancements.AdvancementList/]: Loaded 73 advancements
[1432021 19:16:44.952] [Server thread/INFO] [net.minecraft.server.integrated.IntegratedServer/]: Saving and pausing game...
[1432021 19:16:44.974] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Saving chunks for level '新規ワールド'/minecraft:overworld
[1432021 19:16:54.886] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Dev は進捗 [荒が丘] を達成した
[1432021 19:16:54.900] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] Dev は進捗 [荒が丘] を達成した
[1432021 19:16:54.929] [Client thread/INFO] [net.minecraft.advancements.AdvancementList/]: Loaded 74 advancements
[1432021 19:17:09.518] [Client thread/INFO] [net.minecraft.advancements.AdvancementList/]: Loaded 75 advancements
[1432021 19:17:26.241] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: [Dev: 新しく エンダードラゴン を召喚しました]
[1432021 19:17:26.255] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] 新しく エンダードラゴン を召喚しました
[1432021 19:17:27.742] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Dev は進捗 [エンドの解放] を達成した
[1432021 19:17:27.756] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] Dev は進捗 [エンドの解放] を達成した
[1432021 19:17:27.757] [Client thread/INFO] [net.minecraft.advancements.AdvancementList/]: Loaded 82 advancements
[1432021 19:17:44.114] [Client thread/WARN] [net.minecraft.client.audio.SoundEngine/SOUNDS]: Unable to play empty soundEvent: minecraft:entity.salmon.ambient
[1432021 19:18:03.359] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: [Dev: 新しく エンダードラゴン を召喚しました]
[1432021 19:18:03.370] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] 新しく エンダードラゴン を召喚しました
[1432021 19:18:16.525] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: [Dev: ゲームモードをサバイバルモードに変更しました]
[1432021 19:18:16.526] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] ゲームモードをサバイバルモードに変更しました
[1432021 19:18:27.965] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] 不明なコマンドです
[1432021 19:18:27.965] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] //←[問題箇所]
[1432021 19:18:41.458] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: [Dev: ゲームモードをクリエイティブモードに変更しました]
[1432021 19:18:41.469] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] ゲームモードをクリエイティブモードに変更しました
[1432021 19:19:01.501] [Server thread/INFO] [net.minecraft.server.integrated.IntegratedServer/]: Saving and pausing game...
[1432021 19:19:01.517] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Saving chunks for level '新規ワールド'/minecraft:overworld
[1432021 19:19:01.962] [Server thread/INFO] [net.minecraft.network.play.ServerPlayNetHandler/]: Dev lost connection: 切断されました
[1432021 19:19:01.962] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Dev がゲームを退出しました
[1432021 19:19:01.970] [Server thread/INFO] [net.minecraft.network.play.ServerPlayNetHandler/]: Stopping singleplayer server as player logged out
[1432021 19:19:02.001] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Stopping server
[1432021 19:19:02.002] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Saving players
[1432021 19:19:02.002] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Saving worlds
[1432021 19:19:02.002] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Saving chunks for level '新規ワールド'/minecraft:overworld
[1432021 19:19:02.250] [Server thread/INFO] [net.minecraft.world.server.ChunkManager/]: ThreadedAnvilChunkStorage (新規ワールド): All chunks are saved
[1432021 19:19:02.274] [Server thread/INFO] [net.minecraft.world.server.ChunkManager/]: ThreadedAnvilChunkStorage (新規ワールド): All chunks are saved
[1432021 19:19:02.943] [Client thread/INFO] [net.minecraft.client.Minecraft/]: Stopping!
[1432021 19:19:02.945] [Sound engine/ERROR] [net.minecraft.client.audio.ALUtils/]: Stop: Invalid name parameter.
[2032021 13:29:55.683] [Server thread/INFO] [net.minecraft.item.crafting.RecipeManager/]: Loaded 6 recipes
[2032021 13:29:56.734] [Server thread/INFO] [net.minecraft.advancements.AdvancementList/]: Loaded 811 advancements
[2032021 13:29:57.083] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Preparing start region for dimension minecraft:overworld
[2032021 13:29:57.620] [Client thread/INFO] [net.minecraft.world.chunk.listener.LoggingChunkStatusListener/]: スポーン地点を準備中0%
[2032021 13:29:57.620] [Client thread/INFO] [net.minecraft.world.chunk.listener.LoggingChunkStatusListener/]: スポーン地点を準備中0%
[2032021 13:29:59.363] [Client thread/INFO] [net.minecraft.world.chunk.listener.LoggingChunkStatusListener/]: スポーン地点を準備中83%
[2032021 13:29:59.363] [Client thread/INFO] [net.minecraft.world.chunk.listener.LoggingChunkStatusListener/]: スポーン地点を準備中83%
[2032021 13:29:59.363] [Client thread/INFO] [net.minecraft.world.chunk.listener.LoggingChunkStatusListener/]: スポーン地点を準備中83%
[2032021 13:29:59.611] [Client thread/INFO] [net.minecraft.world.chunk.listener.LoggingChunkStatusListener/]: スポーン地点を準備中95%
[2032021 13:30:00.104] [Client thread/INFO] [net.minecraft.world.chunk.listener.LoggingChunkStatusListener/]: スポーン地点を準備中96%
[2032021 13:30:00.529] [Server thread/INFO] [jp.qhrlhplhp.helicobactermod.HelicoBacterMod/]: HELLO from server starting
[2032021 13:30:00.540] [Client thread/INFO] [net.minecraft.world.chunk.listener.LoggingChunkStatusListener/]: Time elapsed: 3439 ms
[2032021 13:30:01.065] [Server thread/INFO] [net.minecraft.world.server.ChunkManager/]: ThreadedAnvilChunkStorage (DIM1): All chunks are saved
[2032021 13:30:01.066] [Server thread/INFO] [net.minecraft.world.server.ChunkManager/]: ThreadedAnvilChunkStorage (DIM-1): All chunks are saved
[2032021 13:30:03.630] [Netty Local Client IO #0/INFO] [net.minecraftforge.fml.network.NetworkHooks/]: Connected to a modded server.
[2032021 13:30:03.782] [Server thread/INFO] [net.minecraft.server.management.PlayerList/]: Dev[local:E:60b0d3f2] logged in with entity id 213 at (-125.3487455315773, 64.0, -262.73734172968244)
[2032021 13:30:03.812] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Dev がゲームに参加しました
[2032021 13:30:04.107] [Server thread/INFO] [net.minecraft.server.integrated.IntegratedServer/]: Saving and pausing game...
[2032021 13:30:04.123] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Saving chunks for level '新規ワール'/minecraft:overworld
[2032021 13:30:04.269] [Client thread/INFO] [net.minecraft.advancements.AdvancementList/]: Loaded 27 advancements
[2032021 13:30:10.426] [Server thread/WARN] [net.minecraft.server.MinecraftServer/]: Can't keep up! Is the server overloaded? Running 6454ms or 129 ticks behind
[2032021 13:31:32.729] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: <Dev> e
[2032021 13:31:32.752] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] <Dev> e
[2032021 13:31:48.737] [Client thread/INFO] [net.minecraft.advancements.AdvancementList/]: Loaded 37 advancements
[2032021 13:32:25.487] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: [Dev: ゲームモードをサバイバルモードに変更しました]
[2032021 13:32:25.501] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] ゲームモードをサバイバルモードに変更しました
[2032021 13:32:37.057] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: [Dev: ゲームモードをクリエイティブモードに変更しました]
[2032021 13:32:37.073] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] ゲームモードをクリエイティブモードに変更しました
[2032021 13:32:52.962] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: [Dev: ゲームモードをサバイバルモードに変更しました]
[2032021 13:32:52.979] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] ゲームモードをサバイバルモードに変更しました
[2032021 13:33:18.188] [Client thread/INFO] [net.minecraft.advancements.AdvancementList/]: Loaded 37 advancements
[2032021 13:33:49.302] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: [Dev: ゲームモードをクリエイティブモードに変更しました]
[2032021 13:33:49.316] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] ゲームモードをクリエイティブモードに変更しました
[2032021 13:34:27.866] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: [Dev: ゲームモードをサバイバルモードに変更しました]
[2032021 13:34:27.896] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] ゲームモードをサバイバルモードに変更しました
[2032021 13:34:41.028] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Dev は進捗 [モンスターハンター] を達成した
[2032021 13:34:41.034] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] Dev は進捗 [モンスターハンター] を達成した
[2032021 13:34:41.084] [Client thread/INFO] [net.minecraft.advancements.AdvancementList/]: Loaded 39 advancements
[2032021 13:34:43.603] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: [Dev: ゲームモードをクリエイティブモードに変更しました]
[2032021 13:34:43.619] [Client thread/INFO] [net.minecraft.client.gui.NewChatGui/]: [CHAT] ゲームモードをクリエイティブモードに変更しました
[2032021 13:36:10.873] [Server thread/INFO] [net.minecraft.server.integrated.IntegratedServer/]: Saving and pausing game...
[2032021 13:36:10.893] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Saving chunks for level '新規ワール'/minecraft:overworld
[2032021 13:36:11.484] [Server thread/INFO] [net.minecraft.network.play.ServerPlayNetHandler/]: Dev lost connection: 切断されました
[2032021 13:36:11.484] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Dev がゲームを退出しました
[2032021 13:36:11.492] [Server thread/INFO] [net.minecraft.network.play.ServerPlayNetHandler/]: Stopping singleplayer server as player logged out
[2032021 13:36:11.504] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Stopping server
[2032021 13:36:11.504] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Saving players
[2032021 13:36:11.504] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Saving worlds
[2032021 13:36:11.504] [Server thread/INFO] [net.minecraft.server.MinecraftServer/]: Saving chunks for level '新規ワール'/minecraft:overworld
[2032021 13:36:11.655] [Server thread/INFO] [net.minecraft.world.server.ChunkManager/]: ThreadedAnvilChunkStorage (新規ワール): All chunks are saved
[2032021 13:36:11.671] [Server thread/INFO] [net.minecraft.world.server.ChunkManager/]: ThreadedAnvilChunkStorage (新規ワール): All chunks are saved
[2032021 13:36:12.587] [Client thread/INFO] [net.minecraft.client.Minecraft/]: Stopping!

View File

@ -158,6 +158,12 @@
},
"done": true
},
"minecraft:recipes/misc/bowl": {
"criteria": {
"has_brown_mushroom": "2021-03-20 11:03:56 +0900"
},
"done": true
},
"minecraft:recipes/transportation/spruce_boat": {
"criteria": {
"in_water": "2021-03-14 19:04:31 +0900"
@ -212,6 +218,12 @@
},
"done": true
},
"minecraft:recipes/food/mushroom_stew": {
"criteria": {
"has_brown_mushroom": "2021-03-20 11:03:56 +0900"
},
"done": true
},
"minecraft:recipes/building_blocks/gray_wool": {
"criteria": {
"has_white_wool": "2021-03-14 19:02:42 +0900"
@ -272,6 +284,12 @@
},
"done": true
},
"minecraft:story/root": {
"criteria": {
"crafting_table": "2021-03-20 11:03:19 +0900"
},
"done": true
},
"minecraft:recipes/building_blocks/red_wool": {
"criteria": {
"has_white_wool": "2021-03-14 19:02:42 +0900"

View File

@ -1 +1 @@
{"stats":{"minecraft:picked_up":{"minecraft:salmon":9,"minecraft:brown_wool":1,"minecraft:wheat_seeds":1,"minecraft:dandelion":1,"minecraft:porkchop":12,"minecraft:ink_sac":4,"minecraft:nether_star":1,"minecraft:black_wool":1,"minecraft:mutton":20,"minecraft:dirt":4,"minecraft:white_wool":11},"minecraft:custom":{"minecraft:time_since_rest":8995,"minecraft:play_one_minute":8995,"minecraft:sprint_one_cm":28473,"minecraft:damage_taken":80,"minecraft:walk_one_cm":15117,"minecraft:sneak_time":5,"minecraft:walk_under_water_one_cm":4638,"minecraft:mob_kills":34,"minecraft:jump":146,"minecraft:damage_dealt":5209,"minecraft:leave_game":3,"minecraft:walk_on_water_one_cm":4437,"minecraft:time_since_death":8995,"minecraft:swim_one_cm":12003,"minecraft:fall_one_cm":3165,"minecraft:fly_one_cm":22751},"minecraft:mined":{"minecraft:grass":3,"minecraft:dandelion":1,"minecraft:oak_leaves":3},"minecraft:used":{"helicobactermod:golden_pylori":31,"minecraft:soul_sand":4,"minecraft:anvil":2,"minecraft:wither_skeleton_skull":4,"minecraft:porkchop":3,"helicobactermod:urease_sword":15},"minecraft:killed":{"minecraft:sheep":13,"minecraft:ender_dragon":2,"minecraft:pig":6,"minecraft:squid":3,"minecraft:wither":1,"minecraft:salmon":9}},"DataVersion":1976}
{"stats":{"minecraft:used":{"helicobactermod:golden_pylori":36,"minecraft:wither_skeleton_skull":4,"minecraft:armor_stand":2,"minecraft:soul_sand":4,"minecraft:anvil":2,"minecraft:crafting_table":1,"minecraft:porkchop":3,"helicobactermod:urease_sword":15},"minecraft:custom":{"minecraft:time_since_rest":15987,"minecraft:sprint_one_cm":29907,"minecraft:damage_taken":80,"minecraft:walk_one_cm":21847,"minecraft:mob_kills":37,"minecraft:damage_dealt":5209,"minecraft:swim_one_cm":12003,"minecraft:interact_with_crafting_table":6,"minecraft:fly_one_cm":25963,"minecraft:play_one_minute":15987,"minecraft:sneak_time":5,"minecraft:walk_under_water_one_cm":4638,"minecraft:jump":164,"minecraft:leave_game":5,"minecraft:walk_on_water_one_cm":4437,"minecraft:time_since_death":15987,"minecraft:fall_one_cm":3165},"minecraft:killed":{"minecraft:sheep":13,"minecraft:pig":6,"minecraft:salmon":9,"minecraft:ender_dragon":5,"minecraft:squid":3,"minecraft:wither":1},"minecraft:picked_up":{"minecraft:salmon":9,"minecraft:brown_wool":1,"minecraft:dandelion":1,"minecraft:porkchop":12,"minecraft:ink_sac":4,"minecraft:dirt":4,"minecraft:wheat_seeds":1,"minecraft:black_wool":1,"minecraft:mutton":20,"minecraft:white_wool":11,"minecraft:nether_star":1},"minecraft:mined":{"minecraft:dandelion":1,"minecraft:grass":3,"minecraft:oak_leaves":3},"minecraft:crafted":{"helicobactermod:rotten_stomach":29,"helicobactermod:urease_pylori":31,"helicobactermod:fermented_stomach":64,"helicobactermod:breeded_stomach":31,"helicobactermod:stomach":93}},"DataVersion":1976}

View File

@ -1 +1 @@
[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2021-04-14 19:13:58 +0900"}]
[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2021-04-20 13:30:03 +0900"}]

View File

@ -1,25 +1,3 @@
<<<<<<< HEAD
package jp.qhrlhplhp.helicobactermod;
import jp.qhrlhplhp.helicobactermod.lists.ItemList;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
public class HelicoBacterItemGroup extends ItemGroup {
public static final HelicoBacterItemGroup DEFAULT = new HelicoBacterItemGroup();
public HelicoBacterItemGroup() {
super("helicobactermod");
}
@Override
@OnlyIn(Dist.CLIENT)
public ItemStack createIcon() {
return new ItemStack(ItemList.Pylori);
}
=======
package jp.qhrlhplhp.helicobactermod;
import jp.qhrlhplhp.helicobactermod.lists.ItemList;
@ -40,5 +18,4 @@ public class HelicoBacterItemGroup extends ItemGroup {
public ItemStack createIcon() {
return new ItemStack(ItemList.Pylori);
}
>>>>>>> test
}

View File

@ -18,59 +18,43 @@ import org.apache.logging.log4j.Logger;
import java.util.stream.Collectors;
// The value here should match an entry in the META-INF/mods.toml file
@Mod("helicobactermod")
public class HelicoBacterMod
{
public static final String MOD_ID = "helicobactermod";
private static final Logger LOGGER = LogManager.getLogger();
public HelicoBacterMod() {
// Register the setup method for modloading
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
// Register the enqueueIMC method for modloading
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::enqueueIMC);
// Register the processIMC method for modloading
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::processIMC);
// Register the doClientStuff method for modloading
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff);
// Register ourselves for server and other game events we are interested in
MinecraftForge.EVENT_BUS.register(this);
}
private void setup(final FMLCommonSetupEvent event)
{
// some preinit code
LOGGER.info("HELLO FROM PREINIT");
LOGGER.info("DIRT BLOCK >> {}", Blocks.DIRT.getRegistryName());
}
private void doClientStuff(final FMLClientSetupEvent event) {
// do something that can only be done on the client
LOGGER.info("Got game settings {}", event.getMinecraftSupplier().get().gameSettings);
}
private void enqueueIMC(final InterModEnqueueEvent event)
{
// some example code to dispatch IMC to another mod
InterModComms.sendTo("examplemod", "helloworld", () -> { LOGGER.info("Hello world from the MDK"); return "Hello world";});
InterModComms.sendTo("helicobactermod", "helloworld", () -> { LOGGER.info("Hello world from the MDK"); return "Hello world";});
}
private void processIMC(final InterModProcessEvent event)
{
// some example code to receive and process InterModComms from other mods
LOGGER.info("Got IMC {}", event.getIMCStream().
map(m->m.getMessageSupplier().get()).
collect(Collectors.toList()));
}
// You can use SubscribeEvent and let the Event Bus discover methods to call
@SubscribeEvent
public void onServerStarting(FMLServerStartingEvent event) {
// do something when the server starts
LOGGER.info("HELLO from server starting");
}
// You can use EventBusSubscriber to automatically subscribe events on the contained class (this is subscribing to the MOD
// Event bus for receiving Registry Events)
}

View File

@ -1,58 +1,3 @@
<<<<<<< HEAD
package jp.qhrlhplhp.helicobactermod.items;
import jp.qhrlhplhp.helicobactermod.lists.ItemList;
import net.minecraft.item.IItemTier;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.LazyLoadBase;
import java.util.function.Supplier;
public enum GoldenItemTier implements IItemTier {
GOLDEN(3, 1000000000, 1000000000000.0F, 1000000000000.0F, 1000000000, () -> {
return Ingredient.fromItems(ItemList.Pylori);
});
private final int harvestLevel;
private final int maxUses;
private final float efficiency;
private final float attackDamage;
private final int enchantability;
private final LazyLoadBase<Ingredient> repairMaterial;
private GoldenItemTier(int harvestLevelIn, int maxUsesIn, float efficiencyIn, float attackDamageIn, int enchantabilityIn, Supplier<Ingredient> repairMaterialIn) {
this.harvestLevel = harvestLevelIn;
this.maxUses = maxUsesIn;
this.efficiency = efficiencyIn;
this.attackDamage = attackDamageIn;
this.enchantability = enchantabilityIn;
this.repairMaterial = new LazyLoadBase<>(repairMaterialIn);
}
public int getMaxUses() {
return this.maxUses;
}
public float getEfficiency() {
return this.efficiency;
}
public float getAttackDamage() {
return this.attackDamage;
}
public int getHarvestLevel() {
return this.harvestLevel;
}
public int getEnchantability() {
return this.enchantability;
}
public Ingredient getRepairMaterial() {
return this.repairMaterial.getValue();
}
=======
package jp.qhrlhplhp.helicobactermod.items;
import jp.qhrlhplhp.helicobactermod.lists.ItemList;
@ -106,5 +51,4 @@ public enum GoldenItemTier implements IItemTier {
public Ingredient getRepairMaterial() {
return this.repairMaterial.getValue();
}
>>>>>>> test
}

View File

@ -1,13 +1,3 @@
<<<<<<< HEAD
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.SwordItem;
public class ItemGoldenPylori extends SwordItem {
public ItemGoldenPylori(Properties properties) {
super(GoldenItemTier.GOLDEN, 1000000000, 1000000000000.0F, properties);
}
=======
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.SwordItem;
@ -16,5 +6,4 @@ public class ItemGoldenPylori extends SwordItem {
public ItemGoldenPylori(Properties properties) {
super(GoldenItemTier.GOLDEN, 1000000000, 1000000000000.0F, properties);
}
>>>>>>> test
}

View File

@ -1,13 +1,3 @@
<<<<<<< HEAD
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.AxeItem;
public class ItemPyloriAxe extends AxeItem {
public ItemPyloriAxe(Properties properties) {
super(PyloriItemTier.PYLORI, 5, -3.0F, properties);
}
=======
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.AxeItem;
@ -16,5 +6,4 @@ public class ItemPyloriAxe extends AxeItem {
public ItemPyloriAxe(Properties properties) {
super(PyloriItemTier.PYLORI, 5, -3.0F, properties);
}
>>>>>>> test
}

View File

@ -1,13 +1,3 @@
<<<<<<< HEAD
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.HoeItem;
public class ItemPyloriHoe extends HoeItem {
public ItemPyloriHoe(Properties properties) {
super(PyloriItemTier.PYLORI, 0, properties);
}
=======
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.HoeItem;
@ -16,5 +6,4 @@ public class ItemPyloriHoe extends HoeItem {
public ItemPyloriHoe(Properties properties) {
super(PyloriItemTier.PYLORI, 0, properties);
}
>>>>>>> test
}

View File

@ -1,13 +1,3 @@
<<<<<<< HEAD
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.PickaxeItem;
public class ItemPyloriPickaxe extends PickaxeItem {
public ItemPyloriPickaxe(Properties properties) {
super(PyloriItemTier.PYLORI, 3, -3.0F, properties);
}
=======
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.PickaxeItem;
@ -16,5 +6,4 @@ public class ItemPyloriPickaxe extends PickaxeItem {
public ItemPyloriPickaxe(Properties properties) {
super(PyloriItemTier.PYLORI, 3, -3.0F, properties);
}
>>>>>>> test
}

View File

@ -1,13 +1,3 @@
<<<<<<< HEAD
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.ShovelItem;
public class ItemPyloriShovel extends ShovelItem {
public ItemPyloriShovel(Properties properties) {
super(PyloriItemTier.PYLORI, 3F, -3.0F, properties);
}
=======
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.ShovelItem;
@ -16,5 +6,4 @@ public class ItemPyloriShovel extends ShovelItem {
public ItemPyloriShovel(Properties properties) {
super(PyloriItemTier.PYLORI, 3F, -3.0F, properties);
}
>>>>>>> test
}

View File

@ -1,13 +1,3 @@
<<<<<<< HEAD
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.SwordItem;
public class ItemPyloriSword extends SwordItem {
public ItemPyloriSword(Properties properties) {
super(PyloriItemTier.PYLORI, 7, -2.0F, properties);
}
=======
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.SwordItem;
@ -16,5 +6,4 @@ public class ItemPyloriSword extends SwordItem {
public ItemPyloriSword(Properties properties) {
super(PyloriItemTier.PYLORI, 7, -2.0F, properties);
}
>>>>>>> test
}

View File

@ -1,20 +1,9 @@
<<<<<<< HEAD
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.AxeItem;
public class ItemUreaseAxe extends AxeItem {
public ItemUreaseAxe(Properties properties) {
super(PyloriItemTier.PYLORI, 10, -3.0F, properties);
}
=======
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.AxeItem;
public class ItemUreaseAxe extends AxeItem {
public ItemUreaseAxe(Properties properties) {
super(PyloriItemTier.PYLORI, 10, -3.0F, properties);
super(UreaseItemTier.UREASE, 10, -3.0F, properties);
}
>>>>>>> test
}

View File

@ -1,20 +1,9 @@
<<<<<<< HEAD
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.HoeItem;
public class ItemUreaseHoe extends HoeItem {
public ItemUreaseHoe(Properties properties) {
super(PyloriItemTier.PYLORI, 0, properties);
}
=======
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.HoeItem;
public class ItemUreaseHoe extends HoeItem {
public ItemUreaseHoe(Properties properties) {
super(PyloriItemTier.PYLORI, 0, properties);
super(UreaseItemTier.UREASE, 0, properties);
}
>>>>>>> test
}

View File

@ -1,21 +1,9 @@
<<<<<<< HEAD
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.PickaxeItem;
public class ItemUreasePickaxe extends PickaxeItem {
public ItemUreasePickaxe(Properties properties) {
super(PyloriItemTier.PYLORI, 6, -3.0F, properties);
}
}
=======
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.PickaxeItem;
public class ItemUreasePickaxe extends PickaxeItem {
public ItemUreasePickaxe(Properties properties) {
super(PyloriItemTier.PYLORI, 6, -3.0F, properties);
super(UreaseItemTier.UREASE, 6, -3.0F, properties);
}
}
>>>>>>> test

View File

@ -1,20 +1,9 @@
<<<<<<< HEAD
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.ShovelItem;
public class ItemUreaseShovel extends ShovelItem {
public ItemUreaseShovel(Properties properties) {
super(PyloriItemTier.PYLORI, 6F, -3.0F, properties);
}
=======
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.ShovelItem;
public class ItemUreaseShovel extends ShovelItem {
public ItemUreaseShovel(Properties properties) {
super(PyloriItemTier.PYLORI, 6F, -3.0F, properties);
super(UreaseItemTier.UREASE, 6F, -3.0F, properties);
}
>>>>>>> test
}

View File

@ -1,20 +1,9 @@
<<<<<<< HEAD
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.SwordItem;
public class ItemUreaseSword extends SwordItem {
public ItemUreaseSword(Properties properties) {
super(PyloriItemTier.PYLORI, 14, -2.0F, properties);
}
=======
package jp.qhrlhplhp.helicobactermod.items;
import net.minecraft.item.SwordItem;
public class ItemUreaseSword extends SwordItem {
public ItemUreaseSword(Properties properties) {
super(PyloriItemTier.PYLORI, 14, -2.0F, properties);
super(UreaseItemTier.UREASE, 14, -2.0F, properties);
}
>>>>>>> test
}

View File

@ -0,0 +1,68 @@
package jp.qhrlhplhp.helicobactermod.items;
import jp.qhrlhplhp.helicobactermod.HelicoBacterMod;
import jp.qhrlhplhp.helicobactermod.lists.ItemList;
import net.minecraft.inventory.EquipmentSlotType;
import net.minecraft.item.IArmorMaterial;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.LazyLoadBase;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.SoundEvents;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import java.util.function.Supplier;
public enum MaskArmorMaterial implements IArmorMaterial {
MASK("mask", 1, new int[]{1, 1, 1, 1}, 1, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 0.0F, () -> {
return Ingredient.fromItems(ItemList.PyloriIngot);
});
private static final int[] MAX_DAMAGE_ARRAY = new int[]{1, 1, 1, 1000000000};
private final String name;
private final int maxDamageFactor;
private final int[] damageReductionAmountArray;
private final int enchantability;
private final SoundEvent soundEvent;
private final float toughness;
private final LazyLoadBase<Ingredient> repairMaterial;
private MaskArmorMaterial(String nameIn, int maxDamageFactorIn, int[] damageReductionAmountsIn, int enchantabilityIn, SoundEvent equipSoundIn, float toughnessIn, Supplier<Ingredient> repairMaterialSupplier) {
this.name = nameIn;
this.maxDamageFactor = maxDamageFactorIn;
this.damageReductionAmountArray = damageReductionAmountsIn;
this.enchantability = enchantabilityIn;
this.soundEvent = equipSoundIn;
this.toughness = toughnessIn;
this.repairMaterial = new LazyLoadBase<>(repairMaterialSupplier);
}
public int getDurability(EquipmentSlotType slotIn) {
return MAX_DAMAGE_ARRAY[slotIn.getIndex()] * this.maxDamageFactor;
}
public int getDamageReductionAmount(EquipmentSlotType slotIn) {
return this.damageReductionAmountArray[slotIn.getIndex()];
}
public int getEnchantability() {
return this.enchantability;
}
public SoundEvent getSoundEvent() {
return this.soundEvent;
}
public Ingredient getRepairMaterial() {
return this.repairMaterial.getValue();
}
@OnlyIn(Dist.CLIENT)
public String getName() {
return HelicoBacterMod.MOD_ID + ":" + this.name;
}
public float getToughness() {
return this.toughness;
}
}

View File

@ -1,72 +1,3 @@
<<<<<<< HEAD
package jp.qhrlhplhp.helicobactermod.items;
import jp.qhrlhplhp.helicobactermod.HelicoBacterMod;
import jp.qhrlhplhp.helicobactermod.lists.ItemList;
import net.minecraft.inventory.EquipmentSlotType;
import net.minecraft.item.IArmorMaterial;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.LazyLoadBase;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.SoundEvents;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import java.util.function.Supplier;
public enum PyloriArmorMaterial implements IArmorMaterial {
PYLORI("pylori", 50, new int[]{3, 6, 7, 3}, 20, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 2.0F, () -> {
return Ingredient.fromItems(ItemList.PyloriIngot);
});
private static final int[] MAX_DAMAGE_ARRAY = new int[]{11, 13, 14, 9};
private final String name;
private final int maxDamageFactor;
private final int[] damageReductionAmountArray;
private final int enchantability;
private final SoundEvent soundEvent;
private final float toughness;
private final LazyLoadBase<Ingredient> repairMaterial;
private PyloriArmorMaterial(String nameIn, int maxDamageFactorIn, int[] damageReductionAmountsIn, int enchantabilityIn, SoundEvent equipSoundIn, float toughnessIn, Supplier<Ingredient> repairMaterialSupplier) {
this.name = nameIn;
this.maxDamageFactor = maxDamageFactorIn;
this.damageReductionAmountArray = damageReductionAmountsIn;
this.enchantability = enchantabilityIn;
this.soundEvent = equipSoundIn;
this.toughness = toughnessIn;
this.repairMaterial = new LazyLoadBase<>(repairMaterialSupplier);
}
public int getDurability(EquipmentSlotType slotIn) {
return MAX_DAMAGE_ARRAY[slotIn.getIndex()] * this.maxDamageFactor;
}
public int getDamageReductionAmount(EquipmentSlotType slotIn) {
return this.damageReductionAmountArray[slotIn.getIndex()];
}
public int getEnchantability() {
return this.enchantability;
}
public SoundEvent getSoundEvent() {
return this.soundEvent;
}
public Ingredient getRepairMaterial() {
return this.repairMaterial.getValue();
}
@OnlyIn(Dist.CLIENT)
public String getName() {
return HelicoBacterMod.MOD_ID + ":" + this.name;
}
public float getToughness() {
return this.toughness;
}
=======
package jp.qhrlhplhp.helicobactermod.items;
import jp.qhrlhplhp.helicobactermod.HelicoBacterMod;
@ -87,7 +18,7 @@ public enum PyloriArmorMaterial implements IArmorMaterial {
return Ingredient.fromItems(ItemList.PyloriIngot);
});
private static final int[] MAX_DAMAGE_ARRAY = new int[]{11, 13, 14, 9};
private static final int[] MAX_DAMAGE_ARRAY = new int[]{3, 4, 4, 3};
private final String name;
private final int maxDamageFactor;
private final int[] damageReductionAmountArray;
@ -134,5 +65,4 @@ public enum PyloriArmorMaterial implements IArmorMaterial {
public float getToughness() {
return this.toughness;
}
>>>>>>> test
}

View File

@ -1,58 +1,3 @@
<<<<<<< HEAD
package jp.qhrlhplhp.helicobactermod.items;
import jp.qhrlhplhp.helicobactermod.lists.ItemList;
import net.minecraft.item.IItemTier;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.LazyLoadBase;
import java.util.function.Supplier;
public enum PyloriItemTier implements IItemTier {
PYLORI(2, 1000, 7.0F, 3.0F, 7, () -> {
return Ingredient.fromItems(ItemList.PyloriIngot);
});
private final int harvestLevel;
private final int maxUses;
private final float efficiency;
private final float attackDamage;
private final int enchantability;
private final LazyLoadBase<Ingredient> repairMaterial;
private PyloriItemTier(int harvestLevelIn, int maxUsesIn, float efficiencyIn, float attackDamageIn, int enchantabilityIn, Supplier<Ingredient> repairMaterialIn) {
this.harvestLevel = harvestLevelIn;
this.maxUses = maxUsesIn;
this.efficiency = efficiencyIn;
this.attackDamage = attackDamageIn;
this.enchantability = enchantabilityIn;
this.repairMaterial = new LazyLoadBase<>(repairMaterialIn);
}
public int getMaxUses() {
return this.maxUses;
}
public float getEfficiency() {
return this.efficiency;
}
public float getAttackDamage() {
return this.attackDamage;
}
public int getHarvestLevel() {
return this.harvestLevel;
}
public int getEnchantability() {
return this.enchantability;
}
public Ingredient getRepairMaterial() {
return this.repairMaterial.getValue();
}
=======
package jp.qhrlhplhp.helicobactermod.items;
import jp.qhrlhplhp.helicobactermod.lists.ItemList;
@ -63,7 +8,7 @@ import net.minecraft.util.LazyLoadBase;
import java.util.function.Supplier;
public enum PyloriItemTier implements IItemTier {
PYLORI(2, 1000, 7.0F, 3.0F, 7, () -> {
PYLORI(2, 200, 7.0F, 3.0F, 7, () -> {
return Ingredient.fromItems(ItemList.PyloriIngot);
});
@ -106,5 +51,4 @@ public enum PyloriItemTier implements IItemTier {
public Ingredient getRepairMaterial() {
return this.repairMaterial.getValue();
}
>>>>>>> test
}

View File

@ -1,72 +1,3 @@
<<<<<<< HEAD
package jp.qhrlhplhp.helicobactermod.items;
import jp.qhrlhplhp.helicobactermod.HelicoBacterMod;
import jp.qhrlhplhp.helicobactermod.lists.ItemList;
import net.minecraft.inventory.EquipmentSlotType;
import net.minecraft.item.IArmorMaterial;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.LazyLoadBase;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.SoundEvents;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import java.util.function.Supplier;
public enum UreaseArmorMaterial implements IArmorMaterial {
UREASE("urease", 50, new int[]{4, 7, 9, 4}, 20, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 4.0F, () -> {
return Ingredient.fromItems(ItemList.PyloriIngot);
});
private static final int[] MAX_DAMAGE_ARRAY = new int[]{11, 13, 14, 9};
private final String name;
private final int maxDamageFactor;
private final int[] damageReductionAmountArray;
private final int enchantability;
private final SoundEvent soundEvent;
private final float toughness;
private final LazyLoadBase<Ingredient> repairMaterial;
private UreaseArmorMaterial(String nameIn, int maxDamageFactorIn, int[] damageReductionAmountsIn, int enchantabilityIn, SoundEvent equipSoundIn, float toughnessIn, Supplier<Ingredient> repairMaterialSupplier) {
this.name = nameIn;
this.maxDamageFactor = maxDamageFactorIn;
this.damageReductionAmountArray = damageReductionAmountsIn;
this.enchantability = enchantabilityIn;
this.soundEvent = equipSoundIn;
this.toughness = toughnessIn;
this.repairMaterial = new LazyLoadBase<>(repairMaterialSupplier);
}
public int getDurability(EquipmentSlotType slotIn) {
return MAX_DAMAGE_ARRAY[slotIn.getIndex()] * this.maxDamageFactor;
}
public int getDamageReductionAmount(EquipmentSlotType slotIn) {
return this.damageReductionAmountArray[slotIn.getIndex()];
}
public int getEnchantability() {
return this.enchantability;
}
public SoundEvent getSoundEvent() {
return this.soundEvent;
}
public Ingredient getRepairMaterial() {
return this.repairMaterial.getValue();
}
@OnlyIn(Dist.CLIENT)
public String getName() {
return HelicoBacterMod.MOD_ID + ":" + this.name;
}
public float getToughness() {
return this.toughness;
}
=======
package jp.qhrlhplhp.helicobactermod.items;
import jp.qhrlhplhp.helicobactermod.HelicoBacterMod;
@ -87,7 +18,7 @@ public enum UreaseArmorMaterial implements IArmorMaterial {
return Ingredient.fromItems(ItemList.PyloriIngot);
});
private static final int[] MAX_DAMAGE_ARRAY = new int[]{11, 13, 14, 9};
private static final int[] MAX_DAMAGE_ARRAY = new int[]{7, 8, 8, 7};
private final String name;
private final int maxDamageFactor;
private final int[] damageReductionAmountArray;
@ -134,5 +65,4 @@ public enum UreaseArmorMaterial implements IArmorMaterial {
public float getToughness() {
return this.toughness;
}
>>>>>>> test
}

View File

@ -0,0 +1,54 @@
package jp.qhrlhplhp.helicobactermod.items;
import jp.qhrlhplhp.helicobactermod.lists.ItemList;
import net.minecraft.item.IItemTier;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.LazyLoadBase;
import java.util.function.Supplier;
public enum UreaseItemTier implements IItemTier {
UREASE(4, 1000, 7.0F, 3.0F, 7, () -> {
return Ingredient.fromItems(ItemList.PyloriIngot);
});
private final int harvestLevel;
private final int maxUses;
private final float efficiency;
private final float attackDamage;
private final int enchantability;
private final LazyLoadBase<Ingredient> repairMaterial;
private UreaseItemTier(int harvestLevelIn, int maxUsesIn, float efficiencyIn, float attackDamageIn, int enchantabilityIn, Supplier<Ingredient> repairMaterialIn) {
this.harvestLevel = harvestLevelIn;
this.maxUses = maxUsesIn;
this.efficiency = efficiencyIn;
this.attackDamage = attackDamageIn;
this.enchantability = enchantabilityIn;
this.repairMaterial = new LazyLoadBase<>(repairMaterialIn);
}
public int getMaxUses() {
return this.maxUses;
}
public float getEfficiency() {
return this.efficiency;
}
public float getAttackDamage() {
return this.attackDamage;
}
public int getHarvestLevel() {
return this.harvestLevel;
}
public int getEnchantability() {
return this.enchantability;
}
public Ingredient getRepairMaterial() {
return this.repairMaterial.getValue();
}
}

View File

@ -1,87 +1,3 @@
<<<<<<< HEAD
package jp.qhrlhplhp.helicobactermod.lists;
import jp.qhrlhplhp.helicobactermod.HelicoBacterItemGroup;
import jp.qhrlhplhp.helicobactermod.HelicoBacterMod;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.ToolType;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@Mod.EventBusSubscriber(modid = HelicoBacterMod.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
public class BlockList {
public static Block PyloriBlock = new Block(
Block.Properties.create(Material.IRON)
.hardnessAndResistance(2.0f, 3.0f)
.lightValue(0)
.harvestLevel(1)
.harvestTool(ToolType.PICKAXE))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "pylori_block"));
public static Block PyloriPlank = new Block(
Block.Properties.create(Material.IRON)
.hardnessAndResistance(1.0f, 2.0f)
.lightValue(0)
.harvestLevel(0)
.harvestTool(ToolType.SHOVEL))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "pylori_plank"));
public static Block UreaseBlock = new Block(
Block.Properties.create(Material.IRON)
.hardnessAndResistance(2.0f, 3.0f)
.lightValue(10)
.harvestLevel(1)
.harvestTool(ToolType.PICKAXE))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "urease_block"));
public static Block UreasePlank = new Block(
Block.Properties.create(Material.IRON)
.hardnessAndResistance(1.0f, 2.0f)
.lightValue(15)
.harvestLevel(0)
.harvestTool(ToolType.SHOVEL))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "urease_plank"));
@SubscribeEvent
public static void registerBlocks(RegistryEvent.Register<Block> event) {
event.getRegistry().registerAll(
PyloriBlock,
PyloriPlank,
UreaseBlock,
UreasePlank
);
}
@SubscribeEvent
public static void registerBlockItems(RegistryEvent.Register<Item> event) {
event.getRegistry().registerAll(
new BlockItem(PyloriBlock, new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "pylori_block"))
);
event.getRegistry().registerAll(
new BlockItem(PyloriPlank, new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "pylori_plank"))
);
event.getRegistry().registerAll(
new BlockItem(UreaseBlock, new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "urease_block"))
);
event.getRegistry().registerAll(
new BlockItem(UreasePlank, new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "urease_plank"))
);
}
}
=======
package jp.qhrlhplhp.helicobactermod.lists;
import jp.qhrlhplhp.helicobactermod.HelicoBacterItemGroup;
@ -126,7 +42,7 @@ public class BlockList {
public static Block UreasePlank = new Block(
Block.Properties.create(Material.IRON)
.hardnessAndResistance(1.0f, 2.0f)
.lightValue(15)
.lightValue(10)
.harvestLevel(0)
.harvestTool(ToolType.SHOVEL))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "urease_plank"));
@ -164,4 +80,3 @@ public class BlockList {
);
}
}
>>>>>>> test

View File

@ -1,143 +1,3 @@
<<<<<<< HEAD
package jp.qhrlhplhp.helicobactermod.lists;
import jp.qhrlhplhp.helicobactermod.HelicoBacterItemGroup;
import jp.qhrlhplhp.helicobactermod.HelicoBacterMod;
import jp.qhrlhplhp.helicobactermod.items.*;
import net.minecraft.inventory.EquipmentSlotType;
import net.minecraft.item.ArmorItem;
import net.minecraft.item.ArmorMaterial;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@Mod.EventBusSubscriber(modid = HelicoBacterMod.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
public class ItemList {
public static Item UreasePylori = new Item(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "urease_pylori"));
public static Item Urease = new Item(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "urease"));
public static Item Stomach = new Item(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "stomach"));
public static Item FermentedStomach = new Item(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "fermented_stomach"));
public static Item Pylori = new Item(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "pylori"));
public static Item PyloriLump = new Item(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "pylori_lump"));
public static Item PyloriStick = new Item(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "pylori_stick"));
public static Item PyloriIngot = new Item(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "pylori_ingot"));
public static Item ItemPyloriAxe = new ItemPyloriAxe(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "pylori_axe"));
public static Item ItemPyloriHoe = new ItemPyloriHoe(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "pylori_hoe"));
public static Item ItemPyloriPickaxe = new ItemPyloriPickaxe(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "pylori_pickaxe"));
public static Item ItemPyloriShovel = new ItemPyloriShovel(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "pylori_shovel"));
public static Item ItemPyloriSword = new ItemPyloriSword(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "pylori_sword"));
public static Item ItemUreaseAxe = new ItemUreaseAxe(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "urease_axe"));
public static Item ItemUreaseHoe = new ItemUreaseHoe(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "urease_hoe"));
public static Item ItemUreasePickaxe = new ItemUreasePickaxe(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "urease_pickaxe"));
public static Item ItemUreaseShovel = new ItemUreaseShovel(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "urease_shovel"));
public static Item ItemUreaseSword = new ItemUreaseSword(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "urease_sword"));
public static Item ItemGoldenPylori = new ItemGoldenPylori(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "golden_pylori"));
public static Item PyloriHelmet = new ArmorItem(PyloriArmorMaterial.PYLORI, EquipmentSlotType.HEAD, new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "pylori_helmet"));
public static Item PyloriChestplate = new ArmorItem(PyloriArmorMaterial.PYLORI, EquipmentSlotType.CHEST, new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "pylori_chestplate"));
public static Item PyloriLeggings = new ArmorItem(PyloriArmorMaterial.PYLORI, EquipmentSlotType.LEGS, new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "pylori_leggings"));
public static Item PyloriBoots = new ArmorItem(PyloriArmorMaterial.PYLORI, EquipmentSlotType.FEET, new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "pylori_boots"));
public static Item UreaseHelmet = new ArmorItem(UreaseArmorMaterial.UREASE, EquipmentSlotType.HEAD, new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "urease_helmet"));
public static Item UreaseChestplate = new ArmorItem(UreaseArmorMaterial.UREASE, EquipmentSlotType.CHEST, new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "urease_chestplate"));
public static Item UreaseLeggings = new ArmorItem(UreaseArmorMaterial.UREASE, EquipmentSlotType.LEGS, new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "urease_leggings"));
public static Item UreaseBoots = new ArmorItem(UreaseArmorMaterial.UREASE, EquipmentSlotType.FEET, new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "urease_boots"));
@SubscribeEvent
public static void registerItems(RegistryEvent.Register<Item> event) {
event.getRegistry().registerAll(
UreasePylori,
Urease,
Stomach,
FermentedStomach,
Pylori,
PyloriLump,
PyloriStick,
PyloriIngot,
ItemPyloriAxe,
ItemPyloriHoe,
ItemPyloriPickaxe,
ItemPyloriShovel,
ItemPyloriSword,
ItemUreaseAxe,
ItemUreaseHoe,
ItemUreasePickaxe,
ItemUreaseShovel,
ItemUreaseSword,
ItemGoldenPylori,
PyloriHelmet,
PyloriChestplate,
PyloriLeggings,
PyloriBoots,
UreaseHelmet,
UreaseChestplate,
UreaseLeggings,
UreaseBoots
);
}
}
=======
package jp.qhrlhplhp.helicobactermod.lists;
import jp.qhrlhplhp.helicobactermod.HelicoBacterItemGroup;
@ -167,6 +27,12 @@ public class ItemList {
public static Item FermentedStomach = new Item(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "fermented_stomach"));
public static Item RottenStomach = new Item(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "rotten_stomach"));
public static Item BreededStomach = new Item(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "breeded_stomach"));
public static Item Pylori = new Item(new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "pylori"));
@ -236,6 +102,9 @@ public class ItemList {
public static Item UreaseBoots = new ArmorItem(UreaseArmorMaterial.UREASE, EquipmentSlotType.FEET, new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "urease_boots"));
public static Item MaskPylori = new ArmorItem(MaskArmorMaterial.MASK, EquipmentSlotType.HEAD, new Item.Properties().group(HelicoBacterItemGroup.DEFAULT))
.setRegistryName(new ResourceLocation(HelicoBacterMod.MOD_ID, "mask_pylori"));
@SubscribeEvent
public static void registerItems(RegistryEvent.Register<Item> event) {
@ -244,6 +113,8 @@ public class ItemList {
Urease,
Stomach,
FermentedStomach,
RottenStomach,
BreededStomach,
Pylori,
PyloriLump,
PyloriStick,
@ -266,7 +137,8 @@ public class ItemList {
UreaseHelmet,
UreaseChestplate,
UreaseLeggings,
UreaseBoots
UreaseBoots,
MaskPylori
);
@ -276,4 +148,3 @@ public class ItemList {
}
>>>>>>> test

View File

@ -7,12 +7,12 @@ modId="helicobactermod"
version="${file.jarVersion}"
displayName="Helico Bacter Mod"
updateJSONURL="http://myurl.me/"
displayURL="https://twitter.com/popcorn_bomzone"
displayURL="https://github.com/qrhlhplhp/HelicoBacterMod"
logoFile="logo.png"
credits="たくさんのピロリ菌たち"
authors="伊藤しえる"
description='''
'''
[[dependencies.helicobactermod]]

View File

@ -1,12 +1,5 @@
<<<<<<< HEAD
{
"variants": {
"": { "model": "helicobactermod:block/pylori_block" }
}
=======
{
"variants": {
"": { "model": "helicobactermod:block/pylori_block" }
}
>>>>>>> test
}

View File

@ -1,12 +1,5 @@
<<<<<<< HEAD
{
"variants": {
"": { "model": "helicobactermod:block/pylori_plank" }
}
=======
{
"variants": {
"": { "model": "helicobactermod:block/pylori_plank" }
}
>>>>>>> test
}

View File

@ -1,12 +1,5 @@
<<<<<<< HEAD
{
"variants": {
"": { "model": "helicobactermod:block/urease_block" }
}
=======
{
"variants": {
"": { "model": "helicobactermod:block/urease_block" }
}
>>>>>>> test
}

View File

@ -1,12 +1,5 @@
<<<<<<< HEAD
{
"variants": {
"": { "model": "helicobactermod:block/urease_plank" }
}
=======
{
"variants": {
"": { "model": "helicobactermod:block/urease_plank" }
}
>>>>>>> test
}

View File

@ -1,42 +1,9 @@
<<<<<<< HEAD
{
"itemGroup.helicobactermod": "HelicoBacter",
"item.helicobactermod.stomach": "Stomach",
"item.helicobactermod.fermented_stomach": "Fermented Stomach",
"item.helicobactermod.pylori": "Pylori",
"item.helicobactermod.urease_pylori": "Urease-covered Pylori",
"item.helicobactermod.urease": "Urease",
"item.helicobactermod.pylori_lump": "Compressed Pylori",
"item.helicobactermod.pylori_stick": "Helico stick",
"item.helicobactermod.pylori_ingot": "Pylori Ingot",
"item.helicobactermod.pylori_axe": "Pylori Axe",
"item.helicobactermod.pylori_hoe": "Pylori Hoe",
"item.helicobactermod.pylori_pickaxe": "Pylori Pickaxe",
"item.helicobactermod.pylori_shovel": "Pylori Shovel",
"item.helicobactermod.pylori_sword": "Pylori Sword",
"item.helicobactermod.urease_axe": "Urease-covered Pylori Axe",
"item.helicobactermod.urease_hoe": "Urease-covered Pylori Hoe",
"item.helicobactermod.urease_pickaxe": "Urease-covered Pylori Pickaxe",
"item.helicobactermod.urease_shovel": "Urease-covered Pylori Shovel",
"item.helicobactermod.urease_sword": "Urease-covered Pylori Sword",
"item.helicobactermod.golden_pylori": "Golden Pylori",
"item.helicobactermod.pylori_helmet": "Pylori Helmet",
"item.helicobactermod.pylori_chestplate": "Pylori Chestplate",
"item.helicobactermod.pylori_leggings": "Pylori Leggings",
"item.helicobactermod.pylori_boots": "Pylori boots",
"item.helicobactermod.urease_helmet": "Urease-covered Pylori Helmet",
"item.helicobactermod.urease_chestplate": "Urease-covered Pylori Chestplate",
"item.helicobactermod.urease_leggings": "Urease-covered Pylori Leggings",
"item.helicobactermod.urease_boots": "Urease-covered Pylori boots",
"block.helicobactermod.pylori_block": "Metal Block of Pylori",
"block.helicobactermod.pylori_plank": "Block of Pylori",
"block.helicobactermod.urease_block": "Urease-covered Metal Block of Pylori",
"block.helicobactermod.urease_plank": "Urease-covered Block of Pylori"
=======
{
"itemGroup.helicobactermod": "HelicoBacter",
"item.helicobactermod.stomach": "Stomach",
"item.helicobactermod.fermented_stomach": "Fermented Stomach",
"item.helicobactermod.rotten_stomach": "Rotten Stomach",
"item.helicobactermod.breeded_stomach": "Breeded Stomach",
"item.helicobactermod.pylori": "Pylori",
"item.helicobactermod.urease_pylori": "Urease-covered Pylori",
"item.helicobactermod.urease": "Urease",
@ -62,9 +29,9 @@
"item.helicobactermod.urease_chestplate": "Urease-covered Pylori Chestplate",
"item.helicobactermod.urease_leggings": "Urease-covered Pylori Leggings",
"item.helicobactermod.urease_boots": "Urease-covered Pylori boots",
"item.helicobactermod.mask_pylori": "Mask of Pylori",
"block.helicobactermod.pylori_block": "Metal Block of Pylori",
"block.helicobactermod.pylori_plank": "Block of Pylori",
"block.helicobactermod.urease_block": "Urease-covered Metal Block of Pylori",
"block.helicobactermod.urease_plank": "Urease-covered Block of Pylori"
>>>>>>> test
}

View File

@ -1,42 +1,9 @@
<<<<<<< HEAD
{
"itemGroup.helicobactermod": "ヘリコバクテル",
"item.helicobactermod.stomach": "胃",
"item.helicobactermod.fermented_stomach": "発酵した胃",
"item.helicobactermod.pylori": "ピロリ菌",
"item.helicobactermod.urease_pylori": "ウレアーゼに塗れたピロリ菌",
"item.helicobactermod.urease": "ウレアーゼ",
"item.helicobactermod.pylori_lump": "圧縮されたピロリ菌",
"item.helicobactermod.pylori_stick": "らせん状の棒",
"item.helicobactermod.pylori_ingot": "ピロリ菌インゴッド",
"item.helicobactermod.pylori_axe": "ピロリ菌の斧",
"item.helicobactermod.pylori_hoe": "ピロリ菌のクワ",
"item.helicobactermod.pylori_pickaxe": "ピロリ菌のツルハシ",
"item.helicobactermod.pylori_shovel": "ピロリ菌のシャベル",
"item.helicobactermod.pylori_sword": "ピロリ菌の剣",
"item.helicobactermod.urease_axe": "ウレアーゼに塗れたピロリ菌の斧",
"item.helicobactermod.urease_hoe": "ウレアーゼに塗れたピロリ菌のクワ",
"item.helicobactermod.urease_pickaxe": "ウレアーゼに塗れたピロリ菌のツルハシ",
"item.helicobactermod.urease_shovel": "ウレアーゼに塗れたピロリ菌のシャベル",
"item.helicobactermod.urease_sword": "ウレアーゼに塗れたピロリ菌の剣",
"item.helicobactermod.golden_pylori": "黄金のピロリ菌",
"item.helicobactermod.pylori_helmet": "ピロリ菌のヘルメット",
"item.helicobactermod.pylori_chestplate": "ピロリ菌のチェストプレート",
"item.helicobactermod.pylori_leggings": "ピロリ菌のレギンス",
"item.helicobactermod.pylori_boots": "ピロリ菌のブーツ",
"item.helicobactermod.urease_helmet": "ウレアーゼに塗れたピロリ菌のヘルメット",
"item.helicobactermod.urease_chestplate": "ウレアーゼに塗れたピロリ菌のチェストプレート",
"item.helicobactermod.urease_leggings": "ウレアーゼに塗れたピロリ菌のレギンス",
"item.helicobactermod.urease_boots": "ウレアーゼに塗れたピロリ菌のブーツ",
"block.helicobactermod.pylori_block": "ピロリ菌硬質ブロック",
"block.helicobactermod.pylori_plank": "ピロリ菌ブロック",
"block.helicobactermod.urease_block": "ウレアーゼに塗れたピロリ菌硬質ブロック",
"block.helicobactermod.urease_plank": "ウレアーゼに塗れたピロリ菌ブロック"
=======
{
"itemGroup.helicobactermod": "ヘリコバクテル",
"item.helicobactermod.stomach": "胃",
"item.helicobactermod.fermented_stomach": "発酵した胃",
"item.helicobactermod.rotten_stomach": "腐敗した胃",
"item.helicobactermod.breeded_stomach": "細菌が繁殖した胃",
"item.helicobactermod.pylori": "ピロリ菌",
"item.helicobactermod.urease_pylori": "ウレアーゼに塗れたピロリ菌",
"item.helicobactermod.urease": "ウレアーゼ",
@ -62,9 +29,9 @@
"item.helicobactermod.urease_chestplate": "ウレアーゼに塗れたピロリ菌のチェストプレート",
"item.helicobactermod.urease_leggings": "ウレアーゼに塗れたピロリ菌のレギンス",
"item.helicobactermod.urease_boots": "ウレアーゼに塗れたピロリ菌のブーツ",
"item.helicobactermod.mask_pylori": "ピロリのお面",
"block.helicobactermod.pylori_block": "ピロリ菌硬質ブロック",
"block.helicobactermod.pylori_plank": "ピロリ菌ブロック",
"block.helicobactermod.urease_block": "ウレアーゼに塗れたピロリ菌硬質ブロック",
"block.helicobactermod.urease_plank": "ウレアーゼに塗れたピロリ菌ブロック"
>>>>>>> test
}

View File

@ -1,14 +1,6 @@
<<<<<<< HEAD
{
"parent": "block/cube_all",
"textures": {
"all": "helicobactermod:blocks/pylori_block"
}
=======
{
"parent": "block/cube_all",
"textures": {
"all": "helicobactermod:blocks/pylori_block"
}
>>>>>>> test
}

View File

@ -1,14 +1,6 @@
<<<<<<< HEAD
{
"parent": "block/cube_all",
"textures": {
"all": "helicobactermod:blocks/pylori_plank"
}
=======
{
"parent": "block/cube_all",
"textures": {
"all": "helicobactermod:blocks/pylori_plank"
}
>>>>>>> test
}

View File

@ -1,14 +1,6 @@
<<<<<<< HEAD
{
"parent": "block/cube_all",
"textures": {
"all": "helicobactermod:blocks/urease_block"
}
=======
{
"parent": "block/cube_all",
"textures": {
"all": "helicobactermod:blocks/urease_block"
}
>>>>>>> test
}

View File

@ -1,14 +1,6 @@
<<<<<<< HEAD
{
"parent": "block/cube_all",
"textures": {
"all": "helicobactermod:blocks/urease_plank"
}
=======
{
"parent": "block/cube_all",
"textures": {
"all": "helicobactermod:blocks/urease_plank"
}
>>>>>>> test
}

Some files were not shown because too many files have changed in this diff Show More