Commit graph

3037 commits

Author SHA1 Message Date
simibubi
1a8434d09c Flywheel Bump 2022-09-06 15:49:02 +02:00
simibubi
e268784f5a Merge branch 'mc1.18/dev' into mc1.19/dev 2022-09-06 15:48:31 +02:00
simibubi
3e89d9a878 Lag science
- Trains now try to wait for chunks to load in when player passengers are present
- Trains now sync clientside speed with the servers' tps to avoid overcorrection
- Hoppers can now be picked up by the wrench
2022-09-06 15:41:17 +02:00
PepperCode1
6ed8d31af0 Allow configuring max amount of firework ingredients
- Replace boolean allowBiggerFireworksInCrafter config with int
maxFireworkIngredientsInCrafter config
2022-09-03 13:33:53 -07:00
simibubi
1b602c00d5 Curse of the simulation
- Fixed fluid pipes occasionally losing fluid content when distributing to multiple containers
2022-08-31 18:06:32 +02:00
simibubi
a027f82252 Armed and unprepared
- Fixed Mechanical Arms losing their configuration when placed in survival mode
2022-08-24 10:42:43 +02:00
simibubi
d90682e7c3 Angry Conductor
- Added a train hat offset suitable for wardens
2022-08-19 20:41:36 +02:00
simibubi
caa498875c Ask First
- Fixed Arms and Ejectors sending their placement configuration too early
2022-08-19 14:35:33 +02:00
simibubi
7ea13cd6b1 Datagen snowball
- Fixed lang merger merging with its full output from previous rundata cycles
2022-08-19 13:49:11 +02:00
PepperCode1
236ccd152e Merge remote-tracking branch 'origin/mc1.18/dev' into mc1.19/dev
Conflicts:
	src/main/java/com/simibubi/create/events/ClientEvents.java
