Skip to content

Commit

Permalink
-Minecraft 1.21.3
Browse files Browse the repository at this point in the history
-Rework of the mod
-New namespace for config-files
  • Loading branch information
shaijana committed Dec 5, 2024
1 parent cdd69c6 commit f07240c
Show file tree
Hide file tree
Showing 23 changed files with 262 additions and 4,080 deletions.
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ org.gradle.jvmargs = -Xmx3G
org.gradle.daemon = false
org.gradle.cache.cleanup = false

group = fi.dy.masa
mod_id = litematica
mod_name = Litematica
author = masa
mod_file_name = litematica-fabric
group = de.shaijana
mod_id = uwmatica
mod_name = UWmatica
author = shaijana
mod_file_name = uwmatica-fabric

# Current mod version
mod_version = 0.20.0-sakura.3
mod_version = 0.6.7

# Required malilib version
malilib_version = 0.22.0-sakura.3
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/fi/dy/masa/litematica/InitHandler.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package fi.dy.masa.litematica;

import fi.dy.masa.litematica.network.UWPacketHandler; //Shaijana
import net.minecraft.client.MinecraftClient;

import fi.dy.masa.malilib.config.ConfigManager;
Expand Down Expand Up @@ -44,5 +45,7 @@ public void registerModHandlers()

DataManager.getAreaSelectionsBaseDirectory();
DataManager.getSchematicsBaseDirectory();

UWPacketHandler.init(); //Shaijana
}
}
4 changes: 2 additions & 2 deletions src/main/java/fi/dy/masa/litematica/Reference.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

