From 1273712ba056a76cbb7d942bf1716970cc8a09a0 Mon Sep 17 00:00:00 2001 From: Kryppers <65094918+Kryppers@users.noreply.github.com> Date: Fri, 12 May 2023 22:53:00 +0100 Subject: [PATCH 1/3] door to door tweaks to the train door textures --- .../textures/block/andesite_door_bottom.png | Bin 374 -> 2088 bytes .../textures/block/andesite_door_top.png | Bin 358 -> 2017 bytes .../textures/block/copper_door_bottom.png | Bin 365 -> 2022 bytes .../create/textures/block/copper_door_top.png | Bin 351 -> 2197 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/create/textures/block/andesite_door_bottom.png b/src/main/resources/assets/create/textures/block/andesite_door_bottom.png index 5fdd59f6bae2538e0d2eafc98bd16355541194d4..d3d8479422248816226fd90a9e773a3ca4f89dbf 100644 GIT binary patch delta 2086 zcmV+>2-)}c0;mv>8Gix*005AYXf^-<1@(GVSaechcOYjgzihq7(oj>ctJwnhIAIN`f z;9HG*RUC`XJL}#o8f>F|z0&hHXHRpE?Ol-o7{YdHt1w3l7FM9d*S3H=;?LtbUU$Zw zY_W~RcH3;l-6)eIwv&Xqp+b`eb&QP~Y!o+K#OPdee9a|}F1yB-iDlh1UF6K26FY8h zFtZqTw=Hz(&3~7^MhTibVW}esBW(HYZGKwtC-T9U6rkZPM2%jd+x6oosEw|EL=Pup%&|^-h_%U6rk`QPnP#5lW=&cB<^BuSNLh0iQ)^wkS;K6MOVA~PR-N&SGce|a zz<68?AfVmi%q9|Xi@C*_%??@N9gOsgn@+YE3ZPI1IX~&n!jFhmNkmE z)+gQ7TD+c0YiUZmo=xq<$qp)8Tw!w8)397y-&-q)+p`FUE!I(njP(Rn)Ppyd+L2JZ zBK*F-*w(G;M&-P$6q_b*H)@hG-L_X!IOdw$?rm*OX@s1@GU`H$c>&0}=cePWl$~stLp;0Q)Pu(d)qWRvrrmi+E&Gtb1l)#fWNz4zq_?e1tk@0G>*)~UQ9jia* z-Ct_NL9d5!PzEx^pQ1a0VvrjQScPvDe{}11vu2g{%rum>jMl3_rv-G}27eaHcUCcpG;V&L?w>oFMtG`7}N~ZUm?}aoEZ@tsPCj*qv*2{ReYu#)r*c zn4FqA_|ka{&NsWTy4QO5H-F_WT-(fUaEErJ2_0z&)z@P5>mlK--kG0Fem#!p;bIjO ztKHX%CIAi*`@xbDfFsgd{IzhTH#vfEu9*iBwG_wW_n1b(9$gb=AT+-$as58=b*E~~ zG3axoJ3620bc>9#V?xp`$)vxM@NjZ6Kisa}RaO+f+u6_Ydns6Aet*9=oc8VF#4$PJ ztoR>}Zx}TLdn`x*000JJOGiWiB>;c`+ILYqK>z>%32;bRa{vGi!vFvd!vV){sAK>D z00(qQO+^Ri1q>Ai0_PeQV*mgFv`IukR4C77QB7-8K@>d+@4cBfP2b2Pl@uvWivG2NGO&W1*OqkYq?p$h_!uJ}kPpFVlc`b?4lB z&b{YOs|MI%i!&Y&(D6ICjbB#>xW9me5Gjp z58f-=HKDVyE_k-nT{G5~vUPki{9XMb;Rya1Os3OI08IdeEPqmwa+cjc_&|DdJ;x#l z3?`IiyCzh+qFV3hkdjro8VS9lL+gA5n>^2H0qeYEpjw<@td|VN`c$NIJ?ES??bX#v z(F!I+$yB7viQpMMr_)PoUG0Iy0C1L3jhd)i@a)C|&-3wM1VB4zR}WDmr6w1VPg)f9 zO7Wc~e*rvwwtx3(|0N;BiDR2Q&uLxBA`5CTKJWJ_x6W&aRHS9uu1(XG07wS^rx8r( zY^-l?Z3PqPXfdpHNqh*N8SAOz>!&ZXs#;r=B*SE3FQKak6UN#D(9Q$sZf~lQy6&G6 zNIy*;5_0q4#k)9)3f8*r<9#~i@}V0~_I7U-1pwz9V;?uhXH`Y`atxLF2l`j(m0o#c Q&Hw-a07*qoM6N<$f^?Mg_5c6? literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}l0G|-ogyi_9_Lfj9`KCmxL~p(BgJ)M}og3^M3;J|_)y;)1< zuGqY~Bh|8h+Qf{UjELxnC>Iq6S7%QjFH>tvph@SK{fh@u;w3?T!T+%WhG!1X;($sx z3p^r=85sBugD~Uq{1quc!RekZjv*Sswtn40hZQ(hAIRcbn|t@!|N2)=yLl~blI3)~ z1-BlTNM6f!(}q!HL*G>=uEtoVum57ahXQQU&(I)Rrho2?6?(#5y sed%}4U9N8B_q_)$|9!f~^3HvE!N2V1HyAt00-ea<>FVdQ&MBb@0Ngs30RR91 diff --git a/src/main/resources/assets/create/textures/block/andesite_door_top.png b/src/main/resources/assets/create/textures/block/andesite_door_top.png index e899195aeef6d4721c389f2c270c7589fb9acc59..e8cc7ae6310ca458824c394473dc3bcb1dd7e0ef 100644 GIT binary patch delta 1993 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 UJ?oZ$c>n+a07*qoM6N<$g7sXwt^fc4 delta 265 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 WvY=SPy$z560000ELL3i?zE|}&{$vXN$zTx9S) From 3f31353fea334c5b9c6fee749918bdd7989370bb Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sat, 13 May 2023 01:58:14 +0200 Subject: [PATCH 2/3] Start as Patch A --- .github/ISSUE_TEMPLATE/bug_report.yml | 1 + gradle.properties | 2 +- src/main/java/com/simibubi/create/Create.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index b5dc91935..2da08af81 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -49,6 +49,7 @@ body: label: Mod Version description: The version of the mod you were using when the bug occured options: + - "0.5.1a" - "0.5.0j" - "0.5.0i" - "0.5.0h" diff --git a/gradle.properties b/gradle.properties index e34eb5fcb..bfca22de5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs = -Xmx3G org.gradle.daemon = false # mod version info -mod_version = 0.5.1 +mod_version = 0.5.1.a artifact_minecraft_version = 1.18.2 minecraft_version = 1.18.2 diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java index f2fd9fbb7..9ae69d41a 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -71,7 +71,7 @@ public class Create { public static final String ID = "create"; public static final String NAME = "Create"; - public static final String VERSION = "0.5.1-unstable"; + public static final String VERSION = "0.5.1a"; public static final Logger LOGGER = LogUtils.getLogger(); From 2b02e560522aa1ceb9e01cd0b35983dccf1e6d69 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sat, 13 May 2023 12:37:52 +0200 Subject: [PATCH 3/3] Captains log --- ## Changes.md | 138 ++++++++++++++++++ .../structureMovement/Contraption.java | 2 +- .../create/foundation/ponder/PonderTag.java | 34 ++--- .../foundation/utility/LangNumberFormat.java | 3 + 4 files changed, 158 insertions(+), 19 deletions(-) create mode 100644 ## Changes.md diff --git a/## Changes.md b/## Changes.md new file mode 100644 index 000000000..b6e11f765 --- /dev/null +++ b/## Changes.md @@ -0,0 +1,138 @@ +## Additions + +- Netherite Backtank +- Netherite Diving Helmet and Boots +- Contraption Controls +- Elevator Pulley +- Copycat Panels and Copycat Steps +- Block of Andesite Alloy +- Block of Industrial Iron +- Large Water Wheel +- Mechanical Roller +- Andesite, Brass and Copper Doors +- Andesite, Brass and Copper Bars +- Andesite, Brass and Copper Scaffolding +- Clipboard +- Mangrove Windows (1.19) + +## Changes + +- Overhauled models and textures of Andesite & Brass components (Kryppers) +- Reworked textures of colored blocks such as seats and sails (dani) +- New filter sprites (vectorwing) +- Valve handles can now be used to precisely turn mechanical bearings by a set angle +- Pulley ropes are now climbable +- Lowered hitbox of seats for improved traversability inside contraptions +- Improved safety for players standing on vertically moving contraptions +- Pulley contraptions will now make an effort to place remote players at y values sensible to the client +- Fixed seated entities on rotating contraptions not rendering at the correct location +- Deployers no longer fail to activate in chunks claimed or protected by the player that placed them +- Fixed couplings, schematics and in-world overlays not rendering correctly at coordinates far from the origin +- Fixed Bearings, Pistons, Pulleys and Gantries powered by a Sequenced Gearshift not moving precisely to its instructions at high speeds +- Minecart contraptions no longer visually jump to a location when stalled +- Mechanical bearings now snap to a rounded angle when stopped +- Contraption storage now accepts more chests and barrels from other mods +- Players can now open chests and barrels on assembled contraptions +- Mechanical Pumps no longer reverse direction based on kinetic input +- Fixed pipe connections pulling fluids with half the speed compared to a directly attached pump +- Substantially increased speed of visual flow propagation inside pipe networks +- Portable storage interfaces now stall for longer after an exchange has happened, and shorter otherwise +- Single train track blocks with slopes connected on either side will angle themselves to create a smoother ascend across both +- Multiple pulleys can now attach to contraptions in a synchronised group +- Display Boards now update text instantaneously at high input rpm +- Diving helmets now always grant aqua affinity +- Diving helmets can no longer be enchanted with aqua affinity +- Water wheel fins are no longer directional +- Water wheels now only have one speed level +- Water wheels can now take the appearance of any reasonably implemented wood type +- Added sided door control options to elevator contact and train station UI +- Liquid can no longer spread perpendicularly on top of water wheels +- Overhauled UX of scroll values and item filtering +- Filtered item extraction can now be configured to pull "up to x items" per operation +- Connected textures now use and apply the getAppearance() standard by Forge, allowing them to connect across other mods' facades, etc. (1.19) +- Boiler status now highlights information about water flow when insufficient +- The majority of in-world options no longer require a wrench +- Chutes can now be encased in Industrial Iron Blocks +- Chutes are now less prone to resetting shape when moved or rotated +- Moved metal block variants to Building Blocks tab +- Changed stonecutting ingredient of metal block variants from sheet to ingot +- Base stone blocks can now be stonecut back from their cut variants +- Fixed track placement allowing an s-bend between two sloped track pieces in specific arrangements +- Fixed funnels losing filters when changing between types +- New randomised textures for natural palette stone types (Kryppers) +- Readjusted palette stone generation to use taller layers +- World generation now places fewer stone type veins by default +- Fixed lava fans voiding items that have smoking & smelting recipes with different outputs +- Filter items now filter for their own item type if left empty +- Valve handles no longer create stress config entries for each dyed variant +- Place near initial angle mode on bearings now has a smaller interval considered 'near' +- Players can now take items from saws via right-click +- Item Drains now accept dropped items as input +- Train track placement overlay now explicitly mentions the ctrl key +- Fixed Mechanical Saws not rendering as animated when using rubidium +- Fixed a ui element of the Station Screen rendering behind the background +- Belts printed instantly or via cannon now retain the correct type of casing +- Scheduled trains no longer slow down for slight ascends/descents on a straight track +- Fixed saplings and other non-collidables sticking to chassis or super glue +- Encased Fluid Pipes no longer z-fight on open pipe faces +- Valve handles now turn twice as quickly +- Bearings no longer have the angle-indicating nook on their block +- Depot hitbox is now a simple cuboid +- Fixed belts encased with andesite briefly showing brass textures +- Fixed Filters and Attribute Filters not stacking with unmodified, equivalent stacks +- Fixed Attribute Filters saving the name tag preview item in their data +- Filters and Schedules can now be reset via crafting +- Renamed Sails to Windmill Sails +- Crushing gold ore now yields more experience nuggets +- Fixed valve pipes sometimes not rotating their indicator fully +- Horizontal, encased belts now render a support structure when solid blocks are above them +- Added placement assist for mechanical drills, saws and deployers +- Mechanical Belts can now be waterlogged +- Depots and Ejectors can now be Waterlogged +- Chutes and Funnels can now be Waterlogged +- Fixed upright mechanical saws only able to be oriented in two directions +- Deployers now have their filter slot on the side of the block +- Deployers can now be rotated by wrenching them near the edge of the front face +- Deployers now set filters on blocks only by targeting any location on a correct side +- Fixed Schematics loaded for deployer printing not rotating block entity contents +- Added tripwire to #movable_empty_collider +- Renamed Stockpile Switch to Threshold Switch +- Renamed Content Observer to Smart Observer +- Smart observer and threshold switch can now be oriented to face blocks above or below them +- Smart observer will now also emit redstone when the block in front of it matches its filter +- Fixed non-vanilla signs not accepted as valid display targets +- Brass tunnels with no distribution behaviour no longer show the mode switcher +- Used more contrasting colours for diode and tunnel value inputs +- Fixed crash when hose pulley cannot find reference fluid for infinite draining +- Clipboards can now be used to transfer settings between blocks +- Clipboards can now be used to manually write to Display Boards and Nixie Tubes +- Clipboards can now be used as Material Checklists in the Schematicannon +- Fixed and edited existing tooltips and ponder scenes to include behavioural changes in 0.5.1 +- New ponder scenes for Smart Observer, Threshold Switch, Elevator Pulley, Contraption Controls and Mechanical Rollers +- Fixed ponder overlay text rendering with wonky pixels +- Added a ponder category for recently added/changed blocks +- Renamed Filter to List Filter +- Deployers can now apply filters to a Redstone link with less required precision +- Bezier track segments now render with a slight angle to reduce z-fighting +- Fixed offset shaft rotation on encased large cogwheels +- Fixed Smart Fluid Pipe not dropping filter when broken +- Placards and Creative Crates will no longer hold on to special nbt content (except potion data, damage, enchants) of the contained item when imported via Schematicannon +- Schematicannons can no longer print mobs +- Fixed item frames not requiring an exact nbt match for printed contents +- Players can now sneak while using exp nuggets to only consume one item at a time +- Minecart contraption items can no longer be placed in container items like toolboxes or shulkers (configurable) +- Implemented ComputerCraft interaction for Speed Controllers, Display Links, Speedometers, Stressometers, Sequenced Gearshifts and Train Stations (caelwarner) +- Hand crank no longer drains hunger when using the extendo grip (Xstoudi) +- Fixed Encased Chain Drives not reacting to block rotation and mirroring correctly +- Open Ended Pipes now correctly handle Builder's Tea (NerdsOfAFeather) +- Added Config entry for brass tunnel distribution cooldown (Walle123) +- API for custom bogey & track types (Rabbitminers, techno-sam) +- Fixed server crash caused by Gantry Contraptions assembling (Lucasmellof) +- Fix "Lighter than air" fluids displayed incorrectly in spouts (cakeGit) +- Added rotate and mirror methods to Fluid Pipes (xieve) +- Chocolate & Honey fluid fog distance is now configurable (radimous) +- Added a TrackGraph merge event (DaComputerNerd717) +- Fixed players dismounting when trains get assembled (Equinoxxe) +- Added GameTests (TropheusJ) +- Added armor tags (NerdsOfAFeather) +- Major updates now release as patch A \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java index ff378d5c9..9a13bff12 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java @@ -608,7 +608,7 @@ public abstract class Contraption { blockstate = blockstate.setValue(RedstoneContactBlock.POWERED, true); if (AllBlocks.POWERED_SHAFT.has(blockstate)) blockstate = BlockHelper.copyProperties(blockstate, AllBlocks.SHAFT.getDefaultState()); - if (blockstate.getBlock() instanceof ControlsBlock) + if (blockstate.getBlock() instanceof ControlsBlock && getType() == ContraptionType.CARRIAGE) blockstate = blockstate.setValue(ControlsBlock.OPEN, true); if (blockstate.hasProperty(SlidingDoorBlock.VISIBLE)) blockstate = blockstate.setValue(SlidingDoorBlock.VISIBLE, false); diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderTag.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderTag.java index 2e55ae836..5c03e397d 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/PonderTag.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderTag.java @@ -21,57 +21,57 @@ public class PonderTag implements ScreenElement { public static final PonderTag - KINETIC_RELAYS = create("kinetic_relays").item(AllBlocks.COGWHEEL.get(), true, false) + KINETIC_RELAYS = create("kinetic_relays").item(AllBlocks.COGWHEEL.get()) .defaultLang("Kinetic Blocks", "Components which help relaying Rotational Force elsewhere") .addToIndex(), - KINETIC_SOURCES = create("kinetic_sources").item(AllBlocks.WATER_WHEEL.get(), true, false) + KINETIC_SOURCES = create("kinetic_sources").item(AllBlocks.WATER_WHEEL.get()) .defaultLang("Kinetic Sources", "Components which generate Rotational Force") .addToIndex(), - KINETIC_APPLIANCES = create("kinetic_appliances").item(AllBlocks.MECHANICAL_PRESS.get(), true, false) + KINETIC_APPLIANCES = create("kinetic_appliances").item(AllBlocks.MECHANICAL_PRESS.get()) .defaultLang("Kinetic Appliances", "Components which make use of Rotational Force") .addToIndex(), - FLUIDS = create("fluids").item(AllBlocks.FLUID_PIPE.get(), true, false) + FLUIDS = create("fluids").item(AllBlocks.FLUID_PIPE.get()) .defaultLang("Fluid Manipulators", "Components which help relaying and making use of Fluids") .addToIndex(), - LOGISTICS = create("logistics").item(Blocks.CHEST, true, false) + LOGISTICS = create("logistics").item(Blocks.CHEST) .defaultLang("Item Transportation", "Components which help moving items around") .addToIndex(), - REDSTONE = create("redstone").item(Items.REDSTONE, true, false) + REDSTONE = create("redstone").item(Items.REDSTONE) .defaultLang("Logic Components", "Components which help with redstone engineering") .addToIndex(), - DECORATION = create("decoration").item(Items.ROSE_BUSH, true, false) + DECORATION = create("decoration").item(Items.ROSE_BUSH) .defaultLang("Aesthetics", "Components used mostly for decorative purposes"), - CREATIVE = create("creative").item(AllBlocks.CREATIVE_CRATE.get(), true, false) + CREATIVE = create("creative").item(AllBlocks.CREATIVE_CRATE.get()) .defaultLang("Creative Mode", "Components not usually available for Survival Mode") .addToIndex(), - MOVEMENT_ANCHOR = create("movement_anchor").item(AllBlocks.MECHANICAL_PISTON.get(), true, false) + MOVEMENT_ANCHOR = create("movement_anchor").item(AllBlocks.MECHANICAL_PISTON.get()) .defaultLang("Movement Anchors", "Components which allow the creation of moving contraptions, animating an attached structure in a variety of ways") .addToIndex(), - CONTRAPTION_ACTOR = create("contraption_actor").item(AllBlocks.MECHANICAL_HARVESTER.get(), true, false) + CONTRAPTION_ACTOR = create("contraption_actor").item(AllBlocks.MECHANICAL_HARVESTER.get()) .defaultLang("Contraption Actors", "Components which expose special behaviour when attached to a moving contraption") .addToIndex(), - CONTRAPTION_ASSEMBLY = create("contraption_assembly").item(AllItems.SUPER_GLUE.get(), true, false) + CONTRAPTION_ASSEMBLY = create("contraption_assembly").item(AllItems.SUPER_GLUE.get()) .defaultLang("Block Attachment Utility", "Tools and Components used to assemble structures moved as an animated Contraption") .addToIndex(), - SAILS = create("windmill_sails").item(AllBlocks.WINDMILL_BEARING.get()) + SAILS = create("windmill_sails").item(AllBlocks.WINDMILL_BEARING.get(), true, true) .defaultLang("Sails for Windmill Bearings", "Blocks that count towards the strength of a Windmill Contraption when assembled. Each of these have equal efficiency in doing so."), - ARM_TARGETS = create("arm_targets").item(AllBlocks.MECHANICAL_ARM.get()) + ARM_TARGETS = create("arm_targets").item(AllBlocks.MECHANICAL_ARM.get(), true, true) .defaultLang("Targets for Mechanical Arms", "Components which can be selected as inputs or outputs to the Mechanical Arm"), @@ -84,13 +84,11 @@ public class PonderTag implements ScreenElement { "Components that have been added or changed significantly in the latest versions of Create") .addToIndex(), - DISPLAY_SOURCES = create("display_sources").item(AllBlocks.DISPLAY_LINK.get(), true, false) - .item(AllBlocks.DISPLAY_LINK.get(), false, true) + DISPLAY_SOURCES = create("display_sources").item(AllBlocks.DISPLAY_LINK.get(), true, true) .defaultLang("Sources for Display Links", "Components or Blocks which offer some data that can be read with a Display Link"), - DISPLAY_TARGETS = create("display_targets").item(AllBlocks.DISPLAY_LINK.get(), true, false) - .item(AllBlocks.DISPLAY_LINK.get(), false, true) + DISPLAY_TARGETS = create("display_targets").item(AllBlocks.DISPLAY_LINK.get(), true, true) .defaultLang("Targets for Display Links", "Components or Blocks which can process and display the data received from a Display Link"); @@ -158,7 +156,7 @@ public class PonderTag implements ScreenElement { } public PonderTag item(ItemLike item) { - return this.item(item, true, true); + return this.item(item, true, false); } @Override diff --git a/src/main/java/com/simibubi/create/foundation/utility/LangNumberFormat.java b/src/main/java/com/simibubi/create/foundation/utility/LangNumberFormat.java index e96b33e50..79a0f1dfa 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/LangNumberFormat.java +++ b/src/main/java/com/simibubi/create/foundation/utility/LangNumberFormat.java @@ -4,6 +4,7 @@ import java.text.NumberFormat; import java.util.Locale; import net.minecraft.client.Minecraft; +import net.minecraft.util.Mth; public class LangNumberFormat { @@ -25,6 +26,8 @@ public class LangNumberFormat { } public static String format(double d) { + if (Mth.equal(d, 0)) + d = 0; return numberFormat.get() .format(d) .replace("\u00A0", " ");