From c3526376bf44b771ad941ed5dc95c0cae8699b9c Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 9 Dec 2022 16:00:22 +0100 Subject: [PATCH] [Changes] Removed old reflection code to create a Disc --- .../org/betterx/bclib/items/BaseDiscItem.java | 46 +------------------ 1 file changed, 1 insertion(+), 45 deletions(-) diff --git a/src/main/java/org/betterx/bclib/items/BaseDiscItem.java b/src/main/java/org/betterx/bclib/items/BaseDiscItem.java index 18227f20..747de8a0 100644 --- a/src/main/java/org/betterx/bclib/items/BaseDiscItem.java +++ b/src/main/java/org/betterx/bclib/items/BaseDiscItem.java @@ -1,13 +1,9 @@ package org.betterx.bclib.items; -import org.betterx.bclib.BCLib; - import net.minecraft.sounds.SoundEvent; import net.minecraft.world.item.Item; import net.minecraft.world.item.RecordItem; -import java.lang.reflect.Constructor; - public class BaseDiscItem { public static RecordItem create( int comparatorOutput, @@ -15,46 +11,6 @@ public class BaseDiscItem { Item.Properties settings, int lengthInSeconds ) { - for (Constructor c : RecordItem.class.getDeclaredConstructors()) { - if (c.getParameterCount() == 4) { - var types = c.getParameterTypes(); - if (types.length == 4) { //1.19.1 Constructor - if ( - types[0].isAssignableFrom(int.class) - && types[1].isAssignableFrom(SoundEvent.class) - && types[2].isAssignableFrom(Item.Properties.class) - && types[3].isAssignableFrom(int.class) - ) { - c.setAccessible(true); - try { - return (RecordItem) c.newInstance(comparatorOutput, sound, settings, lengthInSeconds); - } catch (Exception e) { - BCLib.LOGGER.error("Failed to instantiate RecordItem", e); - } - } - } - } else if (c.getParameterCount() == 3) { - var types = c.getParameterTypes(); - if (types.length == 3) { //1.19 constructor - if ( - types[0].isAssignableFrom(int.class) - && types[1].isAssignableFrom(SoundEvent.class) - && types[2].isAssignableFrom(Item.Properties.class) - ) { - c.setAccessible(true); - try { - return (RecordItem) c.newInstance(comparatorOutput, sound, settings); - } catch (Exception e) { - BCLib.LOGGER.error("Failed to instantiate RecordItem", e); - } - } - } - } - } - BCLib.LOGGER.error("No Constructor for RecordItems found:"); - for (Constructor c : RecordItem.class.getDeclaredConstructors()) { - BCLib.LOGGER.error(" - " + c); - } - return null; + return new RecordItem(comparatorOutput, sound, settings, lengthInSeconds); } }