Merge remote-tracking branch 'origin/master' into fabric-1.16
# Conflicts: # build.gradle # gradle.properties # src/api/java/appeng/api/config/Upgrades.java # src/api/java/appeng/api/features/IWorldGen.java # src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java # src/api/java/appeng/api/storage/ISpatialDimension.java # src/api/java/appeng/api/util/DimensionalCoord.java # src/main/java/appeng/block/AEBaseBlockItemChargeable.java # src/main/java/appeng/block/AEBaseTileBlock.java # src/main/java/appeng/block/misc/TinyTNTBlock.java # src/main/java/appeng/block/networking/CableBusBlock.java # src/main/java/appeng/block/qnb/QnbFormedBakedModel.java # src/main/java/appeng/block/spatial/MatrixFrameBlock.java # src/main/java/appeng/block/storage/ChestBlock.java # src/main/java/appeng/client/gui/AEBaseMEScreen.java # src/main/java/appeng/client/gui/AEBaseScreen.java # src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java # src/main/java/appeng/client/gui/implementations/ChestScreen.java # src/main/java/appeng/client/gui/implementations/CondenserScreen.java # src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java # src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java # src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java # src/main/java/appeng/client/gui/implementations/DriveScreen.java # src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java # src/main/java/appeng/client/gui/implementations/GrinderScreen.java # src/main/java/appeng/client/gui/implementations/IOPortScreen.java # src/main/java/appeng/client/gui/implementations/InscriberScreen.java # src/main/java/appeng/client/gui/implementations/InterfaceScreen.java # src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java # src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java # src/main/java/appeng/client/gui/implementations/NetworkStatusScreen.java # src/main/java/appeng/client/gui/implementations/NetworkToolScreen.java # src/main/java/appeng/client/gui/implementations/PatternTermScreen.java # src/main/java/appeng/client/gui/implementations/QNBScreen.java # src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java # src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java # src/main/java/appeng/client/gui/implementations/SkyChestScreen.java # src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java # src/main/java/appeng/client/gui/implementations/StorageBusScreen.java # src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java # src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java # src/main/java/appeng/client/gui/implementations/WirelessScreen.java # src/main/java/appeng/client/gui/widgets/AETextField.java # src/main/java/appeng/client/gui/widgets/ActionButton.java # src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java # src/main/java/appeng/client/gui/widgets/IconButton.java # src/main/java/appeng/client/gui/widgets/ProgressBar.java # src/main/java/appeng/client/gui/widgets/SettingToggleButton.java # src/main/java/appeng/client/gui/widgets/ToggleButton.java # src/main/java/appeng/client/render/ColorableTileBlockColor.java # src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java # src/main/java/appeng/client/render/FacingToRotation.java # src/main/java/appeng/client/render/SpatialSkyRender.java # src/main/java/appeng/client/render/StaticBlockColor.java # src/main/java/appeng/client/render/cablebus/CableBuilder.java # src/main/java/appeng/client/render/crafting/CraftingCubeModel.java # src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java # src/main/java/appeng/client/render/effects/ChargedOreFX.java # src/main/java/appeng/client/render/effects/CraftingFx.java # src/main/java/appeng/client/render/effects/LightningArcFX.java # src/main/java/appeng/client/render/effects/MatterCannonFX.java # src/main/java/appeng/client/render/effects/ParticleTypes.java # src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java # src/main/java/appeng/client/render/model/BiometricCardBakedModel.java # src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java # src/main/java/appeng/client/render/model/MemoryCardBakedModel.java # src/main/java/appeng/client/render/model/MemoryCardModel.java # src/main/java/appeng/client/render/model/SkyCompassBakedModel.java # src/main/java/appeng/client/render/tesr/ChestTileEntityRenderer.java # src/main/java/appeng/client/render/tesr/CrankTESR.java # src/main/java/appeng/client/render/tesr/SkyCompassTESR.java # src/main/java/appeng/container/ContainerLocator.java # src/main/java/appeng/container/guisync/SyncData.java # src/main/java/appeng/container/implementations/CraftConfirmContainer.java # src/main/java/appeng/container/implementations/WirelessTermContainer.java # src/main/java/appeng/core/AEConfig.java # src/main/java/appeng/core/AppEng.java # src/main/java/appeng/core/Registration.java # src/main/java/appeng/core/api/ApiClientHelper.java # src/main/java/appeng/core/api/definitions/ApiBlocks.java # src/main/java/appeng/core/features/registries/WirelessRegistry.java # src/main/java/appeng/core/features/registries/WorldGenRegistry.java # src/main/java/appeng/core/localization/ButtonToolTips.java # src/main/java/appeng/core/localization/GuiText.java # src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java # src/main/java/appeng/core/sync/network/NetworkHandler.java # src/main/java/appeng/core/sync/network/TargetPoint.java # src/main/java/appeng/core/worlddata/WorldData.java # src/main/java/appeng/debug/ChunkLoaderBlockEntity.java # src/main/java/appeng/debug/CubeGeneratorBlockEntity.java # src/main/java/appeng/debug/DebugCardItem.java # src/main/java/appeng/debug/DebugPartPlacerItem.java # src/main/java/appeng/debug/MeteoritePlacerItem.java # src/main/java/appeng/debug/ReplicatorCardItem.java # src/main/java/appeng/decorative/solid/SkyStoneBlock.java # src/main/java/appeng/entity/TinyTNTPrimedEntity.java # src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java # src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java # src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java # src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java # src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java # src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java # src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java # src/main/java/appeng/fluids/tile/FluidInterfaceBlockEntity.java # src/main/java/appeng/helpers/DualityInterface.java # src/main/java/appeng/helpers/InvalidPatternHelper.java # src/main/java/appeng/helpers/MetaRotation.java # src/main/java/appeng/hooks/DynamicDimensions.java # src/main/java/appeng/integration/modules/jei/CondenserCategory.java # src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java # src/main/java/appeng/integration/modules/theoneprobe/TheOneProbeText.java # src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java # src/main/java/appeng/items/misc/CrystalSeedItem.java # src/main/java/appeng/items/misc/EncodedPatternItem.java # src/main/java/appeng/items/parts/FacadeItem.java # src/main/java/appeng/items/storage/SpatialStorageCellItem.java # src/main/java/appeng/items/tools/BiometricCardItem.java # src/main/java/appeng/items/tools/MemoryCardItem.java # src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java # src/main/java/appeng/items/tools/powered/MatterCannonItem.java # src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java # src/main/java/appeng/me/cluster/MBCalculator.java # src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java # src/main/java/appeng/me/cluster/implementations/QuantumCluster.java # src/main/java/appeng/mixins/DimensionTypeMixin.java # src/main/java/appeng/mixins/MinecraftServerMixin.java # src/main/java/appeng/mixins/SkyPropertiesMixin.java # src/main/java/appeng/mixins/SkyRenderMixin.java # src/main/java/appeng/mixins/ThreadedAnvilChunkStorageAccessor.java # src/main/java/appeng/parts/automation/AnnihilationPlanePart.java # src/main/java/appeng/parts/misc/CableAnchorPart.java # src/main/java/appeng/parts/reporting/AbstractMonitorPart.java # src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java # src/main/java/appeng/server/subcommands/TestOreGenCommand.java # src/main/java/appeng/services/CompassService.java # src/main/java/appeng/spatial/CachedPlane.java # src/main/java/appeng/spatial/SpatialDimensionExtraData.java # src/main/java/appeng/spatial/SpatialDimensionManager.java # src/main/java/appeng/spatial/StorageCellBiome.java # src/main/java/appeng/spatial/StorageChunkGenerator.java # src/main/java/appeng/spatial/StorageHelper.java # src/main/java/appeng/tile/spatial/SpatialIOPortBlockEntity.java # src/main/java/appeng/tile/storage/SkyChestBlockEntity.java # src/main/java/appeng/util/Platform.java # src/main/java/appeng/worldgen/ChargedQuartzOreConfig.java # src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java # src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java # src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java # src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java # src/main/java/appeng/worldgen/meteorite/debug/MeteoriteSpawner.java # src/main/resources/appliedenergistics2.mixins.json # src/unported/java/appeng/client/ClientHelper.java # src/unported/resources/META-INF/accesstransformer.cfg
This commit is contained in:
Sebastian Hartte
@@ -68,6 +68,12 @@ public class FacadeBlockAccess implements BlockRenderView {
|
||||
return world.getFluidState(pos);
|
||||
}
|
||||
|
||||
// This is for diffuse lighting
|
||||
@Override
|
||||
public float func_230487_a_(Direction p_230487_1_, boolean p_230487_2_) {
|
||||
return world.func_230487_a_(p_230487_1_, p_230487_2_);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LightingProvider getLightingProvider() {
|
||||
return world.getLightingProvider();
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
package appeng.mixins;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Mutable;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
import net.minecraft.world.gen.feature.structure.Structure;
|
||||
import net.minecraft.world.gen.settings.DimensionStructuresSettings;
|
||||
import net.minecraft.world.gen.settings.StructureSeparationSettings;
|
||||
|
||||
import appeng.worldgen.meteorite.MeteoriteStructure;
|
||||
|
||||
/**
|
||||
* This Mixin will add the structure placement configuration for the meteorite
|
||||
* structure to the static final immutable map that contains them. There is
|
||||
* currently no Forge hook for this, and registering them during the registry
|
||||
* event is already too late.
|
||||
* <p>
|
||||
* If this is not done, Meteorites spawn every chunk, since that is the default
|
||||
* for missing entries.
|
||||
*/
|
||||
@Mixin(DimensionStructuresSettings.class)
|
||||
public class DimensionStructuresSettingsMixin {
|
||||
|
||||
@Shadow
|
||||
@Mutable
|
||||
private static ImmutableMap<Structure<?>, StructureSeparationSettings> field_236191_b_;
|
||||
|
||||
@Inject(method = "<clinit>", at = @At("TAIL"))
|
||||
private static void addMeteoriteSpreadConfig(CallbackInfo ci) {
|
||||
field_236191_b_ = ImmutableMap.<Structure<?>, StructureSeparationSettings>builder().putAll(field_236191_b_)
|
||||
.put(MeteoriteStructure.INSTANCE, new StructureSeparationSettings(32, 8, 124895654)).build();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package appeng.mixins;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Invoker;
|
||||
|
||||
import net.minecraft.world.gen.GenerationStage;
|
||||
import net.minecraft.world.gen.feature.structure.Structure;
|
||||
|
||||
@Mixin(Structure.class)
|
||||
public interface StructureAccessor {
|
||||
|
||||
@Invoker("func_236394_a_")
|
||||
static <F extends Structure<?>> F register(String id, F feature, GenerationStage.Decoration defaultStage) {
|
||||
throw new AssertionError();
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user