2022-08-18 10:23:55 -07:00
PepperCode1
62f7364b06 Fix build and JiJ Flywheel
- JiJ Flywheel since Forge 1.19 fixed mixin JiJ
- Add JEI common API as compile time dependency
2022-08-18 09:27:06 -07:00
wenqingl
efdcbb4154
Update README.md (#3232)
* Update README.md

comma before and

* Update README.md

cahgne to verb instead noun

* Update README.md

though -> through

Co-authored-by: PepperCode1 <44146161+PepperCode1@users.noreply.github.com>
2022-08-18 09:09:11 -07:00
simibubi
bea62d0631 Chance precision
- Tweaked jei display of seq. assembly success chance to display <1 and >99 respectively
- Adjusted mechanism recipe to a more rounded success chance (.80537 -> .8)
2022-08-18 18:07:43 +02:00
PepperCode1
08591b3411 Little things
- Check for spectator mode before rendering the toolbox overlay
- Tag sturdy sheets with forge:plates
- Remove empty event handler
- Remove Github Actions building configuration
2022-08-18 08:52:16 -07:00
simibubi
e2f1d260aa
Merge pull request #3661 from swwind/patch-1
fix typo: wrong chance shown in jei when chance < 0.01
2022-08-18 17:44:54 +02:00
swwind
49ccae2db7
fix: wrong chance in jei when chance < 0.01 2022-08-18 20:08:46 +08:00
PepperCode1
f7280b799c 1.19.2 and improvements
- Update to 1.19.2
- SuperByteBuffer no longer accepts a null RenderedBuffer
- Add datagen code for BiomeModifiers
- Switch back to Parchment mappings
2022-08-13 23:42:34 -07:00
PepperCode1
69b4973cac Merge branch 'mc1.18/dev' into mc1.19/dev
Conflicts:
	gradle.properties
	src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java
2022-08-13 21:10:01 -07:00
simibubi
65073e84bd Patch D 2022-08-13 23:19:44 +02:00
simibubi
a1b949c084 Graddle me this
- Temporarily regress to FG 5.1.53
2022-08-13 18:13:20 +02:00
simibubi
b8884fabad PR Datagen 2022-08-13 14:52:53 +02:00
andersonwu2000
54a2ad801a
Updates to zh_tw.json by andersonwu2000 and Akagiyoukai (#3580) 2022-08-13 14:45:01 +02:00
hewxle
b34de86f10
Improvements to the consistency of advancement texts by hewxle (#3578) 2022-08-13 14:43:32 +02:00
CKenJa
3aec03f5c6
Updates to ja_jp.json by CKenJa (#3573) 2022-08-13 14:41:16 +02:00
simibubi
16b17b3295
Merge pull request #3572 from nphhpn/nphhpn-patch-1
Fix fluid dupe exploit with hose pulley
2022-08-13 14:40:07 +02:00
Borusu1
a1431c0995
Added uk_ua.json by Borusu1 (#3570) 2022-08-13 14:38:18 +02:00
璀境石
67fa323637
Updates to zh_cn.json by Demonese (#3557) 2022-08-13 14:35:23 +02:00
luffypirat
693e2f6730
Updates to ru_ru.json by luffypirat (#3556) 2022-08-13 14:33:54 +02:00
simibubi
33daccc397 Committing self-wrench
- Fluid Pumps now orient themselves at adjacent pipes when placed
- Deployers mounted on minecart contraptions can no longer pick up minecart contraptions using a wrench
2022-08-13 14:29:18 +02:00
simibubi
c33fc73f3a Discomportulated
- Potential fix for spout ponder crash with other mods installed
- Fixed train navigation not behaving correctly near portals
2022-08-12 20:50:48 +02:00
PepperCode1
d27f979867
Merge pull request #3621 from SuperCoder7979/fix/door-disassembly
Break door blocks when rotating a contraption vertically
2022-08-11 11:31:39 -07:00
PepperCode1
848ed3a79b
Merge pull request #3620 from SuperCoder7979/fix/deepslate-emerald
Fix deepslate emerald ore providing cobblestone when crushed
2022-08-11 11:30:57 -07:00
SuperCoder79
67fd16b492 Break door blocks when rotating a Contraption vertically
- This prevents them from getting stuck in an invalid state.
2022-08-10 16:19:38 -04:00
SuperCoder79
58e49b9fdf Fix deepslate emerald ore providing cobblestone when crushed 2022-08-10 15:02:14 -04:00
PepperCode1
164dd62a29 Chocolate Can Cause Crashes
- Fix crash when rendering Create fluids
- Fix Create fluids not having a texture
2022-08-07 12:21:41 -07:00
PepperCode1
5e3f1eff1c Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.19/dev
Conflicts:
	src/main/java/com/simibubi/create/content/contraptions/fluids/PipeAttachmentModel.java
2022-08-07 12:20:18 -07:00
PepperCode1
6c0af5f83f Fix fluid pipe culling
- Rework PipeAttachmentModel to not rely on cullfaces for extra
information
- Split connector away from rim/drain models into separate models
- Remove none pipe models
2022-08-06 19:37:19 -07:00
PepperCode1
d09ccf24d2 Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.19/dev
Conflicts:
	src/main/java/com/simibubi/create/AllFluids.java
	src/main/java/com/simibubi/create/CreateClient.java
	src/main/java/com/simibubi/create/foundation/worldgen/BuiltinRegistration.java
	src/main/java/com/simibubi/create/foundation/worldgen/OreFeatureConfigEntry.java
2022-08-05 17:45:46 -07:00
PepperCode1
544b9699d9 More worldgen tweaks
- Pass RegistryAccess to builtin worldgen object creation methods
- Do not cache builtin worldgen objects
- Remove unused fluid layer code
2022-08-05 17:21:47 -07:00
PepperCode1
252aecabd5 Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.19/dev
Conflicts:
	src/main/java/com/simibubi/create/AllEntityDataSerializers.java
	src/main/java/com/simibubi/create/AllParticleTypes.java
	src/main/java/com/simibubi/create/AllRecipeTypes.java
	src/main/java/com/simibubi/create/AllSoundEvents.java
	src/main/java/com/simibubi/create/Create.java
	src/main/java/com/simibubi/create/events/CommonEvents.java
	src/main/java/com/simibubi/create/foundation/worldgen/AllWorldFeatures.java
	src/main/java/com/simibubi/create/foundation/worldgen/BiomeFilter.java
	src/main/java/com/simibubi/create/foundation/worldgen/ConfigDrivenDecorator.java
	src/main/java/com/simibubi/create/foundation/worldgen/ConfigDrivenFeatureEntry.java
	src/main/java/com/simibubi/create/foundation/worldgen/LayeredOreFeature.java
	src/main/java/com/simibubi/create/foundation/worldgen/OreFeatureBase.java
	src/main/java/com/simibubi/create/foundation/worldgen/VanillaStyleOreFeature.java
2022-08-05 13:56:19 -07:00
PepperCode1
42ffe443ac Defer registration, datagen worldgen
- Use DeferredRegister/RegistryObject where possible
- Refactor worldgen code to be cleaner and support datagen
- Fix zinc ore only generating on chunk corners
- Remove fan_heaters block tag
2022-08-05 11:39:34 -07:00
ded8667ae8 Merge remote-tracking branch 'origin/mc1.18/dev' into mc1.18/dev 2022-08-05 12:15:29 +02:00
3536394bdd PonderUI addon accessibility
- PonderUI constructor is now protected to allow addons to make subclasses
- renderWidgets now calls protected sub-methods for different parts of overlay rendering
2022-08-05 12:13:55 +02:00
simibubi
a9b61b5c2f Chipping away 2022-08-04 12:56:08 +02:00
PepperCode1
4ea1f3e620 Final Flywheel Fixes
- Update Flywheel
- Resolve all remaining errors
2022-08-03 23:43:36 -07:00
PepperCode1
9fbb71e4e9 Crash and leak fix
- Fix crash when invoking ContraptionMovementSetting#get
- Fix memory leak in WorldAttached by copying Flywheel's updated version
- Fix stockpile switches not preserving settings after being printed
2022-08-03 22:36:14 -07:00
PepperCode1
1797eddf0f Sequenced Porting
- Resolve all remaining 1.19 errors except for SuperByteBuffer
2022-08-03 14:52:44 -07:00
PepperCode1
4b3a972b9b Merge branch 'mc1.18/dev' into mc1.19/dev
Conflicts:
	src/main/java/com/simibubi/create/Create.java
	src/main/java/com/simibubi/create/CreateClient.java
	src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java
	src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java
	src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java
	src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerApplicationRecipe.java
	src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IDisplayAssemblyExceptions.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueSelectionHandler.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FillingRecipe.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluid.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluidHandler.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/tank/BoilerData.java
	src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleConfigScreen.java
	src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java
	src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java
	src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyRecipe.java
	src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/InstructionSpeedModifiers.java
	src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java
	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltSlicer.java
	src/main/java/com/simibubi/create/content/curiosities/armor/BackTankUtil.java
	src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankArmorLayer.java
	src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java
	src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java
	src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java
	src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperScreen.java
	src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkScreen.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/AccumulatedItemCountDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/BoilerDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/DisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/EnchantPowerDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/FluidAmountDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/FluidListDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/ItemCountDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/ItemThoughputDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/KineticSpeedDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/NumericSingleLineDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/PercentOrProgressBarDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/RedstonePowerDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/ScoreboardDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/SingleLineDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/StationSummaryDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/StopWatchDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/TimeOfDayDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/ValueListDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchScreen.java
	src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerClientHandler.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterContainer.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/FilterItem.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/FilterScreen.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/EnchantAttribute.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/FluidContentsAttribute.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAmuletAttribute.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAttunementAttribute.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryCrystalAttribute.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryPerkGemAttribute.java
	src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntity.java
	src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainStatus.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationMarker.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationScreen.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/TrainEditPacket.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/IScheduleInput.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/Schedule.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleItem.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleRuntime.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleScreen.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/CargoThresholdCondition.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/FluidThresholdCondition.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/ItemThresholdCondition.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/PlayerPassengerCondition.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/RedstoneLinkCondition.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/TimeOfDayCondition.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/TimedWaitCondition.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/ChangeThrottleInstruction.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/ChangeTitleInstruction.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/DestinationInstruction.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/TextScheduleInstruction.java
	src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlock.java
	src/main/java/com/simibubi/create/content/schematics/ClientSchematicLoader.java
	src/main/java/com/simibubi/create/content/schematics/MaterialChecklist.java
	src/main/java/com/simibubi/create/content/schematics/ServerSchematicLoader.java
	src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java
	src/main/java/com/simibubi/create/content/schematics/block/SchematicannonScreen.java
	src/main/java/com/simibubi/create/content/schematics/client/SchematicEditScreen.java
	src/main/java/com/simibubi/create/content/schematics/client/SchematicPromptScreen.java
	src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java
	src/main/java/com/simibubi/create/content/schematics/client/ToolSelectionScreen.java
	src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java
	src/main/java/com/simibubi/create/events/ClientEvents.java
	src/main/java/com/simibubi/create/foundation/advancement/CreateAdvancement.java
	src/main/java/com/simibubi/create/foundation/command/ClearBufferCacheCommand.java
	src/main/java/com/simibubi/create/foundation/command/CloneCommand.java
	src/main/java/com/simibubi/create/foundation/command/ConfigCommand.java
	src/main/java/com/simibubi/create/foundation/command/CouplingCommand.java
	src/main/java/com/simibubi/create/foundation/command/DumpRailwaysCommand.java
	src/main/java/com/simibubi/create/foundation/command/FixLightingCommand.java
	src/main/java/com/simibubi/create/foundation/command/FlySpeedCommand.java
	src/main/java/com/simibubi/create/foundation/command/HighlightCommand.java
	src/main/java/com/simibubi/create/foundation/command/KillTrainCommand.java
	src/main/java/com/simibubi/create/foundation/command/OverlayConfigCommand.java
	src/main/java/com/simibubi/create/foundation/command/ReplaceInCommandBlocksCommand.java
	src/main/java/com/simibubi/create/foundation/command/SConfigureConfigPacket.java
	src/main/java/com/simibubi/create/foundation/config/ui/BaseConfigScreen.java
	src/main/java/com/simibubi/create/foundation/config/ui/ConfigModListScreen.java
	src/main/java/com/simibubi/create/foundation/config/ui/ConfigScreenList.java
	src/main/java/com/simibubi/create/foundation/config/ui/HintableTextFieldWidget.java
	src/main/java/com/simibubi/create/foundation/config/ui/OpenCreateMenuButton.java
	src/main/java/com/simibubi/create/foundation/config/ui/SubMenuConfigScreen.java
	src/main/java/com/simibubi/create/foundation/config/ui/entries/NumberEntry.java
	src/main/java/com/simibubi/create/foundation/config/ui/entries/ValueEntry.java
	src/main/java/com/simibubi/create/foundation/gui/AbstractSimiScreen.java
	src/main/java/com/simibubi/create/foundation/gui/CreateMainMenuScreen.java
	src/main/java/com/simibubi/create/foundation/gui/ModularGuiLineBuilder.java
	src/main/java/com/simibubi/create/foundation/gui/element/TextStencilElement.java
	src/main/java/com/simibubi/create/foundation/gui/widget/AbstractSimiWidget.java
	src/main/java/com/simibubi/create/foundation/gui/widget/Label.java
	src/main/java/com/simibubi/create/foundation/gui/widget/ScrollInput.java
	src/main/java/com/simibubi/create/foundation/gui/widget/SelectionScrollInput.java
	src/main/java/com/simibubi/create/foundation/item/ItemDescription.java
	src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java
	src/main/java/com/simibubi/create/foundation/ponder/PonderTooltipHandler.java
	src/main/java/com/simibubi/create/foundation/ponder/content/DisplayScenes.java
	src/main/java/com/simibubi/create/foundation/ponder/content/RedstoneScenes.java
	src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java
	src/main/java/com/simibubi/create/foundation/ponder/ui/PonderTagIndexScreen.java
	src/main/java/com/simibubi/create/foundation/ponder/ui/PonderUI.java
	src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBox.java
	src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java
	src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringRenderer.java
	src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueRenderer.java
	src/main/java/com/simibubi/create/foundation/utility/Debug.java
	src/main/java/com/simibubi/create/foundation/utility/DynamicComponent.java
	src/main/java/com/simibubi/create/foundation/utility/FluidFormatter.java
	src/main/java/com/simibubi/create/foundation/utility/Lang.java
	src/main/java/com/simibubi/create/foundation/utility/LangBuilder.java
2022-08-03 12:40:21 -07:00
PepperCode1
9c8df2ff27 Registries and components
- Abstract all custom registries behind improved CreateRegistry class
- Remove usage of ForgeRegistryEntry.delegate and IRegistryDelegate
where possible
- Replace usage of IForgeRegistryEntry#getRegistryName with
RegisteredObjects#getKeyOrThrow where key is expected to be not null
- Move all component creation to the Components class
- Backport some other miscellaneous changes from 1.19
2022-08-03 10:08:00 -07:00
nphhpn
b4c0657d8b
Fix #2539 2022-08-03 14:32:09 +07:00