Skip to content

Commit

Permalink
Ported 1.20.5 & 1.20.6 (#1)
Browse files Browse the repository at this point in the history
asdf
  • Loading branch information
Kardane committed May 10, 2024
1 parent 93bda2d commit 60edf4d
Show file tree
Hide file tree
Showing 141 changed files with 234 additions and 69 deletions.
Binary file added .gradle/8.0.1/checksums/sha1-checksums.bin
Binary file not shown.
Empty file.
Binary file added .gradle/8.0.1/fileChanges/last-build.bin
Binary file not shown.
Empty file added .gradle/8.0.1/gc.properties
Empty file.
Binary file added .gradle/8.6/checksums/checksums.lock
Binary file not shown.
Empty file.
Binary file not shown.
Binary file added .gradle/8.6/fileHashes/fileHashes.bin
Binary file not shown.
Empty file added .gradle/8.6/gc.properties
Empty file.
Binary file added .gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
Binary file added .gradle/file-system.probe
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_19_4_1_19_4_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-api-base</artifactId>
<version>0.4.23+9ff28bced8</version>
</project>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_19_4_1_19_4_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-block-api-v1</artifactId>
<version>1.0.5+e022e5d1d8</version>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_19_4_1_19_4_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-blockrenderlayer-v1</artifactId>
<version>1.1.33+c2e6f674d8</version>
</project>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_19_4_1_19_4_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-command-api-v2</artifactId>
<version>2.2.4+ae0966bad8</version>
</project>
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_19_4_1_19_4_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-data-generation-api-v1</artifactId>
<version>11.3.4+5da15ca1d8</version>
</project>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_19_4_1_19_4_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-lifecycle-events-v1</artifactId>
<version>2.2.14+5da15ca1d8</version>
</project>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_19_4_1_19_4_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-object-builder-api-v1</artifactId>
<version>7.0.0+63b515f4d8</version>
</project>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_19_4_1_19_4_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-renderer-indigo</artifactId>
<version>1.1.0+81e8c576d8</version>
</project>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_19_4_1_19_4_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-transfer-api-v1</artifactId>
<version>3.0.1+9003cbe9d8</version>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_19_4_1_19_4_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-transitive-access-wideners-v1</artifactId>
<version>3.0.2+63b515f4d8</version>
</project>
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_20_6_1_20_6_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-biome-api-v1</artifactId>
<version>13.0.25+be5d88beb0</version>
</project>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_20_6_1_20_6_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-client-tags-api-v1</artifactId>
<version>1.1.12+7f945d5bb0</version>
</project>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_20_6_1_20_6_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-content-registries-v0</artifactId>
<version>8.0.5+b82b2392b0</version>
</project>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_20_6_1_20_6_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-convention-tags-v1</artifactId>
<version>2.0.4+7f945d5bb0</version>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_20_6_1_20_6_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-convention-tags-v2</artifactId>
<version>2.1.0+70fd1b46b0</version>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_20_6_1_20_6_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-crash-report-info-v1</artifactId>
<version>0.2.27+80f8cf51b0</version>
</project>
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_20_6_1_20_6_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-entity-events-v1</artifactId>
<version>1.6.8+e9d2a72bb0</version>
</project>
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_20_6_1_20_6_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-gametest-api-v1</artifactId>
<version>1.3.17+1172e897b0</version>
</project>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_20_6_1_20_6_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-key-binding-api-v1</artifactId>
<version>1.0.45+80f8cf51b0</version>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_20_6_1_20_6_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-lifecycle-events-v1</artifactId>
<version>2.3.4+c5fc38b3b0</version>
</project>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_20_6_1_20_6_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-model-loading-api-v1</artifactId>
<version>1.0.12+80f8cf51b0</version>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_20_6_1_20_6_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-models-v0</artifactId>
<version>0.4.11+9386d8a7b0</version>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_20_6_1_20_6_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-networking-api-v1</artifactId>
<version>4.0.8+0dca0349b0</version>
</project>
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_20_6_1_20_6_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-renderer-indigo</artifactId>
<version>1.5.12+80f8cf51b0</version>
</project>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_20_6_1_20_6_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-screen-handler-api-v1</artifactId>
<version>1.3.73+8c7b71c2b0</version>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>net_fabricmc_yarn_1_20_6_1_20_6_build_1_v2.net.fabricmc.fabric-api</groupId>
<artifactId>fabric-sound-api-v1</artifactId>
<version>1.0.21+c5fc38b3b0</version>
</project>
Binary file not shown.
16 changes: 16 additions & 0 deletions .idea/runConfigurations/Minecraft_Client.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
plugins {
id 'fabric-loom' version '1.1-SNAPSHOT'
id 'fabric-loom' version '1.6-SNAPSHOT'
id 'maven-publish'
}

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21

archivesBaseName = project.archives_base_name
version = project.mod_version
Expand Down Expand Up @@ -43,7 +43,7 @@ processResources {

tasks.withType(JavaCompile).configureEach {
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
it.options.release = 17
it.options.release = 21
}

java {
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ org.gradle.parallel=true

# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.19.4
yarn_mappings=1.19.4+build.1
loader_version=0.14.17
minecraft_version=1.20.6
yarn_mappings=1.20.6+build.1
loader_version=0.15.11

# Mod Properties
mod_version = 1.1.1
maven_group = xyz.nat1an
archives_base_name = notebot

# Dependencies
fabric_version=0.75.3+1.19.4
fabric_version=0.98.0+1.20.6
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
61 changes: 1 addition & 60 deletions src/main/java/xyz/nat1an/notebot/NotebotPlayer.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

package xyz.nat1an.notebot;

import net.minecraft.block.Material;
import net.minecraft.block.Block;
import net.minecraft.block.NoteBlock;
import net.minecraft.block.enums.Instrument;
Expand Down Expand Up @@ -79,65 +78,7 @@ public static Instrument getInstrumentUnderneath(BlockPos pos) {
}

public static Instrument blockToInstrument(Block block) {

// Specific block checks
Identifier blockId = Registries.BLOCK.getId(block);
String blockIdString = blockId.toString();
Instrument instrument = Instrument.HARP; // Default to Harp for any other block


if (blockIdString.equals("minecraft:dirt")) {
return Instrument.HARP;
} else if (blockIdString.equals("minecraft:clay")) {
return Instrument.FLUTE;
} else if (blockIdString.equals("minecraft:gold_block")) {
return Instrument.BELL;
} else if (blockIdString.equals("minecraft:packed_ice")) {
return Instrument.CHIME;
} else if (blockIdString.equals("minecraft:bone_block")) {
return Instrument.XYLOPHONE;
} else if (blockIdString.equals("minecraft:iron_block")) {
return Instrument.IRON_XYLOPHONE;
} else if (blockIdString.equals("minecraft:soul_sand")) {
return Instrument.COW_BELL;
} else if (blockIdString.equals("minecraft:pumpkin")) {
return Instrument.DIDGERIDOO;
} else if (blockIdString.equals("minecraft:emerald_block")) {
return Instrument.BIT;
} else if (blockIdString.equals("minecraft:hay_block")) {
return Instrument.BANJO;
} else if (blockIdString.equals("minecraft:glowstone")) {
return Instrument.PLING;
} else if (blockIdString.equals("minecraft:sand") || blockIdString.equals("minecraft:gravel") || blockIdString.equals("minecraft:concrete_powder")) {
return Instrument.SNARE;
} else if (Arrays.asList("minecraft:stone", "minecraft:cobblestone", "minecraft:blackstone", "minecraft:netherrack", "minecraft:nylium", "minecraft:obsidian",
"minecraft:quartz", "minecraft:sandstone", "minecraft:ores", "minecraft:bricks", "minecraft:corals",
"minecraft:respawn_anchor", "minecraft:bedrock", "minecraft:concrete").contains(blockIdString)) {
return Instrument.BASEDRUM;
} else if (blockIdString.equals("minecraft:glass")) {
return Instrument.HAT;
}


Material material = block.getDefaultState().getMaterial();

// Check for blocks with specific materials
if (material.equals(Material.WOOD)) {
return Instrument.BASS;
}
if (material.equals(Material.WOOL)) {
return Instrument.GUITAR;
}
if (material.equals(Material.GLASS)) {
return Instrument.HAT;
}
if (material.equals(Material.STONE)) {
return Instrument.BASEDRUM;
}



return instrument;
return block.getDefaultState().getInstrument();
}

public static boolean isNoteblock(BlockPos pos) {
Expand Down

0 comments on commit 60edf4d

Please sign in to comment.