diff --git a/examples/config/cyclic.toml b/examples/config/cyclic.toml index 785ceb400..a5bd8d411 100644 --- a/examples/config/cyclic.toml +++ b/examples/config/cyclic.toml @@ -516,7 +516,7 @@ [cyclic.blocks.facades] # - # These blocks are not allowed to be used as Facades for blocks because they look weird (used by cables and Glowstone Facade and Soundproofing Facade and others) + # These blocks are not allowed to be used as Facades for blocks because they look weird (used by cables and Glowstone Facade and Soundproofing Facade and others). If you want to ignore one entire mod use an entry like this : storagenetwork:* itemsNotAllowed = ["minecraft:ladder", "minecraft:double_plant", "minecraft:waterlily", "minecraft:torch", "minecraft:*_torch", "minecraft:redstone", "minecraft:iron_bars", "minecraft:chest", "minecraft:ender_chest", "minecraft:sculk_vein", "minecraft:string", "minecraft:vine", "minecraft:rail", "minecraft:*_rail", "minecraft:brewing_stand", "minecraft:*_dripleaf", "minecraft:*_pane", "minecraft:*_sapling", "minecraft:*_sign", "minecraft:*_door", "minecraft:*_banner", "minecraft:*_shulker_box", "cyclic:*_pipe", "cyclic:*_bars", "storagenetwork:*"] [cyclic.blocks.facades.cables] diff --git a/gradle.properties b/gradle.properties index a6920be19..3d3b2c705 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,12 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # as needed run/server.properties : online-mode=false +<<<<<<< HEAD mod_id=cyclic +======= + +mod_version=1.11.1 +>>>>>>> ed054305ea2963d2685624a54e8d077e5ffb1230 curse_id=239286 mod_version=1.13.0 diff --git a/src/main/java/com/lothrazar/cyclic/block/dropper/ScreenDropper.java b/src/main/java/com/lothrazar/cyclic/block/dropper/ScreenDropper.java index b262079ce..953099c17 100644 --- a/src/main/java/com/lothrazar/cyclic/block/dropper/ScreenDropper.java +++ b/src/main/java/com/lothrazar/cyclic/block/dropper/ScreenDropper.java @@ -34,10 +34,10 @@ public void init() { y += 20; btnRender = addRenderableWidget(new ButtonMachineField(x, y, TileDropper.Fields.RENDER.ordinal(), menu.tile.getBlockPos(), TextureEnum.RENDER_HIDE, TextureEnum.RENDER_SHOW, "gui.cyclic.render")); - x = leftPos + 32; - y = topPos + 18; w = 120; - h = 18; + h = 20; + x = leftPos + 32; + y = topPos + h - 4; int f = TileDropper.Fields.DROPCOUNT.ordinal(); GuiSliderInteger dropcount = this.addRenderableWidget(new GuiSliderInteger(x, y, w, h, f, menu.tile.getBlockPos(), 1, 64, menu.tile.getField(f))); diff --git a/src/main/java/com/lothrazar/cyclic/block/forester/ScreenForester.java b/src/main/java/com/lothrazar/cyclic/block/forester/ScreenForester.java index ede309fd0..b4e612d57 100644 --- a/src/main/java/com/lothrazar/cyclic/block/forester/ScreenForester.java +++ b/src/main/java/com/lothrazar/cyclic/block/forester/ScreenForester.java @@ -40,8 +40,8 @@ public void init() { f = TileForester.Fields.RENDER.ordinal(); btnRender = addRenderableWidget(new ButtonMachineField(x, y, f, menu.tile.getBlockPos(), TextureEnum.RENDER_HIDE, TextureEnum.RENDER_SHOW, "gui.cyclic.render")); - x += 30; - y += 36; + x = leftPos + 30; + y = topPos + 36; f = TileForester.Fields.HEIGHT.ordinal(); heightslider = this.addRenderableWidget(new GuiSliderInteger(x, y, w, h, TileForester.Fields.HEIGHT.ordinal(), menu.tile.getBlockPos(), 0, TileForester.MAX_HEIGHT, menu.tile.getField(f))); diff --git a/src/main/java/com/lothrazar/cyclic/block/harvester/ScreenHarvester.java b/src/main/java/com/lothrazar/cyclic/block/harvester/ScreenHarvester.java index 61d19de43..1ba1e535f 100644 --- a/src/main/java/com/lothrazar/cyclic/block/harvester/ScreenHarvester.java +++ b/src/main/java/com/lothrazar/cyclic/block/harvester/ScreenHarvester.java @@ -47,8 +47,8 @@ public void init() { menu.tile.getBlockPos(), TextureEnum.DIR_DOWN, TextureEnum.DIR_UPWARDS, "gui.cyclic.direction")); //now start sliders // - y = topPos + 30; - x = leftPos + 36; + x = leftPos + 30; + y = topPos + 26; f = TileHarvester.Fields.HEIGHT.ordinal(); heightslider = this.addRenderableWidget(new GuiSliderInteger(x, y, w, h, f, menu.tile.getBlockPos(), 0, TileHarvester.MAX_HEIGHT, menu.tile.getField(f))); heightslider.setTooltip("buildertype.height.tooltip"); diff --git a/update.json b/update.json index 4f87af7f7..581d3b586 100644 --- a/update.json +++ b/update.json @@ -187,5 +187,7 @@ ,"1.13.0":"Add mouse-dragging capability to the slider controls in machines. Fluid Hoppers can now insert into cauldrons. Backport #2399 Dry Peat Bog can now hydrate from waterlogged blocks such as scaffolding. Fix spelling #2435. Clock gui-screen size reduced from large to normal. Added an optional item slot in the Block Breaker using the BlockState Data Card so players have the option to limit the block breaker to only the targets listed in the data card. Add new block data tags cyclic:ignored/breaker and cyclic:ignored/miner so that pack devs can customize these machines to not break certain blocks (regardless of hardness). Many blocks now allow minecraft:comparator to pull a redstone signal based on inventory contents (most machines and blocks that have inventory). Fluid collector will now place air and scoop up the fluid if the itemslot is empty. New feature: some machines can now be placed facing Up or Down vertically for convenience (harvester, forester, miner, item collector, fluid collector, dropper). Backported machine feature 'Preview Outline' mode on machines that already have the button. Several blocks added to block-tag mineable/pickaxe (thanks to darkosto) " + + ,"1.13.1":"Fixed some visual glitches" } }