public class Reference
{
public static final String MOD_ID = "litematica";
public static final String MOD_NAME = "Litematica";
public static final String MOD_ID = "uwmatica"; //Shaijana
public static final String MOD_NAME = "UWmatica"; //Shaijana
public static final String MOD_VERSION = StringUtils.getModVersionString(MOD_ID);
public static final String MC_VERSION = MinecraftVersion.CURRENT.getName();
public static final String MOD_TYPE = "fabric";
Expand Down
29 changes: 15 additions & 14 deletions src/main/java/fi/dy/masa/litematica/config/Configs.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;

import fi.dy.masa.litematica.handler.AllowedFunctionsHandler; //Shaijana
import net.minecraft.client.MinecraftClient;

import fi.dy.masa.malilib.config.ConfigUtils;
Expand Down Expand Up @@ -96,12 +97,12 @@ public static class Generic
public static final ConfigBoolean RENDER_THREAD_NO_TIMEOUT = new ConfigBoolean("renderThreadNoTimeout", true).apply(GENERIC_KEY);
public static final ConfigInteger SERVER_NBT_REQUEST_RATE = new ConfigInteger("serverNbtRequestRate", 2).apply(GENERIC_KEY);
public static final ConfigBoolean SIGN_TEXT_PASTE = new ConfigBoolean("signTextPaste", true).apply(GENERIC_KEY);
public static final ConfigString TOOL_ITEM = new ConfigString( "toolItem", "minecraft:stick").apply(GENERIC_KEY);
public static final ConfigBoolean TOOL_ITEM_ENABLED = new ConfigBoolean("toolItemEnabled", true).apply(GENERIC_KEY);
public static final ConfigString TOOL_ITEM = new ConfigString( "toolItem", "minecraft:wooden_sword").apply(GENERIC_KEY); //Shaijana
public static final ConfigBoolean TOOL_ITEM_ENABLED = new ConfigBoolean("toolItemEnabled", false).apply(GENERIC_KEY); //Shaijana
public static final ConfigString TOOL_ITEM_COMPONENTS = new ConfigString( "toolItemComponents", "empty").apply(GENERIC_KEY);
public static final ConfigBoolean UNHIDE_SCHEMATIC_PROJECTS = new ConfigBoolean("unhideSchematicVCS", false).apply(GENERIC_KEY);

public static final ImmutableList<IConfigBase> OPTIONS = ImmutableList.of(
public static final ImmutableList<IConfigBase> OPTIONS_DISABLED = ImmutableList.of( //Shaijana
AREAS_PER_WORLD,
//BETTER_RENDER_ORDER,
CHANGE_SELECTED_CORNER,
Expand Down Expand Up @@ -216,7 +217,7 @@ public static class Visuals
public static final ConfigBoolean SCHEMATIC_OVERLAY_TYPE_WRONG_STATE = new ConfigBoolean("schematicOverlayTypeWrongState", true).apply(VISUALS_KEY);
public static final ConfigBoolean SCHEMATIC_VERIFIER_BLOCK_MODELS = new ConfigBoolean("schematicVerifierUseBlockModels", false).apply(VISUALS_KEY);

public static final ImmutableList<IConfigBase> OPTIONS = ImmutableList.of(
public static final ImmutableList<IConfigBase> OPTIONS_DISABLED = ImmutableList.of( //Shaijana
ENABLE_RENDERING,
ENABLE_SCHEMATIC_RENDERING,
//RENDER_SCHEMATIC_MAX_THREADS,
Expand Down Expand Up @@ -333,7 +334,7 @@ public static class Colors
public static final ConfigColor SCHEMATIC_OVERLAY_COLOR_WRONG_BLOCK = new ConfigColor("schematicOverlayColorWrongBlock", "#4CFF3333").apply(COLORS_KEY);
public static final ConfigColor SCHEMATIC_OVERLAY_COLOR_WRONG_STATE = new ConfigColor("schematicOverlayColorWrongState", "#4CFF9010").apply(COLORS_KEY);

public static final ImmutableList<IConfigBase> OPTIONS = ImmutableList.of(
public static final ImmutableList<IConfigBase> OPTIONS_DISABLED = ImmutableList.of( //Shaijana
AREA_SELECTION_BOX_SIDE_COLOR,
HIGHTLIGHT_BLOCK_IN_INV_COLOR,
MATERIAL_LIST_HUD_ITEM_COUNTS,
Expand All @@ -359,11 +360,11 @@ public static void loadFromFile()
{
JsonObject root = element.getAsJsonObject();

ConfigUtils.readConfigBase(root, "Colors", Colors.OPTIONS);
ConfigUtils.readConfigBase(root, "Generic", Generic.OPTIONS);
ConfigUtils.readConfigBase(root, "Hotkeys", Hotkeys.HOTKEY_LIST);
ConfigUtils.readConfigBase(root, "Colors", AllowedFunctionsHandler.ALLOWED_COLORS_CONFIGS); //Shaijana
ConfigUtils.readConfigBase(root, "Generic", AllowedFunctionsHandler.ALLOWED_GENERIC_CONFIGS); //Shaijana
ConfigUtils.readConfigBase(root, "Hotkeys", AllowedFunctionsHandler.ALLOWED_HOTKEYS); //Shaijana
ConfigUtils.readConfigBase(root, "InfoOverlays", InfoOverlays.OPTIONS);
ConfigUtils.readConfigBase(root, "Visuals", Visuals.OPTIONS);
ConfigUtils.readConfigBase(root, "Visuals", AllowedFunctionsHandler.ALLOWED_VISUALS_CONFIGS); //Shaijana
}
}

Expand All @@ -372,7 +373,7 @@ public static void loadFromFile()
{
DataManager.getInstance().setToolItemComponents(Generic.TOOL_ITEM_COMPONENTS.getStringValue(), MinecraftClient.getInstance().world.getRegistryManager());
}
InventoryUtils.setPickBlockableSlots(Generic.PICK_BLOCKABLE_SLOTS.getStringValue());
// InventoryUtils.setPickBlockableSlots(Generic.PICK_BLOCKABLE_SLOTS.getStringValue()); //Shaijana
}

public static void saveToFile()
Expand All @@ -383,11 +384,11 @@ public static void saveToFile()
{
JsonObject root = new JsonObject();

ConfigUtils.writeConfigBase(root, "Colors", Colors.OPTIONS);
ConfigUtils.writeConfigBase(root, "Generic", Generic.OPTIONS);
ConfigUtils.writeConfigBase(root, "Hotkeys", Hotkeys.HOTKEY_LIST);
ConfigUtils.writeConfigBase(root, "Colors", AllowedFunctionsHandler.ALLOWED_COLORS_CONFIGS); //Shaijana
ConfigUtils.writeConfigBase(root, "Generic", AllowedFunctionsHandler.ALLOWED_GENERIC_CONFIGS); //Shaijana
ConfigUtils.writeConfigBase(root, "Hotkeys", AllowedFunctionsHandler.ALLOWED_HOTKEYS); //Shaijana
ConfigUtils.writeConfigBase(root, "InfoOverlays", InfoOverlays.OPTIONS);
ConfigUtils.writeConfigBase(root, "Visuals", Visuals.OPTIONS);
ConfigUtils.writeConfigBase(root, "Visuals", AllowedFunctionsHandler.ALLOWED_VISUALS_CONFIGS); //Shaijana

JsonUtils.writeJsonToFile(root, new File(dir, CONFIG_FILE_NAME));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fi/dy/masa/litematica/config/Hotkeys.java
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public class Hotkeys
public static final ConfigHotkey TOOL_SELECT_MODIFIER_BLOCK_2 = new ConfigHotkey("toolSelectModifierBlock2", "LEFT_SHIFT", KeybindSettings.MODIFIER_INGAME).apply(HOTKEYS_KEY);
public static final ConfigHotkey UNLOAD_CURRENT_SCHEMATIC = new ConfigHotkey("unloadCurrentSchematic", "").apply(HOTKEYS_KEY);

public static final List<ConfigHotkey> HOTKEY_LIST = ImmutableList.of(
public static final List<ConfigHotkey> HOTKEY_LIST_DISABLED = ImmutableList.of( //Shaijana
ADD_SELECTION_BOX,
CLONE_SELECTION,
DELETE_SELECTION_BOX,
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/fi/dy/masa/litematica/event/InputHandler.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package fi.dy.masa.litematica.event;

import fi.dy.masa.litematica.handler.AllowedFunctionsHandler; //Shaijana
import net.minecraft.client.MinecraftClient;
import net.minecraft.entity.Entity;
import net.minecraft.util.math.BlockPos;
Expand Down Expand Up @@ -36,7 +37,7 @@ public static InputHandler getInstance()
@Override
public void addKeysToMap(IKeybindManager manager)
{
for (IHotkey hotkey : Hotkeys.HOTKEY_LIST)
for (IHotkey hotkey : AllowedFunctionsHandler.ALLOWED_HOTKEYS) //Shaijana
{
manager.addKeybindToMap(hotkey.getKeybind());
}
Expand All @@ -45,7 +46,7 @@ public void addKeysToMap(IKeybindManager manager)
@Override
public void addHotkeys(IKeybindManager manager)
{
manager.addHotkeysForCategory(Reference.MOD_NAME, "litematica.hotkeys.category.generic_hotkeys", Hotkeys.HOTKEY_LIST);
manager.addHotkeysForCategory(Reference.MOD_NAME, "litematica.hotkeys.category.generic_hotkeys", AllowedFunctionsHandler.ALLOWED_HOTKEYS); //Shaijana
}

@Override
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/fi/dy/masa/litematica/gui/GuiConfigs.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import fi.dy.masa.litematica.config.Configs;
import fi.dy.masa.litematica.config.Hotkeys;
import fi.dy.masa.litematica.data.DataManager;
import fi.dy.masa.litematica.handler.AllowedFunctionsHandler; //Shaijana
import fi.dy.masa.litematica.util.SchematicWorldRefresher;
import fi.dy.masa.malilib.config.IConfigBase;
import fi.dy.masa.malilib.gui.GuiBase;
Expand Down Expand Up @@ -86,11 +87,11 @@ public List<ConfigOptionWrapper> getConfigs()
List<? extends IConfigBase> configs;
ConfigGuiTab tab = DataManager.getConfigGuiTab();
configs = switch (tab) {
case GENERIC -> Configs.Generic.OPTIONS;
case GENERIC -> AllowedFunctionsHandler.ALLOWED_GENERIC_CONFIGS; //Shaijana
case INFO_OVERLAYS -> Configs.InfoOverlays.OPTIONS;
case VISUALS -> Configs.Visuals.OPTIONS;
case COLORS -> Configs.Colors.OPTIONS;
case HOTKEYS -> Hotkeys.HOTKEY_LIST;
case VISUALS -> AllowedFunctionsHandler.ALLOWED_VISUALS_CONFIGS; //Shaijana
case COLORS -> AllowedFunctionsHandler.ALLOWED_COLORS_CONFIGS; //Shaijana
case HOTKEYS -> AllowedFunctionsHandler.ALLOWED_HOTKEYS; //Shaijana
case RENDER_LAYERS -> Collections.emptyList();
//case TEST -> Configs.Test.OPTIONS;
};
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/fi/dy/masa/litematica/gui/GuiMainMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,22 @@ public void initGui()
this.createChangeMenuButton(x, y, width, ButtonListenerChangeMenu.ButtonType.LOAD_SCHEMATICS);
y += 44;

this.createChangeMenuButton(x, y, width, ButtonListenerChangeMenu.ButtonType.AREA_EDITOR);
// this.createChangeMenuButton(x, y, width, ButtonListenerChangeMenu.ButtonType.AREA_EDITOR); //Shaijana
y += 22;
this.createChangeMenuButton(x, y, width, ButtonListenerChangeMenu.ButtonType.AREA_SELECTION_BROWSER);
// this.createChangeMenuButton(x, y, width, ButtonListenerChangeMenu.ButtonType.AREA_SELECTION_BROWSER); //Shaijana
y += 22;

SelectionMode mode = DataManager.getSelectionManager().getSelectionMode();
String label = StringUtils.translate("litematica.gui.button.area_selection_mode", mode.getDisplayName());
ButtonGeneric button = new ButtonGeneric(x, y, width, 20, label);
this.addButton(button, new ButtonListenerCycleAreaMode(this));
// this.addButton(button, new ButtonListenerCycleAreaMode(this)); //Shaijana

label = StringUtils.translate("litematica.gui.button.tool_mode", DataManager.getToolMode().getName());
int width2 = this.getStringWidth(label) + 10;

y = this.height - 26;
button = new ButtonGeneric(x, y, width2, 20, label);
this.addButton(button, new ButtonListenerCycleToolMode(this));
// this.addButton(button, new ButtonListenerCycleToolMode(this)); //Shaijana

x += width + 20;
y = 30;
Expand All @@ -69,7 +69,7 @@ public void initGui()
if (Configs.Generic.UNHIDE_SCHEMATIC_PROJECTS.getBooleanValue())
{
y += 22;
this.createChangeMenuButton(x, y, width, ButtonListenerChangeMenu.ButtonType.SCHEMATIC_PROJECTS_MANAGER);
// this.createChangeMenuButton(x, y, width, ButtonListenerChangeMenu.ButtonType.SCHEMATIC_PROJECTS_MANAGER); //Shaijana
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
package fi.dy.masa.litematica.handler;

import com.google.common.collect.ImmutableList;
import fi.dy.masa.litematica.config.Configs;
import fi.dy.masa.litematica.config.Hotkeys;
import fi.dy.masa.malilib.config.IConfigBase;
import fi.dy.masa.malilib.config.options.ConfigHotkey;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;

import java.util.Arrays;
import java.util.HashSet;
import java.util.List;

public class AllowedFunctionsHandler {

public final static ImmutableList<IConfigBase> ALLOWED_GENERIC_CONFIGS = ImmutableList.of(
Configs.Generic.PLACEMENT_REPLACE_BEHAVIOR,
Configs.Generic.PLACEMENT_RESTRICTION_WARN,
Configs.Generic.CUSTOM_SCHEMATIC_BASE_DIRECTORY_ENABLED,
Configs.Generic.CUSTOM_SCHEMATIC_BASE_DIRECTORY,
Configs.Generic.BETTER_RENDER_ORDER,
Configs.Generic.DEBUG_LOGGING,
Configs.Generic.DATAFIXER_DEFAULT_SCHEMA,
Configs.Generic.EXECUTE_REQUIRE_TOOL,
Configs.Generic.FIX_CHEST_MIRROR,
Configs.Generic.FIX_RAIL_ROTATION,
Configs.Generic.GENERATE_LOWERCASE_NAMES,
Configs.Generic.ITEM_USE_PACKET_CHECK_BYPASS,
Configs.Generic.LAYER_MODE_DYNAMIC,
Configs.Generic.LOAD_ENTIRE_SCHEMATICS,
Configs.Generic.MATERIAL_LIST_IGNORE_STATE,
Configs.Generic.RENDER_MATERIALS_IN_GUI,
Configs.Generic.RENDER_THREAD_NO_TIMEOUT,
Configs.Generic.SIGN_TEXT_PASTE,
Configs.Generic.TOOL_ITEM,
Configs.Generic.TOOL_ITEM_ENABLED
);

public final static ImmutableList<IConfigBase> ALLOWED_VISUALS_CONFIGS = ImmutableList.of(
Configs.Visuals.ENABLE_RENDERING,
Configs.Visuals.ENABLE_SCHEMATIC_RENDERING,
Configs.Visuals.ENABLE_SCHEMATIC_BLOCKS,
Configs.Visuals.ENABLE_SCHEMATIC_FLUIDS,
Configs.Visuals.ENABLE_SCHEMATIC_OVERLAY,
Configs.Visuals.IGNORE_EXISTING_FLUIDS,
Configs.Visuals.OVERLAY_REDUCED_INNER_SIDES,
Configs.Visuals.RENDER_BLOCKS_AS_TRANSLUCENT,
Configs.Visuals.RENDER_COLLIDING_SCHEMATIC_BLOCKS,
Configs.Visuals.RENDER_ERROR_MARKER_CONNECTIONS,
Configs.Visuals.RENDER_ERROR_MARKER_SIDES,
Configs.Visuals.RENDER_PLACEMENT_BOX_SIDES,
Configs.Visuals.RENDER_PLACEMENT_ENCLOSING_BOX,
Configs.Visuals.RENDER_PLACEMENT_ENCLOSING_BOX_SIDES,
Configs.Visuals.RENDER_TRANSLUCENT_INNER_SIDES,
Configs.Visuals.SCHEMATIC_OVERLAY_ENABLE_OUTLINES,
Configs.Visuals.SCHEMATIC_OVERLAY_ENABLE_RESORTING,
Configs.Visuals.SCHEMATIC_OVERLAY_ENABLE_SIDES,
Configs.Visuals.SCHEMATIC_OVERLAY_MODEL_OUTLINE,
Configs.Visuals.SCHEMATIC_OVERLAY_MODEL_SIDES,
Configs.Visuals.SCHEMATIC_OVERLAY_RENDER_THROUGH,
Configs.Visuals.SCHEMATIC_OVERLAY_TYPE_EXTRA,
Configs.Visuals.SCHEMATIC_OVERLAY_TYPE_MISSING,
Configs.Visuals.SCHEMATIC_OVERLAY_TYPE_WRONG_BLOCK,
Configs.Visuals.SCHEMATIC_OVERLAY_TYPE_WRONG_STATE,
Configs.Visuals.SCHEMATIC_VERIFIER_BLOCK_MODELS,

Configs.Visuals.GHOST_BLOCK_ALPHA,
Configs.Visuals.PLACEMENT_BOX_SIDE_ALPHA,
Configs.Visuals.SCHEMATIC_OVERLAY_OUTLINE_WIDTH,
Configs.Visuals.SCHEMATIC_OVERLAY_OUTLINE_WIDTH_THROUGH
);

public final static ImmutableList<IConfigBase> ALLOWED_COLORS_CONFIGS = ImmutableList.of(
Configs.Colors.MATERIAL_LIST_HUD_ITEM_COUNTS,
Configs.Colors.SCHEMATIC_OVERLAY_COLOR_EXTRA,
Configs.Colors.SCHEMATIC_OVERLAY_COLOR_MISSING,
Configs.Colors.SCHEMATIC_OVERLAY_COLOR_WRONG_BLOCK,
Configs.Colors.SCHEMATIC_OVERLAY_COLOR_WRONG_STATE
);

public static final List<ConfigHotkey> ALLOWED_HOTKEYS = ImmutableList.of(
Hotkeys.INVERT_GHOST_BLOCK_RENDER_STATE,
Hotkeys.INVERT_OVERLAY_RENDER_STATE,
Hotkeys.LAYER_MODE_NEXT,
Hotkeys.LAYER_MODE_PREVIOUS,
Hotkeys.LAYER_NEXT,
Hotkeys.LAYER_PREVIOUS,
Hotkeys.LAYER_SET_HERE,
Hotkeys.OPEN_GUI_LOADED_SCHEMATICS,
Hotkeys.OPEN_GUI_MAIN_MENU,
Hotkeys.OPEN_GUI_MATERIAL_LIST,
Hotkeys.OPEN_GUI_PLACEMENT_SETTINGS,
Hotkeys.OPEN_GUI_SCHEMATIC_PLACEMENTS,
Hotkeys.OPEN_GUI_SCHEMATIC_VERIFIER,
Hotkeys.OPEN_GUI_SETTINGS,
Hotkeys.OPERATION_MODE_CHANGE_MODIFIER,
Hotkeys.RENDER_INFO_OVERLAY,
Hotkeys.RENDER_OVERLAY_THROUGH_BLOCKS,
Hotkeys.RERENDER_SCHEMATIC,
Hotkeys.SCHEMATIC_PLACEMENT_ROTATION,
Hotkeys.SCHEMATIC_PLACEMENT_MIRROR,
Hotkeys.TOGGLE_ALL_RENDERING,
Hotkeys.TOGGLE_AREA_SELECTION_RENDERING,
Hotkeys.TOGGLE_INFO_OVERLAY_RENDERING,
Hotkeys.TOGGLE_OVERLAY_RENDERING,
Hotkeys.TOGGLE_OVERLAY_OUTLINE_RENDERING,
Hotkeys.TOGGLE_OVERLAY_SIDE_RENDERING,
Hotkeys.TOGGLE_PLACEMENT_BOXES_RENDERING,
Hotkeys.TOGGLE_PLACEMENT_RESTRICTION,
Hotkeys.TOGGLE_SCHEMATIC_BLOCK_RENDERING,
Hotkeys.TOGGLE_SCHEMATIC_RENDERING,
Hotkeys.TOGGLE_SIGN_TEXT_PASTE,
Hotkeys.TOGGLE_TRANSLUCENT_RENDERING,
Hotkeys.TOGGLE_VERIFIER_OVERLAY_RENDERING,
Hotkeys.TOOL_ENABLED_TOGGLE,
Hotkeys.TOOL_SELECT_ELEMENTS,
Hotkeys.UNLOAD_CURRENT_SCHEMATIC
);

private static final HashSet<Block> forbiddenBlocks = new HashSet<>(Arrays.asList(
Blocks.DIAMOND_ORE,
Blocks.IRON_ORE,
Blocks.LAPIS_ORE,
Blocks.COAL_ORE,
Blocks.EMERALD_ORE,
Blocks.GOLD_ORE,
Blocks.NETHER_GOLD_ORE,
Blocks.REDSTONE_ORE,
Blocks.NETHER_QUARTZ_ORE,
Blocks.DEEPSLATE_IRON_ORE,
Blocks.COPPER_ORE,
Blocks.DEEPSLATE_COPPER_ORE,
Blocks.DEEPSLATE_GOLD_ORE,
Blocks.DEEPSLATE_REDSTONE_ORE,
Blocks.DEEPSLATE_EMERALD_ORE,
Blocks.DEEPSLATE_LAPIS_ORE,
Blocks.DEEPSLATE_DIAMOND_ORE,
Blocks.ANCIENT_DEBRIS,
Blocks.AMETHYST_BLOCK,
Blocks.BUDDING_AMETHYST,
Blocks.END_PORTAL_FRAME,
Blocks.END_PORTAL,
Blocks.SPAWNER,
Blocks.SMALL_AMETHYST_BUD,
Blocks.MEDIUM_AMETHYST_BUD,
Blocks.LARGE_AMETHYST_BUD,
Blocks.AMETHYST_CLUSTER,
Blocks.POINTED_DRIPSTONE
));

public static boolean isAllowed(Block block) {
return !forbiddenBlocks.contains(block);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ private void addDebugLines(CallbackInfoReturnable<List<String>> cir)
{
WorldSchematic world = SchematicWorldHandler.getSchematicWorld();

if (world != null)
if (world != null && false) //Shaijana
{
List<String> list = cir.getReturnValue();
String pre = GuiBase.TXT_GOLD;
Expand Down
Loading

0 comments on commit f07240c

Please sign in to comment.